diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt index f992bd7c..92ce0c46 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 21, 2003 +1.64 - April 25, 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 @@ -9,6 +9,7 @@ NSIS Modern User Interface - VERSION HISTORY * Header text for aborted installation * New macro's: get language for uninstaller, delete shortcuts * Language specific fonts +* Welcome/Finish page INI files can be modified in pre functions * 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 8f774a39..dfa89f49 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -115,7 +115,12 @@ a:hover selection page.

Because of the macro system with support for plugins and the special language files, writing scripts for the Modern UI is -easy. Read this document for more info.

+easy.

+

Important: Because the Modern +UI has its own macro system, its own default settings and a lot of +new features, the interface configuration works differently. So you +should not use commands like Icon, BrandingText etc. Read this document +for more info.

Screenshots

@@ -542,8 +547,8 @@ MUI_CUSTOMFUNCTION_UNGUIINIT

Welcome Page
-MUI_CUSTOMFUNCTION_WELCOME_PRE
-MUI_CUSTOMFUNCTION_WELCOME_SHOW - ${MUI_TEMP1} contains HWND of Welcome dialog +MUI_CUSTOMFUNCTION_WELCOME_PRE - You can write to the IO INI file of the page (ioSpecial.ini)
+MUI_CUSTOMFUNCTION_WELCOME_SHOW - ${MUI_HWND} contains HWND of Welcome dialog

License Page
@@ -565,7 +570,7 @@ MUI_CUSTOMFUNCTION_DIRECTORY_LEAVE

Start Menu Folder Page
-MUI_CUSTOMFUNCTION_STARTMENU_PRE +MUI_CUSTOMFUNCTION_STARTMENU_PRE
MUI_CUSTOMFUNCTION_STARTMENU_LEAVE

@@ -576,8 +581,8 @@ MUI_CUSTOMFUNCTION_INSTFILES_LEAVE

Finish Page
-MUI_CUSTOMFUNCTION_FINISH_PRE
-MUI_CUSTOMFUNCTION_FINISH_SHOW - ${MUI_TEMP1} contains HWND of Finish dialog +MUI_CUSTOMFUNCTION_FINISH_PRE - You can write to the IO INI file of the page (ioSpecial.ini)
+MUI_CUSTOMFUNCTION_FINISH_SHOW - ${MUI_HWND} contains HWND of Finish dialog

Installer Abort
@@ -597,7 +602,7 @@ MUI_UNCUSTOMFUNCTION_INSTFILES_LEAVE

Version history

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index a782d5ad..92f2f11d 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -21,6 +21,7 @@ !define MUI_TEMP1 $R0 !define MUI_TEMP2 $R1 !define MUI_TEMP3 $R2 +!define MUI_HWND ${MUI_TEMP1} !macro MUI_INTERFACE @@ -975,10 +976,6 @@ Function "${FUNCTION}" - !ifdef MUI_CUSTOMFUNCTION_WELCOME_PRE - Call "${MUI_CUSTOMFUNCTION_WELCOME_PRE}" - !endif - Push ${MUI_TEMP1} Push ${MUI_TEMP2} Push ${MUI_TEMP3} @@ -994,7 +991,11 @@ GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1045 ShowWindow ${MUI_TEMP1} ${SW_NORMAL} - + + !ifdef MUI_CUSTOMFUNCTION_WELCOME_PRE + Call "${MUI_CUSTOMFUNCTION_WELCOME_PRE}" + !endif + !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioSpecial.ini" Pop ${MUI_TEMP1} @@ -1237,10 +1238,6 @@ !endif Function "${FUNCTION}" - - !ifdef MUI_CUSTOMFUNCTION_FINISH_PRE - Call "${MUI_CUSTOMFUNCTION_FINISH_PRE}" - !endif Push ${MUI_TEMP1} Push ${MUI_TEMP2} @@ -1346,7 +1343,11 @@ !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT mui.finish_load: !endif - + + !ifdef MUI_CUSTOMFUNCTION_FINISH_PRE + Call "${MUI_CUSTOMFUNCTION_FINISH_PRE}" + !endif + !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioSpecial.ini" Pop ${MUI_TEMP1}