From d70079825a9bbbad6305407fc0a5cab40b79e5a9 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Thu, 22 Sep 2016 15:59:37 +0200 Subject: [PATCH] ui: Black and white size grips for dialog windows --- bin/app/data/gui/window/size_grip.png | Bin 672 -> 0 bytes bin/app/data/gui/window/size_grip_black.png | Bin 0 -> 875 bytes bin/app/data/gui/window/size_grip_white.png | Bin 0 -> 849 bytes deployment/windows/wixSetup/coati.wxs | 123 ++++++++-------- deployment/windows/wixSetup/installDir.wxs | 155 ++++++++++---------- src/lib_gui/qt/window/QtAbout.cpp | 1 + src/lib_gui/qt/window/QtIndexingDialog.cpp | 1 + src/lib_gui/qt/window/QtWindow.cpp | 25 ++-- src/lib_gui/qt/window/QtWindow.h | 2 + 9 files changed, 161 insertions(+), 146 deletions(-) delete mode 100644 bin/app/data/gui/window/size_grip.png create mode 100644 bin/app/data/gui/window/size_grip_black.png create mode 100644 bin/app/data/gui/window/size_grip_white.png diff --git a/bin/app/data/gui/window/size_grip.png b/bin/app/data/gui/window/size_grip.png deleted file mode 100644 index 39246b9bcd083f4a94e5211c861c6b513e000227..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 672 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsMa{ZC&cytf1nZuWqAc6 z5m3GGsXKWe!&b32J7!Pygy&CUtoTMLw{f=n*&gaG0EHAg`tC0)&t1lEbxdd zW?zv5?e?TY3IeWy!g)@Q zzWo3Hc15zJ0{e@@KQ!`RuG*{Rr1i1r=Q{qitx>B5H|9mAHC{cP+#31dYIn@@hI0Kv zE{m#(k_zt+vrPE@sA9p3+(nIxzH8U^l%8i=K9A*`EqlW}rhxMd8`K%@yl!+`&la^; zEaRKkg1fI9{MIv7?PWXgSL%IubPz-Dzpr6(`}ueM{VV5oV1c+jgWKO1Yi-{BE;o4h zyL!Qk+V>(RweQ!id40QKQ$EwJeXJ{fvn_aU= zyqd9g{-MuV+KjuzZx$yk5}(a@SR$(kE$XT9^kw(HU7f3g3g z_AAu6SRU+W^#TU0YKdz^NlIc#s#S7PDv)9@GB7mLH82OF5JMv?BMU1-V{HQ?D+7bL iH=G|)H00)|WTsW()}X&}BQR+(FnGH9xvX!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$Ysfr0UKW=KRygs+cPa(=E} zVoH8es$NBI0Z<16gH44MkeQoWlBiITo0C^;Rbi_HR$&EXgM{^!6u?SKvTcRlR{lkqsX*s~9A#%{ z12!H-4BJVF!;L zyP0_K@5-t-N!<0Gezy!vUgWHJ?6Ti)?e%2ST>BX1C!$J@|L*4bIdGg=D!edtZnRSk z!*-6}u6LcT@3eXKPS9+!_^*}cCKhmCe9kjd&WXv`;%Lg2xgQ*#-OSr^cz59%r@e=s ziLYq>7Qp;9^4{|VTX}(ibxz%NjH>BN#3r52@^VUkmC)&M^4d-1xBFiNcC{Hw=CapR*t#s0-6yHfrg!Vm`Ua1u9Htk}ORiLlf9_%W;rLlj g3r6(^EdN>#Fvs&c{n_fJWe!T`p00i_>zopr02`4kumAu6 literal 0 HcmV?d00001 diff --git a/bin/app/data/gui/window/size_grip_white.png b/bin/app/data/gui/window/size_grip_white.png new file mode 100644 index 0000000000000000000000000000000000000000..04deacd76c46f59155e1014233641a83a722db78 GIT binary patch literal 849 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEjKx9jP7LeL$-D%zPiKZiltlRY zSS9D@>LsS+C#C9D0BS3v*iS0onb8|oS8W7AZUnTBv4iY|~0L>t&w5X)?UL1X1yl$uzQ zUlfv`pJV3;3OfbQ+{EAFUm{>`W56OJ3||N3^AyB8-0*> zk-QHHTd*iFaP7E&Ho+pwj!RSTtSvBFO*~y3Ln1iePHp5pq#)qBwy>e^f}ljB=$!++ zB`k9t!V8$(3s`nD<|UY~;AiGsXiLvM%=X-Q~kON8-Bc?_~R^b8i;iVY8Xjbo|Uq)!3U{A;lLL z?-RMd$}u`Lv~c=^wdWnL3F#hhl76N4>bZSesDy-gLF$=uj!BXNv$~!pe-vUfxPR2} z{-2#vUuX5-cVzdwl5pB0XtEpenf}Ye8_*e>Jt8{6$4aSLWOm zx%vE?z?ZbwD|RrM&zmb<8l$|2|Mwl<`f1Kfw#_tCy5hR8bo+vh!aj|6v&}wk^tw~8 zu#VBxLj9Yi6SvWK;pumuuZa`5%KB0*#Dy`?K}3MHZtVf#qyWBM|NPx9ffB!`tDnm{ Hr-UW|TO=v= literal 0 HcmV?d00001 diff --git a/deployment/windows/wixSetup/coati.wxs b/deployment/windows/wixSetup/coati.wxs index e932b7cd..f866e8a6 100644 --- a/deployment/windows/wixSetup/coati.wxs +++ b/deployment/windows/wixSetup/coati.wxs @@ -2,20 +2,20 @@ - + - + - + - + - + - + INSTALLSTARTMENUSHORTCUT - - + - + - + INSTALLSTARTMENUSHORTCUT - + INSTALLDESKTOPSHORTCUT @@ -75,19 +75,19 @@ - + - - + + - + @@ -95,7 +95,7 @@ - + @@ -109,26 +109,26 @@ - - - + + + - + - + - + - + - + @@ -141,19 +141,19 @@ - + - + - + - + @@ -163,7 +163,7 @@ - + @@ -181,37 +181,37 @@ - + - + - + - + - + - + - + - + - + @@ -224,12 +224,13 @@ - + + - + - + @@ -238,26 +239,26 @@ - + - + - + - + - + - + - + @@ -283,40 +284,40 @@ - + - + SELFFOUND NEWERFOUND NOT Installed AND NOT PATCH (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL") - + - + - + WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1" 1 - + - + - + - + - + - + \ No newline at end of file diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs index f47d337f..1649e890 100644 --- a/deployment/windows/wixSetup/installDir.wxs +++ b/deployment/windows/wixSetup/installDir.wxs @@ -2,10 +2,10 @@ - + - + @@ -14,102 +14,102 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -117,7 +117,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -146,12 +146,12 @@ - + - + @@ -177,15 +177,15 @@ - + - + - + @@ -219,7 +219,7 @@ - + @@ -235,17 +235,17 @@ - + - + - + @@ -254,13 +254,13 @@ - + - + - + @@ -274,34 +274,34 @@ - + - + - + - + - + - + - + - + @@ -310,48 +310,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -388,19 +388,22 @@ - - + + + + + - + - + - + - + @@ -425,16 +428,16 @@ - - + + - + - + - + \ No newline at end of file diff --git a/src/lib_gui/qt/window/QtAbout.cpp b/src/lib_gui/qt/window/QtAbout.cpp index cc83c425..57088263 100644 --- a/src/lib_gui/qt/window/QtAbout.cpp +++ b/src/lib_gui/qt/window/QtAbout.cpp @@ -13,6 +13,7 @@ QtAbout::QtAbout(QWidget *parent) : QtWindow(parent) { + setSizeGripStyle(false); } QSize QtAbout::sizeHint() const diff --git a/src/lib_gui/qt/window/QtIndexingDialog.cpp b/src/lib_gui/qt/window/QtIndexingDialog.cpp index 3be10c2a..4b1adf88 100644 --- a/src/lib_gui/qt/window/QtIndexingDialog.cpp +++ b/src/lib_gui/qt/window/QtIndexingDialog.cpp @@ -25,6 +25,7 @@ QtIndexingDialog::QtIndexingDialog(QWidget* parent) , m_callback([](bool){}) { // setWindowFlags(Qt::WindowStaysOnTopHint); + setSizeGripStyle(false); } QSize QtIndexingDialog::sizeHint() const diff --git a/src/lib_gui/qt/window/QtWindow.cpp b/src/lib_gui/qt/window/QtWindow.cpp index 45c9be0b..71577551 100644 --- a/src/lib_gui/qt/window/QtWindow.cpp +++ b/src/lib_gui/qt/window/QtWindow.cpp @@ -55,16 +55,10 @@ QtWindow::QtWindow(QWidget* parent) layout->addWidget(m_content); QHBoxLayout* gripLayout = new QHBoxLayout(); - QSizeGrip* sizeGrip = new QSizeGrip(m_window); - sizeGrip->setStyleSheet(QString::fromStdString( - "QSizeGrip {" - " max-height: 12px;" - " max-width: 12px;" - " border-image: url(" + ResourcePaths::getGuiPath() + "window/size_grip.png);" - "}" - )); + m_sizeGrip = new QSizeGrip(m_window); + setSizeGripStyle(true); gripLayout->addWidget(new QWidget()); - gripLayout->addWidget(sizeGrip); + gripLayout->addWidget(m_sizeGrip); layout->addLayout(gripLayout); resize(sizeHint()); @@ -143,6 +137,19 @@ void QtWindow::setup() setupDone(); } +void QtWindow::setSizeGripStyle(bool isBlack) +{ + std::string path = isBlack ? "size_grip_black.png" : "size_grip_white.png"; + + m_sizeGrip->setStyleSheet(QString::fromStdString( + "QSizeGrip {" + " max-height: 16px;" + " max-width: 16px;" + " border-image: url(" + ResourcePaths::getGuiPath() + "window/" + path + ");" + "}" + )); +} + void QtWindow::setCancelAble(bool cancelable) { setCloseEnabled(cancelable); diff --git a/src/lib_gui/qt/window/QtWindow.h b/src/lib_gui/qt/window/QtWindow.h index a452ca7b..3b677b54 100644 --- a/src/lib_gui/qt/window/QtWindow.h +++ b/src/lib_gui/qt/window/QtWindow.h @@ -24,6 +24,8 @@ public: void setup(); + void setSizeGripStyle(bool isBlack); + void setCancelAble(bool cancelAble); void setScrollAble(bool scrollAble);