From 5a4ba69c6ef2c74ddf99be5796981833f49321aa Mon Sep 17 00:00:00 2001 From: Ivan Ilin Date: Tue, 13 Sep 2011 12:45:39 +0300 Subject: [PATCH 1/3] fixed bug with capturing a part... on win32 --- src/desktop/UBDesktopAnnotationController.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index a0a79cbd..063359fc 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -433,7 +433,10 @@ void UBDesktopAnnotationController::customCapture() UBCustomCaptureWindow customCaptureWindow(mDesktopPalette); // need to show the window before execute it to avoid some glitch on windows. + +#ifndef Q_WS_WIN // Working only without this call on win32 desktop mode customCaptureWindow.show(); +#endif if (customCaptureWindow.execute(getScreenPixmap()) == QDialog::Accepted) { From e83227b8965303cf88f7d2363f8154ec490d1c7d Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Tue, 13 Sep 2011 15:35:17 +0200 Subject: [PATCH 2/3] Stylized a bit the UI --- resources/images/down_arrow.png | Bin 0 -> 258 bytes resources/images/left_arrow.png | Bin 0 -> 258 bytes resources/images/right_arrow.png | Bin 0 -> 256 bytes resources/images/up_arrow.png | Bin 0 -> 238 bytes resources/sankore.qrc | 4 ++ resources/style.qss | 95 ++++++++++++++++++++++++++++++- src/gui/UBDocumentNavigator.cpp | 2 + src/gui/UBLibPathViewer.cpp | 1 - src/gui/UBLibWidget.cpp | 5 ++ src/gui/UBLibraryWidget.cpp | 1 - 10 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 resources/images/down_arrow.png create mode 100644 resources/images/left_arrow.png create mode 100644 resources/images/right_arrow.png create mode 100644 resources/images/up_arrow.png diff --git a/resources/images/down_arrow.png b/resources/images/down_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..a518176814401ba1f6478e81acd5e117c85eb362 GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~wj^(N7l!{J zxM1({$v_d#0*}aI1_o|n5N2eUHAey{$X?><>&kwclb4;#V$RoHg+L+664!_l=ltB< z)VvY~=c3falGGH1^30M91$R&1fbd2>aiF4DPZ!4!i_^(}{{OdUHf0oMo_g?s`2^P3 z1BdUK%9Q-uWlI_#Ke#yr3XKrjk{MVUJaqP_UOl9MB>LPgg&ebxsLQ00%5tGynhq literal 0 HcmV?d00001 diff --git a/resources/images/left_arrow.png b/resources/images/left_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..53e58f205b9e3c951aee9df35c5454e681db3bc6 GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~wj^(N7l!{J zxM1({$v_d#0*}aI1_o|n5N2eUHAey{$X?><>&kwclb2UQ;EwY1KA@0fiEBiObAE1a zYF-J0b5UwyNotBhd1gt5g1e`0KzJjcI8afnr;B5V#p$_McV#r4ApZcln{=qkK*SY7w2>B<5zAxCW!mhy?35giXi<{w)o t;Ank7w>>OEHb*ySp9p8$|9$V6wQV{zB9u?LJ_lOF;OXk;vd$@?2>`@TQ=$L> literal 0 HcmV?d00001 diff --git a/resources/images/right_arrow.png b/resources/images/right_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a64d2da468705fa50f96c747c356e4769ca9a0 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~wj^(N7l!{J zxM1({$v_d#0*}aI1_o|n5N2eUHAey{$X?><>&kwclb2UQO?YOJI8aEk#5JPCIX^cy zHLrxhxhOTUBsE2$JhLQ2!QIn0AiR+eq$t|c#WBR<^xG@mTnq{vEEjs-rMa)W?7Mn_ z?~jwNj>Qe_eF}^o6HjVd@Hb7BoGSTHxGJ$QReR050PflSN(YZd|LfXz@1;b{#KoND q6C|f7n67AbxxjVyLVf)AM&{sK>S3yt(}IE4FnGH9xvX<>&kwclb4-K+HTTmW}uK{iEBiObAE1a zYF-J0b5UwyNotBhd1gt5g1e`0KzJjcI8c$Nr;B5V#p&cf|Nq-Fn=%SBPd#`*;>E*v z|LR#PC7;D6?e&cpU$nbRBK*?%)*Ugstyle.qss images/cache_circle.png images/cache_square.png + images/down_arrow.png + images/up_arrow.png + images/left_arrow.png + images/right_arrow.png diff --git a/resources/style.qss b/resources/style.qss index dced298b..9f79a645 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -1,8 +1,12 @@ -QWidget#DockPaletteWidgetBox, QWidget#documentNavigator +QWidget#DockPaletteWidgetBox, +QWidget#documentNavigator, +QWidget#UBLibraryWidget, +QWidget#UBLibPathViewer { background: #EEEEEE; border-radius: 10px; border: 2px solid #999999; +/* padding-bottom: -2px; */ } QColorDialog @@ -32,6 +36,95 @@ QPushButton#DockPaletteWidgetButton::checked background-color: #BBBBBB; } +QScrollBar::vertical +{ + background:transparent; + margin: 23px 1px 25px 1px; +} + +QScrollBar::handle:vertical +{ + border: 2px solid #999999; + border-radius:6px; + background:#BBBBBB; + min-height:40px; +} + +QScrollBar::add-line:vertical +{ + image:url(:/images/down_arrow.png); + height:16px; + background:#BBBBBB; + border:2px solid #999999; + border-radius:6px; + margin: 1px 1px 4px 1px; + subcontrol-position:bottom; + subcontrol-origin:margin; +} + +QScrollBar::sub-line:vertical +{ + image:url(:/images/up_arrow.png); + height:16px; + background:#BBBBBB; + border:2px solid #999999; + border-radius:6px; + margin: 2px 1px 1px 1px; + subcontrol-position:top; + subcontrol-origin:margin; +} + +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical +{ + background:transparent; +} + + + +QScrollBar::horizontal +{ + background:transparent; + margin: 1px 23px 1px 25px; +} + +QScrollBar::handle:horizontal +{ + border: 2px solid #999999; + border-radius:6px; + background:#BBBBBB; + min-width:40px; +} + +QScrollBar::add-line:horizontal +{ + image:url(:/images/right_arrow.png); + width:16px; + background:#BBBBBB; + border:2px solid #999999; + border-radius:6px; + margin: 1px 1px 1px 4px; + subcontrol-position:right; + subcontrol-origin:margin; +} + +QScrollBar::sub-line:horizontal +{ + image:url(:/images/left_arrow.png); + width:16px; + background:#BBBBBB; + border:2px solid #999999; + border-radius:6px; + margin: 1px 2px 1px 1px; + subcontrol-position:left; + subcontrol-origin:margin; +} + +QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal +{ + background:transparent; +} + + QSlider::handle::horizontal { background-color:#EEEEEE; diff --git a/src/gui/UBDocumentNavigator.cpp b/src/gui/UBDocumentNavigator.cpp index 3f5332fe..53fea402 100644 --- a/src/gui/UBDocumentNavigator.cpp +++ b/src/gui/UBDocumentNavigator.cpp @@ -51,6 +51,8 @@ UBDocumentNavigator::UBDocumentNavigator(QWidget *parent, const char *name):QGra setScene(mScene); mThumbnailWidth = width() - 2*border(); + setFrameShadow(QFrame::Plain); + connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(addNewPage())); connect(mScene, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); } diff --git a/src/gui/UBLibPathViewer.cpp b/src/gui/UBLibPathViewer.cpp index 5342c740..39af07e7 100644 --- a/src/gui/UBLibPathViewer.cpp +++ b/src/gui/UBLibPathViewer.cpp @@ -37,7 +37,6 @@ UBLibPathViewer::UBLibPathViewer(QWidget *parent, const char *name):QGraphicsVie setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn); setAcceptDrops(true); - setStyleSheet(QString("QGraphicsView{background:#EEEEEE; border-radius:10px; border:2px solid #999999;}")); mpScene = new UBPathScene(this); setScene(mpScene); diff --git a/src/gui/UBLibWidget.cpp b/src/gui/UBLibWidget.cpp index de9cf34d..51ffdc16 100644 --- a/src/gui/UBLibWidget.cpp +++ b/src/gui/UBLibWidget.cpp @@ -16,6 +16,7 @@ #include "UBLibWidget.h" #include "core/memcheck.h" +#include "core/UBApplication.h" /** * \brief Constructor @@ -31,6 +32,10 @@ UBLibWidget::UBLibWidget(QWidget *parent, const char *name):UBDockPaletteWidget( { setObjectName(name); mName = "LibWidget"; + + setAttribute(Qt::WA_StyledBackground, true); + setStyleSheet(UBApplication::globalStyleSheet()); + mIconToLeft = QPixmap(":images/library_open.png"); mIconToRight = QPixmap(":images/library_close.png"); setAcceptDrops(true); diff --git a/src/gui/UBLibraryWidget.cpp b/src/gui/UBLibraryWidget.cpp index 65f26cfb..1c0007f7 100644 --- a/src/gui/UBLibraryWidget.cpp +++ b/src/gui/UBLibraryWidget.cpp @@ -37,7 +37,6 @@ UBLibraryWidget::UBLibraryWidget(QWidget *parent, const char *name):UBThumbnailW { setObjectName(name); setSpacing(5); - setStyleSheet(QString("background: #EEEEEE; border-radius : 10px; border : 2px solid #999999;")); mLibraryController = new UBLibraryController(parentWidget()); } From 54c872e30345643bf08b22ff726286953b980463 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Tue, 13 Sep 2011 15:46:09 +0200 Subject: [PATCH 3/3] removed a piece of code --- src/gui/UBLibNavigatorWidget.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gui/UBLibNavigatorWidget.cpp b/src/gui/UBLibNavigatorWidget.cpp index 308cff59..ef4109ef 100644 --- a/src/gui/UBLibNavigatorWidget.cpp +++ b/src/gui/UBLibNavigatorWidget.cpp @@ -50,7 +50,6 @@ UBLibNavigatorWidget::UBLibNavigatorWidget(QWidget *parent, const char *name):QW mSlider = new QSlider(Qt::Horizontal, this); mSlider->setMinimumHeight(20); - mSlider->setStyleSheet(QString("QSlider::handle::horizontal{background-color:#EEEEEE; margin-top:-5px; margin-bottom:-5px; height:20px; width:18px; border-radius:10px; border:1px solid #555555;} QSlider::groove::horizontal{background-color:#999999; height:10px; border-radius:5px; border:1px solid #555555;}")); mSlider->setRange(lowBoundForSlider, topBoundForSlider); mSliderWidthSetting = new UBSetting(UBSettings::settings(), "Library", "LibWidgetWidth", topBoundForSlider); int defaultWidth = mSliderWidthSetting->get().toInt();