From 7f5e1d7b1b0d7ab62bd8482354abd38ba290248a Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 13 Apr 2007 20:10:50 +0000 Subject: [PATCH] fixed bug #1267491 - MUI finish page has unnecessary cancel button git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5068 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/Readme.html | 3 +++ Contrib/Modern UI/System.nsh | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index ab91c2f9..5ba8fd0b 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -782,6 +782,9 @@ Extra space for the text area (if using checkboxes).

MUI_FINISHPAGE_BUTTON text
Text to display on the Finish button.

+

MUI_FINISHPAGE_CANCEL_ENABLED
+Enable the Cancel button so the user can skip any options +displayed on the finish page.

MUI_FINISHPAGE_TEXT_REBOOT text
Text to display on the finish page when asking for a system reboot. diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 126cd201..a82c4fa9 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -985,7 +985,7 @@ Var /GLOBAL MUI_TEMP2 !endif !endif - !ifdef MUI_FINISHPAGE_RUN | MUI_FINISHPAGE_SHOWREADME + !ifdef MUI_FINISHPAGE_CANCEL_ENABLED !define MUI_FINISHPAGE_ABORTWARNINGCHECK !ifndef MUI_VAR_NOABORTWARNING !define MUI_VAR_NOABORTWARNING @@ -1008,6 +1008,7 @@ Var /GLOBAL MUI_TEMP2 !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT_LARGE !insertmacro MUI_UNSET MUI_FINISHPAGE_BUTTON + !insertmacro MUI_UNSET MUI_FINISHPAGE_CANCEL_ENABLED !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT_REBOOT !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT_REBOOTNOW !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT_REBOOTLATER