diff --git a/resources/style.qss b/resources/style.qss index 38eeecbc..8bc816cd 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -4,7 +4,8 @@ QWidget#UBLibPathViewer, QWidget#UBLibNavigatorWidget, QWidget#UBLibItemProperties, QWidget#UBDownloadWidget, -QWidget#UBTeacherGuideWidget +QWidget#UBTeacherGuideWidget, +QWidget#UBFeatureProperties { background: #EEEEEE; border-radius: 10px; @@ -25,6 +26,13 @@ QWidget#UBLibWebView border: 2px solid #999999; } +QListView +{ + background: #EEEEEE; + border-radius : 10px; + border: 2px solid #999999; +} + QWebView#SearchEngineView { background:white; diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index e8f6aaa4..25f9d1d8 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -138,6 +138,7 @@ void UBBoardPaletteManager::setupDockPaletteWidgets() mpDownloadWidget = new UBDockDownloadWidget(); mpTeacherGuideWidget = new UBDockTeacherGuideWidget(); + mpFeaturesWidget = new UBFeaturesWidget(); // Add the dock palettes mLeftPalette = new UBLeftPalette(mContainer); diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index c655ac3c..0d8e7c39 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -16,6 +16,7 @@ #include #include +#include #include "UBDrawingController.h" @@ -808,7 +809,7 @@ void UBBoardView::dropEvent (QDropEvent *event) } else if (!event->source() || dynamic_cast(event->source()) || dynamic_cast(event->source()) - || dynamic_cast(event->source())) + || dynamic_cast(event->source()) || dynamic_cast(event->source()) ) { mController->processMimeData (event->mimeData (), mapToScene (event->pos ())); diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp index dbdaa99b..e8f0722d 100644 --- a/src/gui/UBFeaturesWidget.cpp +++ b/src/gui/UBFeaturesWidget.cpp @@ -4,6 +4,7 @@ #include "frameworks/UBFileSystemUtils.h" #include "core/UBApplication.h" #include "core/UBDownloadManager.h" +#include "globals/UBGlobals.h" UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPaletteWidget(parent) { @@ -11,8 +12,9 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPale mName = "FeaturesWidget"; mVisibleState = true; - setAttribute(Qt::WA_StyledBackground, true); - setStyleSheet(UBApplication::globalStyleSheet()); + SET_STYLE_SHEET(); + //setAttribute(Qt::WA_StyledBackground, true); + //setStyleSheet(UBApplication::globalStyleSheet()); mIconToLeft = QPixmap(":images/library_open.png"); mIconToRight = QPixmap(":images/library_close.png"); @@ -44,6 +46,7 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPale featuresPathModel->setSourceModel( featuresModel ); + //featuresListView->setStyleSheet( QString("background: #EEEEEE;border-radius: 10px;border: 2px solid #999999;") ); featuresListView->setDragDropMode( QAbstractItemView::InternalMove ); featuresListView->setModel( featuresProxyModel ); @@ -55,6 +58,7 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPale featuresListView->setIconSize( QSize(40, 40) ); featuresListView->setGridSize( QSize(70, 70) ); + //pathListView->setStyleSheet( QString("background: #EEEEEE; border-radius : 10px; border : 2px solid #999999;") ); pathListView->setModel( featuresPathModel ); pathListView->setViewMode( QListView::IconMode ); pathListView->setIconSize( QSize(30, 30) ); @@ -201,8 +205,8 @@ UBFeatureProperties::UBFeatureProperties( QWidget *parent, const char *name ) : { setObjectName(name); - setAttribute(Qt::WA_StyledBackground, true); - setStyleSheet(UBApplication::globalStyleSheet()); + SET_STYLE_SHEET(); + //setStyleSheet(UBApplication::globalStyleSheet()); // Create the GUI mpLayout = new QVBoxLayout(this); @@ -316,9 +320,9 @@ UBFeaturesPathViewer::UBFeaturesPathViewer(const QPixmap &root, const QString &r { setObjectName(name); - setAttribute(Qt::WA_StyledBackground, true); + /*setAttribute(Qt::WA_StyledBackground, true); setStyleSheet(UBApplication::globalStyleSheet()); - +*/ layout = new QGraphicsLinearLayout(); container = new QGraphicsWidget();