diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt index 92ce0c46..dcf80981 100644 --- a/Contrib/Modern UI/Changelog.txt +++ b/Contrib/Modern UI/Changelog.txt @@ -1,6 +1,6 @@ NSIS Modern User Interface - VERSION HISTORY -1.64 - April 25, 2003 +1.64 - April 27, 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 @@ -10,6 +10,7 @@ NSIS Modern User Interface - VERSION HISTORY * New macro's: get language for uninstaller, delete shortcuts * Language specific fonts * Welcome/Finish page INI files can be modified in pre functions +* More texts can be customized * Language files have to be updated 1.63 - March 9, 2003 diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index dfa89f49..9d5a3e2d 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -158,7 +158,7 @@ follow these steps:
!define MUI_WELCOMEPAGE ;No value !define MUI_FINISHPAGE_RUN "$INSTDIR\Application.exe" ;Value -!define MUI_FONTSTYLE_HEADER "700 /ITALIC" ;Multiple parameters +!define MUI_INSTALLCOLORS "FFFFFF 000000" ;Multiple parameters
All defines are optional.
3a. General settings
@@ -331,7 +331,18 @@ follow these steps:Have a look at the language files for a complete list of all the string names.
-You can also customize the fonts for a language using these defines:
+You can customize texts that can be set in the Classic UI using the LicenseText, + ComponentText, DirText and MiscButtonText commands but are not being changed by the Modern UI using + these defines:
++MUI_BUTTONTEXT_LICENSE, MUI_BUTTONTEXT_BACK, MUI_BUTTONTEXT_NEXT, +MUI_BUTTONTEXT_CANCEL + +MUI_INNERTEXT_COMPONENTS_SUB1, MUI_INNERTEXT_COMPONENTS_SUB2 + +MUI_TEXT_DIRECTORY_BROWSE ++
You can also customize the fonts for a language using the following defines:
MUI_FONT_HEADER font_name
MUI_FONTSIZE_HEADER font_size
MUI_FONTSTYLE_HEADER weight [/ITALIC] [/UNDERLINE] [/STRIKE]
@@ -602,7 +613,7 @@ MUI_UNCUSTOMFUNCTION_INSTFILES_LEAVE
Version history
Credits
Made by Joost Verburg.
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 92f2f11d..b9273e5f 100644
--- a/Contrib/Modern UI/System.nsh
+++ b/Contrib/Modern UI/System.nsh
@@ -1994,7 +1994,11 @@
!ifdef MUI_LICENSEPAGE
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_TITLE"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_SUBTITLE"
- !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "LicenseText" "MUI_INNERTEXT_LICENSE_TOP"
+ !ifndef MUI_BUTTONTEXT_LICENSE
+ !define MUI_BUTTONTEXT_LICENSE ""
+ !endif
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "LicenseText" "MUI_INNERTEXT_LICENSE_TOP" "$\"${MUI_INNERTEXT_LICENSE_TOP}$\" $\"${MUI_BUTTONTEXT_LICENSE}$\""
+ !undef MUI_BUTTONTEXT_LICENSE
!ifndef MUI_LICENSEPAGE_CHECKBOX & MUI_LICENSEPAGE_RADIOBUTTONS
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_BOTTOM"
!else
@@ -2012,7 +2016,19 @@
!ifdef MUI_COMPONENTSPAGE
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_COMPONENTS_TITLE"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_COMPONENTS_SUBTITLE"
- !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_CONTINUE "ComponentText" "MUI_INNERTEXT_COMPONENTS_TOP" "MUI_INSTALLBUTTON_COMPONENTS"
+ !ifndef MUI_INNERTEXT_COMPONENTS_SUB1
+ !define MUI_INNERTEXT_COMPONENTS_SUB1 ""
+ !endif
+ !ifndef MUI_INNERTEXT_COMPONENTS_SUB2
+ !define MUI_INNERTEXT_COMPONENTS_SUB2 ""
+ !endif
+ !ifndef MUI_INSTALLBUTTON_COMPONENTS
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "ComponentText" "MUI_INNERTEXT_COMPONENTS_TOP" "$\"${MUI_INNERTEXT_COMPONENTS_TOP} ${MUI_TEXT_CONTINUE_NEXT}$\" $\"${MUI_INNERTEXT_COMPONENTS_SUB1}$\" $\"${MUI_INNERTEXT_COMPONENTS_SUB2}$\""
+ !else
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "ComponentText" "MUI_INNERTEXT_COMPONENTS_TOP" "$\"${MUI_INNERTEXT_COMPONENTS_TOP} ${MUI_TEXT_CONTINUE_INSTALL}$\" $\"${MUI_INNERTEXT_COMPONENTS_SUB1}$\" $\"${MUI_INNERTEXT_COMPONENTS_SUB2}$\""
+ !endif
+ !undef MUI_INNERTEXT_COMPONENTS_SUB1
+ !undef MUI_INNERTEXT_COMPONENTS_SUB2
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO"
!endif
@@ -2020,7 +2036,15 @@
!ifdef MUI_DIRECTORYPAGE
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_DIRECTORY_TITLE"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_DIRECTORY_SUBTITLE"
- !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_CONTINUE "DirText" "MUI_INNERTEXT_DIRECTORY_TOP" "MUI_INSTALLBUTTON_DIRECTORY"
+ !ifndef MUI_TEXT_DIRECTORY_BROWSE
+ !define MUI_TEXT_DIRECTORY_BROWSE ""
+ !endif
+ !ifndef MUI_INSTALLBUTTON_DIRECTORY
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "DirText" "MUI_INNERTEXT_DIRECTORY_TOP" "$\"${MUI_INNERTEXT_DIRECTORY_TOP} ${MUI_TEXT_CONTINUE_NEXT}$\" $\"$\" $\"${MUI_TEXT_DIRECTORY_BROWSE}$\""
+ !else
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "DirText" "MUI_INNERTEXT_DIRECTORY_TOP" "$\"${MUI_INNERTEXT_DIRECTORY_TOP} ${MUI_TEXT_CONTINUE_INSTALL}$\" $\"$\" $\"${MUI_TEXT_DIRECTORY_BROWSE}$\""
+ !endif
+ !undef MUI_TEXT_DIRECTORY_BROWSE
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_DIRECTORY_DESTINATION"
!endif
@@ -2040,8 +2064,18 @@
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_TITLE"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_SUBTITLE"
+ !ifndef MUI_BUTTONTEXT_BACK
+ !define MUI_BUTTONTEXT_BACK ""
+ !endif
+ !ifndef MUI_BUTTONTEXT_NEXT
+ !define MUI_BUTTONTEXT_NEXT ""
+ !endif
+ !ifndef MUI_BUTTONTEXT_CANCEL
+ !define MUI_BUTTONTEXT_CANCEL ""
+ !endif
+
!ifdef MUI_FINISHPAGE
- !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "MiscButtonText" "MUI_TEXT_FINISH_BUTTON" '"" "" "" "${MUI_TEXT_FINISH_BUTTON}"'
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "MiscButtonText" "MUI_TEXT_FINISH_BUTTON" "$\${MUI_BUTTONTEXT_BACK}"$\" $\"${MUI_BUTTONTEXT_NEXT}$\" $\"${MUI_BUTTONTEXT_CANCEL}$\" $\"${MUI_TEXT_FINISH_BUTTON}$\""
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_INFO_TITLE"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_INFO_TEXT"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_INFO_REBOOT"
@@ -2049,8 +2083,18 @@
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_REBOOTLATER"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_RUN"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_SHOWREADME"
+ !else
+ !ifndef MUI_BUTTONTEXT_CLOSE
+ !define MUI_BUTTONTEXT_CLOSE ""
+ !endif
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "MiscButtonText" "MUI_TEXT_FINISH_BUTTON" "$\${MUI_BUTTONTEXT_BACK}"$\" $\"${MUI_BUTTONTEXT_NEXT}$\" $\"${MUI_BUTTONTEXT_CANCEL}$\" $\"${MUI_BUTTONTEXT_CLOSE}$\""
+ !undef MUI_BUTTONTEXT_CLOSE
!endif
+ !undef MUI_BUTTONTEXT_BACK
+ !undef MUI_BUTTONTEXT_NEXT
+ !undef MUI_BUTTONTEXT_CANCEL
+
!ifdef MUI_ABORTWARNING
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_ABORTWARNING"
!endif