From e326dab268bc56a44d21ae166e5e052673ef5e05 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Tue, 23 Sep 2003 18:34:01 +0000 Subject: [PATCH] new Graphics folder with a good structure, updated icons git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2954 212acab6-be3b-0410-9dea-997c60f758d6 --- .../Checks/big.bmp} | Bin .../Checks/classic-cross.bmp} | Bin Contrib/Graphics/Checks/classic.bmp | Bin 0 -> 886 bytes .../Checks/colorful.bmp} | Bin .../Checks/grey-cross.bmp} | Bin .../checks2.bmp => Graphics/Checks/grey.bmp} | Bin Contrib/{Icons => Graphics/Checks}/modern.bmp | Bin .../Checks/red-round.bmp} | Bin .../checks1.bmp => Graphics/Checks/red.bmp} | Bin .../Checks/simple-round.bmp} | Bin .../Checks/simple.bmp} | Bin .../Header/nsis.bmp} | Bin .../Header/win.bmp} | Bin .../Icons/arrow-install.ico} | Bin .../Icons/arrow-uninstall.ico} | Bin .../Icons/box-install.ico} | Bin .../Icons/box-uninstall.ico} | Bin .../Icons/classic-install.ico} | Bin Contrib/Graphics/Icons/classic-uninstall.ico | Bin 0 -> 1078 bytes .../Icons/llama-blue.ico} | Bin .../Icons/llama-grey.ico} | Bin .../Icons/modern-install-blue-full.ico} | Bin 22486 -> 23558 bytes .../Icons/modern-install-blue.ico | Bin .../Icons/modern-install-colorful.ico} | Bin 22486 -> 23558 bytes .../Graphics/Icons/modern-install-full.ico | Bin 0 -> 23558 bytes .../{ => Graphics}/Icons/modern-install.ico | Bin .../Icons/modern-uninstall-blue-full.ico} | Bin 22486 -> 23558 bytes .../Icons/modern-uninstall-blue.ico | Bin .../Icons/modern-uninstall-colorful.ico} | Bin 22486 -> 23558 bytes .../Icons/modern-uninstall-full.ico} | Bin 22486 -> 23558 bytes .../{ => Graphics}/Icons/modern-uninstall.ico | Bin .../Icons/nsis1-install.ico} | Bin .../Icons/pixel-install.ico} | Bin .../Icons/pixel-uninstall.ico} | Bin .../Icons/win-install.ico} | Bin .../Wizard/llama.bmp} | Bin .../Wizard/nsis.bmp} | Bin .../Wizard/nullsoft.bmp} | Bin .../Wizard/win.bmp} | Bin Contrib/Icons/adni18-installer-C.ico | Bin 22486 -> 0 bytes Contrib/Icons/checks-sdbarker-aa.bmp | Bin 2614 -> 0 bytes Contrib/Icons/lama.ico | Bin 2238 -> 0 bytes Contrib/Icons/lama2.ico | Bin 2238 -> 0 bytes Contrib/Icons/lama5.ico | Bin 2238 -> 0 bytes Contrib/Icons/lucas-checks.bmp | Bin 886 -> 0 bytes Contrib/Icons/new_nsis_3.ico | Bin 2238 -> 0 bytes Contrib/Icons/normal-uninstall.ico | Bin 766 -> 0 bytes Contrib/Icons/nsis_cd.ico | Bin 2238 -> 0 bytes Contrib/Icons/setup.ico | Bin 766 -> 0 bytes Contrib/Icons/yi-simple_install.ico | Bin 4710 -> 0 bytes Contrib/Icons/yi-simple_uninstall.ico | Bin 4710 -> 0 bytes Contrib/Makensisw/resource.rc | 2 +- Contrib/Makensisw/shell.ico | Bin 13590 -> 23246 bytes Contrib/Modern UI/Readme.html | 12 ++++++------ Contrib/Modern UI/System.nsh | 8 ++++---- Contrib/NSIS Menu/nsismenu/nsisicon.ico | Bin 13902 -> 23558 bytes Contrib/NSIS Update/NSISUpdate.nsi | 2 +- Examples/gfx.nsi | 16 ++++++++-------- Examples/makensis.nsi | 4 ++-- 59 files changed, 22 insertions(+), 22 deletions(-) rename Contrib/{Icons/checks-sdbarker.bmp => Graphics/Checks/big.bmp} (100%) rename Contrib/{Icons/checksX2.bmp => Graphics/Checks/classic-cross.bmp} (100%) create mode 100644 Contrib/Graphics/Checks/classic.bmp rename Contrib/{Icons/yi-box_check.bmp => Graphics/Checks/colorful.bmp} (100%) rename Contrib/{Icons/checksX.bmp => Graphics/Checks/grey-cross.bmp} (100%) rename Contrib/{Icons/checks2.bmp => Graphics/Checks/grey.bmp} (100%) rename Contrib/{Icons => Graphics/Checks}/modern.bmp (100%) rename Contrib/{Icons/jarsonic-checks.bmp => Graphics/Checks/red-round.bmp} (100%) rename Contrib/{Icons/checks1.bmp => Graphics/Checks/red.bmp} (100%) rename Contrib/{Icons/yi-simple2_check.bmp => Graphics/Checks/simple-round.bmp} (100%) rename Contrib/{Icons/yi-simple_check.bmp => Graphics/Checks/simple.bmp} (100%) rename Contrib/{Icons/modern-header.bmp => Graphics/Header/nsis.bmp} (100%) rename Contrib/{Icons/modern-header 2.bmp => Graphics/Header/win.bmp} (100%) rename Contrib/{Icons/yi-simple2_install.ico => Graphics/Icons/arrow-install.ico} (100%) rename Contrib/{Icons/yi-simple2_uninstall.ico => Graphics/Icons/arrow-uninstall.ico} (100%) rename Contrib/{Icons/yi-box_install.ico => Graphics/Icons/box-install.ico} (100%) rename Contrib/{Icons/yi-box_uninstall.ico => Graphics/Icons/box-uninstall.ico} (100%) rename Contrib/{Icons/new_nsis.ico => Graphics/Icons/classic-install.ico} (100%) create mode 100644 Contrib/Graphics/Icons/classic-uninstall.ico rename Contrib/{Icons/lama4.ico => Graphics/Icons/llama-blue.ico} (100%) rename Contrib/{Icons/lama3.ico => Graphics/Icons/llama-grey.ico} (100%) rename Contrib/{Icons/adni18-installer-B.ico => Graphics/Icons/modern-install-blue-full.ico} (75%) rename Contrib/{ => Graphics}/Icons/modern-install-blue.ico (100%) rename Contrib/{Icons/adni18-installer-A.ico => Graphics/Icons/modern-install-colorful.ico} (82%) create mode 100644 Contrib/Graphics/Icons/modern-install-full.ico rename Contrib/{ => Graphics}/Icons/modern-install.ico (100%) rename Contrib/{Icons/adni18-uninstall-B.ico => Graphics/Icons/modern-uninstall-blue-full.ico} (62%) rename Contrib/{ => Graphics}/Icons/modern-uninstall-blue.ico (100%) rename Contrib/{Icons/adni18-uninstall-A.ico => Graphics/Icons/modern-uninstall-colorful.ico} (79%) rename Contrib/{Icons/adni18-uninstall-C.ico => Graphics/Icons/modern-uninstall-full.ico} (72%) rename Contrib/{ => Graphics}/Icons/modern-uninstall.ico (100%) rename Contrib/{Icons/normal-install.ico => Graphics/Icons/nsis1-install.ico} (100%) rename Contrib/{Icons/yi-pixel.ico => Graphics/Icons/pixel-install.ico} (100%) rename Contrib/{Icons/yi-pixel-uninstall.ico => Graphics/Icons/pixel-uninstall.ico} (100%) rename Contrib/{Icons/new_nsis_2.ico => Graphics/Icons/win-install.ico} (100%) rename Contrib/{Icons/modern-wizard llama.bmp => Graphics/Wizard/llama.bmp} (100%) rename Contrib/{Icons/modern-wizard nsis.bmp => Graphics/Wizard/nsis.bmp} (100%) rename Contrib/{Icons/modern-wizard nsis llama.bmp => Graphics/Wizard/nullsoft.bmp} (100%) rename Contrib/{Icons/modern-wizard.bmp => Graphics/Wizard/win.bmp} (100%) delete mode 100644 Contrib/Icons/adni18-installer-C.ico delete mode 100644 Contrib/Icons/checks-sdbarker-aa.bmp delete mode 100644 Contrib/Icons/lama.ico delete mode 100644 Contrib/Icons/lama2.ico delete mode 100644 Contrib/Icons/lama5.ico delete mode 100644 Contrib/Icons/lucas-checks.bmp delete mode 100644 Contrib/Icons/new_nsis_3.ico delete mode 100644 Contrib/Icons/normal-uninstall.ico delete mode 100644 Contrib/Icons/nsis_cd.ico delete mode 100644 Contrib/Icons/setup.ico delete mode 100644 Contrib/Icons/yi-simple_install.ico delete mode 100644 Contrib/Icons/yi-simple_uninstall.ico diff --git a/Contrib/Icons/checks-sdbarker.bmp b/Contrib/Graphics/Checks/big.bmp similarity index 100% rename from Contrib/Icons/checks-sdbarker.bmp rename to Contrib/Graphics/Checks/big.bmp diff --git a/Contrib/Icons/checksX2.bmp b/Contrib/Graphics/Checks/classic-cross.bmp similarity index 100% rename from Contrib/Icons/checksX2.bmp rename to Contrib/Graphics/Checks/classic-cross.bmp diff --git a/Contrib/Graphics/Checks/classic.bmp b/Contrib/Graphics/Checks/classic.bmp new file mode 100644 index 0000000000000000000000000000000000000000..83e3cf565385105ac3e973e146aff90548f9cf37 GIT binary patch literal 886 zcma))K@Ni;5JjhHldep9jGm+W-l0e6%5g*DPBz}jBe;VNXR&_oaN8$anM?`VIX=7i2`5k1y-o5}{GsMnT4qhGBrp#H5X;Nk-^+~C?@ jKe*hVn;-sqUb(pqzrLS8{|9kFcyBdKN&6IWSvh|Iu!-To literal 0 HcmV?d00001 diff --git a/Contrib/Icons/yi-box_check.bmp b/Contrib/Graphics/Checks/colorful.bmp similarity index 100% rename from Contrib/Icons/yi-box_check.bmp rename to Contrib/Graphics/Checks/colorful.bmp diff --git a/Contrib/Icons/checksX.bmp b/Contrib/Graphics/Checks/grey-cross.bmp similarity index 100% rename from Contrib/Icons/checksX.bmp rename to Contrib/Graphics/Checks/grey-cross.bmp diff --git a/Contrib/Icons/checks2.bmp b/Contrib/Graphics/Checks/grey.bmp similarity index 100% rename from Contrib/Icons/checks2.bmp rename to Contrib/Graphics/Checks/grey.bmp diff --git a/Contrib/Icons/modern.bmp b/Contrib/Graphics/Checks/modern.bmp similarity index 100% rename from Contrib/Icons/modern.bmp rename to Contrib/Graphics/Checks/modern.bmp diff --git a/Contrib/Icons/jarsonic-checks.bmp b/Contrib/Graphics/Checks/red-round.bmp similarity index 100% rename from Contrib/Icons/jarsonic-checks.bmp rename to Contrib/Graphics/Checks/red-round.bmp diff --git a/Contrib/Icons/checks1.bmp b/Contrib/Graphics/Checks/red.bmp similarity index 100% rename from Contrib/Icons/checks1.bmp rename to Contrib/Graphics/Checks/red.bmp diff --git a/Contrib/Icons/yi-simple2_check.bmp b/Contrib/Graphics/Checks/simple-round.bmp similarity index 100% rename from Contrib/Icons/yi-simple2_check.bmp rename to Contrib/Graphics/Checks/simple-round.bmp diff --git a/Contrib/Icons/yi-simple_check.bmp b/Contrib/Graphics/Checks/simple.bmp similarity index 100% rename from Contrib/Icons/yi-simple_check.bmp rename to Contrib/Graphics/Checks/simple.bmp diff --git a/Contrib/Icons/modern-header.bmp b/Contrib/Graphics/Header/nsis.bmp similarity index 100% rename from Contrib/Icons/modern-header.bmp rename to Contrib/Graphics/Header/nsis.bmp diff --git a/Contrib/Icons/modern-header 2.bmp b/Contrib/Graphics/Header/win.bmp similarity index 100% rename from Contrib/Icons/modern-header 2.bmp rename to Contrib/Graphics/Header/win.bmp diff --git a/Contrib/Icons/yi-simple2_install.ico b/Contrib/Graphics/Icons/arrow-install.ico similarity index 100% rename from Contrib/Icons/yi-simple2_install.ico rename to Contrib/Graphics/Icons/arrow-install.ico diff --git a/Contrib/Icons/yi-simple2_uninstall.ico b/Contrib/Graphics/Icons/arrow-uninstall.ico similarity index 100% rename from Contrib/Icons/yi-simple2_uninstall.ico rename to Contrib/Graphics/Icons/arrow-uninstall.ico diff --git a/Contrib/Icons/yi-box_install.ico b/Contrib/Graphics/Icons/box-install.ico similarity index 100% rename from Contrib/Icons/yi-box_install.ico rename to Contrib/Graphics/Icons/box-install.ico diff --git a/Contrib/Icons/yi-box_uninstall.ico b/Contrib/Graphics/Icons/box-uninstall.ico similarity index 100% rename from Contrib/Icons/yi-box_uninstall.ico rename to Contrib/Graphics/Icons/box-uninstall.ico diff --git a/Contrib/Icons/new_nsis.ico b/Contrib/Graphics/Icons/classic-install.ico similarity index 100% rename from Contrib/Icons/new_nsis.ico rename to Contrib/Graphics/Icons/classic-install.ico diff --git a/Contrib/Graphics/Icons/classic-uninstall.ico b/Contrib/Graphics/Icons/classic-uninstall.ico new file mode 100644 index 0000000000000000000000000000000000000000..a37774cf3d64bf2d49b13938d17a5608f6dfa203 GIT binary patch literal 1078 zcmbu7F>>QD3`M`<%xF9N26DBNTVzj=>(Cw1iCwOwqj+YUlrB|df;^B?)&9W*f3{`eqLH-E)%uvjdO;f9N=o^%FW7vMW*Z%&{ru^r zzIT7!xnIzPY*mMkv}(C=u=SiB+|T@g=+hDXLu;Rm9)7)y9+9CZ)v)7!yH8ZuR)5-j zygr>;7hAMX@D>2CIq-@rZrm`~qFDV0+W8;x7%yW{uU_bvyj~|e^|;W&c`gJ#IL~7u zurgV0P<&yq-l8xPIAG(HgY#@9j>j0mWET$9Gl#7nuPCr_L)B~X^#z&s$Zr?{8$YsC zl#kC*`OD@0pJ_AqH$D2S!OzGvyh+0xQ+*=}^|v}pyBl>AV~cjEM}tY(81hNIUwFl< IvO6>X4xy1yC;$Ke literal 0 HcmV?d00001 diff --git a/Contrib/Icons/lama4.ico b/Contrib/Graphics/Icons/llama-blue.ico similarity index 100% rename from Contrib/Icons/lama4.ico rename to Contrib/Graphics/Icons/llama-blue.ico diff --git a/Contrib/Icons/lama3.ico b/Contrib/Graphics/Icons/llama-grey.ico similarity index 100% rename from Contrib/Icons/lama3.ico rename to Contrib/Graphics/Icons/llama-grey.ico diff --git a/Contrib/Icons/adni18-installer-B.ico b/Contrib/Graphics/Icons/modern-install-blue-full.ico similarity index 75% rename from Contrib/Icons/adni18-installer-B.ico rename to Contrib/Graphics/Icons/modern-install-blue-full.ico index a786d9afd0ebd40daac0eb177292e55e253c19f3..8f1c512222e60b28caeaac1e4b832d0f72fb3d61 100644 GIT binary patch delta 1638 zcmb_czl#$=6#mw|ulpp0>?YRlbg}Lz?@;e-ih|ahTz40 zCYGdR#zg{pk({n!3F)K40{p_-Ah>c1=NzRRc>ThA*^&7Xl`I|Al@d(d2-UXcDakgS zL9XXB$gzKx zj}>W4{d@Z?Juq2Sl_Bn_{|OLA1#uY~SE&JUwTT;TY=|J|e2Fqf>@d&;yb_x~9o7|y zLziG(z$_$W4nWQ&qsFgnz`2x=H%-L*ZPT3UF!0fARq;rvwu()-o5U|U9c>n`Sk3g2 zZ53w5`x#B>oayZ7^iaW&Jxt>s76X~JXfH8(*la4cfOSYi!OSN`27+H@-nEH$CA=$O z9AIR582E@%IAWySCuIHcUY1tolH8In$SX2uKk@Bf_yVbndqJL%zNckxR);a`YByDUF)(D&Dg| zbx^slZtBQsXMQhJuW~7pf!t-ufQl)t=uO;QA>};$6KqFX3A2&s&04WpDe+S5c_Wo< ljoyrsjRJV{UMJWYHc~sqrwg5PT_=}aXX$w8Ni;MRzX7I&4fg;5 delta 480 zcmZ9IuTBF&5Qo1DS9(;Gqu_fDG$9DmAZq&#An*uM%?sSAzCaVuxH=Nn5Q3<~A(7-B z0f``7e>2>L(oJ^1`M)zWdy3v4q8uW&NmFCOv<25t>lxD+-ek+NU;iS3ai`HU7RvkR z!Dv+byD&R!boqyHdIrZnR zT#ZkT)Nb_y{Yw0Twy{(t<5J1SLd-#7FoADlzveC|O^NVn-1=i_x>{PUQ?lz~q02!d ztaE-JU*?4@b_#ztxLHt1A*|Z~idusDv+Zw~i(O8w`>9KKrY!%QN_Iw|{7e(d@ FSOLY)O&I_H diff --git a/Contrib/Icons/modern-install-blue.ico b/Contrib/Graphics/Icons/modern-install-blue.ico similarity index 100% rename from Contrib/Icons/modern-install-blue.ico rename to Contrib/Graphics/Icons/modern-install-blue.ico diff --git a/Contrib/Icons/adni18-installer-A.ico b/Contrib/Graphics/Icons/modern-install-colorful.ico similarity index 82% rename from Contrib/Icons/adni18-installer-A.ico rename to Contrib/Graphics/Icons/modern-install-colorful.ico index ce36754ab3310ddedcd40e25f5e62216bffed3ba..2908f58be0f58154dc012697b5e80e133cc707a1 100644 GIT binary patch delta 1257 zcmb_cv5FKy5Pj|3GUEm3vVjh`Oc7dQE#axV95%eM>9FccVk4 z_7y5sbN;bhE+78KJno0)VRVy9k#dN8T9>EtUl58IcTcL)au*+-KbkzLxn2JjkS6bVoxTon4-2J{`TY+pC z6Ko4urG(4@h+Q&jeCrdhq=c&LGQTo(-KjPMFU?y^lS=EAyYy}nzhQR_Wqw7w(o6O> z^-PQ_x^Q!;y`$Yj1w-y|I`43CkY3CF5@UzE^NI`L+N7yq=940mAa2SS1`|Vr7;3lx zI2rCH9B~$8j)H4L=*Ro(?4>V>fjA>J1bg4a;V(EtA?;oh3qt;pfPx=>e}Df~HJg(i cZS_>|_it{zJm^19p6&JDX6tEx=ho}PpWA18`~Uy| delta 181 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 literal 0 HcmV?d00001 diff --git a/Contrib/Icons/modern-install.ico b/Contrib/Graphics/Icons/modern-install.ico similarity index 100% rename from Contrib/Icons/modern-install.ico rename to Contrib/Graphics/Icons/modern-install.ico diff --git a/Contrib/Icons/adni18-uninstall-B.ico b/Contrib/Graphics/Icons/modern-uninstall-blue-full.ico similarity index 62% rename from Contrib/Icons/adni18-uninstall-B.ico rename to Contrib/Graphics/Icons/modern-uninstall-blue-full.ico index 3e3cd4a86fbf361af467b54439b2d4ed76bff341..cd9227971c3731d85cb8e64bcfb6fee2197492b5 100644 GIT binary patch delta 1616 zcmb_cF^kkt5dPxclJ$z)Ws5^>5>df&v9J=fvJot7>_o7+R+}6syjNY)T_I>=En6wF zAeQ+J7S;h93yUpN96Nq9@4dU+s+Bjplka`==FLndlYIY_9evFlkYR$^YzCEE8E`~Y zs`i61@R7E%4EsMX0sFb~u)mxDo6Epr5&0hQVV=&HIM@LmT}%EYmJIXdX7VR@Bv0=! zu_mQ5E;8^GrL}9gg!IYa0si5A0A9I7+qOjA5c@+!S5*Ggq?dtI4dBSDs__PjlZx^O zHqqXo=C<^PQaeRysHnv^Rpr*xhUnHn?`t7o+MmlRQ<0OA$eP-Yq~k4|?-ct_x&QgqlkxLXSJc!$&xe)dg8KL7#ptTb4^vdbygFnfPbII&&kUqP zu5`eSp7B7HdyQw$BKQxuvj79bzj>|MC=6&7{U;CgFuxN9WCgK6*Eckra@W@t4T*D? zB{UK_sg==iEVv*Iyy7U`b|>tyQ}xt-|nrxjbHApe$AJ&)!p0W z4aQ;d3`t?NxnjpdiY-qmdZIHo@HUy8Qbgpd$zyiV+NrOpa$={*K#}nlcvUmSqr96>lw2c-ek+Nm4A`IxYOtv3*~+E zU^J@zU6>y>y8J^pJ%eMbsjD*nk6;3X*J#oT7YEmITcz!U{mxwyo`w%;Qd@SybMLkr zuEr-vYPb4{PUQ?lz~p-aCJ z)_L<1U*?4@b_#ztxLHt1A*|Z~idusDv+Zw~i(O5oSwHnvQRspSH&-dYbQDm-w EU+iy9xc~qF diff --git a/Contrib/Icons/modern-uninstall-blue.ico b/Contrib/Graphics/Icons/modern-uninstall-blue.ico similarity index 100% rename from Contrib/Icons/modern-uninstall-blue.ico rename to Contrib/Graphics/Icons/modern-uninstall-blue.ico diff --git a/Contrib/Icons/adni18-uninstall-A.ico b/Contrib/Graphics/Icons/modern-uninstall-colorful.ico similarity index 79% rename from Contrib/Icons/adni18-uninstall-A.ico rename to Contrib/Graphics/Icons/modern-uninstall-colorful.ico index 572cc031365cf3d0ccbc8ee7395b557aa8917ea3..461035cc2c3fef9a2b405435f18557d31c6fc4ab 100644 GIT binary patch delta 1235 zcmb`Hv5VAD5XQflTe4npyKHfYO(Jq&xmZ{UTG%dJ@HY$o%5Gn1LOFSGmoQ+E0_vp|L^=JPpJZe_qJ zt)lvmC%{Mgsw&2RUI7jZ?seAatj0Y^)81I5nJ2jL) ztRMUyHN(;eE45WCo{CzWH^z1|Pis4%ceT)9)?ex>Gm-OLq@%XEJP^l4(2SOfq{E(- zUBTp1WX-Q|`J{OMl>47wKAAkPbVW_)=lHUc{HODK{VKn1i<49}*utFfAh%K&@`Zyq zX2lT)yx@q+PV0qt5%WiELxGXw?_6s)3JZoE{UgWyu)h@+L>| z3tk2$hHZF`1sBA~hND;$o!4|7B{HJ}E8>jF?s3Qu3^Eh6jD|VlfwveO!#sw#I$S*@ zM~~EJ9bfA;EAoTmGFTWG&H=>~6d>{|I2ahrxL|w* zh7~}4_kXTpQr#rL0Ttogyhmsn-{vHH>GVl7zM*ok11+GYa^GgWrG6oNL^l1h<- zV7Y&Th4q1rg~gRygp9v8yOY}l1i`|0_x79b&Aj(!zMZ@8pR>cSnUgY&HJMCgww+0b zpiztOuS%bY6-77y^NO^U8}H_i$I{tVX=kVB>(a-~lwW9nMS5~OtuJ&;nUi~IJ^U8r z`2!kTQ=GcWL>AV(eKfk^yu?@DcfgaOnx+A5BE+vkuo2G3LiQL~Sw~WqwP#R990SHL zV%_sv71P1BaS$qJ7;0Qq@O4?b#YPRfh1B{g0NQ9TbPXHQ=}21O4epbpsK+^J=Rh=z zqi!>m=2S9Kt}RtTYi#e!>u0Mk3mf4{E6GA_|mzI|Y zoseB9FX77objXbkc%)0-QRCi<#h1{nA8;273<7`Vm36}?7 z@^cyk{e6t{7VuTSxQm49Xu)f}?n3y%FT{s%rrpqL8s@my^h}zzc8@PP9rMdRmqwR7 zYq*j42+#4Um-qo^p-~!8j3N(hJ zC3@o&OlZ^!M{sHIAJDUdH?|WS40qTV=LGX1ax#R9CydC+lM+dpq*PMQq=-tA5S1kX J;jk!Z_zi^1-zES6 delta 408 zcmYL^p-uxq6h+U5ExS~dO-ZmF0u2N~8bmFEKY%|#kZLSqSM>*)fJN4kFouwdIvf&7 z`Uyw`VYzRZDU-~ex%1}TcX#@ny+39(WNcDZ#*#?~t|4m2B!@TMIrmqemoV-o?U<|Y zqYtA|toLBLpS0>jI5~wQ^VF72m?PK${A+gE@fUkHc_C|Cey4k1`j_ETRmPhwzv$of z{MGpQKylko7_{OF3S%QDqc!XEW31uZcm`j_0jLeOVP!1-xiq~2iH&JROEkG&vxoe4 mw}~=v{c^T&hv)K7^V0m3N6|vQb{X?3P{^-_@IQJ`YySdR1Vc~& diff --git a/Contrib/Icons/modern-uninstall.ico b/Contrib/Graphics/Icons/modern-uninstall.ico similarity index 100% rename from Contrib/Icons/modern-uninstall.ico rename to Contrib/Graphics/Icons/modern-uninstall.ico diff --git a/Contrib/Icons/normal-install.ico b/Contrib/Graphics/Icons/nsis1-install.ico similarity index 100% rename from Contrib/Icons/normal-install.ico rename to Contrib/Graphics/Icons/nsis1-install.ico diff --git a/Contrib/Icons/yi-pixel.ico b/Contrib/Graphics/Icons/pixel-install.ico similarity index 100% rename from Contrib/Icons/yi-pixel.ico rename to Contrib/Graphics/Icons/pixel-install.ico diff --git a/Contrib/Icons/yi-pixel-uninstall.ico b/Contrib/Graphics/Icons/pixel-uninstall.ico similarity index 100% rename from Contrib/Icons/yi-pixel-uninstall.ico rename to Contrib/Graphics/Icons/pixel-uninstall.ico diff --git a/Contrib/Icons/new_nsis_2.ico b/Contrib/Graphics/Icons/win-install.ico similarity index 100% rename from Contrib/Icons/new_nsis_2.ico rename to Contrib/Graphics/Icons/win-install.ico diff --git a/Contrib/Icons/modern-wizard llama.bmp b/Contrib/Graphics/Wizard/llama.bmp similarity index 100% rename from Contrib/Icons/modern-wizard llama.bmp rename to Contrib/Graphics/Wizard/llama.bmp diff --git a/Contrib/Icons/modern-wizard nsis.bmp b/Contrib/Graphics/Wizard/nsis.bmp similarity index 100% rename from Contrib/Icons/modern-wizard nsis.bmp rename to Contrib/Graphics/Wizard/nsis.bmp diff --git a/Contrib/Icons/modern-wizard nsis llama.bmp b/Contrib/Graphics/Wizard/nullsoft.bmp similarity index 100% rename from Contrib/Icons/modern-wizard nsis llama.bmp rename to Contrib/Graphics/Wizard/nullsoft.bmp diff --git a/Contrib/Icons/modern-wizard.bmp b/Contrib/Graphics/Wizard/win.bmp similarity index 100% rename from Contrib/Icons/modern-wizard.bmp rename to Contrib/Graphics/Wizard/win.bmp diff --git a/Contrib/Icons/adni18-installer-C.ico b/Contrib/Icons/adni18-installer-C.ico deleted file mode 100644 index 18c134383b6edcd8e569481b9fea4d01e38bd2b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22486 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 R{nuH|zk>hMj}rP<<4;9@f1&^Y diff --git a/Contrib/Icons/lama.ico b/Contrib/Icons/lama.ico deleted file mode 100644 index d38ddaf0acf2e5f478348a7e07108d2acdf571bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmcJRc~DbV6vjVWyG*AYJ67#NYqb{CVqLI7S%N}=pio5x!2+?0Aj)FPq7*D5i(my6 zA|i``K-hxDvWp;#VUtZj)+nGLSOknh5VH0rL7~%5|Ld3eopa}YcbogpdlO&|`7K!j z65mDIyTBpoPHHT~NzH}u z*It64&5Lnbe?CG?7U8V%Ct#R=LHd+&inazpMk^3%xDgZIltecO}C2P!UFmG2e*zA1R2l)JF7v6~x-FM9hH|h(G)-Vh^sx z7Tt~jqo%04Zm?x!N@$T}pttVMz|1qn_R(pE=;qZ+QbXd%s(iWIl? z1PYQ}HIaTy9ciuf-!%V{$$kl3ew` z^w3AjQ3E8q=^@#}2&tY1NcA#7x|ac1zZoIpIE`duqru3pI%A$7ScFZo66Ur{_!0lKw zRL1W{#btBSrlT^>0%fs|s7kOzb>bdWU)h5@$yT_-v_fr)HENl3)TP=G&j$5rbks0y zQImRv;E0Bd{b*#_p)u1Qb!mIic+DC084lni`Jgu44Rx8nqUqWpG_jr0oaKspIUZ=q z_CRZ%7g}<>(OTexwgPW(k^@oAI)|F84Afl@MMG{J8uAD^mr^DPn?K7K;1j=fJ%ki3b(o=&rnoo~ldomx9Yl zL{|k1Jv9mFs>(%Yc@DbkO3+&qgNL>8=&en}qxvK~YDghuqVFyX{Y~kFOgwJBiYM*4 z80sp-5Vsh8_c$2rtio`21x9)+@vQF-M*A8u@~8>C{zmWyn(*RDE5?S}Np8W|(=LoZ zhQ&1OY(=sYFbWKq{3Xg;+EN4$+e3t2b(DegAi9Y3`DF9M0$87@0b{9X;lI za<+Vr9d)r?L+nK>sV0Zq15bsdR5j*?2gwwkQ(u*K;Z≥cqz{B{ls6E}p@mu_Zmv z+LO=86j$H>qAfi<*wbkX=Pjjm`u1*qA?F!MWxZ|544I;sjYGq&DItDtJ9aKmHr#s9 zJ>YB@BO-&_#*9!5C>fCUrk@RPKd7?sJ8NSH5C2f&r*iL?=QE?oi11qj(t*0m{vHm? z7wXYp`}dzc?!A|h7#$INYd|nQST6T1Z4`b)RK|U&KswmgT$U77G9VNSo8rTphTw+os_L=s8MEI&NG_2D3&bV?*5{$T&`OYz_Q-_u)11Y*)BlUOX0 zw`R@1P(L!IFlWUX|7ctbZ+h~-`lm~KUd}S6n=|txyZFNY@)I8XbNAWjf8~n=lL`sM z5|Lo$ex`jP@9{&0hF%KCpD6BEc7Ksw<3dt|qGO`MNPXC=EU>gTKK$#YyTl*5 z6)rEY=@1(1>2l!fH_d-EJX3MEXM*?zXXWLo2*IR251A~3xy9xiqhk{SiSW;CznKar z_3h?(fc6#kSm<6G9UT`4C%Uh=IK7s$qvJtSn#PxN_E}L}Z`|x0o9Hg|GTlBSldUv; z4YiNwdVA|p^sM7Mo>m?)(0(PVwl-B`{kpZvZ*lgsz0K9te~RxY-mCLkn{;$G>8L9! zea7K@ai^N~+b?!LnXKbK&z7CtKIKo}ATOX>3^W9683XScJnGdo)?)-Bp&XNpHfR7#7K1;h%n6e)C(bU|rBMMOCY z7LZG{F%T}5$|*t=!Yv{oHv}+*8q;|~Tx{OK(* zto{}Wi>-9n?YJavtA@w+F zZ+aq+76#@6cQhpKMC0{O(2!t?hUf!$O8XEU86Tr9^&>Q=o1#7246NLJ=q);cCb~5` z?|7i|);DNQIf1%Z3)Cf3P)GMhYnl%lZ=FS3t~J_oPogK&9c-o@1}i>8f9YZLRUJWJ zwFg)g4(QCMpe-j9tik}WvwgrW2nIVZ0Ic%!c;4uW(G~{`)&GFu=1{!o^8%mk3?AD9 zye=nuG?Xw+>T7 z?c~h6$^2bp-d2qFv%no0gmm~R7DwALJKl@=$wACa43Rmz$-5cC!t@B1rv{-^HbNom zBx@RgP}mGUpO5jeF-*S{V0wBA^Ye3%OplZG^GIJF7Uu<65(}{;nT0~cheA37jhY9E zM2w}SB`hyW$ao86KQgElOHeDNP$(3T%jM*mgjz{LMf#}7URTK8HPC3(FwjD$XBU<+ zSz5YuCCPbtIzQ8h~gSQyQHyQCeqkdE^yzF75nVfj#MR6DPx#G!oYOKC~ zJbxk~Sm#qsoRf6@#c?4`og$@@v}kGJiYKmx=zPkW=Z3a(MKTR}P0J$DvaDmxzrWgl zCjQc-lGs-$*Zg;@eyaImyLe5K{M!HLl@Dv>E7fX^YL%7Op0e`l@=#w_QQ&**Jqu6IGxxmB44cHXQO-<$bv)_J6{MT+i`!Yx77JEPcqUtr()s+{{`MAAr zZ0>pNYqx*z-5fC+z47~i*IWoV=jY>Qzs=a(>zJLryNAaoQOSFLSjXT0w1>OB)rJkb z(j2XA?2bCv@BM7|H|w~&I~=vM+P=YHYg(#>wW*bjt&NTCKi9FfwY4(cZfszHon@(x zUs_vRANdW|f8YMD_Il!9?4lIPSHI=B(|bB?V4(Mp+YgGeZ{NOs_Z8&v&UfbT8tduq qr*?>Uw*HQHRkx7x&H?tlVn5y diff --git a/Contrib/Icons/lama5.ico b/Contrib/Icons/lama5.ico deleted file mode 100644 index 2563b069659fce33f660eaa46d0c30c6600737c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmcJRdr(tX9>>2}tCX@kv;XXWZFQ^G*6nKPYG+$i3KXR&NWn-2q4mL91$0#&${PZr zJT=NgFgzj<9`XvvOCBLWfCPgi1PFluAq0c~5)33jU~i!8x;wLf?&r?$oVoY&JLfm| z+;e6wU_e|uc7SLNk!uM25x`y|h(|CZLjPP($kz34qcPa%9PMr4a+(akq@2pjIU**ImGe8#2`A<2Qd_XLh7OKec~0c6ECAB$pg(q&rZ35=0~1rpt_+s*+JlD z`6K#nB&gBhNR1CiN?aId)JV`CL?eM3hxBABl9Q8>Ly19NWCG|3QOJ833PwsC@@e-` z_Bawn2{|arc!<1=Bos5!z@$F}GdmeI1&>kv32W&PQ9UVOI+FCH!*$5$zjsC7S42VS-kVqhv4niyz zL)0zAsGt#YAsY%28 ziJ(@9F{hA1H6g{qq!gMlAralsC`8bV_d+u{0PU-OC=?2e$z@O~m6(_q$HKH6TIC3| zvtwAAS7L5%4r;X;Z|3K*vN#9L;v49+3s}~wq0wltw6p}>vKG3PC9JKjVRdyCt2!NQ z^pI1Fipt8$h`sU~3`TY=d0pvkPP0fRlMVM1Yu2ZyM<{4zGV>m7WRPiW(ag-u=x|3> zvv^QXPa}&f5VREB(*PX_Ordd3R z-1Fg^n}!*L4Xlkz)t6LLb<^|O+D(6#UcwO$@QfOi+7;r1=ya*zMdCj}onzFz;D-=f|wtJNA}6R8(hmh0WmaSD<`j$232 zi#ft;KI%0>&vtkBN+i-(bLzP#wpTa>2|>rLDQN{Qg8NrzS9B|~^zHlqqUQj=`|9Ue zEqU>-*56ao^O^*#Bh*FRo6PM#tVRNs|51-4S=^@FIG69ugH!1xt%58Ajc&@+Qz#*j zN_(GVumr6oX|ZR_zjckL<S8kUX)&&j2Te}jjf(x0+5dWZp?be>;U@VxX~{96r%5Iz_LQKo!(LS*i*wXZ z!yj*uoP6(5OjM|ootcS=-Q6>%fBf^i+eD*VzX*-o>U5P zt!eKGhktR>-qDU^c5v5cHap{E?7y?Hu-JF_lSAMA8!IbIv)#M?WMi|3)EHw=vamSx zMJcYD# u$Ck|#{K1C=AH9YC{)2U^0X`ZAwzGhDLWo}lec=DZ=KL(8)-X|1U;Cd3S6tEn diff --git a/Contrib/Icons/lucas-checks.bmp b/Contrib/Icons/lucas-checks.bmp deleted file mode 100644 index 203d4773ae8f37d97de768c95c9e171027d4b0a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 886 zcmaiwy=}ul423U9iZli?hUZA{9WsSa4FPphV|XQvpib9t7Ud%;ThhsZpG5M09v>g> z_j3JAjw|_0{1HFINBSazElpKl8# z2jpE{=tW{7b*=j!`Wv1dS)Uzk=XLbjnV|>?z$@QTr)+iAZ+hb&^;>%b`f|nZozI=2 z2nmRkl+X~FeE6#0^gV`-`r~QD5PUkQPd`m(hQw93`l`WK-ScyH{?WfGhU|S5wN;-% z7<#2|1Dwx*9iIV5|7I`+Un_owZ`Ys*3AnC~r>K+c^mEg_*4Kqk`}2K#(TS_p`j0u= Q_l!ol1@3#DTQJdgoLXVDKnEy`0okHe20@TP zwg7`bFf0z6tfB~(B?SYr6N^LzWC?2o23iv`DkNrZ(9?1JYwkPu-QWFvzW2Ah-#hOC z47%2=0o`?RMHg5GU?Vwo!IE6lud(1o3*p6$@!vLs!GMmA4i+)Bz|zx(o}M09EEX2) zFktwWK2{nnhJk?rmKqwu*w`2=mm9(KJr>p*8^L7tDs0(gjBRG`z|_TO9b~7_r zSXkhXpIBhqwr#L9(}vY2D{yf8D(u^_5jJ~1!lBQ0z;zD`9#)^i*Zx!N-n|>v*4Eg+ zYZq*7ZDD6;2Nx?Vxc+4y*!B)M@r4~uesvTl9rxq(cee2K^n|0MBRKBv2nYy3U|=B5 z`uV~94`noWA?;z5HmIich_PYAGg#V0VDH`{oH>&QZ|`iHLk2|qX(TXuYJm01#ne6k zJoknl_XvVg*|4lzh2>RM`2F?kU`f($rHXGrt#}UQmAT%flk-ol&;BXM{>U6 zqdjE#`y-#U#Z*&x`ZS7(R}d4>o^Q}T1*EB>{tAk>9URa|LAGg6HwGHuapi~}1Y-}uIA|nwRnv8^)81Ta*kRBC>#Kc6TrKN#) z@gj1lzc?%mh0!s{rMxUS7}w67!?o~mRFc<5N2BJ#1(Zca;YV&9%1Kj2UYpEAHIIjq z)KpYv#UU#z3q?gm$j{D16}7L^nN(C%Kp+qxBBG9X2db+(P+mTSpHz2oo6CiW#%v1- zfsoeIkbViR@$u-OvD<0f4n7}U5fNz0%|!!^E6T}1TXr@&3JOqPl7)t{GBniIqMc$J zy#t+jdFZ@+8C}K2=*`cExV#+qsK1Nm@1}M1R9504wfkynFj*T9Nl6JNC*x6HUyqiS z7KlV5h%~XTj@tdWNAVspaa$W6QXC-G-O&ND_&)j`JV0Mp7kYbp(bLn5f&PBDze;<>?hK7bPHa13cPGV+e2ES00OQn!YB#=`slga2j6_}r& zr}Iphl#4_y!xPfScqj*%dj$E#`=x@}UaR8pz6<+<~*H%M?x zCYQ@)6Jz5o%}t3;ZbIQVcBLe+-hDns+7HxC%4ZddS^30R-B4pnN=lW`g3B#^ehu5B zq|!$>&@7*wo1a(6Wn($hc|0DkUbuzJ<;L6Fm_sV10lH=s^GfC1tZck;D2>lQE)?4J z^z;O07de?xECZSq^N*hq|5@1X<>ke05GF{aF&FkGC-io6xjSfqUDMUQ+(LtrV+2#ij6$9dpst+ml1*S({T4pfgsbBNBquVO}$=85*QzE)dpjchPS#B7x4MS zo4dKgIPno?fXnYMF!v794!NXhW3V} ztvz!}l}g#O4$L;gccga0PV#HTC$3@@Yq{zrVky zdDFl1&%Uk8)crVZ6)q^R2)hT_|7?iB0H=X{TtJP}BPWlX~)&Bwfn2me@ diff --git a/Contrib/Icons/normal-uninstall.ico b/Contrib/Icons/normal-uninstall.ico deleted file mode 100644 index 9b336f06d739754912b6ec63aa8ad921c0a39bd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmbu7F>-@25Jf+6W=NM*X`#$5l3U?U+d=0maTL#_N$HXzj&Nl2eZcXHL^V;>Ky}I}%sMrHjF5 z26Gn!@0SHwxJ$ulvLUu(oM7CU19f1tGJS62tS-43VINry9NGz>1%xJct7joaaXyS^T7w;K%&4e)N*0I$ab zFU=bp8`0F%1TST;*NYug+rjg;ZRp&(6@I@Tovp3t?CeCSr3Inw+YxSWM|kH>gm&*n zXwM#mLLr2A?LwH=;k|p&MY-$10ffV0bai#1d*42E@86G}g9p)l=n#6S-b3{W<;dZ~ z=%;!Akt68t?nck?8gZ11apN9lS+N-qZCgC>e zZ;^)9ksIV21^elDu%AiSOS;HiuwUzZ*UNdYp&6mSIK99e1~X$gM0^Q{TtyH;Wk4wO5E@;*j+m79%=5=dBda|CjKtr z9^t_Qus)JU>S2$et@e)Lv1~%d~Xp8X%?VROn%B*&$Gv1cqBT_;T zX!EIjj&{LH^J)?}h_}W0(sSatzZ9qNhO}j-0!3ht@1T9}h(7or34+WUCx234iV2>k z&%n`0NT7j6{`#di7Znvf5@b%AoHkXC)PzxE4D|Bz-m(;r5LoLwf=UQuQu%*3VM)nq zRZz65yu7kmrGvrrXNWe=SW%`5R()Ibb@jS{$~Rj-dM=wW{X&OT5tKHq|EgkbgO>yy zEzV+-DR)YWB&L4qw9A5$&0ESBWzDy3+tJ=!W~R?%)3RyL3&PlXms57|1j;ifzMr0I zYu&t(vlQYcKKKd@wqj!84;xmzp>ZOS4(Z6%L_f&zaacXG1C^jYpUYw?$B z)|8c5KOla*sx^56g|nVb)+K%H_LnKWaLwlYGDTqa1h$K_v}yAyTir!+v+RypNun@* z0p~5AmSCXC`$g_&wz<@sRJytR#XQbuCrhfpuim8E&8(Tq)2-M06oE&* zNu`?~zASHNOq{5k&=I>yx!t*1{&2`4zLw1${2M*7UKAHCnh<;RNg__vOTiBR#*Hxt z^TG*_c5@3+pPVf=`+raz3Kvg%Lp@ve=Yyb2)#ufbgMI1T>ErT7zAsgcXhajh z-+N;w^oHQ!i>>ASkiLnp@NZ+_Zvrjx2jLFk3gIaId?1YCaM7IbION|DPgZEfHM0IF bPWTE{U78(RANmf{dfw?S8 zA|D>|m?QBhVZ?$Im6m)CWnQbd$V^)kU{$oLIE8B diff --git a/Contrib/Icons/yi-simple_install.ico b/Contrib/Icons/yi-simple_install.ico deleted file mode 100644 index e00e594496e543b53fc4a623b9ce10d3a878fae7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4710 zcmeHJL2lbX45THuNC5-!6MW1wd=PRqkXQ85zCq9ND+)cpfNp(54?XHAU^7GRYPpIM zG>8khs2J~(!y&mFIuRwZk*)0ad({sckw+0=0lt&3pG3aHcQ_dTs}lM7nb`RAoyd>{o1OB)!HZEFfUOsrPAt^*PDBO%bj!Vg{CqUN;_6g0SpudyQj`;Vv{GF$m)mS^QcHsZ& zz(%F2Oye0rsUT_?CNzg)gX$nokPhGs;aJ92pCy$~=S7^)SAO9>^ZUJpul#NDIeWl5 zVx@T`m|e@#V)%f;{85D+=DX$*vQ@TCAxGe$8BU=&HDPEP#U~iUse#MzFf`=pCLbaR zXgn$e#G{B}f4~v*kHT3<;T)rIhEXEc+2}AwqT_8=W}dVKXui^%uCboc8bChM8t{jh z_i^zfanA!RpCvJu6CMqxdEe`iAR~`!X?(u_U&QHqz7<{moyYfyt-Brmb<_LAx2Jnq z-zi*gR&(vZ+5zi;zDB&d;Tb}yZPj&Qz?pfaG?Fov;`rKX#QaT+p7P!Ii5Vde_^H}(qb75Kj@aG*30 zHSmsjD`sGdZ}5VF?HHEg#(3^wnC>cDSe+A1-m-B4rsCwm2Q_T@3ycLK@;4T~XU`Z9 z7~YQry=z-WG#@bNKdLapd{aL{w928cqywJ&d5Hbc$GPtn4>0DT$CBZB?#XkRd`u*u z@yHP2k0gq*oTWqmgJ{p9!F~w&t2lW6#r8vg)cv$iV*h}?%N~laK2L}XF_dF8Vz%QI zN0mRs+Nl{ZrSk@jX1a8K!+;5^18J`h9S9x6VJR`TQ0V*=jK1AHz<)3A)%EW@-6xJk zR{pip-)m^T%YLUQYO|Yr1@;P91*{LhHmCmGg2!mv%FzC;k;-MujgoH}j|80DD0n6? zrZ5UVhb1q2l6=1ay)7bkQ?VIQkaFc;;q6ex`O+!<4+#=HzpEIm<%_oO~zT(xPq_256 JR5bVxE-$-Wr0W0x diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc index a7dde87c..aee08b7e 100644 --- a/Contrib/Makensisw/resource.rc +++ b/Contrib/Makensisw/resource.rc @@ -54,7 +54,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON ICON DISCARDABLE "..\\..\\contrib\\icons\\adni18-installer-B.ico" +IDI_ICON ICON DISCARDABLE "..\\..\\contrib\\graphics\\icons\\modern-install-blue-full.ico" IDI_SHELL ICON DISCARDABLE "shell.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/Contrib/Makensisw/shell.ico b/Contrib/Makensisw/shell.ico index 540e4017eacc2f753db0eb7f1e7f4610b4d87886..dffb927c33a00339e13768e192598d7eae65947c 100644 GIT binary patch delta 4411 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 DqBKNr delta 137 zcmX@Nm2p~DJp%(H0~>>Y0Ep&b$Y5n)NMm4NP*4C00Kp3;28MG$F$D#P{0a^RhHXG> zU;yRwF)+jlGC=h!Fl4YWFt7pDLewiTtN The interface files with a customized dialog resource IDD_SELCOM for a small or no description area.
Defaults: {NSISDIR}\Contrib\UIs\modern-smalldesc.exe, {NSISDIR}\Contrib\UIs\modern-nodesc.exe

MUI_ICON icon_file
- The icon of the installer.
Default: ${NSISDIR}\Contrib\Icons\modern-install.ico

+ The icon of the installer.
Default: ${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico

MUI_UNICON icon_file
- The icon of the uninstaller.
Default: ${NSISDIR}\Contrib\Icons\modern-uninstall.ico

+ The icon of the uninstaller.
Default: ${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico

MUI_LICENSEBKCOLOR (/windows | /grey | (color: RRGGBB hexadecimal))
The background color for the license textbox. Use /windows for the default text background (usually white). Use the /grey for the standard window background (usually grey).
Default: /windows

MUI_CHECKBITMAP bitmap_file
The bitmap with images for the checks of the component select treeview.
- Default: ${NSISDIR}\Contrib\Icons\modern.bmp

+ Default: ${NSISDIR}\Contrib\Graphics\Checks\modern.bmp

MUI_INSTALLCOLORS (/windows | (foreground color: RRGGBB hexadecimal) (background color: RRGGBB hexadecimal))
The colors of the details screen. Use /windows for the default colors.

@@ -358,7 +358,7 @@ will also help you to learn more about the Modern UI.

The style of the progress bar. Colored makes it use the MUI_INSTALLCOLORS.
Default: smooth

MUI_HEADERBITMAP bmp_file
Bitmap to display in the white header (recommended size: 150x57 pixels). The NSIS Setup uses the bitmap - ${NSISDIR}\Contrib\Icons\modern-header.bmp, but can also make one with your own logo.

+ ${NSISDIR}\Contrib\Graphics\Header\nsis.bmp, but can also make one with your own logo.

MUI_HEADERBITMAP_RIGHT
Display the header image on the right side instead of the left side.

@@ -372,7 +372,7 @@ will also help you to learn more about the Modern UI.

Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini

MUI_SPECIALBITMAP bmp_file
Bitmap for the Welcome and Finish page (recommended size: 164x314 pixels).
- Default: ${NSISDIR}\Contrib\Icons\modern-wizard.bmp

+ Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp

MUI_SPECIALBITMAP_NOSTRETCH
Do not stretch the bitmap for the Welcome and Finish page to fit the size of the field. @@ -601,7 +601,7 @@ the data block, because this will make your installer start faster.

or above your own init- or page functions, you have to reserve files:

 ReserveFile "ioFile.ini" ;Your own InstallOptions INI files
-ReserveFile "${NSISDIR}\Contrib\Icons\modern-header.bmp" ;Your header bitmap
+ReserveFile "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp" ;Your header bitmap
 
 !insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE ;Welcome- or Finish page
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ;InstallOptions
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index b9b022f2..71e58aea 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -52,15 +52,15 @@ Var MUI_TEMP2
   !endif
 
   !ifndef MUI_ICON
-    !define MUI_ICON "${NSISDIR}\Contrib\Icons\modern-install.ico"
+    !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
   !endif
 
   !ifndef MUI_UNICON
-    !define MUI_UNICON "${NSISDIR}\Contrib\Icons\modern-uninstall.ico"
+    !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
   !endif
 
   !ifndef MUI_CHECKBITMAP
-    !define MUI_CHECKBITMAP "${NSISDIR}\Contrib\Icons\modern.bmp"
+    !define MUI_CHECKBITMAP "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp"
   !endif
   
   !ifndef MUI_LICENSEBKCOLOR
@@ -84,7 +84,7 @@ Var MUI_TEMP2
   !endif
   
   !ifndef MUI_SPECIALBITMAP
-    !define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Icons\modern-wizard.bmp"
+    !define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
   !endif
 
   XPStyle On
diff --git a/Contrib/NSIS Menu/nsismenu/nsisicon.ico b/Contrib/NSIS Menu/nsismenu/nsisicon.ico
index f8fbd5ffa910bd7e090becb3ec78fda3cfa4dd8f..3aa83e9f426548d9ba03e62af4276fdb27122ef4 100644
GIT binary patch
delta 7442
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

delta 137
zcmZqM!FVpGo`Hdpft^7>K!5=RG#D8e%78S8%gDgNkip8pFb^oEpa7A7!NkD8#tz~`
z here
 FunctionEnd
 
 Function dirImage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\checks2.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Header\win.bmp" /RESIZETOFIT
 FunctionEnd
 
 Function instImage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\checks-sdbarker.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Wizard\llama.bmp" /RESIZETOFIT
 FunctionEnd
 
 ;--------------------------------
@@ -94,17 +94,17 @@ UninstPage custom un.customPage
 UninstPage instfiles un.instImage
 
 Function un.uninstImage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\checksX.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp" /RESIZETOFIT
 FunctionEnd
 
 Function un.customPage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\modern.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Header\win.bmp" /RESIZETOFIT
 	MessageBox MB_OK 'This is a nice uninstaller custom "page" with yet another image :P'
 	#insert install options/start menu/ here
 FunctionEnd
 
 Function un.instImage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\jarsonic-checks.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Wizard\llama.bmp" /RESIZETOFIT
 FunctionEnd
 
 ;--------------------------------
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index f2e622fe..4be1ef44 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -57,8 +57,8 @@ Caption "NSIS ${VER_DISPLAY} Setup"
 ;Settings
 !define MUI_ABORTWARNING
 
-!define MUI_HEADERBITMAP "${NSISDIR}\Contrib\Icons\modern-header.bmp"
-!define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Icons\modern-wizard nsis llama.bmp"
+!define MUI_HEADERBITMAP "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp"
+!define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Graphics\Wizard\nullsoft.bmp"
 
 !define MUI_COMPONENTSPAGE_SMALLDESC