diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt
index f8e7e49b..fd1d9122 100644
--- a/Contrib/Modern UI/Changelog.txt
+++ b/Contrib/Modern UI/Changelog.txt
@@ -1,17 +1,23 @@
NSIS Modern User Interface - VERSION HISTORY
+1.62 - December 14, 2002
+* No problems anymore when using both 'Run program' and 'Show Readme' on the finish page
+* Default state of checkboxes on the finish page can be changed
+* Welcome / Finish pages compatible with custom DPI settings
+* Converted Install Options INI files to use dialog units
+
1.61 - December 5, 2002
* Final version for NSIS 2 beta 0
* modern3.exe UI without description area
* Added define to show uninstall confirm page
* Added language string for finish page title and continue to uninstall
-* Define for parameters for the application to run on the finishpage
+* Define for parameters for the application to run on the finish page
* Bugfixes
1.6 - November 18, 2002
* Welcome / Finish pages
* Automatic ask for reboot on finish page
-* Create no shortcut option on Start Menu Folder selection page
+* Create no shortcut option on the Start Menu Folder selection page
* Customizing GUIInit functions easier
* Minor font / UI changes
@@ -35,71 +41,71 @@ NSIS Modern User Interface - VERSION HISTORY
* Modern UI Language Files load NLF language files
* Renamed macro's and defines
-1.3 - October 27, 2002
-* Easier macro system for basic scripts
-* New MultiLanguage system using Modern UI Language Files
-* New directory structure (header/language files in Contrib\Modern UI)
-* Small bugfixes & typo corrections
-* SetPage function should be set using defines
-* Different NextPage/PrevPage/FinishHeader macro's for install/uninstall
-* Interface settings can be definend (for example, MUI_ICON), no parameters for MUI_INTERFACE anymore
-* New Install Options macro's to read/write IO INI file values
+1.3 - October 27, 2002
+* Easier macro system for basic scripts
+* New MultiLanguage system using Modern UI Language Files
+* New directory structure (header/language files in Contrib\Modern UI)
+* Small bugfixes & typo corrections
+* SetPage function should be set using defines
+* Different NextPage/PrevPage/FinishHeader macro's for install/uninstall
+* Interface settings can be definend (for example, MUI_ICON), no parameters for MUI_INTERFACE anymore
+* New Install Options macro's to read/write IO INI file value
-1.21 - September 30, 2002
-* Temp vars set in Modern UI header
-* Currentpage & Install Options vars should be set using parameters of the MUI_INTERFACE and * MUI_INSTALLOPTIONS macro's
-* MultiLanguage.nsi uses the new language strings
+1.21 - September 30, 2002
+* Temp vars set in Modern UI header
+* Currentpage & Install Options vars should be set using parameters of the MUI_INTERFACE and * MUI_INSTALLOPTIONS macro's
+* MultiLanguage.nsi uses the new language strings
-1.2 - September 22, 2002
-* Lots of macro system updates & fixes
-* InstallOptions support in macro system
-* Added Modern UI + InstallOptions example (InstallOptions.nsi)
-* MUI_NEXTPAGE_OUTER integrated in MUI_NEXTPAGE
+1.2 - September 22, 2002
+* Lots of macro system updates & fixes
+* InstallOptions support in macro system
+* Added Modern UI + InstallOptions example (InstallOptions.nsi)
+* MUI_NEXTPAGE_OUTER integrated in MUI_NEXTPAGE
* No hard-coded function names anymore (you should give MUI_PREVPAGE a parameter with the set page function name (for example, MUI_PREVPAGE SetPage)
-* Examples use ReserveFile for faster startup
+* Examples use ReserveFile for faster startup
-1.19 - Semtember 19, 2002
-* Renamed some macro's
-* Custom code can be used between page start/stop macro's
+1.19 - Semtember 19, 2002
+* Renamed some macro's
+* Custom code can be used between page start/stop macro's
-1.18 - Semtember 13, 2002
-* Uses the new Sendmessage string option
+1.18 - Semtember 13, 2002
+* Uses the new Sendmessage string option
-1.17 - Semtember 10, 2002
-* Win9x font weight bug fixed (font of title in white rect)
+1.17 - Semtember 10, 2002
+* Win9x font weight bug fixed (font of title in white rect)
-1.16 - Semtember 6, 2002
-* Change text 'Scroll down' on license page to 'Press Page Down', because the RichEdit control has focus by default now
+1.16 - Semtember 6, 2002
+* Change text 'Scroll down' on license page to 'Press Page Down', because the RichEdit control has focus by default now
-1.15 - Semtember 4, 2002
-* Multilanguage example: changed LangDialog to LangDLL::LangDialog (using the DLL name is now required)
+1.15 - Semtember 4, 2002
+* Multilanguage example: changed LangDialog to LangDLL::LangDialog (using the DLL name is now required)
-1.14 - Semtember 3, 2002
-* Small grammar fix (thanks eccles)
-* UI files updated by Justin for better RichEdit usage
+1.14 - Semtember 3, 2002
+* Small grammar fix (thanks eccles)
+* UI files updated by Justin for better RichEdit usage
-1.13 - Semtember 2, 2002
+1.13 - Semtember 2, 2002
* Added 16 color icons
-1.12 - August 30, 2002
-* Verifying installer & Unpacking data dialog has no titlebar anymore
+1.12 - August 30, 2002
+* Verifying installer & Unpacking data dialog has no titlebar anymore
-1.11 - August 29, 2002
-* Finish header for uninstaller can also be set using MUI_FINISHHEADER
+1.11 - August 29, 2002
+* Finish header for uninstaller can also be set using MUI_FINISHHEADER
-1.1 - August 29, 2002
-* Header file with macros, it's now very easy to use the UI in your scripts :)
-* Added the modern2.exe UI, with an other location of the Description frame, for installers with a lot of subsections (thanks rainwater)
-* Updated example scripts
-* Added Multilanguage.nsi example (Multilanguage & LangDLL)
-* Fixed background color issue with some custom XP themes
-* Removed WS_VISIBLE from black rect for inner dialog (fixes display issues)
-* Changed size of description area
-* Example script: Added instructions for the user on the Description frame
-* Auto sizing branding text
-* Used modern.bmp for the checks (thanks rainwater)
-* Using the new NSIS version, descriptions work using the keyboard and you can give descriptions to subsections
-* Correct font size using High-DPI fonts
+1.1 - August 29, 2002
+* Header file with macros, it's now very easy to use the UI in your scripts :)
+* Added the modern2.exe UI, with an other location of the Description frame, for installers with a lot of subsections (thanks rainwater)
+* Updated example scripts
+* Added Multilanguage.nsi example (Multilanguage & LangDLL)
+* Fixed background color issue with some custom XP themes
+* Removed WS_VISIBLE from black rect for inner dialog (fixes display issues)
+* Changed size of description area
+* Example script: Added instructions for the user on the Description frame
+* Auto sizing branding text
+* Used modern.bmp for the checks (thanks rainwater)
+* Using the new NSIS version, descriptions work using the keyboard and you can give descriptions to subsections
+* Correct font size using High-DPI fonts
-1.0 - August 26, 2002
-* Initial release
\ No newline at end of file
+1.0 - August 26, 2002
+* Initial release
\ No newline at end of file
diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html
index fe419cc7..d3732a95 100644
--- a/Contrib/Modern UI/Readme.html
+++ b/Contrib/Modern UI/Readme.html
@@ -111,7 +111,7 @@ with a custom user interface.
like the wizards of recent Windows versions. This new interface
also features new graphics and a description area on the
component selection page.
-To use this new interface for for installer, you need
+
To use this new interface for your installer, you need
to add some code to your NSIS script. Read this document for more info!
NSIS 2 beta 0 (or later)
@@ -158,7 +158,7 @@ add the following things (in order, from the beginning of the script):
MUI_DIRECTORYPAGE
Show the directory selection page.
MUI_STARTMENUPAGE
- Show the Start Menu Folder selection page page.
+ Show the Start Menu Folder selection page.
MUI_STARTMENU_VARIABLE
Variable to store the current Start Menu Folder. Default is $9.
@@ -171,15 +171,23 @@ add the following things (in order, from the beginning of the script):
Show the Finish page.
MUI_FINISHPAGE_RUN
- Applcation which the user can select to run (using a checkbox).
+ Application which the user can select to run (using a checkbox).
You don't need to put quotes around the filename when it contains spaces.
+
MUI_FINISHPAGE_RUN_PARAMETERS
Parameters for the application to run. Don't forget to escape double
quotes ($\") in the value.
+
MUI_FINISHPAGE_RUN_NOTCHECKED
+ Do not check the 'Run program' checkbox by default
+
MUI_FINISHPAGE_SHOWREADME
File which the user can select to view (using a checkbox).
You don't need to put quotes around the filename when it contains spaces.
Use $(LANGSTRINGNAME) as value is you want to use a language string.
+
+
MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+ Do not check the 'Show Readme' checkbox by default
+
MUI_FINISHPAGE_NOAUTOCLOSE
Do not automatically jump to the finish page, to allow the user to
check the log.
@@ -227,7 +235,7 @@ add the following things (in order, from the beginning of the script):
Please help to translate the new strings and post them at the
NSIS Forum.
-
You can also change the settings of the interface by usings defines:
+
You can also change the settings of the interface by using defines:
!define MUI_UI "${NSISDIR}\Contrib\UIs\modern2.exe"
If you don't define a setting, the default will be used.
The following settings are available: (default values)
@@ -266,7 +274,7 @@ add the following things (in order, from the beginning of the script):
after all the sections to display the finish-header:
!insertmacro MUI_SECTIONS_FINISHHEADER
For the uninstaller, insert MUI_UNFINISHHEADER at the end of the
-Unintaller section:
+Uninstaller section:
!insertmacro MUI_UNFINISHHEADER
@@ -338,6 +346,11 @@ Function FunctionName
!insertmacro MUI_INSTALLOPTIONS_SHOW "ioFile.ini"
FunctionEnd
+
To read or write values to the INI Files on runtime, use these macro's:
+
+!insertmacro MUI_INSTALLOPTIONS_READ $VAR "ioFile.ini" "Field #" "Value Name"
+!insertmacro MUI_INSTALLOPTIONS_WRITE "ioFile.ini" "Field #" "Value Name" "Value"
+
Basic: Basic.nsi
Multilanguage: MultiLanguage.nsi
@@ -382,21 +395,30 @@ FunctionEnd
+- 1.62 - December 14, 2002
+
+ - No problems anymore when using both 'Run program' and 'Show Readme'
+ on the finish page
+
- Default state of checkboxes on the finish page can be changed
+
- Welcome / Finish pages compatible with custom DPI settings
+
- Converted Install Options INI files to use dialog units
+
+
- 1.61 - December 5, 2002
- Final version for NSIS 2 beta 0
- modern3.exe UI without description area
- Added define to show uninstall confirm page
- Added language string for finish page title and continue to uninstall
-
- Define for parameters for the application to run on the finishpage
+
- Define for parameters for the application to run on the finish page
- Bugfixes
- 1.6 - November 18, 2002
- Welcome / Finish pages
-
- Automatic ask for reboot on finish page
-
- Create no shortcut option on Start Menu Folder selection page
+
- Automatic ask for reboot on the finish page
+
- Create no shortcut option on the Start Menu Folder selection page
- Customizing GUIInit functions easier
- Minor font / UI changes
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 713bc40e..8390ed33 100644
--- a/Contrib/Modern UI/System.nsh
+++ b/Contrib/Modern UI/System.nsh
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.61
+;NSIS Modern User Interface version 1.62
;Macro System
;Written by Joost Verburg
@@ -7,10 +7,6 @@
;--------------------------------
-!ifndef NSIS_CONFIG_ENHANCEDUI_SUPPORT
- !error "To use the Modern UI you must have a NSIS version compiled with NSIS_CONFIG_ENHANCEDUI_SUPPORT (in Source/exehead/config.h)!"
-!endif
-
!verbose 3
!ifndef MUI_MACROS_USED
@@ -975,7 +971,7 @@
;Write Finish text
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_TEXT_FINISH_INFO_TITLE)"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "150"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "80"
!ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT
@@ -987,18 +983,18 @@
!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" "187"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "478"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "155"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "170"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Left" "120"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "321"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "85"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "95"
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "1"
!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" "187"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Right" "478"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Top" "185"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Bottom" "200"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Left" "120"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Right" "321"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Top" "105"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Bottom" "115"
Goto init
@@ -1006,52 +1002,55 @@
!endif
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_FINISH_INFO_TEXT)"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_FINISH_INFO_TEXT)"
- !ifdef MUI_FINISHPAGE_RUN
+ !ifdef MUI_FINISHPAGE_RUN
- !ifndef MUI_FINISHPAGE_SHOWREADME
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "4"
- !endif
-
- !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" "187"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "478"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "155"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "170"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "1"
-
- !ifdef MUI_FINISHPAGE_SHOWREADME
-
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "5"
-
- !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" "187"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Right" "478"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Top" "185"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Bottom" "200"
-
- !endif
-
- !else
-
- !ifdef MUI_FINISHPAGE_SHOWREADME
-
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "4"
-
- !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" "187"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "478"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "155"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "170"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "1"
-
- !endif
-
+ !ifndef MUI_FINISHPAGE_SHOWREADME
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "4"
!endif
+
+ !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" "120"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "315"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "85"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "95"
+ !ifndef MUI_FINISHPAGE_RUN_NOTCHECKED
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "1"
+ !endif
+
+ !ifdef MUI_FINISHPAGE_SHOWREADME
+
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "5"
+
+ !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" "120"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Right" "315"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Top" "105"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Bottom" "115"
+ !ifndef MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "State" "1"
+ !endif
+
+ !endif
+
+ !else ifdef MUI_FINISHPAGE_SHOWREADME
+
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "4"
+
+ !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" "120"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "315"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "85"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "95"
+ !ifndef MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "1"
+ !endif
+
+ !endif
!ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT
init:
@@ -1099,14 +1098,10 @@
!endif
- !else
-
- !ifdef MUI_FINISHPAGE_SHOWREADME
+ !else ifdef MUI_FINISHPAGE_SHOWREADME
GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1203
SetStaticBkColor ${MUI_TEMP2} 0x00FFFFFF
-
- !endif
!endif
@@ -1156,22 +1151,18 @@
!insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioSpecial.ini" "Field 5" "State"
- StrCmp ${MUI_TEMP1} "1" "" +3
- StrCpy ${MUI_TEMP1} "$\"${MUI_FINISHPAGE_SHOWREADME}$\""
- ExecShell "open" "{MUI_TEMP1}"
+ StrCmp ${MUI_TEMP1} "1" "" +2
+ ExecShell "open" "${MUI_FINISHPAGE_SHOWREADME}"
!endif
- !else
-
- !ifdef MUI_FINISHPAGE_SHOWREADME
+ !else ifdef MUI_FINISHPAGE_SHOWREADME
!insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioSpecial.ini" "Field 4" "State"
- StrCmp ${MUI_TEMP1} "1" "" +3
- StrCpy ${MUI_TEMP1} ${MUI_FINISHPAGE_SHOWREADME}
- ExecShell "open" '"${MUI_TEMP1}"'
-
+ StrCmp ${MUI_TEMP1} "1" "" +2
+ ExecShell "open" "${MUI_FINISHPAGE_SHOWREADME}"
+
!endif
!endif
diff --git a/Contrib/Modern UI/ioSpecial.ini b/Contrib/Modern UI/ioSpecial.ini
index 3b977fa8..bb7ed8b9 100644
--- a/Contrib/Modern UI/ioSpecial.ini
+++ b/Contrib/Modern UI/ioSpecial.ini
@@ -4,18 +4,19 @@ NumFields=3
[Field 1]
Type=bitmap
Left=0
-Right=164
+Right=109
Top=0
-Bottom=314
+Bottom=193
+Flags=RESIZETOFIT
[Field 2]
Type=label
-Left=184
-Right=478
-Top=20
-Bottom=60
+Left=120
+Right=315
+Top=10
+Bottom=32
[Field 3]
Type=label
-Left=184
-Right=478
-Top=75
-Bottom=300
\ No newline at end of file
+Left=120
+Right=315
+Top=42
+Bottom=185
\ No newline at end of file
diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi
index 339546fb..7f6b13e5 100644
--- a/Examples/Modern UI/Basic.nsi
+++ b/Examples/Modern UI/Basic.nsi
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.61
+;NSIS Modern User Interface version 1.62
;Basic Example Script
;Written by Joost Verburg
diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi
index b3fb6189..19dcf025 100644
--- a/Examples/Modern UI/InstallOptions.nsi
+++ b/Examples/Modern UI/InstallOptions.nsi
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.61
+;NSIS Modern User Interface version 1.62
;Install Options Example Script
;Written by Joost Verburg
diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi
index 331f64cb..32cb7a67 100644
--- a/Examples/Modern UI/MultiLanguage.nsi
+++ b/Examples/Modern UI/MultiLanguage.nsi
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.61
+;NSIS Modern User Interface version 1.62
;MultiLanguage Example Script
;Written by Joost Verburg
@@ -36,6 +36,7 @@
!insertmacro MUI_LANGUAGE "Ukrainian"
!insertmacro MUI_LANGUAGE "Czech"
!insertmacro MUI_LANGUAGE "Bulgarian"
+ !insertmacro MUI_LANGUAGE "Thai"
OutFile "MultiLanguage.exe"
@@ -56,6 +57,7 @@
LicenseData /LANG=${LANG_UKRAINIAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
LicenseData /LANG=${LANG_CZECH} "${NSISDIR}\Contrib\Modern UI\License.txt"
LicenseData /LANG=${LANG_BULGARIAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
+ LicenseData /LANG=${LANG_THAI} "${NSISDIR}\Contrib\Modern UI\License.txt"
;Component-selection page
;Titles
@@ -75,6 +77,7 @@
LangString TITLE_SecCopyUI ${LANG_UKRAINIAN} "modern.exe"
LangString TITLE_SecCopyUI ${LANG_CZECH} "modern.exe"
LangString TITLE_SecCopyUI ${LANG_BULGARIAN} "modern.exe"
+ LangString TITLE_SecCopyUI ${LANG_THAI} "modern.exe"
;Descriptions
LangString DESC_SecCopyUI ${LANG_ENGLISH} "modern.exe: English description"
@@ -93,6 +96,7 @@
LangString DESC_SecCopyUI ${LANG_UKRAINIAN} "modern.exe: Ukrainian description"
LangString DESC_SecCopyUI ${LANG_CZECH} "modern.exe: Czechian description"
LangString DESC_SecCopyUI ${LANG_BULGARIAN} "modern.exe: Bulgarian description"
+ LangString DESC_SecCopyUI ${LANG_THAI} "modern.exe: Thai description"
;Folder-selection page
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
@@ -151,8 +155,9 @@ Function .onInit
!insertmacro MUI_LANGDLL_PUSH "Ukrainian"
!insertmacro MUI_LANGDLL_PUSH "Czech"
!insertmacro MUI_LANGDLL_PUSH "Bulgarian"
+ !insertmacro MUI_LANGDLL_PUSH "Thai"
- Push 16F ;16 = number of languages, F = change font
+ Push 17F ;17 = number of languages, F = change font
LangDLL::LangDialog "Installer Language" "Please select a language."
diff --git a/Examples/Modern UI/StartMenu.nsi b/Examples/Modern UI/StartMenu.nsi
index 393161c6..c4f10fba 100644
--- a/Examples/Modern UI/StartMenu.nsi
+++ b/Examples/Modern UI/StartMenu.nsi
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.61
+;NSIS Modern User Interface version 1.62
;Start Menu Folder Selection Example Script
;Written by Joost Verburg
@@ -12,7 +12,7 @@
;You can change this variable or the default Start Menu Folder by using
;these defines:
-;!define MUI_STARTMENU_VARIABLE "$VARNAME"
+;!define MUI_STARTMENU_VARIABLE "$VAR"
;!define MUI_STARTMENU_DEFAULTFOLDER "Folder Name"
;--------------------------------
diff --git a/Examples/Modern UI/WelcomeFinish.nsi b/Examples/Modern UI/WelcomeFinish.nsi
index a8ad7436..d727223f 100644
--- a/Examples/Modern UI/WelcomeFinish.nsi
+++ b/Examples/Modern UI/WelcomeFinish.nsi
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.61
+;NSIS Modern User Interface version 1.62
;Welcome/Finish Page Example Script
;Written by Joost Verburg
diff --git a/Examples/Modern UI/ioA.ini b/Examples/Modern UI/ioA.ini
index 3f508f3f..162f19e7 100644
--- a/Examples/Modern UI/ioA.ini
+++ b/Examples/Modern UI/ioA.ini
@@ -5,6 +5,6 @@ NumFields=1
Type=label
Text=Install Options Page A
Left=0
-Right=110
+Right=-1
Top=0
-Bottom=15
\ No newline at end of file
+Bottom=10
\ No newline at end of file
diff --git a/Examples/Modern UI/ioB.ini b/Examples/Modern UI/ioB.ini
index 0516ce60..298919f0 100644
--- a/Examples/Modern UI/ioB.ini
+++ b/Examples/Modern UI/ioB.ini
@@ -5,6 +5,6 @@ NumFields=1
Type=label
Text=Install Options Page B
Left=0
-Right=110
+Right=-1
Top=0
-Bottom=15
\ No newline at end of file
+Bottom=10
\ No newline at end of file
diff --git a/Examples/Modern UI/ioC.ini b/Examples/Modern UI/ioC.ini
index 722707f2..07d48625 100644
--- a/Examples/Modern UI/ioC.ini
+++ b/Examples/Modern UI/ioC.ini
@@ -5,15 +5,15 @@ NumFields=2
Type=label
Text=Instal Options Page C
Left=0
-Right=110
+Right=-1
Top=0
-Bottom=15
+Bottom=10
[Field 2]
Type=checkbox
Text=Display a MessageBox
Left=0
-Right=125
-Top=40
-Bottom=55
+Right=-1
+Top=30
+Bottom=40
State=1
\ No newline at end of file