From 6790a4a46ac3d0f7c19bd7604d1c32a35a421b73 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Mon, 18 Nov 2002 15:43:21 +0000 Subject: [PATCH] font / ui changes git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1783 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/System.nsh | 158 ++++++++++++++++----------- Contrib/UIs/modern.exe | Bin 6144 -> 6144 bytes Contrib/UIs/modern2.exe | Bin 6144 -> 6144 bytes Examples/Modern UI/WelcomeFinish.nsi | 4 +- 4 files changed, 95 insertions(+), 67 deletions(-) diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 26f3d019..5babe65d 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -42,6 +42,34 @@ !ifndef MUI_FONT !define MUI_FONT "MS Shell Dlg" !endif + + !ifndef MUI_FONTSIZE + !define MUI_FONTSIZE "8" + !endif + + !ifndef MUI_FONT_HEADER + !define MUI_FONT_HEADER "MS Sans Serif" + !endif + + !ifndef MUI_FONTSIZE_HEADER + !define MUI_FONTSIZE_HEADER "8" + !endif + + !ifndef MUI_FONTSTYLE_HEADER + !define MUI_FONTSTYLE_HEADER "700" + !endif + + !ifndef MUI_FONT_TITLE + !define MUI_FONT_TITLE "Verdana" + !endif + + !ifndef MUI_FONTSIZE_TITLE + !define MUI_FONTSIZE_TITLE "12" + !endif + + !ifndef MUI_FONTSTYLE_TITLE + !define MUI_FONTSTYLE_TITLE "700" + !endif !ifndef MUI_INSTALLCOLORS !define MUI_INSTALLCOLORS "/windows" @@ -55,12 +83,12 @@ !define MUI_BRANDINGTEXT "" ;Default value !endif - !ifndef MUI_WIZARDINI - !define MUI_WIZARDINI "${NSISDIR}\Contrib\Modern UI\ioWizard.ini" + !ifndef MUI_SPECIALINI + !define MUI_SPECIALINI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" !endif - !ifndef MUI_WIZARDBITMAP - !define MUI_WIZARDBITMAP "${NSISDIR}\Contrib\Icons\modern-wizard.bmp" + !ifndef MUI_SPECIALBITMAP + !define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Icons\modern-wizard.bmp" !endif !ifdef MUI_FINISHPAGE @@ -75,7 +103,7 @@ Icon "${MUI_ICON}" UninstallIcon "${MUI_UNICON}" CheckBitmap "${MUI_CHECKBITMAP}" - SetFont "${MUI_FONT}" 8 + SetFont "${MUI_FONT}" "${MUI_FONTSIZE}" InstallColors "${MUI_INSTALLCOLORS}" InstProgressFlags "${MUI_PROGRESSBAR}" BrandingText /TRIMRIGHT "${MUI_BRANDINGTEXT}" @@ -211,7 +239,7 @@ Push ${MUI_TEMP2} GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1037 - CreateFont ${MUI_TEMP2} "Tahoma" 10 700 + CreateFont ${MUI_TEMP2} "${MUI_FONT_HEADER}" "${MUI_FONTSIZE_HEADER}" "${MUI_FONTSTYLE_HEADER}" SendMessage ${MUI_TEMP1} ${WM_SETFONT} ${MUI_TEMP2} 0 SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF @@ -239,7 +267,7 @@ Push ${MUI_TEMP2} GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1037 - CreateFont ${MUI_TEMP2} "Tahoma" 10 700 + CreateFont ${MUI_TEMP2} "${MUI_FONT_HEADER}" "${MUI_FONTSIZE_HEADER}" "${MUI_FONTSTYLE_HEADER}" SendMessage ${MUI_TEMP1} ${WM_SETFONT} ${MUI_TEMP2} 0 SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF @@ -262,16 +290,16 @@ !macro MUI_WELCOMEFINISHPAGE_INIT ;Extract Install Options INI Files - !insertmacro MUI_INSTALLOPTIONS_EXTRACT_CUSTOMNAME "${MUI_WIZARDINI}" "ioWizard.ini" - !insertmacro MUI_INSTALLOPTIONS_EXTRACT_CUSTOMNAME "${MUI_WIZARDBITMAP}" "modern-wizard.bmp" + !insertmacro MUI_INSTALLOPTIONS_EXTRACT_CUSTOMNAME "${MUI_SPECIALINI}" "ioSpecial.ini" + !insertmacro MUI_INSTALLOPTIONS_EXTRACT_CUSTOMNAME "${MUI_SPECIALBITMAP}" "modern-wizard.bmp" ;Write bitmap location - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp" ;Write Welcome text !ifdef MUI_WELCOMEPAGE - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 2" "Text" "$(MUI_TEXT_WELCOME_TITLE)" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 3" "Text" "$(MUI_TEXT_WELCOME_INFO)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_TEXT_WELCOME_TITLE)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_WELCOME_INFO)" !endif !macroend @@ -647,7 +675,7 @@ GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1045 ShowWindow ${MUI_TEMP1} ${SW_NORMAL} - !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioWizard.ini" + !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioSpecial.ini" Pop ${MUI_TEMP1} @@ -655,7 +683,7 @@ GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1201 SetStaticBkColor ${MUI_TEMP2} 0x00FFFFFF - CreateFont ${MUI_TEMP3} "Verdana" 12 1000 + CreateFont ${MUI_TEMP3} "${MUI_FONT_TITLE}" "${MUI_FONTSIZE_TITLE}" "${MUI_FONTSTYLE_TITLE}" SendMessage ${MUI_TEMP2} ${WM_SETFONT} ${MUI_TEMP3} 0 GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1202 @@ -788,32 +816,32 @@ ShowWindow ${MUI_TEMP1} ${SW_NORMAL} ;Write Finish text - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 2" "Text" "$(MUI_TEXT_FINISH_TITLE)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_TEXT_FINISH_TITLE)" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 3" "Bottom" "150" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "150" !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT IfRebootFlag "" noreboot_init - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 3" "Text" "$(MUI_TEXT_FINISH_INFO_REBOOT)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_FINISH_INFO_REBOOT)" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Settings" "Numfields" "5" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "5" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Type" "RadioButton" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Text" "$(MUI_TEXT_FINISH_REBOOTNOW)" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Left" "190" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Right" "475" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Top" "160" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Bottom" "175" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "State" "1" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Type" "RadioButton" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Text" "$(MUI_TEXT_FINISH_REBOOTNOW)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Left" "190" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "475" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "160" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "175" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "1" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Type" "RadioButton" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Text" "$(MUI_TEXT_FINISH_REBOOTLATER)" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Left" "190" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Right" "475" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Top" "190" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Bottom" "205" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Type" "RadioButton" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Text" "$(MUI_TEXT_FINISH_REBOOTLATER)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Left" "190" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Right" "475" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Top" "190" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Bottom" "205" Goto init @@ -821,34 +849,34 @@ !endif - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 3" "Text" "$(MUI_TEXT_FINISH_INFO)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_FINISH_INFO)" !ifdef MUI_FINISHPAGE_RUN - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Text" "$(MUI_TEXT_FINISH_INFO)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Text" "$(MUI_TEXT_FINISH_INFO)" !ifndef MUI_FINISHPAGE_SHOWREADME - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Settings" "Numfields" "4" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "4" !endif - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Type" "CheckBox" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Text" "$(MUI_TEXT_FINISH_RUN)" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Left" "190" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Right" "475" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Top" "160" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Bottom" "175" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "State" "1" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Type" "CheckBox" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Text" "$(MUI_TEXT_FINISH_RUN)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Left" "190" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "475" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "160" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "175" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "1" !ifdef MUI_FINISHPAGE_SHOWREADME - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Settings" "Numfields" "5" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "5" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Type" "CheckBox" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Text" "$(MUI_TEXT_FINISH_SHOWREADME)" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Left" "190" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Right" "475" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Top" "190" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Bottom" "205" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Type" "CheckBox" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Text" "$(MUI_TEXT_FINISH_SHOWREADME)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Left" "190" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Right" "475" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Top" "190" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Bottom" "205" !endif @@ -858,15 +886,15 @@ !ifdef MUI_FINISHPAGE_SHOWREADME - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Settings" "Numfields" "4" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "4" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Type" "CheckBox" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Text" "$(MUI_TEXT_FINISH_SHOWREADME)" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Left" "190" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Right" "475" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Top" "160" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Bottom" "175" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "State" "1" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Type" "CheckBox" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Text" "$(MUI_TEXT_FINISH_SHOWREADME)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Left" "190" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "475" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "160" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "175" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "1" !endif @@ -876,7 +904,7 @@ init: !endif - !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioWizard.ini" + !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioSpecial.ini" Pop ${MUI_TEMP1} @@ -884,7 +912,7 @@ GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1201 SetStaticBkColor ${MUI_TEMP2} 0x00FFFFFF - CreateFont ${MUI_TEMP3} "Verdana" 12 1000 + CreateFont ${MUI_TEMP3} "${MUI_FONT_TITLE}" "${MUI_FONTSIZE_TITLE}" "${MUI_FONTSTYLE_TITLE}" SendMessage ${MUI_TEMP2} ${WM_SETFONT} ${MUI_TEMP3} 0 GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1202 @@ -950,7 +978,7 @@ IfRebootFlag "" noreboot_end - !insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioWizard.ini" "Field 4" "State" + !insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioSpecial.ini" "Field 4" "State" StrCmp ${MUI_TEMP1} "1" "" +2 Reboot @@ -963,14 +991,14 @@ !ifdef MUI_FINISHPAGE_RUN - !insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioWizard.ini" "Field 4" "State" + !insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioSpecial.ini" "Field 4" "State" StrCmp ${MUI_TEMP1} "1" "" +2 Exec '"${MUI_FINISHPAGE_RUN}"' !ifdef MUI_FINISHPAGE_SHOWREADME - !insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioWizard.ini" "Field 5" "State" + !insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioSpecial.ini" "Field 5" "State" StrCmp ${MUI_TEMP1} "1" "" +2 ExecShell "open" '"${MUI_FINISHPAGE_SHOWREADME}"' @@ -983,7 +1011,7 @@ !ifdef MUI_FINISHPAGE_SHOWREADME - !insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioWizard.ini" "Field 4" "State" + !insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioSpecial.ini" "Field 4" "State" StrCmp ${MUI_TEMP1} "1" "" +2 ExecShell "open" '"${MUI_FINISHPAGE_SHOWREADME}"' @@ -1096,11 +1124,11 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !macroend -!macro MUI_RESERVEFILE_WIZARDINI - ReserveFile "${NSISDIR}\Contrib\Modern UI\ioWizard.ini" +!macro MUI_RESERVEFILE_SPECIALINI + ReserveFile "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" !macroend -!macro MUI_RESERVEFILE_WIZARDBITMAP +!macro MUI_RESERVEFILE_SPECIALBITMAP ReserveFile "${NSISDIR}\Contrib\Icons\modern-wizard.bmp" !macroend diff --git a/Contrib/UIs/modern.exe b/Contrib/UIs/modern.exe index fa82f32b9111999049dab999ac46ed4afc0f6f7e..77bdfa125440b42c39a1d18eb96ffbfac7f68806 100644 GIT binary patch delta 1395 zcmZ`(J!lhQ7=FH9QjcqBnoCki1+8WYHP%+~4?0{_Y9NRQtx^OLiqt_Zh#)Q{7sbs% zIB;+(2ZJ(nEiYjI3BYL1@-fuN(vDr(G2f{2TV< zc%Li5s>tFyks!Dm`l@frTqd3+ehHt6`yaBSN3@3wyh&gLL#ZgRlMRlkoHg0OriYem z;XKxn!EZ&^>YxLJyNMYbBju*Ty$(DB$yy<+i9ZQ)HNJ#LAa6`nJ4q7;gtLN0+=hj% zo&>jWg$aTL0w@8pUsH+w+5u4DH1RTWN`NjvwhM$V|en;J! zwt~y3;a`F*U3ZDNiN8JZo@GsvEZl=aVqH5qxCJ(TUQ)0w|5t9`2`y2U{0?PYWYg?e z$x#7)?m7;j!MW%4O#E~9E~6nnasdyQ-(wAjFbKKQLEuGU>X&eHV$FYT*P0Enih_>c z=JT|jgQaiFF+_c7tfD3a1`^_lJ0LzwyqJKqHFIga^zY@L?6;8@76xNp-TR(a+QP#H zS6~EFtjHg!w*sul#BIsKiI;tT(Yq^3};;7P2i&;y=7x6=e zju%Hu-7@(q1Lc;i2x Cl+u#` delta 1280 zcmah|J!lkB5dL0vH!hnqyWZ{@lW05*!g0AsVhSx%?5RZ12qz{Yfp46p5&$RQy?I-tGE!CE_cVof*FQX1ABL0#e2bG1~Z%DN)Dn;0g0)sxcr!PVovWxCN() z?H!Ze#3BLXOj7(IWKE`Xn(P7+O=c)IiakUaF$=wawvY4Fmb~QcZ5lYF;7b_9bu8l> z(cbH#>8tx(Kpnp_CFwo~u|Vbi+%fjQR)T}MUIvnZETKZhP+C(i77tIRExyGlu8=sz zOp9ra9gO1~&CzGQ<*Mt;^`c|UiudxdJ9$JjI#|Oo^n=$_3zRl08opSQQ-0l=6>S9a zgXfR)20Twtys3YqJQChQ8+9Sj$B5nJ2|=DY@|2W^s=I9AHLj6DCVONdcrX^g7Y_PO z&e>hzd$a1M#6v(?jEB8@7GTtI5r@R%m zLY0Wtpe9!E)sXE{d04LyE5IUWS>Zled_eJLlee&b{xxXOG&WPiIB! z%64ZVR&$<-2mE|~CiXJbSVpkQ#{p9W_S^|zCS<=k39N_gClkQYkp1ZtuoQ&Dt^%7O zTflXFvzmBq#(^H%WpT&3Y>bV>EDtP;G`f z1P0Nc2m;&LU~1A?k?n8TXj(eX;vG`>E$NzVbbzonFoh$e+>p54hNs}MmdL8%PlQ~B zFXA4^8&cIu(m))-T*f@EL&s)Uf~%Ni0ylyHQh?X5@yLE{11NBUco7*XKoy|cl2tmY ziO#;nvB#>TfE7&Qr=-2zR=1)p;Q}i77a>d4T_CREZ&$o)Sz{#g=O7nZ*A8x6osD0i z0F8AyzcPD|DT!XmbzH(KiZDVY2L;5eIb6dF7|5zUaZVdM<2CV-19-6b9&0#&K6oST zx^@sIzl4<$YtE`sY1G6Daw>j{&!bijmcAuNKlLR&;Xirg}gfFJt?*MhYOa#AjVl;T*lZE4IZ`$4q{pK;wz;)_jAJo3KR&SZ!PGs zg4AAnBdAAiRnlxSYk~MYet4lH`JqCmO#bI;$!vIgKTMe#lA+S13m>-Dv?|>DFFdr~ z9pJj1ht{8+U2THGoNqPURh*B>q?WoGCNbqK8oQ?jC$L1>H`tJ#2o;Rx)uAJg92KYw V$8|6IBIR4<&}9zK$2m8!{vVTt*_EaKhgj1u~NGy&MQ38i3HgbD{ zAY!2mSP9yQmWqO)&50l>)5XR@NRfz2O2wb`y}4a?S0YX^%zKaTec$^Tf6O0yQWu%W zrfg;o%ctT#J)a%Ryv(-lAwKRtz!kAw+7DC`_RIlbDPixO0yZV=+Ckt(497dN7ZSFo zcRV&V<*SHWK#zKw@@Q^LB~w!dT@_*DixvdeLWgcX2xB(IPGeb1KpqbFTQ+S+F61q3TD+Hc?C~9tqjJ=E107U_KrbWKlg9&jX2?@e9#VJ8 zz$=`g4(aTXS@-6s3rAS!(>Z5%wWC29N>F-Fhey?b1O_ol1!$?_eIn#z(d>KiNt4Aw zIWLfQe^%~Y@yK|KtW@U>ukEQsv<4M1hp(FK6pBOf3ULP*Mt@Zu^;OSD`%xxoCJgR< z828QY->T9mKhob?ru~TjR)ph>!zm#h6Sp}Mg4Yg0qw%##ss%1afo#lJqlge*-*A%DDgl diff --git a/Examples/Modern UI/WelcomeFinish.nsi b/Examples/Modern UI/WelcomeFinish.nsi index 0a6a275f..965a6b03 100644 --- a/Examples/Modern UI/WelcomeFinish.nsi +++ b/Examples/Modern UI/WelcomeFinish.nsi @@ -40,8 +40,8 @@ ;Only useful for BZIP2 compression ;Use ReserveFile for your own Install Options ini files too! !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - !insertmacro MUI_RESERVEFILE_WIZARDINI - !insertmacro MUI_RESERVEFILE_WIZARDBITMAP + !insertmacro MUI_RESERVEFILE_SPECIALINI + !insertmacro MUI_RESERVEFILE_SPECIALBITMAP ;-------------------------------- ;Modern UI System