From 8a6def2d7a77f6dc93210ede7e33be08a80b517d Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Wed, 31 May 2017 13:33:34 +0200 Subject: [PATCH] ui: Fixes for source group ui * added final icons * fixed inconsistent names on copy * fixed files list for cdb groups not updated --- bin/app/data/gui/window/source_group_add.png | Bin 0 -> 578 bytes .../data/gui/window/source_group_add_hover.png | Bin 0 -> 1321 bytes bin/app/data/gui/window/source_group_copy.png | Bin 0 -> 832 bytes .../gui/window/source_group_copy_hover.png | Bin 0 -> 1688 bytes .../data/gui/window/source_group_delete.png | Bin 0 -> 518 bytes .../gui/window/source_group_delete_hover.png | Bin 0 -> 1226 bytes bin/app/data/gui/window/window.css | 7 ++++++- src/lib_gui/qt/element/QtIconButton.cpp | 2 +- .../project_wizzard/QtProjectWizzard.cpp | 17 +++++++---------- .../QtProjectWizzardContent.cpp | 1 - .../QtProjectWizzardContentCDBSource.cpp | 2 ++ 11 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 bin/app/data/gui/window/source_group_add.png create mode 100644 bin/app/data/gui/window/source_group_add_hover.png create mode 100644 bin/app/data/gui/window/source_group_copy.png create mode 100644 bin/app/data/gui/window/source_group_copy_hover.png create mode 100644 bin/app/data/gui/window/source_group_delete.png create mode 100644 bin/app/data/gui/window/source_group_delete_hover.png diff --git a/bin/app/data/gui/window/source_group_add.png b/bin/app/data/gui/window/source_group_add.png new file mode 100644 index 0000000000000000000000000000000000000000..e77b03435ff5c6ff4224265efb645feecff42d64 GIT binary patch literal 578 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7@v5$IEGZ*dUMy`?~sE;`$Mq^?&?b}`3>d`!X4J-FL)oY z920)PJ4MucC!=kX`G#eQ`5zd5`Tp@(735^CYw-5Bx0;&$6}HZr#+uz0akW$UG%DEgw4Uxs;#HeuBzVL%GdAKwUaIl*ODhxl zjZ1fBZa;tT`s?%84>5|qU&-cteS?O}|MN4xhh3buT{lf<&jwjx>CWqqr5@()`h4S? z@1%ysQtO=7<=kH|wPJ7fG1KIu%{RR!_s2|_sCe?qa`mTi+izde7Agoob47mFl`UVo z`&cgZ6rSGn?edM!hg;TtyST}|`mizs6Nf?rivt5A%LE1>i$Ms;5^!L8pm=GOv+CoD zr$@ch*r}2Q)0(CKYFaTK$C;wUAoXlAjmRi~H zx8~`O?FXOf@aay_d&7`$ZSoX`f9J2*xI4aYP|=+1@nq@!Pg!}~wHL2N+&Fi7PtpSk z-2%7jP0Tf4>gFjsd}4TYSX^yFgpX3w51rZ85jts!u6wR|wmykG_G0lwy{)Eg21}2x zk80f{cl(y!Qi~~%BP4)6P=WhpP4udYss9?*UtRbinT0{l{5}&8LzsWsMG50+b-+Zy N;OXk;vd$@?2>^Y?_2U2l literal 0 HcmV?d00001 diff --git a/bin/app/data/gui/window/source_group_add_hover.png b/bin/app/data/gui/window/source_group_add_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..3fe56ba8b559c029e7b4882837d2a95a0d1fdc98 GIT binary patch literal 1321 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 Yev_~Lpn?BP9jLnSboFyt=akR{0DK>^B>(^b literal 0 HcmV?d00001 diff --git a/bin/app/data/gui/window/source_group_delete.png b/bin/app/data/gui/window/source_group_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..4cdbe8bbe5fe16ba26e8a1d88aa8cd2f7304efb7 GIT binary patch literal 518 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7*}|@IEGZ*dNaq-?~sFt!}6(HH>mr5VXI)aY1~oVeviQ~ z!G`gkL*&jW(l?YVn6st6vGFhXe?0%vjA;_fczu4yeKPj-ICbXn`T2>4k7W+nb*{4W znDo$LR_BqBB$*!;!JSKwXq~?<-^(phsg?GrQOIC3>9~=g<0n?a~=-=j?|o^L=}`&u`{C`Frj;$v{Ip4_8XqY9U=T~Z^~B&q3XHE-gPwOdnrUWx4Bjs10bLeS~D7d|do zz15kosvp&tsqvQfnce+|&n|4(hogGn`? zge%_Hy%TJRWx4f~yLd{4j*`;Hz**8;D%KoQ`*=xA^hT<5a=7x`NV8=bOu!g~g8Y4~ Z5)9WHWBjxBS6P9?JYD@<);T3K0RXq2(-Z&z literal 0 HcmV?d00001 diff --git a/bin/app/data/gui/window/source_group_delete_hover.png b/bin/app/data/gui/window/source_group_delete_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..0a4df2e2977fc027a685fb707e305fc12918230f GIT binary patch literal 1226 zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r7o!#^NA%Cx&(BWL^R}oCO|{#S9GG z!XV7ZFl&wkP{HZUkcg59UmvUF{9L`nl>DSry^7odplSvNn+hu+GdHy)QK2F?C$HG5 z!d3~a!V1U+3F|8Y3;nDA{o-C@9zzrKDK}xwt{K19`Se z86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx=P7{9O-#x!EwNQn0$BtHP6qmLm5Rd1sY@-CA1Az=#^1qQAi7tkhHMA>m^>YcS^U|^cz>Eakt!T9#h z!NA)N5^aemn|Ak~IbyJg`Ne^d2}_uKSS77EL>WXAtP0ozm{c=1Og(wAd{f*%-$Q+p zBJNH66V9yeZrSo{OVywCPZRg}35l`X(wVUCRm{BSe~&)Ods6%9<}Kdvt#1!(JoL-r zq)~aCi2dPjt9Aaf+`TDT^Zj1^=GEWgpPqUzZFO$b*~g1Cp1sPmVf-6CH9Tx;^{ei! zI{Et|RM=A^?`i!0%JGFc(N5yrTit~CpJErPJ@~Sp*TvQ}oQm1^bYJn!qo4Yw=N;#g zDxE; z{i_l!%;rwp`1k*z5<{8qwKMk(>|7ltm8>1XB+q_chS?jvFO&{83@%^0mm+8=nXMS9}FWj|U63VgB zDOc#9Zz%IOQ{j#UWw%l{2WQ5r3OH8pJ-g9#M!0EGd~G9#RGrAFw!fZ#gEJ$6Qil)T zzWwP;*y9anKiM?8FHk)6PqI2?b>WS)OuY{*CN6&*zsBco=BVF%MSKMd?{fd;_G)aq tvuB5Ge7U4fMOV;)fssW37jez!ft-9+`=$Orv%Y}}7*AI}mvv4FO#lWB+}r>F literal 0 HcmV?d00001 diff --git a/bin/app/data/gui/window/window.css b/bin/app/data/gui/window/window.css index 2e724f4c..90ccc612 100644 --- a/bin/app/data/gui/window/window.css +++ b/bin/app/data/gui/window/window.css @@ -221,10 +221,15 @@ QCheckBox:disabled { color: black; } +#project_menu QListWidget::item:disabled, #project_menu #general_button:disabled { + background: white; + color: gray; +} + #project_menu #action_button { background: white; border: none; color: white; - margin: 5px; + margin: 5px 5px 3px; padding: 1px; } diff --git a/src/lib_gui/qt/element/QtIconButton.cpp b/src/lib_gui/qt/element/QtIconButton.cpp index a24b098a..9038a3b7 100644 --- a/src/lib_gui/qt/element/QtIconButton.cpp +++ b/src/lib_gui/qt/element/QtIconButton.cpp @@ -25,7 +25,7 @@ void QtIconButton::setColor(QColor color) void QtIconButton::enterEvent(QEvent *event) { - if (m_hoveredIconPath.size()) + if (m_hoveredIconPath.size() && isEnabled()) { setIconFromPath(m_hoveredIconPath); } diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp index 6e2a1557..8a9c4949 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp @@ -152,16 +152,16 @@ void QtProjectWizzard::populateWindow(QWidget* widget) buttonsLayout->setSpacing(0); QPushButton* addButton = new QtIconButton( - (ResourcePaths::getGuiPath().str() + "window/plus.png").c_str(), - (ResourcePaths::getGuiPath().str() + "window/plus_hover.png").c_str()); + (ResourcePaths::getGuiPath().str() + "window/source_group_add.png").c_str(), + (ResourcePaths::getGuiPath().str() + "window/source_group_add_hover.png").c_str()); m_removeButton = new QtIconButton( - (ResourcePaths::getGuiPath().str() + "window/minus.png").c_str(), - (ResourcePaths::getGuiPath().str() + "window/minus_hover.png").c_str()); + (ResourcePaths::getGuiPath().str() + "window/source_group_delete.png").c_str(), + (ResourcePaths::getGuiPath().str() + "window/source_group_delete_hover.png").c_str()); m_duplicateButton = new QtIconButton( - (ResourcePaths::getGuiPath().str() + "window/minus.png").c_str(), - (ResourcePaths::getGuiPath().str() + "window/minus_hover.png").c_str()); + (ResourcePaths::getGuiPath().str() + "window/source_group_copy.png").c_str(), + (ResourcePaths::getGuiPath().str() + "window/source_group_copy_hover.png").c_str()); addButton->setIconSize(QSize(20, 20)); m_removeButton->setIconSize(QSize(20, 20)); @@ -182,11 +182,8 @@ void QtProjectWizzard::populateWindow(QWidget* widget) connect(m_removeButton, SIGNAL(clicked()), this, SLOT(removeSelectedSourceGroup())); connect(m_duplicateButton, SIGNAL(clicked()), this, SLOT(duplicateSelectedSourceGroup())); - buttonsLayout->addStretch(); buttonsLayout->addWidget(addButton); - buttonsLayout->addStretch(); buttonsLayout->addWidget(m_removeButton); - buttonsLayout->addStretch(); buttonsLayout->addWidget(m_duplicateButton); buttonsLayout->addStretch(); @@ -523,7 +520,7 @@ void QtProjectWizzard::removeSelectedSourceGroup() void QtProjectWizzard::duplicateSelectedSourceGroup() { - if (!m_allSourceGroupSettings.size() || m_sourceGroupList->currentRow() < 0) + if (!m_allSourceGroupSettings.size() || m_sourceGroupList->currentRow() < 0 || !canExitContent()) { return; } diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp index 5ca74122..35a40c34 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp @@ -134,7 +134,6 @@ void QtProjectWizzardContent::filesButtonClicked() std::thread([&](){ std::vector fileNames = getFileNames(); m_showFilesFunctor(fileNames); - }).detach(); } diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp index 981c3a3e..e31c4fc9 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp @@ -79,6 +79,8 @@ void QtProjectWizzardContentCDBSource::load() std::vector QtProjectWizzardContentCDBSource::getFileNames() const { + const_cast(this)->load(); + return m_fileNames; }