Modern UI 1.70

* Improved documentation
 * New Init custom function for Welcome and Finish page


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3473 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/Modern UI/Changelog.txt

@@ -1,11 +1,15 @@
 NSIS Modern User Interface - VERSION HISTORY
 
+1.70 - February 6, 2004
+* Improved documentation
+* New Init custom function for Welcome and Finish page
+
 1.69 - January 7, 2004
 * All uninstaller pages work without installer pages
 * Fixed top text on uninstaller license page
 
 1.68 - November 24, 2003
-* New settings for extra space for title and text on Welcome page and Finish page.
+* New settings for extra space for title and text on Welcome and Finish page.
 * Improved handling of verbose settings. Define MUI_VERBOSE the set the Modern UI verbose level (1-4).
 * Language file string for uninstaller reboot information
 * Setting for folder validation in leave function
@@ -18,7 +22,8 @@ NSIS Modern User Interface - VERSION HISTORY
 * Renamed a few settings
 * Default header image
 * Support for uninstaller abort warning
-* Setting for 3 line text on Welcome page and Finish page
+* Setting for 3 line text on Welcome and Finish page
+  (NOTE: New settings have been introduces in version 1.68)
 * Langauge file backwards compatibility: English for missing strings
 * Support for different uninstaller header image
 * Language selection dialog not displayed if installer is silent
@@ -29,7 +34,7 @@ NSIS Modern User Interface - VERSION HISTORY
 * New system for page settings and custom pages
 * Support for uninstaller components page
 * Support for multiple pages of the same type
-* New possition for interface settings
+* New position for interface settings
 * Changed macro, setting names
 * Updated langauge system, new language files and settings
 * Removed MUI_BRANDINGTEXT. Use BrandingText command now.
@@ -43,8 +48,7 @@ NSIS Modern User Interface - VERSION HISTORY
 * ReserveFile macro for StartMenu plug-in
 * Option to always show the language selection dialog (even if a language has been stored in the registry)
 * Checkboxes on Finish page can be used to call a function
-* Support for custom leave functions for Start Menu Folder,
-  Welcome and Finish pages
+* Support for custom leave functions for Start Menu Folder, Welcome and Finish pages
 * Support for a link on the Finish page
 * New macro to get Start Menu folder in uninstaller
 * Options to disable bitmap stretching
@@ -63,7 +67,7 @@ NSIS Modern User Interface - VERSION HISTORY
 
 1.63 - March 9, 2003
 * Support for a bitmap in the wizard header
-* New defines to change the description area
+* New defines to change the components page interface
 * MUI_SYSTEM inserted automatically
 * Single macro for language selection dialog
 * Removed page description in window title
@@ -80,21 +84,25 @@ NSIS Modern User Interface - VERSION HISTORY
 * Minor fixes
 
 1.62 - February 2, 2003
-* New language strings for finish page
+* New language strings for Finish page
 * Possibility to let a Modern UI Function call your own function
-* No problems anymore when using both 'Run program' and 'Show Readme'  on the finish page
+* 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 page compatible with custom DPI settings
 * Converted Install Options INI files to use dialog units
 * More ReserveFile macros
+  (NOTE: Some of these macros have been removed in later versions)
 * Background color can be changed with a define
 * Support for multilingual branding texts
 * Start Menu / Finish page window titles also work when using custom page commands
 * Language files should be inserted after inserting the MUI_SYSTEM macro
+  (NOTE: The MUI_SYSTEM macro has been removed in version 1.63)
 * Define MUI_MANUALVERBOSE if you don't want the Modern UI to change the verbose settings during compilation
+  (NOTE: This setting has been changed in version 1.68)
     
 1.61 - December 5, 2002
 * modern3.exe UI without description area
+  (NOTE: This setting has been changed in version 1.63)
 * 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 finish page
@@ -112,7 +120,8 @@ NSIS Modern User Interface - VERSION HISTORY
 * Language strings can be changed in the script without editing languagefiles
 * Start Menu Folder selection page
 * 'Click Next to continue' and 'Click Install to start the installation' texts automatically change to the page order
-* Install Options macros updated. MUI_INSTALLOPTIONS_DISPLAY is the standard macro now. Use MUI_INSTALLOPTIONS_INITDIALOG and MUI_INSTALLOPTIONS_SHOW if you want to customize dialog controls.
+* Install Options macros updated. MUI_INSTALLOPTIONS_DISPLAY is the standard macro now.
+  Use MUI_INSTALLOPTIONS_INITDIALOG and MUI_INSTALLOPTIONS_SHOW if you want to customize dialog controls.
 * No more writing window titles & abort warnings to Install Options INI Files
 * Compatible with updated paging system
 * Renamed macros and defines
@@ -132,6 +141,7 @@ NSIS Modern User Interface - VERSION HISTORY
 * Small bugfixes & typo corrections
 * SetPage function should be set using defines
 * Different NextPage/PrevPage/FinishHeader macros for install/uninstall
+  (NOTE: These macros have been removed in version 1.4)
 * Interface settings can be definend (for example, MUI_ICON), no parameters for MUI_INTERFACE anymore
 * New Install Options macros to read/write IO INI file value
 
@@ -139,9 +149,12 @@ NSIS Modern User Interface - VERSION HISTORY
 * Temp vars set in Modern UI header
 * Currentpage & Install Options vars should be set using
   parameters of the MUI_INTERFACE and * MUI_INSTALLOPTIONS macros
+  (NOTE: The MUI_INTERFACE macro has been removed in version 1.3)
 * MultiLanguage.nsi uses the new language strings
 
 1.2 - September 22, 2002
+  (NOTE: All macors mentioned here have been removed in version 1.4)
+  
 * Lots of macro system updates & fixes
 * InstallOptions support in macro system
 * Added Modern UI + InstallOptions example (InstallOptions.nsi)
@@ -154,6 +167,7 @@ NSIS Modern User Interface - VERSION HISTORY
 1.19 - Semtember 19, 2002
 * Renamed some macros
 * Custom code can be used between page start/stop macros
+  (NOTE: These macros have been removed in version 1.4)
 
 1.18 - Semtember 13, 2002
 * Uses the new Sendmessage string option
@@ -167,6 +181,7 @@ NSIS Modern User Interface - VERSION HISTORY
 
 1.15 - Semtember 4, 2002
 * Multilanguage example: changed LangDialog to LangDLL::LangDialog (using the DLL name is now required)
+  (NOTE: A new macro for the language selection dialog has been introduced in version 1.63)
 
 1.14 - Semtember 3, 2002
 * Small grammar fix (thanks eccles)
@@ -180,8 +195,11 @@ NSIS Modern User Interface - VERSION HISTORY
 
 1.11 - August 29, 2002
 * Finish header for uninstaller can also be set using MUI_FINISHHEADER
+  (NOTE: The MUI_FINISHHEADER macro has been removed in version 1.64)
 
 1.1 - August 29, 2002
+  (NOTE: All settings mentioned here do not exist anymore)
+
 * 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

Contrib/Modern UI/System.nsh

@@ -1110,10 +1110,21 @@ Var MUI_TEMP2
   
 !macroend
 
+!macro MUI_WELCOMEFINISHPAGE_FUNCTION_CUSTOM
+
+  !ifdef MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT
+    Call "${MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT}"
+    !undef MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT
+  !endif
+
+!macroend
+
 !macro MUI_FUNCTION_WELCOMEPAGE PRE LEAVE
 
   Function "${PRE}"
   
+    !insertmacro MUI_WELCOMEFINISHPAGE_FUNCTION_CUSTOM
+  
     !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "NumFields" "3"
     !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "NextButtonText" ""
     !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "CancelEnabled" ""
@@ -1353,6 +1364,8 @@ Var MUI_TEMP2
 
   Function "${PRE}"
     
+    !insertmacro MUI_WELCOMEFINISHPAGE_FUNCTION_CUSTOM
+    
     !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "NextButtonText" "${MUI_FINISHPAGE_BUTTON}"
     
     !ifdef MUI_FINISHPAGE_ABORTWARNINGCHECK

Examples/Modern UI/Basic.nsi

@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.69
+;NSIS Modern User Interface version 1.70
 ;Basic Example Script
 ;Written by Joost Verburg
 
@@ -8,10 +8,10 @@
   !include "MUI.nsh"
 
 ;--------------------------------
-;Configuration
-
 ;General
-  Name "Modern UI Test 1.69"
+
+  ;Name and file
+  Name "Modern UI Test 1.70"
   OutFile "Basic.exe"
 
   ;Default installation folder
@@ -48,7 +48,7 @@ Section "Dummy Section" SecDummy
 
   SetOutPath "$INSTDIR"
   
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
   
   ;Store installation folder
   WriteRegStr HKCU "Software\Modern UI Test" "" $INSTDIR
@@ -74,7 +74,7 @@ SectionEnd
 
 Section "Uninstall"
 
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
 
   Delete "$INSTDIR\Uninstall.exe"
 

Examples/Modern UI/HeaderBitmap.nsi

@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.69
+;NSIS Modern User Interface version 1.70
 ;Header Bitmap Example Script
 ;Written by Joost Verburg
 
@@ -8,10 +8,10 @@
   !include "MUI.nsh"
 
 ;--------------------------------
-;Configuration
-
 ;General
-  Name "Modern UI Test 1.69"
+
+  ;Name and file
+  Name "Modern UI Test 1.70"
   OutFile "HeaderBitmap.exe"
 
   ;Default installation folder
@@ -21,7 +21,7 @@
   InstallDirRegKey HKCU "Software\Modern UI Test" ""
 
 ;--------------------------------
-;Modern UI Configuration
+;Interface Configuration
 
   !define MUI_HEADERIMAGE
   !define MUI_ABORTWARNING
@@ -49,7 +49,7 @@ Section "Dummy Section" SecDummy
 
   SetOutPath "$INSTDIR"
   
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
   
   ;Store installation folder
   WriteRegStr HKCU "Software\Modern UI Test" "" $INSTDIR
@@ -75,7 +75,7 @@ SectionEnd
 
 Section "Uninstall"
 
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
 
   Delete "$INSTDIR\Uninstall.exe"
 

Examples/Modern UI/InstallOptions.nsi

@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.69
+;NSIS Modern User Interface version 1.70
 ;InstallOptions Example Script
 ;Written by Joost Verburg
 
@@ -8,10 +8,10 @@
   !include "MUI.nsh"
 
 ;--------------------------------
-;Configuration
-
 ;General
-  Name "Modern UI Test 1.69"
+
+  ;Name and file
+  Name "Modern UI Test 1.70"
   OutFile "InstallOptions.exe"
 
   ;Default installation folder
@@ -68,7 +68,7 @@ Section "Dummy Section" SecDummy
 
   SetOutPath "$INSTDIR"
   
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
   
   ;Store installation folder
   WriteRegStr HKCU "Software\Modern UI Test" "" $INSTDIR
@@ -137,7 +137,7 @@ FunctionEnd
 
 Section "Uninstall"
 
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
 
   Delete "$INSTDIR\Uninstall.exe"
 

Examples/Modern UI/MultiLanguage.nsi

@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.69
+;NSIS Modern User Interface version 1.70
 ;Multilingual Example Script
 ;Written by Joost Verburg
 
@@ -8,10 +8,10 @@
   !include "MUI.nsh"
 
 ;--------------------------------
-;Configuration
-
 ;General
-  Name "Modern UI Test 1.69"
+
+  ;Name and file
+  Name "Modern UI Test 1.70"
   OutFile "MultiLanguage.exe"
 
   ;Default installation folder
@@ -103,7 +103,7 @@ Section "Dummy Section" SecDummy
 
   SetOutPath "$INSTDIR"
   
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
   
   ;Store installation folder
   WriteRegStr HKCU "Software\Modern UI Test" "" $INSTDIR
@@ -138,7 +138,7 @@ FunctionEnd
 
 Section "Uninstall"
 
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
 
   Delete "$INSTDIR\Uninstall.exe"
 

Examples/Modern UI/StartMenu.nsi

@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.69
+;NSIS Modern User Interface version 1.70
 ;Start Menu Folder Selection Example Script
 ;Written by Joost Verburg
 
@@ -8,10 +8,10 @@
   !include "MUI.nsh"
 
 ;--------------------------------
-;Configuration
-
 ;General
-  Name "Modern UI Test 1.69"
+
+  ;Name and file
+  Name "Modern UI Test 1.70"
   OutFile "StartMenu.exe"
 
   ;Default installation folder
@@ -62,7 +62,7 @@ Section "Dummy Section" SecDummy
 
   SetOutPath "$INSTDIR"
   
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
   
   ;Store installation folder
   WriteRegStr HKCU "Software\Modern UI Test" "" $INSTDIR
@@ -96,7 +96,7 @@ SectionEnd
 
 Section "Uninstall"
 
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
 
   Delete "$INSTDIR\Uninstall.exe"
 

Examples/Modern UI/WelcomeFinish.nsi

@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.69
+;NSIS Modern User Interface version 1.70
 ;Welcome/Finish Page Example Script
 ;Written by Joost Verburg
 
@@ -8,10 +8,10 @@
   !include "MUI.nsh"
 
 ;--------------------------------
-;Configuration
-
 ;General
-  Name "Modern UI Test 1.69"
+
+  ;Name and file
+  Name "Modern UI Test 1.70"
   OutFile "WelcomeFinish.exe"
 
   ;Default installation folder
@@ -52,7 +52,7 @@ Section "Dummy Section" SecDummy
 
   SetOutPath "$INSTDIR"
   
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
   
   ;Store installation folder
   WriteRegStr HKCU "Software\Modern UI Test" "" $INSTDIR
@@ -78,7 +78,7 @@ SectionEnd
 
 Section "Uninstall"
 
-  ;ADD YOUR OWN STUFF HERE!
+  ;ADD YOUR OWN FILES HERE...
 
   Delete "$INSTDIR\Uninstall.exe"