From 12cba7a6a329c7920a297717b5e0425faf495ff2 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Sun, 17 Nov 2002 16:45:34 +0000 Subject: [PATCH] shell font git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1774 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/System.nsh | 40 ++++++++++++----------------------- Contrib/UIs/modern.exe | Bin 6144 -> 6144 bytes 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 4aaa3ff7..816f7b6b 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -40,7 +40,7 @@ !endif !ifndef MUI_FONT - !define MUI_FONT "Tahoma" ;"MS Shell Dlg" + !define MUI_FONT "MS Shell Dlg" !endif !ifndef MUI_INSTALLCOLORS @@ -84,18 +84,6 @@ !macroend -!macro MUI_INTERFACE_ALLRES UI ICON UNICON CHECKS PROGRESSBAR FONT - - !define MUI_UI "${UI}" - !define MUI_ICON "${ICON}" - !define MUI_UNICON "${UNICON}" - !define MUI_CHECKBITMAP "${CHECKS}" - !define MUI_PROGRESSBAR "${PROGRESSBAR}" - !define MUI_FONT "${FONT}" - !insertmacro MUI_INTERFACE - -!macroend - !macro MUI_INNERDIALOG_TEXT CONTROL TEXT !verbose 3 @@ -667,7 +655,7 @@ GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1201 SetStaticBkColor ${MUI_TEMP2} 0x00FFFFFF - CreateFont ${MUI_TEMP3} "Tahoma" 12 1000 + CreateFont ${MUI_TEMP3} "Verdana" 12 1000 SendMessage ${MUI_TEMP2} ${WM_SETFONT} ${MUI_TEMP3} 0 GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1202 @@ -802,7 +790,7 @@ ;Write Finish text !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 2" "Text" "$(MUI_TEXT_FINISH_TITLE)" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 3" "Bottom" "170" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 3" "Bottom" "150" !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT @@ -816,16 +804,16 @@ !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" "180" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Bottom" "195" + !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 "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" "210" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Bottom" "225" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Top" "190" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Bottom" "205" Goto init @@ -847,8 +835,8 @@ !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" "180" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Bottom" "195" + !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" !ifdef MUI_FINISHPAGE_SHOWREADME @@ -859,8 +847,8 @@ !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" "210" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Bottom" "225" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Top" "190" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 5" "Bottom" "205" !endif @@ -876,8 +864,8 @@ !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" "180" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioWizard.ini" "Field 4" "Bottom" "195" + !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" !endif @@ -896,7 +884,7 @@ GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1201 SetStaticBkColor ${MUI_TEMP2} 0x00FFFFFF - CreateFont ${MUI_TEMP3} "Tahoma" 12 1000 + CreateFont ${MUI_TEMP3} "Verdana" 12 1000 SendMessage ${MUI_TEMP2} ${WM_SETFONT} ${MUI_TEMP3} 0 GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1202 diff --git a/Contrib/UIs/modern.exe b/Contrib/UIs/modern.exe index 418ee8bf4988ea198707d6b71467783502d39823..fa82f32b9111999049dab999ac46ed4afc0f6f7e 100644 GIT binary patch delta 737 zcmZvaze~eF6vw~sY#`RQsWbscp@R-B6er#MQFO3{lU8t4vD85aN2dlS2c5DOoP;id z(y>d&j&8a*2>uU(4(GeH`C-}%_PA4$Gpgf--#cdeBBj{+nMH0C1W zozRp5HZ7F-o7~}NP8YZdnVx8_V~vKeStPk`@Hp83r%!Dl4@d(;Y!P80%#Zqm4cuUe zCL5g4pj!q*92pqk7$#CPxNZOx{rt=f&Q+M}0~C=C_-Rnvk3yzl@U5qj4Gb~Pr;;Ty r;lPG9;Yzh*4m}mpVqV}Hxv|Gng_Y#h_c!eM>Hp!-xt=n9I^XmM1H5hy delta 715 zcmZvZKTE?v7{;GBe;|!*Q%NEb912|=S_poE`hT#3qJwTNRHcK0Iyp7%T&Md0I_Mxc zC>gtS><18>{2YP~@$S-+6LQ1dz3=ay=egseFbdzgq;)NJt?jXQdZ2E6sEv!AM`R<| z00PSDa1#iXy1fNFDYdZ!tSEJL7Z_!7yz=^kT{;c7gDc#kiX)ui20feu?8Ujy>&M#_ zlkxyNUHt7&tZ5_?N;0NJUvdR3>~nJwkP{`((1BP!F~u6nAS6j7`(jF&ODWS7W&llb z!a)Od8ujs`C&^HB_?SbnZ_xyvk+Hey^DIzTOe=uAjEM=>iLjvPIBN<&aCXd@uP~sm zod{%Nj5dF>p}@H*P?N%UblGMl>wWTT`oeWt6E1s@)qP{Jg+5Kc&i m4hJq5mK9;sNMB*HfwP?VnQ_l6