From f9700baff35b0bad740bf46411a2332277eb5ab6 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Wed, 5 Nov 2003 16:02:44 +0000 Subject: [PATCH] added MUI_(UN)WELCOMEFINISHPAGE_INI_3LINES, welcome page after installation works, doc fixes git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3102 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/Readme.html | 38 ++++++++++++++++++++++------------- Contrib/Modern UI/System.nsh | 37 ++++++++++++++++++++++------------ 2 files changed, 48 insertions(+), 27 deletions(-) diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index f3bc582e..8f56a374 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -194,7 +194,7 @@ will also help you to learn more about the Modern UI.

MUI_BGCOLOR (color: RRGGBBR hexadecimal)
Background color for the header, Welcome- and Finish page.
Default: FFFFFF

-

User Interface Resource Settings

+

Interface Resource Settings

MUI_UI ui_file
The interface file with the dialog resources. Change this if you have made your own customized UI.
@@ -216,13 +216,9 @@ will also help you to learn more about the Modern UI.

Welcome/Finish Page Interface Settings

-

MUI_WELCOMEFINISHPAGE_3LINES ini_file
+

MUI_WELCOMEFINISHPAGE_3LINES
Create a bigger area for the title on the Welcome- and Finish page, to allow displaying 3 lines of text - (with the default font). This setting has no effect when using a custom INI file.

-

MUI_WELCOMEFINISHPAGE_INI ini_file
- InstallOptions INI file for the Welcome- and Finish page. You can create your own modified copy of - ioSpecial.ini or ioSpecial3.ini (for 3 lines title).
- Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini

+ (with the default font).

MUI_WELCOMEFINISHPAGE_BITMAP bmp_file
Bitmap for the Welcome- and Finish page (recommended size: 164x314 pixels).
Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp

@@ -234,15 +230,20 @@ will also help you to learn more about the Modern UI.

if the user has a custom DPI setting.

-

Uninstaller Welcome/Finish Page Interface Settings

+

Welcome/Finish Page InstallOptions INI Settings

-

MUI_UNWELCOMEFINISHPAGE_3LINES ini_file
- Create a bigger area for the title on the uninstaller Welcome- and Finish page, to allow displaying 3 lines of text - (with the default font). This setting has no effect when using a custom INI file.

-

MUI_UNWELCOMEFINISHPAGE_INI ini_file
- InstallOptions INI file for the uninstaller Welcome- and Finish page. You can create your own modified copy of - ioSpecial.ini or ioSpecial3.ini (for 3 lines title).
+

MUI_WELCOMEFINISHPAGE_INI ini_file
+ InstallOptions INI file for the Welcome- and Finish page.
Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini

+

MUI_WELCOMEFINISHPAGE_INI_3LINES ini_file
+ InstallOptions INI file for the Welcome- and Finish page with space for 3 lines of title text (with the default font).
+ Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini

+
+

Uninstaller Welcome/Finish Page InstallOptions INI Settings

+
+

MUI_UNWELCOMEFINISHPAGE_3LINES
+ Create a bigger area for the title on the uninstaller Welcome- and Finish page, to allow displaying 3 lines of text + (with the default font).

MUI_UNWELCOMEFINISHPAGE_BITMAP bmp_file
Bitmap for the Welcome- and Finish page (recommended size: 164x314 pixels).
Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp

@@ -254,6 +255,15 @@ will also help you to learn more about the Modern UI.

if the user has a custom DPI setting.

+

Uninstaller Welcome/Finish Page Interface INI File Settings

+
+

MUI_UNWELCOMEFINISHPAGE_INI ini_file
+ InstallOptions INI file for the uninstaller Welcome- and Finish page.
+ Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini

+

MUI_WELCOMEFINISHPAGE_INI_3LINES ini_file
+ InstallOptions INI file for the Welcome- and Finish page with space for 3 lines of title text (with the default font).
+ Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini

+

License Page Interface Settings

MUI_LICENSEPAGE_BGCOLOR diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 07d4268f..857f4a42 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -80,19 +80,19 @@ Var MUI_TEMP2 !endif !ifndef MUI_WELCOMEFINISHPAGE_INI - !ifndef MUI_WELCOMEFINISHPAGE_3LINES - !define MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" - !else - !define MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini" - !endif + !define MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" + !endif + + !ifndef MUI_WELCOMEFINISHPAGE_INI_3LINES + !define MUI_WELCOMEFINISHPAGE_INI_3LINES "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini" !endif !ifndef MUI_UNWELCOMEFINISHPAGE_INI - !ifndef MUI_UNWELCOMEFINISHPAGE_3LINES - !define MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" - !else - !define MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini" - !endif + !define MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" + !endif + + !ifndef MUI_UNWELCOMEFINISHPAGE_INI_3LINES + !define MUI_UNWELCOMEFINISHPAGE_INI_3LINES "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini" !endif !ifndef MUI_WELCOMEFINISHPAGE_BITMAP @@ -359,8 +359,12 @@ Var MUI_TEMP2 !macro MUI_WELCOMEFINISHPAGE_INIT !ifdef MUI_WELCOMEPAGE | MUI_FINISHPAGE - - !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_WELCOMEFINISHPAGE_INI}" "ioSpecial.ini" + + !ifndef MUI_WELCOMEFINISHPAGE_3LINES + !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_WELCOMEFINISHPAGE_INI}" "ioSpecial.ini" + !else + !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_WELCOMEFINISHPAGE_INI_3LINES}" "ioSpecial.ini" + !endif File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_WELCOMEFINISHPAGE_BITMAP}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp" @@ -377,7 +381,11 @@ Var MUI_TEMP2 !ifdef MUI_UNWELCOMEPAGE | UNMUI_FINISHPAGE - !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_UNWELCOMEFINISHPAGE_INI}" "ioSpecial.ini" + !ifndef MUI_UNWELCOMEFINISHPAGE_3LINES + !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_UNWELCOMEFINISHPAGE_INI}" "ioSpecial.ini" + !else + !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_UNWELCOMEFINISHPAGE_INI_3LINES}" "ioSpecial.ini" + !endif File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_UNWELCOMEFINISHPAGE_BITMAP}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp" @@ -1105,6 +1113,9 @@ Var MUI_TEMP2 Function "${PRE}" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "NextButtonText" "" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "CancelEnabled" "" + !ifndef MUI_WELCOMEPAGE_TITLE !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_${MUI_PAGE_UNINSTALLER}TEXT_WELCOME_INFO_TITLE)" !else