From cea3c3282a80ab47efdb8731646b38d20b8a7ab0 Mon Sep 17 00:00:00 2001
From: Dimitar Tasev <dimitar.tasev@stfc.ac.uk>
Date: Thu, 4 Oct 2018 10:34:54 +0100
Subject: [PATCH] Added image icons and changed WindowsNSIS make to use them,
 re #23263

---
 buildconfig/CMake/WindowsNSIS.cmake          |   8 ++++++++
 images/MantidPlot_Icon_32offset_nightly.ico  | Bin 0 -> 1417 bytes
 images/MantidPlot_Icon_32offset_unstable.ico | Bin 0 -> 1408 bytes
 3 files changed, 8 insertions(+)
 create mode 100644 images/MantidPlot_Icon_32offset_nightly.ico
 create mode 100644 images/MantidPlot_Icon_32offset_unstable.ico

diff --git a/buildconfig/CMake/WindowsNSIS.cmake b/buildconfig/CMake/WindowsNSIS.cmake
index dca048bdf4d..200a8e276ad 100644
--- a/buildconfig/CMake/WindowsNSIS.cmake
+++ b/buildconfig/CMake/WindowsNSIS.cmake
@@ -17,6 +17,14 @@ set( CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\MantidPlot
 # 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( 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" )
+
   string(LENGTH ${CPACK_PACKAGE_SUFFIX} WINDOWS_NSIS_SUFFIX_LENGTH)
   # get only first letter
   string(SUBSTRING ${CPACK_PACKAGE_SUFFIX} 0 1 WINDOWS_NSIS_CAPITAL_FIRST_LETTER)
diff --git a/images/MantidPlot_Icon_32offset_nightly.ico b/images/MantidPlot_Icon_32offset_nightly.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6f10b12d0fa01f1887800080282f690c262ff491
GIT binary patch
literal 1417
zcmV;41$O!X0096203ad&0096X0CNQZ02TlM0EtjeM-2)Z3IG5A4M|8uQUCw|AOHXW
zA_xWm002I++y4Ln1v*JYK~z|U?U!k6R8<&;-*dOQGt-&Qv@>**+E}3MN~nlhwLm2T
zf=PkIg=qLe0vL!G6E-yyXb2J!Q-~;%NDL+zB9T2Mh@h=tB5PP=D}>UP(rL@Acb0qa
z=MSgN%rH}?2>s>z=iZ#}ocBEEyXSl-7x-UkL_~9l=;p)pAtECYZOX)lOBY~_ZD)*?
zWXPMWNdV>~G;EsrUgdX{@_hg?!s|rTKt%V5XmK(*5m|}o5D|3}(GDVV$9b5DsE&xb
zh-hJ~?MndJM07&ebyl-$U4b_e+9vuP!C%iE+Z*%TNJKviu>k`CR0Eg^U=e`YB+z*P
zN&%DsSd|pB0r(KWEC5RYd<EbG0NV%GOnqmhBlrBNdreYHC;*9Z?C^!(s$%1209e-j
z3GOh)&H}guz?dSXg8`gmjI{$eoD{pm7`p)AGJu{GtD1&VyYZYm&@LOn!zsyir{;cN
zSo7w`JQ2MGzzJY)cLwy>lTu6$0M`J_Cn5)c$w@Ii?w!S++Go4Jun0t4zA3-$$h@s#
zNfcijx^gIp=pcX%0QNJ+{Ao9#uIubpTay9bj1>WF0niBG3V?#7N$=C*?aRlUX+O(N
zEScD~bHTQcL_vsO*be~m0Q?wFoS;E#rZ{yjvP<TLr;3bLr%lX?EF3@ASULKofdJkG
z@HS&?bjsOX;3ntJ@-vP#*1f-TWPFH-1OW2^tO1b67*kSa;M$6V?Tu~0$&H?_ilgou
z6<td3z^3D0bD!_o*c3BZk#6<RX3tnD2_kC^dY(%WUKg8uDPv4Y=aEvw)>bX3s(nK*
zUq9tkZ~Z3KR=dY-n6W-n-?V!mS(la_-rO7vOqWO>Gj{#dt*QD9S~KAlRSoBg5x5>X
zKn!BP%J|a~>2ooAHlG~Nm5pnoAaBFcJ-){R001pMt%{(t(c?UulVcKNqXL?GtS^3j
z2Dt62>m<hCvhZR;t%qxbWZ(sps&hX*RsaC-Y5Eq2oMp^$RX)+(HY6*5YQE9NR4#h@
zu>)KT-mVn|k%}#*Mcr+7-c-#P!)3Hz?~7N;LX^q4%G&Byp5u5=RQW>$itUoA%qE$P
ze|z2Ad|G(l)z-iPY&ibFvz{?P+3NAy0E2~7v@luaY$DRQf~;H!oB$$%PC9sw$9c~k
zQWP(97_y*fQCtlLU-h_7Bwt`X64C|Y<y>8UZiKCv8)z#8#~8cVc9rQo4}tr4IAaVv
z<IxiIz)U(DHlP&QvK3KXh3vj@sJ@p^ozWg}GHIm4Y{vkr15T?0FO-y{+3!xcIlW;&
zn*DdFz?_3pX9<dI`6#v(!XaCF&2mNnUedf2Tj|8%lVCQQ;WSu!;`c&6bSNH}If>a#
zHW+vb)1H1EA}7KZ4fT3+W(08ilRxb@yPBxe+lBfozayXo&>0Eztjr|Jka!V3EkyoM
z03j`meP{Nf)qj_MS+eiGiW#pyor2*t&xealcG0bPX;j|e1o)sD#@ViBsCq=n5sXq$
zi(J37qQ2}wo)2{lEv|7xp0O95ER@Yz23|yG*pH5|pW4FVgN@6NOzVqRujxsr$kFBw
zwZh?1C^8|eMFg)JQL;sY*sAy%d`E8W?u*w$RYCx0QR}~U^0I8@4Xo6hW6Cqy7&1K8
zj|2cN=w2<_VV5mE^}sI575xVQAgD$Xj#!?-{3KjsP5lPIb6mndM4l;|D;CW=`VBzl
zgoJ-Rf#WeM+d18`s{F-FJ^H+9;-%`er!(w-nPbct)yb#m(JNs!@~!XFzZ(9FZ@=mv
Xs^KG`p2gsY00000NkvXXu0mjfzdD&t

literal 0
HcmV?d00001

diff --git a/images/MantidPlot_Icon_32offset_unstable.ico b/images/MantidPlot_Icon_32offset_unstable.ico
new file mode 100644
index 0000000000000000000000000000000000000000..fa8869aaa0c48240ee87c351450ac94eee725655
GIT binary patch
literal 1408
zcmV-`1%LVg0096203jj(0096X0BQvQ02TlM0EtjeM-2)Z3IG5A4M|8uQUCw|ApigX
zA_xWm007Z&u)zQT1u;oPK~z|U)t6~(R8<tmfA_t4Z{EywnQ1#^saC@pHkGv2g(3(D
zVHW}>M!x6=qd^p-Miwy>N(?bUv?lH(BpPEPYCyC>fj}HYqOwU`K)?W{ENyZ2?ajM>
z=qu7Xwli$T^X1OF=iLAMoip#8nFs%8li-!G;%aCqS8(=zU|cSTge4NzciVeH!iJm>
z5}uXtksTP6Fi*l_3Hv29OE@T@Ou_{F`n-h6KmeF1;ROj5681_+NNBLN>m;0!uuDSe
z=4Zy=kr`m95~}Uka}plttrA5*jlGTo9t3s*%Yjuk#5U3K`4M0@Fa>zjK5qddq!V?~
znmLD7R(TdodveO`;G*&CfFLjdXq2Eh>;s~+GM7Lc6djqI1f0Ozz&bkU-|q&z!G`+4
zjs-X{xM8Yybg6svo>;4XIvGP3ir83g)YZczV38eH?f{Z>l&A_AbcwKKuhL$h1Gd;}
zlbww&LANVo0ZV~50L;pgy1_ozPc6x)u1P5$%c{S=vhMrev=-~Et+yWd3}{n;O@QAP
zZRg)D0L-+rUIpv{MgmU(Ujws%Id&yV8lE0orAX--l`@kb2Ali7zG}}KT8othRs*$m
zB8$b}$>zMJQv33(F}z))^#GRBYS+$KIPa~8<k;6{H{}yAa%~QJX{z5+(w`ctV?dRw
z#IHc)Oe*^7foGZ;a>aMC0LtX@c~PN=V_Oz}JTf1MoZa#JvZnLL&c-Jn3tgz+(R#f8
zWIWU~$m3f%=GEE3-UM$iowZzdXrd(^x+5Qef^698NsmuzoNd*vnYy>9xQUH(TkF=&
zT2qL2-V^heC0pNYj>l%|(i&Z}X4-qXVg|i*?>N&;m1}7N*95`_`N9<HK3!T5Gk?C?
z-Cu6FR%ejmUC(cdTr&uO(~;~Xi6w5S3%%LhrwcJEmNj=4s#!3^slb+YDby3is<xnu
zBQQdDst&hlDW6<(2!Ke|dZ)rDa+L+f-_W@?q^R$-zAmpYmCU~D0`YVFRHNq5WOcE-
zbN=H~-E)Ny{KomCh3e%TR{5M8-#E8LRTMRpNqnn8wNG~s_3Ccdui@79k!))7k(St(
ztlgcsst`jP?#xy?i<Lw+B}<G_DP>maS5%HeaUi9{k`}6>awv30CK6#$;VdGN&2S_c
zzb_Q{Zfj54j-H&I=5MGyIKo@4-01C(B82$)>=9w9Dh~UffDi&zsGN?6@JLGxs~kwF
zQ9{NtF<Os*73}3}&+D1+3w>mT$46yJ1^$u>?!LK}=4h+DG$x#i(i}Y}`+3S3=)ajN
zZ(pjt{i!gDd#!d}5Mh}OOFA;1Fnl5&mj}PI_@e*MWQ4Xv2#=x*pWBO5)tP?l3^YX}
zl1cXPQ(XYWsTF&Ce_S{z+rt+K9{z?{B1U^Ub}>V@W}vGYk!(^%lQELn6r1;dPD}Kh
z-1hY5e@xcyR#0~gUv*ci%I(uy6Ja^3&)_Zz#LW~3E;M6W=|q{srN^`BqrWT*4$VjR
zvRbq_P&ec@U)7KO4Ns9%)o4#eX-h@r*;K0O*wXFO3)SnjRJkm@qq)tjuLvb%`rcGF
z?FgIcM5*S~S`v|6k?kio7OHpIFF&Wv;9GvxFiKRX80aZ;_i=dzdA9sjgCKwv&Su(t
zM)AdY;nR%z>k9$I&2*Rc>*Ms?M4-lfT_IFOadm-kmnzko=cDTiVJHsc(rbsJGOE-+
zvv_6gm_l?e>p|)?(~_IoQ_*`AAzT?tMiN%$aLP=-8+q}EU00&}pV(iI)a^>cne^iT
O0000<MNUMnLSTZf1*ic4

literal 0
HcmV?d00001

-- 
GitLab