From 83b359fe854f3329e99ebd1b93d2d2599339bdac Mon Sep 17 00:00:00 2001
From: Dimitar Tasev <dimitar.tasev@stfc.ac.uk>
Date: Thu, 4 Oct 2018 15:49:31 +0100
Subject: [PATCH] Unstable and Nightly now have the correct icons, re #23263

Added PNG icons for nightly and unstable, used by NSIS for the package icon
---
 buildconfig/CMake/WindowsNSIS.cmake          |  21 +++++++++++--------
 images/MantidPlot_Icon_32offset_nightly.png  | Bin 0 -> 1424 bytes
 images/MantidPlot_Icon_32offset_unstable.png | Bin 0 -> 1401 bytes
 3 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 images/MantidPlot_Icon_32offset_nightly.png
 create mode 100644 images/MantidPlot_Icon_32offset_unstable.png

diff --git a/buildconfig/CMake/WindowsNSIS.cmake b/buildconfig/CMake/WindowsNSIS.cmake
index 200a8e276ad..7789ad8fd70 100644
--- a/buildconfig/CMake/WindowsNSIS.cmake
+++ b/buildconfig/CMake/WindowsNSIS.cmake
@@ -10,20 +10,22 @@ set( CPACK_INSTALL_PREFIX "/")
 set( CPACK_PACKAGE_NAME "mantid${CPACK_PACKAGE_SUFFIX}" )
 set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}" )
 set( CPACK_NSIS_INSTALL_ROOT "C:")
-set( CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\MantidPlot_Icon_32offset.png" )
-set( CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\MantidPlot_Icon_32offset.ico" )
-set( CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\MantidPlot_Icon_32offset.ico" )
+set( WINDOWS_NSIS_MANTIDPLOT_ICON_NAME "MantidPlot_Icon_32offset" )
+set( CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}.png" )
+set( CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}.ico" )
+set( CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}.ico" )
 
 # Choose the proper suffix for the build.
 # if the string is not empty, capitalise the first letter
 if (NOT CPACK_PACKAGE_SUFFIX STREQUAL "" )
   # change the icon if this is not a release build - the icons have _<suffix> appended, e.g. _nightly and _unstable
   # this is done before the capitalisation of the first letter
-  set( WINDOWS_NSIS_MANTIDPLOT_ICON "MantidPlot_Icon_32offset_${CPACK_PACKAGE_SUFFIX}.ico" )
+  set( WINDOWS_NSIS_MANTIDPLOT_ICON_NAME "${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}_${CPACK_PACKAGE_SUFFIX}" )
   
-  set( CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON}.ico" )
-  set( CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON}.ico" )
-  set( CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON}.ico" )
+  # note: the PACKAGE icon uses PNG, the other two use ICO
+  set( CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}.png" )
+  set( CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}.ico" )
+  set( CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}.ico" )
 
   string(LENGTH ${CPACK_PACKAGE_SUFFIX} WINDOWS_NSIS_SUFFIX_LENGTH)
   # get only first letter
@@ -175,6 +177,7 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/buildconfig/CMake/Packaging/launch_m
 # Icons for shortcuts	
 ###########################################################################	
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/mantid_notebook.ico DESTINATION bin )
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}.ico DESTINATION bin )
 
 ###########################################################################
 # Extra NSIS commands for shortcuts, start menu items etc
@@ -187,7 +190,7 @@ set ( MANTIDPLOT_LINK_NAME "MantidPlot${WINDOWS_CAPITALIZED_PACKAGE_SUFFIX}.lnk"
 set ( MANTIDNOTEBOOK_LINK_NAME "MantidNotebook${WINDOWS_CAPITALIZED_PACKAGE_SUFFIX}.lnk" )
 
 set (CPACK_NSIS_CREATE_ICONS_EXTRA "
-  CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${MANTIDPLOT_LINK_NAME}' '$SYSDIR\\\\wscript.exe' '\\\"$INSTDIR\\\\bin\\\\launch_mantidplot.vbs\\\"' '$INSTDIR\\\\bin\\\\MantidPlot.exe' 0
+  CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${MANTIDPLOT_LINK_NAME}' '$SYSDIR\\\\wscript.exe' '\\\"$INSTDIR\\\\bin\\\\launch_mantidplot.vbs\\\"' '$INSTDIR\\\\bin\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}.ico'
 
   CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${MANTIDNOTEBOOK_LINK_NAME}' '$INSTDIR\\\\bin\\\\mantidpython.bat' 'notebook --notebook-dir=%userprofile%' '$INSTDIR\\\\bin\\\\mantid_notebook.ico'
 ")
@@ -197,7 +200,7 @@ set (CPACK_NSIS_DELETE_ICONS_EXTRA "
 ")
 # The blank lines seem to be required or it doesn't create the shortcut
 set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-  CreateShortCut '$DESKTOP\\\\${MANTIDPLOT_LINK_NAME}' '$SYSDIR\\\\wscript.exe' '\\\"$INSTDIR\\\\bin\\\\launch_mantidplot.vbs\\\"' '$INSTDIR\\\\bin\\\\MantidPlot.exe' 0
+  CreateShortCut '$DESKTOP\\\\${MANTIDPLOT_LINK_NAME}' '$SYSDIR\\\\wscript.exe' '\\\"$INSTDIR\\\\bin\\\\launch_mantidplot.vbs\\\"' '$INSTDIR\\\\bin\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}.ico'
 
   CreateShortCut '$DESKTOP\\\\${MANTIDNOTEBOOK_LINK_NAME}' '$INSTDIR\\\\bin\\\\mantidpython.bat' 'notebook --notebook-dir=%userprofile%' '$INSTDIR\\\\bin\\\\mantid_notebook.ico'
 
diff --git a/images/MantidPlot_Icon_32offset_nightly.png b/images/MantidPlot_Icon_32offset_nightly.png
new file mode 100644
index 0000000000000000000000000000000000000000..7745efbbffa6779901828ab50386e47c6da38347
GIT binary patch
literal 1424
zcmV;B1#kL^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;tB)|C>r~(F>3$-1szF5
zK~z}7)t75*R7DiW|8rk^celIUZFlKQYGZ}+RzgM8ss$<$5KIarK8S`7B!Gd4G2x|V
z0}VkUVhRyN5{bbCLnQJ}Nk!0BFp+0?$g2=aTS~Vr`@DO1@4d$_+orp8$rf4?&zGCb
znfagJ%$zfG2S{N=G?$2O;USi)4-uJ(XmdI`Tq*}+Y$s!^2#;oy0nANk*gWgQ@*m3O
z2LR%PH;Aa7i0%{7l4NosvJ=q}BI+QbT}0&Vp<yAS8Y1c>qDAqxZvbQx(MiKFSk<2O
zdH!f*hZuB)e?NbGe_V4D5&bH}2Mh*K31Ak0#Q>_4K<5J}22cWEb&}5k;1d9|0W1aZ
zEr5>!>>N@x?fp@%><g#wH%iTs5G2O2+KYcw#K+A9u)J#v?lQ*C0k{mn+{=;<0dR^j
z)&`(9$#<7Ab`ii80NqQh={ky?=JVcAn`{OTw<On`p7&#Z)jOZ@MD#8IH-P<JD`0fx
zPl`Rg4qyQhxd2Q_@)<o-C;rvH-21gnAmVZ@xvfX%Z&xKzd~?{UVIZQz05$?R$QTQz
zOhUsj*zMLv6TTZK0@wzi0l-xNc}YPZuq8WJj6K_Sj+<08sdM+j9iNJV&~sux0muRH
zb5G&~dv@(qx4}jC$h`1Of!XeMh#ApE6Xu!A$Gkcizy|={V~maIHM$4fl<e6-#<7N)
zk9LnrDo+8x0sw0P<S@pRURU7y%EN69t>GyRzRt2^-kW8eO8C&`6I;2j_HAm63#?2v
z`xi22u95_iwS;{y_TpY2559~sru3<>hp($xSW*49QMzI3>4zQw)s^1y8)t4vSC>n-
z<K^YGTbjb584?*|$8DIlz4xt~_`0U4*<uu)eg}v{9Ml+pMj~S#=FH)f{n@g4T@2)}
zU$!qWAOHZ+9MCHW1{*Wpw<XypF*Z7+YsdSd*Jpq`o|+C~{B0XA&P~kzk&=lQESkan
zGN1qe5YUZnE;+-T<tcxvt8HjT?zCL9gK1ps%zy)23g4*~1(6DEmc?CdPTo?<7{e8`
z-RO%Jd&KLOl~-4`@EphcV#;44Q0SB_B@W4A{@3r_5zy5G*IGh{u<?Y_ZvZ80Cg_7q
zHcru1vdfu7q;q*0*$_AZL<EBj@Enf|zPqF-e&#Y|K+$8k774%M^PH?rr7NTp+`Xps
z{76S3H`tL6jxlzr^%^sH9s(zH{k(u@JetEkSjk|+2Nfezwj*X}ki9pL)IDUY)5-xi
zlSa9$P7JcU;I_N)a#1Oog5HFi)2{~66ud`y)+`jei%{UmMWG`fF4@K&I|==y`zb!t
zNh2o1YPP~{vUU6KM*?V9e6Vs7b6OlQ@e-y#_ZCD>L?9M19vk4!=YKnIbv9CmzY}#=
z|3pX$p(7gVo|#3IA@L#tdW3?J5F)yY184W6C3ug1TY7-+w<;J>^^#g(af)8WPor~&
zB*2F?73VsepczpmOE61eJ$mEv%DR#PDMOoQ{Ltr}1*h_5Ylevz(V+&>t_G=9RS!3;
zI6A#ATKuB`M2|JKYh^B<LeYt;9u@prRLK-gVv7=}4;;O{cfe0V0BF|gwz_#)w(}-d
zY|XOdm>n$LvhEiEcwqSTSi4iUb)N@LQ7(IO006>TG@-<DOxCC28E1K706fPfydiQd
znOvc0-Sxx(WKKwU>j@l>(V6ZUw$-Jtq^lu34uEFRz793`8poJ9W>7#eVpmly`hDPw
ef9mmnvHt+6-y@)>KUtXo0000<MNUMnLSTXi%Z4ui

literal 0
HcmV?d00001

diff --git a/images/MantidPlot_Icon_32offset_unstable.png b/images/MantidPlot_Icon_32offset_unstable.png
new file mode 100644
index 0000000000000000000000000000000000000000..3da719a54f7e74295b97cd5bb2f039ec67167995
GIT binary patch
literal 1401
zcmV-<1%~>GP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;tB)|Cpt%24Qv1a1qMk(
zK~z}7)s$&$R8<&;pL6frJ9lQf%(NZ0Y9*{;sY<9trN}CTtpoxjMt-P2j0UR^G_t6f
zP-2J)f;C}LNk}w?MAU$2g93p#h(u+RunHKUElVlRzTLUUA6$?&P+Dk7Jb%u;-+9k_
zp6{IV9k|CP;ROlX?=ZGd!iE;H*CcFesZ}JrDPf~63QCwMVV;D866z!zmQWyJjQxK_
z!gwG6jFs??gdz$1B_t$N+ur38E=t%VA%E+FQNuF53{^sjt-UN^w$e(HIlxf69|=4M
z>;{$q%WQxh;`;YXz+PYi@UlJM0tQJZYSoJAN0t_Q=1h8h!n9!3sP#Y)7z5NeY_Yhp
zBewt?7S}U44>*B!z<OXd@OcZ^O*YUMwie(}-|C6pA^Gkh`(llHeKLkF6tTI`D6fEV
zKox)kNOFB!ih(}2m|FiG9{_Iw+w8v9&O(=<+dE<bi-6StW|zG3zCPEV4aumkNhx2+
zs>eTE|Jw<z!MbGoZ2-PifGvREHf(C;NCLoAJKJTzK438L2JjP52~4+lAg_A<h+;)b
zS82*jei^Lm_VKcPtF;Cz3oHl9>?G#3wwzM-LFI7P4b|FPA!RG4%$>RRc{$>vX|;FL
zirWSIyg$)zDd}$v)zPcimFHI=axoQMb!b6t^<7sFpo}k^85N2+vu*BIgYPE4Z58~r
zxc17KOY!k%Lf0yGHJ+_F9}m^`@%WYwUo|awH^V3LE0^dFO*F(q!|2F1VEMRL$JI=;
z%2rI=-<oc0&5XwKm6a>n>Z`O>cx>VJHFfdWR9#v_hOU_O+3k;R^hnc86>4b$9S&ea
zd~XW%fG({UnKesoIbLYEmS>RRJ#TM`bP51KeIz?hVu?q~Lu*=&=|YsovgYpg__Z70
zLSS2y6zaKLRh!fN_7BpXs>5ws%GaF=01(MqpA;E6u7bd*hi=6B<#e0W&E*xQk~z@n
z07v5&YBYx?OLE;+H)1~3Jwph=39g)OkC(W|suZJYW;CdZqJ}bwUo<H3>F)ks-R(La
zZrl*brna7Hi2cCIy@?J3=wJP0wu>`YNn}$p&&ZcjW|i(ag*X%kQc5gop(-jzLKkHs
z5f(+x91__Kr;_n!LxEqn-^tg}mc{+mWrqiOOO%JbJy3)YM=zZcma5`Vu1^<2pbC}x
zcnFWQ#DFfn$v5)ISSCi}*&l<g9Ce%SfM4i?i#$HM<Q3u1E8^*%Wz<C*<*k}<DoS1S
zvh40Dptrv##olg|czaM}<cj;ggkhNtOFPps1IOZVdGI@PZ;t<yjBqs(!lUTI=l0@M
zbtXSH1x?Y2WRli>16+7_pYQK$=Vep)8o`r46HCNsO2=+y=GF{!RU?v3%4jl1GMi%S
z!S85@UY0xNZ&f?23I;BFDpl<EX^n}nEbZF28GPJKap+ndrj<?<I9z%>n?8MPaj<`<
zlwoe5yx-%#;y-#Ao*bvD(UgjEH5HYYQmNWAi*`<KkC%Ec0O?(ISIvr|P(r3hr?P2B
z*i0w#HK*2)i0p~%Jh!>iUqXO-Gq~2T8b+S#6umtK?yfGcXlq$_2mk@Ba5i(*XXM^|
z4}6+Y@!$Y}xS4KNVqKk{M+gjcKQI7QQC!Uc-1$n0=Gpkb01U-pG<(+-mC}6w)ZC?I
z!`tfNxE}!1l3SWm(PtDPTp3G75?1D9%1nP6dGGf<{9oF?7rg37NKn__00000NkvXX
Hu0mjfW*L*R

literal 0
HcmV?d00001

-- 
GitLab