From 84db51ea2cc2ede7746e89e0f4f1d2812ab1c963 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 25 Apr 2003 15:27:32 +0000
Subject: [PATCH] write to INI file in Welcome/Finish page pre functions

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2494 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI/Changelog.txt |  3 ++-
 Contrib/Modern UI/Readme.html   | 20 +++++++++++++-------
 Contrib/Modern UI/System.nsh    | 21 +++++++++++----------
 3 files changed, 26 insertions(+), 18 deletions(-)

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.</p>
 <p class="text">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.</p>
+easy.</p>
+<p class="text"><span class="bold">Important: </span>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.</p>
 <p class="header">Screenshots</p>
 <p class="text"><img src="Screenshot.png" width="503" height="393" alt="" /></p>
 <p class="text"><img src="Screenshot2.png" width="503" height="393" alt="" /></p>
@@ -542,8 +547,8 @@ MUI_CUSTOMFUNCTION_UNGUIINIT
 </p>
 <p class="text">
 <span class="bold">Welcome Page</span><br />
-MUI_CUSTOMFUNCTION_WELCOME_PRE<br />
-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)<br />
+MUI_CUSTOMFUNCTION_WELCOME_SHOW - ${MUI_HWND} contains HWND of Welcome dialog
 </p>
 <p class="text">
 <span class="bold">License Page</span><br />
@@ -565,7 +570,7 @@ MUI_CUSTOMFUNCTION_DIRECTORY_LEAVE
 </p>
 <p class="text">
 <span class="bold">Start Menu Folder Page</span><br />
-MUI_CUSTOMFUNCTION_STARTMENU_PRE
+MUI_CUSTOMFUNCTION_STARTMENU_PRE<br />
 MUI_CUSTOMFUNCTION_STARTMENU_LEAVE
 </p>
 <p class="text">
@@ -576,8 +581,8 @@ MUI_CUSTOMFUNCTION_INSTFILES_LEAVE
 </p>
 <p class="text">
 <span class="bold">Finish Page</span><br />
-MUI_CUSTOMFUNCTION_FINISH_PRE<br />
-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)<br />
+MUI_CUSTOMFUNCTION_FINISH_SHOW - ${MUI_HWND} contains HWND of Finish dialog
 </p>
 <p class="text">
 <span class="bold">Installer Abort</span><br />
@@ -597,7 +602,7 @@ MUI_UNCUSTOMFUNCTION_INSTFILES_LEAVE
 </p>
 <p class="header">Version history</p>
 <ul>
-<li>1.64 - April 21, 2003
+<li>1.64 - April 25, 2003
   <ul>
     <li>Support for license page with checkbox or radiobuttons to
     let the user accept the agreement or not</li>
@@ -607,6 +612,7 @@ MUI_UNCUSTOMFUNCTION_INSTFILES_LEAVE
     <li>Header text for aborted installation</li>
     <li>New macro's: get language for uninstaller, delete shortcuts</li>
     <li>Language specific fonts</li>
+    <li>Welcome/Finish page INI files can be modified in pre functions</li>
     <li>Language files have to be updated</li>
   </ul></li>
 </ul>
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}