From 3cc310ed4a599aab78dae9ed4e37655fbf922507 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 27 Nov 2004 14:50:43 +0000
Subject: [PATCH] Modern UI 1.72 * Fixed state of Finish page Cancel button
 when both an installer and uninstaller page is included

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3795 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI/Changelog.txt      | 3 +++
 Contrib/Modern UI/Readme.html        | 5 +++--
 Contrib/Modern UI/System.nsh         | 8 +++++---
 Examples/Modern UI/Basic.nsi         | 4 ++--
 Examples/Modern UI/HeaderBitmap.nsi  | 4 ++--
 Examples/Modern UI/MultiLanguage.nsi | 4 ++--
 Examples/Modern UI/StartMenu.nsi     | 4 ++--
 Examples/Modern UI/WelcomeFinish.nsi | 4 ++--
 8 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt
index 3f9cad01..019e0a7d 100644
--- a/Contrib/Modern UI/Changelog.txt	
+++ b/Contrib/Modern UI/Changelog.txt	
@@ -1,5 +1,8 @@
 NSIS Modern User Interface - VERSION HISTORY
 
+1.72 - November 27, 2004
+* Fixed state of Finish page Cancel button when both an installer and uninstaller page is included
+
 1.71 - October 14, 2004
 * The selected language is only stored in the registry when installation was succesful
 
diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html
index d1370ca6..7452a28c 100644
--- a/Contrib/Modern UI/Readme.html	
+++ b/Contrib/Modern UI/Readme.html	
@@ -1214,9 +1214,10 @@ Start Menu Folder page: <a href=
 <h1>Version history</h1>
 <div>
 <ul>
-<li>1.71 - October 14, 2004
+<li>1.72 - November 27, 2004
 <ul>
-<li>The selected language is only stored in the registry when installation was succesful</li>
+<li>Fixed state of Finish page Cancel button when both an installer and
+uninstaller page is included</li>
 </ul>
 </li>
 </ul>
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 9a277778..7ace2cec 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.71
+;NSIS Modern User Interface version 1.72
 ;Macro System
 ;Written by Joost Verburg
 
@@ -8,7 +8,7 @@
 ;License: License.txt
 ;Examples: Examples\Modern UI
 
-!echo "NSIS Modern User Interface version 1.71 - © 2002-2004 Joost Verburg"
+!echo "NSIS Modern User Interface version 1.72 - © 2002-2004 Joost Verburg"
 
 ;--------------------------------
 
@@ -32,7 +32,7 @@
 !include "WinMessages.nsh"
 !verbose pop
 
-!define MUI_SYSVERSION "1.70"
+!define MUI_SYSVERSION "1.72"
 
 Var MUI_TEMP1
 Var MUI_TEMP2
@@ -968,6 +968,8 @@ Var MUI_TEMP2
     !insertmacro MUI_UNSET MUI_FINISHPAGE_LINK_LOCATION
     !insertmacro MUI_UNSET MUI_FINISHPAGE_LINK_COLOR
   !insertmacro MUI_UNSET MUI_FINISHPAGE_NOREBOOTSUPPORT
+  
+  !insertmacro MUI_UNSET MUI_FINISHPAGE_ABORTWARNINGCHECK
 
   !verbose pop
 
diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi
index 949ede0f..b9a64157 100644
--- a/Examples/Modern UI/Basic.nsi	
+++ b/Examples/Modern UI/Basic.nsi	
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.70
+;NSIS Modern User Interface
 ;Basic Example Script
 ;Written by Joost Verburg
 
@@ -11,7 +11,7 @@
 ;General
 
   ;Name and file
-  Name "Modern UI Test 1.70"
+  Name "Modern UI Test"
   OutFile "Basic.exe"
 
   ;Default installation folder
diff --git a/Examples/Modern UI/HeaderBitmap.nsi b/Examples/Modern UI/HeaderBitmap.nsi
index 6fa51020..82bb8d7c 100644
--- a/Examples/Modern UI/HeaderBitmap.nsi	
+++ b/Examples/Modern UI/HeaderBitmap.nsi	
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.70
+;NSIS Modern User Interface
 ;Header Bitmap Example Script
 ;Written by Joost Verburg
 
@@ -11,7 +11,7 @@
 ;General
 
   ;Name and file
-  Name "Modern UI Test 1.70"
+  Name "Modern UI Test"
   OutFile "HeaderBitmap.exe"
 
   ;Default installation folder
diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi
index 84a3a48d..13b2f2f2 100644
--- a/Examples/Modern UI/MultiLanguage.nsi	
+++ b/Examples/Modern UI/MultiLanguage.nsi	
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.70
+;NSIS Modern User Interface
 ;Multilingual Example Script
 ;Written by Joost Verburg
 
@@ -11,7 +11,7 @@
 ;General
 
   ;Name and file
-  Name "Modern UI Test 1.70"
+  Name "Modern UI Test"
   OutFile "MultiLanguage.exe"
 
   ;Default installation folder
diff --git a/Examples/Modern UI/StartMenu.nsi b/Examples/Modern UI/StartMenu.nsi
index 76f62031..a3a97cd6 100644
--- a/Examples/Modern UI/StartMenu.nsi	
+++ b/Examples/Modern UI/StartMenu.nsi	
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.70
+;NSIS Modern User Interface
 ;Start Menu Folder Selection Example Script
 ;Written by Joost Verburg
 
@@ -11,7 +11,7 @@
 ;General
 
   ;Name and file
-  Name "Modern UI Test 1.70"
+  Name "Modern UI Test"
   OutFile "StartMenu.exe"
 
   ;Default installation folder
diff --git a/Examples/Modern UI/WelcomeFinish.nsi b/Examples/Modern UI/WelcomeFinish.nsi
index 5c22ae3a..e7987894 100644
--- a/Examples/Modern UI/WelcomeFinish.nsi	
+++ b/Examples/Modern UI/WelcomeFinish.nsi	
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.70
+;NSIS Modern User Interface
 ;Welcome/Finish Page Example Script
 ;Written by Joost Verburg
 
@@ -11,7 +11,7 @@
 ;General
 
   ;Name and file
-  Name "Modern UI Test 1.70"
+  Name "Modern UI Test"
   OutFile "WelcomeFinish.exe"
 
   ;Default installation folder