language specific fonts

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2474 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2003-04-21 12:41:50 +00:00
parent e0b8698a84
commit 526ecc097b
3 changed files with 82 additions and 48 deletions

View file

@ -1,6 +1,6 @@
NSIS Modern User Interface - VERSION HISTORY
1.64 - April 7, 2003
1.64 - April 21, 2003
* Support for license page with checkbox or radiobuttons to let the
user accept the agreement or not
* Macro's for finish headers don't have to be inserted anymore
@ -8,6 +8,7 @@ NSIS Modern User Interface - VERSION HISTORY
no problems anymore when the users selects the wrong language
* Header text for aborted installation
* New macro's: get language for uninstaller, delete shortcuts
* Language specific fonts
* Language files have to be updated
1.63 - March 9, 2003

View file

@ -281,17 +281,6 @@ follow these steps:</p>
<p class="text"><span class="bold">MUI_CHECKBITMAP </span><span class="parameter">bitmap_file</span><br />
The bitmap with images for the checks of the component select treeview.<br />
<i>Default: ${NSISDIR}\Contrib\Icons\modern.bmp</i></p>
<p class="text"><span class="bold">MUI_FONT </span><span class="parameter">font_name</span><br />
<span class="bold">MUI_FONTSIZE </span><span class="parameter">font_size</span><br />
The font for the normal texts.<br /><i>Defaults: MS Shell Dlg, 8</i></p>
<p class="text"><span class="bold">MUI_FONT_HEADER </span><span class="parameter">font_name</span><br />
<span class="bold">MUI_FONTSIZE_HEADER </span><span class="parameter">font_size</span><br />
<span class="bold">MUI_FONTSTYLE_HEADER </span><span class="parameter">weight [/ITALIC] [/UNDERLINE] [/STRIKE]</span><br />
The font for the title in the header.<br /><i>Defaults: MS Shell Dlg, 8, 700</i></p>
<p class="text"><span class="bold">MUI_FONT_TITLE </span><span class="parameter">font_name</span><br />
<span class="bold">MUI_FONTSIZE_TITLE </span><span class="parameter">font_size</span><br />
<span class="bold">MUI_FONTSTYLE_TITLE </span><span class="parameter">weight [/ITALIC] [/UNDERLINE] [/STRIKE]</span><br />
The font for the title on the Welcome and Finish page.<br /><i>Defaults: Verdana, 12, 700</i></p>
<p class="text"><span class="bold">MUI_INSTALLCOLORS </span><span class="parameter">(/windows | (foreground color: RRBBGG)
(background color: RRGGBB))</span>
<br />The colors of the details screen. Use /windows instead of the colors to use the Windows
@ -337,6 +326,15 @@ follow these steps:</p>
</pre>
<p class="text">Have a look at the language files for a complete list of all the
string names.</p>
<p class="text">You can also customize the fonts for a language using these defines:</p>
<p class="text"><span class="bold">MUI_FONT_HEADER </span><span class="parameter">font_name</span><br />
<span class="bold">MUI_FONTSIZE_HEADER </span><span class="parameter">font_size</span><br />
<span class="bold">MUI_FONTSTYLE_HEADER </span><span class="parameter">weight [/ITALIC] [/UNDERLINE] [/STRIKE]</span><br />
The font for the title in the header.</p>
<p class="text"><span class="bold">MUI_FONT_TITLE </span><span class="parameter">font_name</span><br />
<span class="bold">MUI_FONTSIZE_TITLE </span><span class="parameter">font_size</span><br />
<span class="bold">MUI_FONTSTYLE_TITLE </span><span class="parameter">weight [/ITALIC] [/UNDERLINE] [/STRIKE]</span><br />
The font for the title on the Welcome and Finish page.</p>
<p class="text"><span class="bold">Language selection dialog</span></p>
<p class="text">If you want the installer to display a language selection dialog
(have a look at the <a href="../../Examples/Modern UI/MultiLanguage.nsi">
@ -599,7 +597,7 @@ MUI_UNCUSTOMFUNCTION_INSTFILES_LEAVE
</p>
<p class="header">Version history</p>
<ul>
<li>1.64 - April 7, 2003
<li>1.64 - April 21, 2003
<ul>
<li>Support for license page with checkbox or radiobuttons to
let the user accept the agreement or not</li>
@ -608,6 +606,7 @@ MUI_UNCUSTOMFUNCTION_INSTFILES_LEAVE
no problems anymore when the users selects the wrong language</li>
<li>Header text for aborted installation</li>
<li>New macro's: get language for uninstaller, delete shortcuts</li>
<li>Language specific fonts</li>
<li>Language files have to be updated</li>
</ul></li>
</ul>

View file

@ -62,38 +62,10 @@
!define MUI_CHECKBITMAP "${NSISDIR}\Contrib\Icons\modern.bmp"
!endif
!ifndef MUI_FONT
!define MUI_FONT "MS Shell Dlg"
!ifdef MUI_FONT
!error "Use SetFont to change the dialog font"
!endif
!ifndef MUI_FONTSIZE
!define MUI_FONTSIZE "8"
!endif
!ifndef MUI_FONT_HEADER
!define MUI_FONT_HEADER "MS Shell Dlg"
!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"
!endif
@ -165,7 +137,6 @@
!endif
CheckBitmap "${MUI_CHECKBITMAP}"
SetFont "${MUI_FONT}" "${MUI_FONTSIZE}"
InstallColors ${MUI_INSTALLCOLORS}
InstProgressFlags ${MUI_PROGRESSBAR}
@ -341,7 +312,7 @@
!insertmacro MUI_HEADERBITMAP_INIT
!insertmacro MUI_GUIINIT_BASIC
!insertmacro MUI_UNGUIINIT_BASIC
!macroend
@ -351,7 +322,38 @@
Push ${MUI_TEMP2}
GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1037
CreateFont ${MUI_TEMP2} "${MUI_FONT_HEADER}" "${MUI_FONTSIZE_HEADER}" "${MUI_FONTSTYLE_HEADER}"
CreateFont ${MUI_TEMP2} "$(MUI_FONT_HEADER)" "$(MUI_FONTSIZE_HEADER)" "$(MUI_FONTSTYLE_HEADER)"
SendMessage ${MUI_TEMP1} ${WM_SETFONT} ${MUI_TEMP2} 0
SetBkColor ${MUI_TEMP1} "${MUI_BGCOLOR}"
GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1038
SetBkColor ${MUI_TEMP1} "${MUI_BGCOLOR}"
GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1034
SetBkColor ${MUI_TEMP1} "${MUI_BGCOLOR}"
GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1039
SetBkColor ${MUI_TEMP1} "${MUI_BGCOLOR}"
GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1028
SetBkColor ${MUI_TEMP1} -1
GetWindowText ${MUI_TEMP2} ${MUI_TEMP1}
GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1256
SetBkColor ${MUI_TEMP1} -1
SendMessage ${MUI_TEMP1} ${WM_SETTEXT} ${NSIS_MAX_STRLEN} "STR:${MUI_TEMP2}"
Pop ${MUI_TEMP2}
Pop ${MUI_TEMP1}
!macroend
!macro MUI_UNGUIINIT_BASIC
Push ${MUI_TEMP1}
Push ${MUI_TEMP2}
GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1037
CreateFont ${MUI_TEMP2} "$(un.MUI_FONT_HEADER)" "$(un.MUI_FONTSIZE_HEADER)" "$(un.MUI_FONTSTYLE_HEADER)"
SendMessage ${MUI_TEMP1} ${WM_SETFONT} ${MUI_TEMP2} 0
SetBkColor ${MUI_TEMP1} "${MUI_BGCOLOR}"
@ -1001,7 +1003,7 @@
GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1201
SetBkColor ${MUI_TEMP2} "${MUI_BGCOLOR}"
CreateFont ${MUI_TEMP3} "${MUI_FONT_TITLE}" "${MUI_FONTSIZE_TITLE}" "${MUI_FONTSTYLE_TITLE}"
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
@ -1353,7 +1355,7 @@
GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1201
SetBkColor ${MUI_TEMP2} "${MUI_BGCOLOR}"
CreateFont ${MUI_TEMP3} "${MUI_FONT_TITLE}" "${MUI_FONTSIZE_TITLE}" "${MUI_FONTSTYLE_TITLE}"
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
@ -1919,6 +1921,30 @@
!macroend
!macro MUI_LANGUAGEFILE_LANGSTRING_INSTFONT NAME DEFAULT
!ifdef "${NAME}"
Langstring "${NAME}" 0 "${${NAME}}"
!undef "${NAME}"
!else
Langstring "${NAME}" 0 "${DEFAULT}"
!endif
!macroend
!macro MUI_LANGUAGEFILE_LANGSTRING_FONT NAME DEFAULT
!ifdef "${NAME}"
Langstring "${NAME}" 0 "${${NAME}}"
Langstring "un.${NAME}" 0 "${${NAME}}"
!undef "${NAME}"
!else
Langstring "${NAME}" 0 "${DEFAULT}"
Langstring "un.${NAME}" 0 "${DEFAULT}"
!endif
!macroend
!macro MUI_LANGUAGEFILE_END
!insertmacro MUI_LANGUAGEFILE_DEFINE "MUI_${LANGUAGE}_LANGNAME" "MUI_LANGNAME"
@ -1934,6 +1960,14 @@
!define MUI_LANGDLL_PUSHLIST "'${MUI_${LANGUAGE}_LANGNAME}' ${LANG_${LANGUAGE}} ${MUI_LANGDLL_PUSHLIST_TEMP}"
!endif
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_FONT "MUI_FONT_HEADER" "MS Shell Dlg"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_FONT "MUI_FONTSIZE_HEADER" "8"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_FONT "MUI_FONTSTYLE_HEADER" "700"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_INSTFONT "MUI_FONT_TITLE" "Verdana"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_INSTFONT "MUI_FONTSIZE_TITLE" "12"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_INSTFONT "MUI_FONTSTYLE_TITLE" "700"
!insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "Name" "MUI_NAME"
SubCaption 0 " "