From a68aaf620afd6de85e9b55c007c92a8150d058c0 Mon Sep 17 00:00:00 2001
From: Victor Poughon <victor.poughon@cnes.fr>
Date: Tue, 31 Jan 2017 10:51:42 +0100
Subject: [PATCH] BUG: Fix monteverdi confusing layer delete UI
Swap delete and delete all buttons order
Change delete icon to be visually more different than delete all
---
.../Monteverdi/src/mvdMainWindow.qrc | 2 +-
.../MonteverdiGui/src/mvdLayerStackWidget.ui | 12 ++++++------
Utilities/Data/Icons/layer-delete.png | Bin 0 -> 925 bytes
Utilities/Data/Icons/layer-delete_24x24.png | Bin 489 -> 0 bytes
4 files changed, 7 insertions(+), 7 deletions(-)
create mode 100644 Utilities/Data/Icons/layer-delete.png
delete mode 100644 Utilities/Data/Icons/layer-delete_24x24.png
diff --git a/Modules/Visualization/Monteverdi/src/mvdMainWindow.qrc b/Modules/Visualization/Monteverdi/src/mvdMainWindow.qrc
index c4178f4181..dfd8f7d286 100644
--- a/Modules/Visualization/Monteverdi/src/mvdMainWindow.qrc
+++ b/Modules/Visualization/Monteverdi/src/mvdMainWindow.qrc
@@ -7,7 +7,7 @@
<file alias="action_LayerProjection_Icon">../../../../Utilities/Data/Icons/projection_24x24.png</file>
<file alias="action_LayerUp_Icon">../../../../Utilities/Data/Icons/layer-up_24x24.png</file>
<file alias="action_LayerBottom_Icon">../../../../Utilities/Data/Icons/layer-bottom_24x24.png</file>
- <file alias="action_LayerDelete_Icon">../../../../Utilities/Data/Icons/layer-delete_24x24.png</file>
+ <file alias="action_LayerDelete_Icon">../../../../Utilities/Data/Icons/layer-delete.png</file>
<file alias="action_LayerDown_Icon">../../../../Utilities/Data/Icons/layer-down_24x24.png</file>
<file alias="action_LayerTop_Icon">../../../../Utilities/Data/Icons/layer-top_24x24.png</file>
<file alias="action_ZoomFull_Icon">../../../../Utilities/Data/Icons/zoom-1to1.png</file>
diff --git a/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.ui b/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.ui
index 0d4f254b2c..96f5c15ebc 100644
--- a/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.ui
+++ b/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.ui
@@ -194,9 +194,9 @@
</widget>
</item>
<item>
- <widget class="QToolButton" name="deleteAllButton">
+ <widget class="QToolButton" name="deleteButton">
<property name="toolTip">
- <string>Delete all layers</string>
+ <string>Delete selected layer</string>
</property>
<property name="locale">
<locale language="C" country="AnyCountry"/>
@@ -206,14 +206,14 @@
</property>
<property name="icon">
<iconset>
- <normaloff>:/icons/action_LayerDeleteAll_Icon</normaloff>:/icons/action_LayerDeleteAll_Icon</iconset>
+ <normaloff>:/icons/action_LayerDelete_Icon</normaloff>:/icons/action_LayerDelete_Icon</iconset>
</property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="deleteButton">
+ <widget class="QToolButton" name="deleteAllButton">
<property name="toolTip">
- <string>Delete selected layer</string>
+ <string>Delete all layers</string>
</property>
<property name="locale">
<locale language="C" country="AnyCountry"/>
@@ -223,7 +223,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>:/icons/action_LayerDelete_Icon</normaloff>:/icons/action_LayerDelete_Icon</iconset>
+ <normaloff>:/icons/action_LayerDeleteAll_Icon</normaloff>:/icons/action_LayerDeleteAll_Icon</iconset>
</property>
</widget>
</item>
diff --git a/Utilities/Data/Icons/layer-delete.png b/Utilities/Data/Icons/layer-delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d6aaf6f257bee75a76325181f7a39b4b903034a
GIT binary patch
literal 925
zcmV;O17iG%P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)e8y<G%tx@184vM11d>G
zK~y-))s#PI8)q2Cf2X_CKPM!%goULNnKWr=!H7($hn7Nz(0b2g(y2>^j)6c5g#<EW
zPfEHvYllL-BwL0;At5AAEQpGof@B3-w$84klXUmK9rT@YaaHP${ov#KclW%{_q@;h
z!T+sU|8%edS>Ot=1S|m4z#i}dcmUj4hVFj?UV(3cTW2bjT=CpFj^*<>uEVg`!)v}}
zt5##<)vFe8Z5e(#67UM#m?;#lpTBsKtmhHFd4u-4s3@w6xGsrOiSE=C&mTX=+ugmn
z4BsEdu@5tyDHLumUb=+y>={yTpu+*Gii#pCXb>Q~Eo{%DxVXq}z5e-<?>ByirxO_)
zP5=1v^5tB5eH}SCKt&(|R5OZ#Dyo8}GxW>z{QBr&3pf?mJP`|W<xHiL%X)2ee;*Y=
zRS*?K6){0Da}h;49nuFLAI#6^Orn_tyfk<ABf^bMBw`efbX7HgDu|3&kGe3ZH<&HX
zVcaurPHet#ET2Q3`=|){*RTK8tDA)a+V7K{I*zgAM8?yO<BYF)los8_wi6hiPXyi@
z`o6K190^!tr1!x0F~u`ciWmFM<`>zdgZMsM<uYP|s3^)iZO1uKMQxiu+igrm{++SF
zYNJ-eDwak+i-L*)FfLFNAletf&ga=~ZXvK5w{HY&HQ?@Mwc6@tGLXrj8jkeVcMK63
z=Rif#RElmoO|$v7Rf8W5uoYFF1tcDUehprCXJ={d!UbfzWvWibl^2z@s$!**Bu;-w
z_2n9^VQ}p#JOR{nY{S|HlE1+EXTG26G#Z~yfATSII!)N=qQTJUt*B$;%+BJ^%uroh
zW3$)0`yJdffD(a6jBOwZWFEj;x!>>hHZ~T-aZ<@rkyN>iTPz{@96iUSzOzHMRy+7D
z2=4s=_kjQynlXspiimNV(R)z<PMw6=Z{VwWsGNYJ3)unm+R*$RUfzdQ59+`+&;r^(
z2N(dM6$5t-_z9p0oHXmCIdjc-A*08}Gv3_;_RZeFFcvG8$%N@CU<$|>pF3thvQlUO
zhCm<iV={!1&eoylGakT>t>3HULp_KkE;{Eg7`E`n$)}e800000NkvXXu0mjf5jCqS
literal 0
HcmV?d00001
diff --git a/Utilities/Data/Icons/layer-delete_24x24.png b/Utilities/Data/Icons/layer-delete_24x24.png
deleted file mode 100644
index bf57b112d72f6d8276168ff1ef39a2c0e7b63034..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 489
zcmV<F0T%v=P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10cJ@=K~zYI?Uuc20znjoznN%6B#FU5&^NHK5>(Jq(9+H)5V7_-
ztbGP6wOK5zEX5}H*NYaigkW?fWYJBLxL}giu*((+In4}rhV#wLfy)TPFmO}SRri0u
zPvkjF>h-##v@4a0I0*nK6biP?TdkJm+V9W6eSp(&&jQ>u{~G|$`7Pf|pUv2II_UE`
z8DLl{9c3w?zmu|R8?fzkxQ)m0=5lOCBZSurfT8PL#bUgwYC>(dYqp<ApU?3{BHW}>
z1k-7Rln5yarqf&}lla163`p3%0l;QFM*95(qEWLJh(^(-Q#O+c;2?v8o(BWd7(km&
z&6;DtQ?CcWWjJgCUKR_p{snNVD}GkyW4tdG31zc9cDn$CvRMF@jm9y+s-IhFSSlHJ
z`Mha<Fg!r^>ouyPyaTNI(J82a{!Y^pYO{%|C}w@xXs}zY*l8L9`oiwF<)K{8T<rHX
f0}_@8kh1y)_kMwMv(7s$00000NkvXXu0mjfBzw|F
--
GitLab