From 34a538916ed570236a99f73ea91e9b46818baf54 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 29 Aug 2002 19:48:16 +0000
Subject: [PATCH] Uninstall text in the UI macros

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@835 212acab6-be3b-0410-9dea-997c60f758d6
---
 Examples/Modern UI/Example.nsi       |  8 +++-----
 Examples/Modern UI/ModernUI.nsh      |  6 +++---
 Examples/Modern UI/MultiLanguage.nsi | 10 ++++------
 Examples/Modern UI/Readme.html       |  6 +++++-
 Examples/makensis.nsi                |  5 ++---
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/Examples/Modern UI/Example.nsi b/Examples/Modern UI/Example.nsi
index 317c304a..c24ec3fd 100644
--- a/Examples/Modern UI/Example.nsi	
+++ b/Examples/Modern UI/Example.nsi	
@@ -1,5 +1,5 @@
 ;NSIS Modern Style UI
-;Example Script version 1.1
+;Example Script version 1.11
 ;Written by Joost Verburg
 
 !define NAME "Test Software" ;Define your own software name here
@@ -62,7 +62,7 @@ SectionEnd
 Section ""
 
   ;Invisible section to display the Finish header
-  !insertmacro MUI_FINISHHEADER
+  !insertmacro MUI_FINISHHEADER SetHeader
   
 SectionEnd
 
@@ -161,9 +161,7 @@ Section "Uninstall"
 
   RMDir "$INSTDIR"
 
-  ;Display the Finish header
-  IntOp ${CURRENTPAGE} ${CURRENTPAGE} + 1
-  Call un.SetHeader
+  !insertmacro MUI_FINISHHEADER un.SetHeader
  
 SectionEnd
 
diff --git a/Examples/Modern UI/ModernUI.nsh b/Examples/Modern UI/ModernUI.nsh
index 57dbed1a..7e054680 100644
--- a/Examples/Modern UI/ModernUI.nsh	
+++ b/Examples/Modern UI/ModernUI.nsh	
@@ -1,4 +1,4 @@
-;Modern UI Header File version 1.0
+;Modern UI Header File version 1.01
 ;Written by Joost Verburg
 
 ;See Example.nsi & Multilanguage.nsi for an example of usage
@@ -23,12 +23,12 @@
 
 !macroend
 
-!macro MUI_FINISHHEADER
+!macro MUI_FINISHHEADER CALL
 
   ;Finish text on the header (white rectangle)
   
   IntOp ${CURRENTPAGE} ${CURRENTPAGE} + 1
-  Call SetHeader
+  Call ${CALL}
 
 !macroend
 
diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi
index 49686190..01fc3005 100644
--- a/Examples/Modern UI/MultiLanguage.nsi	
+++ b/Examples/Modern UI/MultiLanguage.nsi	
@@ -1,5 +1,5 @@
 ;NSIS Modern Style UI
-;Multilanguage & LangDLL Example Script version 1.0
+;Multilanguage & LangDLL Example Script version 1.01
 ;Written by Joost Verburg
 
 !define NAME "Test Software" ;Define your own software name here
@@ -72,7 +72,7 @@ SectionEnd
 Section ""
 
   ;Invisible section to display the Finish header
-  !insertmacro MUI_FINISHHEADER
+  !insertmacro MUI_FINISHHEADER SetHeader
   
 SectionEnd
 
@@ -199,10 +199,8 @@ Section "Uninstall"
 
   RMDir "$INSTDIR"
 
-  ;Display the Finish header
-  IntOp ${CURRENTPAGE} ${CURRENTPAGE} + 1
-  Call un.SetHeader
- 
+  !insertmacro MUI_FINISHHEADER un.SetHeader
+
 SectionEnd
 
 ;--------------------------------
diff --git a/Examples/Modern UI/Readme.html b/Examples/Modern UI/Readme.html
index 3cc4cbf6..bfec56f7 100644
--- a/Examples/Modern UI/Readme.html	
+++ b/Examples/Modern UI/Readme.html	
@@ -124,6 +124,10 @@ table
                   of the MUI_INTERFACE macro.</p>
                 <p class="header">Version history</p>
                 <ul>
+				<li class="text">1.11 - August 29th, 2002
+                  <ul>
+                    <li>Finish header for uninstaller can also be set using MUI_FINISHHEADER
+                  </ul> 
                 <li class="text">1.1 - August 29th, 2002
                   <ul>
                     <li>Header file with macros, it's now very easy to use the UI in your scripts :)
@@ -139,7 +143,7 @@ table
                     <li>Used modern.bmp for the checks (thanks rainwater)
                     <li>Using the new NSIS version, descriptions work using the keyboard and you can give
                     descriptions to subsections
-		    <li>Correct font size using High-DPI fonts
+                    <li>Correct font size using High-DPI fonts
                   </ul>
                 <li class="text">1.0 - August 26th, 2002
                   <ul>
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index dfb88f3c..00aa6e27 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -339,7 +339,7 @@ Section -post
   nofunshit:
   Delete $INSTDIR\uninst-nsis.exe 
   WriteUninstaller $INSTDIR\uninst-nsis.exe
-  !insertmacro MUI_FINISHHEADER
+  !insertmacro MUI_FINISHHEADER SetHeader
 SectionEnd
 
 Function .onInstSuccess
@@ -535,8 +535,7 @@ Section Uninstall
     IfFileExists $INSTDIR 0 Removed 
       MessageBox MB_OK|MB_ICONEXCLAMATION "Note: $INSTDIR could not be removed."
   Removed:
-  IntOp ${CURRENTPAGE} ${CURRENTPAGE} + 1
-  Call un.SetHeader
+  !insertmacro MUI_FINISHHEADER un.SetHeader
 SectionEnd
 
 Function un.onNextPage