diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt index 54d723e3..dc6a3335 100644 --- a/Contrib/Modern UI/Changelog.txt +++ b/Contrib/Modern UI/Changelog.txt @@ -1,17 +1,25 @@ NSIS Modern User Interface - VERSION HISTORY -1.67 - November 9, 2003 -* Support for uninstaller Welcome- and Finish pages +1.68 - November 24, 2003 +* New settings for extra space for title and text on Welcome page and Finish page. +* Improved handling of verbose settings. Define MUI_VERBOSE the set the Modern UI verbose level (1-4). +* Language file string for uninstaller reboot information +* Setting for folder validation in leave function +* Fixed finish page text settings for multiple pages + +1.67 - November 18, 2003 +* Support for uninstaller Welcome pages and Finish pages * Improved and changed text settings * ID for Start Menu Folder pages, easier to use multiple pages * Renamed a few settings * Default header image * Support for uninstaller abort warning -* Setting for 3 line text on Welcome- and Finish page +* Setting for 3 line text on Welcome page and Finish page * Langauge file backwards compatibility: English for missing strings * Support for different uninstaller header image * Language selection dialog not displayed if installer is silent * Cancel button on Finish page when there are options +* Full RTL support 1.66 - October 7, 2003 * New system for page settings and custom pages @@ -24,14 +32,12 @@ NSIS Modern User Interface - VERSION HISTORY * Removed MUI_PRODUCT and MUI VERSION. Use Name command now. 1.65 - July 16, 2003 -* New page configuration system, no different system for installers - with custom pages +* New page configuration system, no different system for installers with custom pages * Default windows color for the license text background * Example script updates (new format, user variables) * Improved registry storage for Start Menu folder * ReserveFile macro for StartMenu plug-in -* Option to always show the language selection dialog - (even if a language has been stored in the registry) +* Option to always show the language selection dialog (even if a language has been stored in the registry) * Checkboxes on Finish page can be used to call a function * Support for custom leave functions for Start Menu Folder, Welcome and Finish pages @@ -42,11 +48,9 @@ NSIS Modern User Interface - VERSION HISTORY when mouse is outside box, disabled style 1.64 - April 27, 2003 -* Support for license page with checkbox or radiobuttons to let the - user accept the agreement or not +* Support for license page with checkbox or radiobuttons to let the user accept the agreement or not * Macros for finish headers don't have to be inserted anymore -* Language preference stored when installation has completed, - no problems anymore when the users selects the wrong language +* Language preference stored when installation has completed, no problems anymore when the users selects the wrong language * Header text for aborted installation * New macros: get language for uninstaller, delete shortcuts * Language specific fonts @@ -62,8 +66,7 @@ NSIS Modern User Interface - VERSION HISTORY * Easier to customize resource files * New system for custom functions * Start Menu folder registry key automatically written -* New InstallOptions macros that do not remove the return value from - the stack +* New InstallOptions macros that do not remove the return value from the stack * Support for custom pages before the finish page * Renamed Start Menu page defines * 'Do not create shortcuts' checkbox can be removed @@ -75,20 +78,16 @@ NSIS Modern User Interface - VERSION HISTORY 1.62 - February 2, 2003 * New language strings for finish page * Possibility to let a Modern UI Function call your own function -* No problems anymore when using both 'Run program' and 'Show Readme' - on the finish page +* No problems anymore when using both 'Run program' and 'Show Readme' on the finish page * Default state of checkboxes on the finish page can be changed * Welcome / Finish page compatible with custom DPI settings * Converted Install Options INI files to use dialog units * More ReserveFile macros * Background color can be changed with a define * Support for multilingual branding texts -* Start Menu / Finish page window titles also work when using - custom page commands -* Language files should be inserted after inserting the MUI_SYSTEM - macro -* Define MUI_MANUALVERBOSE if you don't want the Modern UI to change - the verbose settings during compilation +* Start Menu / Finish page window titles also work when using custom page commands +* Language files should be inserted after inserting the MUI_SYSTEM macro +* Define MUI_MANUALVERBOSE if you don't want the Modern UI to change the verbose settings during compilation 1.61 - December 5, 2002 * modern3.exe UI without description area @@ -106,17 +105,11 @@ NSIS Modern User Interface - VERSION HISTORY 1.5 - November 11, 2002 * New language file format -* Language strings can be changed in the script without editing language - files +* Language strings can be changed in the script without editing languagefiles * Start Menu Folder selection page -* 'Click Next to continue' and 'Click Install to start the installation' - texts automatically change to the page order -* Install Options macros updated. MUI_INSTALLOPTIONS_DISPLAY is the - standard macro now. - Use MUI_INSTALLOPTIONS_INITDIALOG and MUI_INSTALLOPTIONS_SHOW if you - want to customize dialog controls. -* No more writing window titles & abort warnings to Install Options - INI Files +* 'Click Next to continue' and 'Click Install to start the installation' texts automatically change to the page order +* Install Options macros updated. MUI_INSTALLOPTIONS_DISPLAY is the standard macro now. Use MUI_INSTALLOPTIONS_INITDIALOG and MUI_INSTALLOPTIONS_SHOW if you want to customize dialog controls. +* No more writing window titles & abort warnings to Install Options INI Files * Compatible with updated paging system * Renamed macros and defines * Some small fixes @@ -134,10 +127,8 @@ NSIS Modern User Interface - VERSION HISTORY * New directory structure (header/language files in Contrib\Modern UI) * Small bugfixes & typo corrections * SetPage function should be set using defines -* Different NextPage/PrevPage/FinishHeader macros for - install/uninstall -* Interface settings can be definend (for example, MUI_ICON), no - parameters for MUI_INTERFACE anymore +* Different NextPage/PrevPage/FinishHeader macros for install/uninstall +* Interface settings can be definend (for example, MUI_ICON), no parameters for MUI_INTERFACE anymore * New Install Options macros to read/write IO INI file value 1.21 - September 30, 2002 @@ -171,8 +162,7 @@ NSIS Modern User Interface - VERSION HISTORY because the RichEdit control has focus by default now 1.15 - Semtember 4, 2002 -* Multilanguage example: changed LangDialog to LangDLL::LangDialog - (using the DLL name is now required) +* Multilanguage example: changed LangDialog to LangDLL::LangDialog (using the DLL name is now required) 1.14 - Semtember 3, 2002 * Small grammar fix (thanks eccles) @@ -188,10 +178,8 @@ NSIS Modern User Interface - VERSION HISTORY * Finish header for uninstaller can also be set using MUI_FINISHHEADER 1.1 - August 29, 2002 -* Header file with macros, it's now very easy to use the UI in your - scripts -* Added the modern2.exe UI, with an other location of the Description - frame, for installers with a lot of subsections (thanks rainwater) +* Header file with macros, it's now very easy to use the UI in your scripts +* Added the modern2.exe UI, with an other location of the Description frame, for installers with a lot of subsections (thanks rainwater) * Updated example scripts * Added Multilanguage.nsi example (Multilanguage & LangDLL) * Fixed background color issue with some custom XP themes @@ -200,8 +188,7 @@ NSIS Modern User Interface - VERSION HISTORY * Example script: Added instructions for the user on the Description frame * Auto sizing branding text * Used modern.bmp for the checks (thanks rainwater) -* Using the new NSIS version, descriptions work using the keyboard and - you can give descriptions to subsections +* Using the new NSIS version, descriptions work using the keyboard and you can give descriptions to subsections * Correct font size using High-DPI fonts 1.0 - August 26, 2002 diff --git a/Contrib/Modern UI/Language files/Default.nsh b/Contrib/Modern UI/Language files/Default.nsh index d1b0e601..da07864c 100644 --- a/Contrib/Modern UI/Language files/Default.nsh +++ b/Contrib/Modern UI/Language files/Default.nsh @@ -4,7 +4,7 @@ ;-------------------------------- !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_TEXT_WELCOME_INFO_TITLE "Welcome to the $(^Name) Setup Wizard" - !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_TEXT_WELCOME_INFO_TEXT "This wizard will guide you through the installation of $(^Name).\r\n\r\nIt is recommended that you close all other applications before starting Setup. This will allow Setup to update certain system files without rebooting your computer.\r\n\r\n$_CLICK" + !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_TEXT_WELCOME_INFO_TEXT "This wizard will guide you through the installation of $(^Name).\r\n\r\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without having to reboot your computer.\r\n\r\n$_CLICK" !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_TEXT_LICENSE_TITLE "License Agreement" !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_TEXT_LICENSE_SUBTITLE "Please review the license terms before installing $(^Name)." @@ -48,7 +48,7 @@ !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_WELCOME_INFO_TITLE "Welcome to the $(^Name) Uninstall Wizard" - !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_WELCOME_INFO_TEXT "This wizard will guide you through the uninstallation of $(^Name) components.\r\n\r\nBefore starting the uninstallation, make sure $(^Name) is not running.\r\n\r\n$_CLICK" + !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_WELCOME_INFO_TEXT "This wizard will guide you through the uninstallation of $(^Name).\r\n\r\nBefore starting the uninstallation, make sure $(^Name) is not running.\r\n\r\n$_CLICK" !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_CONFIRM_TITLE "Uninstall $(^Name)" !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_CONFIRM_SUBTITLE "Remove $(^Name) from your computer." @@ -75,6 +75,7 @@ !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_ABORT_SUBTITLE "Uninstall was not completed successfully." !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_FINISH_INFO_TITLE "Completing the $(^Name) Uninstall Wizard" - !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_FINISH_INFO_TEXT "$(^Name) components have been uninstalled from your computer.\r\n\r\nClick Finish to close this wizard." + !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_FINISH_INFO_TEXT "$(^Name) has been uninstalled from your computer.\r\n\r\nClick Finish to close this wizard." + !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_FINISH_INFO_REBOOT "Your computer must be restarted in order to complete the uninstallation of $(^Name). Do you want to reboot now?" - !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_ABORTWARNING "Are you sure you want to quit $(^Name) Uninstall?" \ No newline at end of file + !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_ABORTWARNING "Are you sure you want to quit $(^Name) Uninstall?" \ No newline at end of file diff --git a/Contrib/Modern UI/Language files/Dutch.nsh b/Contrib/Modern UI/Language files/Dutch.nsh index 5c8f5032..03079db1 100644 --- a/Contrib/Modern UI/Language files/Dutch.nsh +++ b/Contrib/Modern UI/Language files/Dutch.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.67 +;Compatible with Modern UI 1.68 ;Language: Dutch (1043) ;By Joost Verburg @@ -83,6 +83,7 @@ !define MUI_UNTEXT_FINISH_INFO_TITLE "Voltooien van de $(^Name) Deïnstallatie Wizard" !define MUI_UNTEXT_FINISH_INFO_TEXT "$(^Name) zijn verwijderd van uw systeem.\r\n\r\nKlik op Voltooien om deze wizard te sluiten." + !define MUI_UNTEXT_FINISH_INFO_REBOOT "Uw system moet worden opnieuw opgestart om de deïnstallatie van $(^Name) te voltooien. Wilt u nu herstarten?" !define MUI_UNTEXT_ABORTWARNING "Weet u zeker dat u $(^Name) Deïnstallatie wilt afsluiten?" diff --git a/Contrib/Modern UI/Language files/English.nsh b/Contrib/Modern UI/Language files/English.nsh index c5c5caa8..02b21f47 100644 --- a/Contrib/Modern UI/Language files/English.nsh +++ b/Contrib/Modern UI/Language files/English.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.67 +;Compatible with Modern UI 1.68 ;Language: English (1033) ;By Joost Verburg @@ -11,7 +11,7 @@ !define MUI_LANGNAME "English" ;Use only ASCII characters (if this is not possible, use the English name) !define MUI_TEXT_WELCOME_INFO_TITLE "Welcome to the $(^Name) Setup Wizard" - !define MUI_TEXT_WELCOME_INFO_TEXT "This wizard will guide you through the installation of $(^Name).\r\n\r\nIt is recommended that you close all other applications before starting Setup. This will allow Setup to update certain system files without rebooting your computer.\r\n\r\n$_CLICK" + !define MUI_TEXT_WELCOME_INFO_TEXT "This wizard will guide you through the installation of $(^Name).\r\n\r\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without having to reboot your computer.\r\n\r\n$_CLICK" !define MUI_TEXT_LICENSE_TITLE "License Agreement" !define MUI_TEXT_LICENSE_SUBTITLE "Please review the license terms before installing $(^Name)." @@ -83,7 +83,8 @@ !define MUI_UNTEXT_FINISH_INFO_TITLE "Completing the $(^Name) Uninstall Wizard" !define MUI_UNTEXT_FINISH_INFO_TEXT "$(^Name) has been uninstalled from your computer.\r\n\r\nClick Finish to close this wizard." + !define MUI_UNTEXT_FINISH_INFO_REBOOT "Your computer must be restarted in order to complete the uninstallation of $(^Name). Do you want to reboot now?" - !define MUI_UNTEXT_ABORTWARNING "Are you sure you want to quit $(^Name) Uninstall?" + !define MUI_UNTEXT_ABORTWARNING "Are you sure you want to quit $(^Name) Uninstall?" !insertmacro MUI_LANGUAGEFILE_END \ No newline at end of file diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index 45fad49a..a8aab00e 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -244,9 +244,6 @@ The interface files with a customized dialog resource IDD_SELCOM without a descr

Welcome/Finish Page Interface Settings

-

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

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

@@ -263,16 +260,9 @@ if the user has a custom DPI setting.

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

-

MUI_WELCOMEFINISHPAGE_INI_3LINES ini_file
-InstallOptions INI file for the Welcome page and the 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 Settings

-

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

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

@@ -289,10 +279,6 @@ if the user has a custom DPI setting.

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

-

MUI_WELCOMEFINISHPAGE_INI_3LINES ini_file
-InstallOptions INI file for the Welcome page and the 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

@@ -407,6 +393,8 @@ Subtext to display on the header of the page.

MUI_WELCOMEPAGE_TITLE title
Title to display on the top of the page.

+

MUI_WELCOMEPAGE_TITLE_3LINES
+Extra space for the title area.

MUI_WELCOMEPAGE_TEXT text
Text to display on the page. Use \r\n for a newline.

@@ -460,7 +448,11 @@ Text to display on the destination folder frame.

MUI_DIRECTORYPAGE_VARIABLE variable
Variable in which to store the selected folder.
Default: $INSTDIR

+

MUI_DIRECTORYPAGE_VERIFYONLEAVE
+Does not disable the Next button when a folder is invalid but allows you to use GetInstDirError in +the leave function to handle an invalid folder.

+

Start Menu Folder Page Settings

Put the code to write the shortcuts (using CreateShortcut) between the MUI_STARTMENU_WRITE_BEGIN @@ -511,8 +503,12 @@ aborted.

MUI_FINISHPAGE_TITLE title
Title to display on the top of the page.

+

MUI_FINISHPAGE_TITLE_3LINES
+Extra space for the title area.

MUI_FINISHPAGE_TEXT text
Text to display on the page. Use \r\n for a newline.

+

MUI_FINISHPAGE_TEXT_LARGE
+Extra space for the text area (if using checkboxes).

MUI_FINISHPAGE_BUTTON text
Text to display on the Finish button.

MUI_FINISHPAGE_TEXT_REBOOT text
@@ -828,69 +824,14 @@ inner dialog

Version history

- - - diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 38642f61..5b1a0157 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.67 +;NSIS Modern User Interface version 1.68 ;Macro System ;Written by Joost Verburg @@ -8,7 +8,7 @@ ;License: License.txt ;Examples: Examples\Modern UI -!echo "NSIS Modern User Interface version 1.67 - © 2002-2003 Joost Verburg" +!echo "NSIS Modern User Interface version 1.68 - © 2002-2003 Joost Verburg" ;-------------------------------- @@ -108,9 +108,7 @@ Var MUI_TEMP2 !insertmacro MUI_DEFAULT MUI_INSTFILESPAGE_PROGRESSBAR "smooth" !insertmacro MUI_DEFAULT MUI_BGCOLOR "FFFFFF" !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" - !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_INI_3LINES "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini" !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" - !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_INI_3LINES "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini" !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" @@ -159,7 +157,10 @@ Var MUI_TEMP2 LicenseBkColor "${MUI_LICENSEPAGE_BGCOLOR}" InstallColors ${MUI_INSTFILESPAGE_COLORS} InstProgressFlags ${MUI_INSTFILESPAGE_PROGRESSBAR} - + + SubCaption 4 " " + UninstallSubCaption 2 " " + !insertmacro MUI_DEFAULT MUI_ABORTWARNING_TEXT "$(MUI_TEXT_ABORTWARNING)" !insertmacro MUI_DEFAULT MUI_UNABORTWARNING_TEXT "$(MUI_UNTEXT_ABORTWARNING)" @@ -358,12 +359,8 @@ Var MUI_TEMP2 !macro MUI_WELCOMEFINISHPAGE_INIT UNINSTALLER !ifdef MUI_${UNINSTALLER}WELCOMEPAGE | MUI_${UNINSTALLER}FINISHPAGE - - !ifndef MUI_WELCOMEFINISHPAGE_3LINES - !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_${UNINSTALLER}WELCOMEFINISHPAGE_INI}" "ioSpecial.ini" - !else - !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_${UNINSTALLER}WELCOMEFINISHPAGE_INI_3LINES}" "ioSpecial.ini" - !endif + + !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_${UNINSTALLER}WELCOMEFINISHPAGE_INI}" "ioSpecial.ini" File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_${UNINSTALLER}WELCOMEFINISHPAGE_BITMAP}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp" @@ -676,6 +673,7 @@ Var MUI_TEMP2 !insertmacro MUI_FUNCTION_WELCOMEPAGE ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.WelcomePre_${MUI_UNIQUEID} ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.WelcomeLeave_${MUI_UNIQUEID} !insertmacro MUI_UNSET MUI_WELCOMEPAGE_TITLE + !insertmacro MUI_UNSET MUI_WELCOMEPAGE_TITLE_3LINES !insertmacro MUI_UNSET MUI_WELCOMEPAGE_TEXT !verbose pop @@ -805,6 +803,10 @@ Var MUI_TEMP2 !ifdef MUI_DIRECTORYPAGE_VARIABLE DirVar "${MUI_DIRECTORYPAGE_VARIABLE}" !endif + + !ifdef MUI_DIRECTORYPAGE_VERIFYONLEAVE + DirVerify leave + !endif PageExEnd @@ -813,6 +815,7 @@ Var MUI_TEMP2 !undef MUI_DIRECTORYPAGE_TEXT_TOP !undef MUI_DIRECTORYPAGE_TEXT_DESTINATION !insertmacro MUI_UNSET MUI_DIRECTORYPAGE_VARIABLE + !insertmacro MUI_UNSET MUI_DIRECTORYPAGE_VERIFYONLEAVE !verbose pop @@ -908,8 +911,8 @@ Var MUI_TEMP2 !insertmacro MUI_DEFAULT MUI_FINISHPAGE_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_INFO_TEXT)" !insertmacro MUI_DEFAULT MUI_FINISHPAGE_BUTTON "$(MUI_BUTTONTEXT_FINISH)" !insertmacro MUI_DEFAULT MUI_FINISHPAGE_TEXT_REBOOT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_INFO_REBOOT)" - !insertmacro MUI_DEFAULT MUI_FINISHPAGE_TEXT_REBOOTNOW "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_REBOOTNOW)" - !insertmacro MUI_DEFAULT MUI_FINISHPAGE_TEXT_REBOOTLATER "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_REBOOTLATER)" + !insertmacro MUI_DEFAULT MUI_FINISHPAGE_TEXT_REBOOTNOW "$(MUI_TEXT_FINISH_REBOOTNOW)" + !insertmacro MUI_DEFAULT MUI_FINISHPAGE_TEXT_REBOOTLATER "$(MUI_TEXT_FINISH_REBOOTLATER)" !insertmacro MUI_DEFAULT MUI_FINISHPAGE_RUN_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_RUN)" !insertmacro MUI_DEFAULT MUI_FINISHPAGE_SHOWREADME_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_SHOWREADME)" @@ -942,11 +945,13 @@ Var MUI_TEMP2 !insertmacro MUI_FUNCTION_FINISHPAGE ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.FinishPre_${MUI_UNIQUEID} ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.FinishLeave_${MUI_UNIQUEID} !insertmacro MUI_UNSET MUI_FINISHPAGE_TITLE + !insertmacro MUI_UNSET MUI_FINISHPAGE_TITLE_3LINES !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT + !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT_LARGE !insertmacro MUI_UNSET MUI_FINISHPAGE_BUTTON - !insertmacro MUI_UNSET MUI_FINISHPAGE_REBOOT - !insertmacro MUI_UNSET MUI_FINISHPAGE_REBOOTNOW - !insertmacro MUI_UNSET MUI_FINISHPAGE_REBOOTLATER + !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT_REBOOT + !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT_REBOOTNOW + !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT_REBOOTLATER !insertmacro MUI_UNSET MUI_FINISHPAGE_RUN !insertmacro MUI_UNSET MUI_FINISHPAGE_RUN_TEXT !insertmacro MUI_UNSET MUI_FINISHPAGE_RUN_PARAMETES @@ -1112,6 +1117,14 @@ Var MUI_TEMP2 !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "${MUI_WELCOMEPAGE_TITLE}" + !ifndef MUI_WELCOMEPAGE_TITLE_3LINES + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Bottom" "38" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Top" "45" + !else + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Bottom" "48" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Top" "55" + !endif + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "185" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "${MUI_WELCOMEPAGE_TEXT}" @@ -1343,12 +1356,32 @@ Var MUI_TEMP2 !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "CancelEnabled" "1" !endif + !ifndef MUI_FINISHPAGE_TITLE_3LINES + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Bottom" "38" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Top" "45" + !else + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Bottom" "48" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Top" "55" + !endif + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "${MUI_FINISHPAGE_TITLE}" - !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_3LINES - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "85" + !ifdef MUI_FINISHPAGE_RUN | MUI_FINISHPAGE_SHOWREADME + !ifndef MUI_FINISHPAGE_TITLE_3LINES + !ifndef MUI_FINISHPAGE_TEXT_LARGE + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "85" + !else + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "115" + !endif + !else + !ifndef MUI_FINISHPAGE_TEXT_LARGE + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "95" + !else + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "125" + !endif + !endif !else - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "95" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "185" !endif !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT @@ -1363,19 +1396,29 @@ Var MUI_TEMP2 !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Text" "${MUI_FINISHPAGE_TEXT_REBOOTNOW}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Left" "120" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "321" - !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_3LINES - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "90" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "100" + !ifndef MUI_FINISHPAGE_TITLE_3LINES + !ifndef MUI_FINISHPAGE_TEXT_LARGE + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "90" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "100" + !else + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "120" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "130" + !endif !else - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "100" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "110" + !ifndef MUI_FINISHPAGE_TEXT_LARGE + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "100" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "110" + !else + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "130" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "140" + !endif !endif !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "1" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Type" "RadioButton" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Text" "${MUI_FINISHPAGE_TEXT_REBOOTLATER}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Left" "120" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Right" "321" - !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_3LINES + !ifndef MUI_FINISHPAGE_TITLE_3LINES !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Top" "110" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Bottom" "120" !else @@ -1397,12 +1440,22 @@ Var MUI_TEMP2 !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Text" "${MUI_FINISHPAGE_RUN_TEXT}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Left" "120" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "315" - !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_3LINES - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "90" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "100" + !ifndef MUI_FINISHPAGE_TITLE_3LINES + !ifndef MUI_FINISHPAGE_TEXT_LARGE + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "90" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "100" + !else + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "120" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "130" + !endif !else - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "100" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "110" + !ifndef MUI_FINISHPAGE_TEXT_LARGE + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "100" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "110" + !else + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "130" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "140" + !endif !endif !ifndef MUI_FINISHPAGE_RUN_NOTCHECKED !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "1" @@ -1418,22 +1471,42 @@ Var MUI_TEMP2 !ifndef MUI_FINISHPAGE_RUN !define MUI_FINISHPAGE_CURFIELD_NO 4 - !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_3LINES - !define MUI_FINISHPAGE_CURFIELD_TOP 90 - !define MUI_FINISHPAGE_CURFIELD_BOTTOM 100 + !ifndef MUI_FINISHPAGE_TITLE_3LINES + !ifndef MUI_FINISHPAGE_TEXT_LARGE + !define MUI_FINISHPAGE_CURFIELD_TOP 90 + !define MUI_FINISHPAGE_CURFIELD_BOTTOM 100 + !else + !define MUI_FINISHPAGE_CURFIELD_TOP 120 + !define MUI_FINISHPAGE_CURFIELD_BOTTOM 130 + !endif !else - !define MUI_FINISHPAGE_CURFIELD_TOP 100 - !define MUI_FINISHPAGE_CURFIELD_BOTTOM 110 + !ifndef MUI_FINISHPAGE_TEXT_LARGE + !define MUI_FINISHPAGE_CURFIELD_TOP 100 + !define MUI_FINISHPAGE_CURFIELD_BOTTOM 110 + !else + !define MUI_FINISHPAGE_CURFIELD_TOP 130 + !define MUI_FINISHPAGE_CURFIELD_BOTTOM 140 + !endif !endif !else !define MUI_FINISHPAGE_CURFIELD_NO 5 - !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_3LINES - !define MUI_FINISHPAGE_CURFIELD_TOP 110 - !define MUI_FINISHPAGE_CURFIELD_BOTTOM 120 + !ifndef MUI_FINISHPAGE_TITLE_3LINES + !ifndef MUI_FINISHPAGE_TEXT_LARGE + !define MUI_FINISHPAGE_CURFIELD_TOP 110 + !define MUI_FINISHPAGE_CURFIELD_BOTTOM 120 + !else + !define MUI_FINISHPAGE_CURFIELD_TOP 140 + !define MUI_FINISHPAGE_CURFIELD_BOTTOM 150 + !endif !else - !define MUI_FINISHPAGE_CURFIELD_TOP 120 - !define MUI_FINISHPAGE_CURFIELD_BOTTOM 130 - !endif + !ifndef MUI_FINISHPAGE_TEXT_LARGE + !define MUI_FINISHPAGE_CURFIELD_TOP 120 + !define MUI_FINISHPAGE_CURFIELD_BOTTOM 130 + !else + !define MUI_FINISHPAGE_CURFIELD_TOP 150 + !define MUI_FINISHPAGE_CURFIELD_BOTTOM 160 + !endif + !endif !endif !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field ${MUI_FINISHPAGE_CURFIELD_NO}" "Type" "CheckBox" @@ -2121,6 +2194,7 @@ Var MUI_TEMP2 !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE FINISH "MUI_UNTEXT_FINISH_INFO_TITLE" !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE FINISH "MUI_UNTEXT_FINISH_INFO_TEXT" + !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE FINISH "MUI_UNTEXT_FINISH_INFO_REBOOT" !ifdef MUI_UNABORTWARNING !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_ABORTWARNING" diff --git a/Contrib/Modern UI/ioSpecial.ini b/Contrib/Modern UI/ioSpecial.ini index fd601a22..c8dfe6ec 100644 --- a/Contrib/Modern UI/ioSpecial.ini +++ b/Contrib/Modern UI/ioSpecial.ini @@ -13,10 +13,7 @@ Type=label Left=120 Right=315 Top=10 -Bottom=37 [Field 3] Type=label Left=120 -Right=315 -Top=45 -Bottom=185 \ No newline at end of file +Right=315 \ No newline at end of file diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi index 6e501262..803b2c56 100644 --- a/Examples/Modern UI/Basic.nsi +++ b/Examples/Modern UI/Basic.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.67 +;NSIS Modern User Interface version 1.68 ;Basic Example Script ;Written by Joost Verburg @@ -11,7 +11,7 @@ ;Configuration ;General - Name "Modern UI Test 1.67" + Name "Modern UI Test 1.68" OutFile "Basic.exe" ;Folder selection page diff --git a/Examples/Modern UI/HeaderBitmap.nsi b/Examples/Modern UI/HeaderBitmap.nsi index 8f4ecccc..c59a80a2 100644 --- a/Examples/Modern UI/HeaderBitmap.nsi +++ b/Examples/Modern UI/HeaderBitmap.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.67 +;NSIS Modern User Interface version 1.68 ;Header Bitmap Example Script ;Written by Joost Verburg @@ -11,7 +11,7 @@ ;Configuration ;General - Name "Modern UI Test 1.67" + Name "Modern UI Test 1.68" OutFile "HeaderBitmap.exe" ;Folder selection page diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi index c1fc5d76..78571d12 100644 --- a/Examples/Modern UI/InstallOptions.nsi +++ b/Examples/Modern UI/InstallOptions.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.67 +;NSIS Modern User Interface version 1.68 ;InstallOptions Example Script ;Written by Joost Verburg @@ -11,7 +11,7 @@ ;Configuration ;General - Name "Modern UI Test 1.67" + Name "Modern UI Test 1.68" OutFile "InstallOptions.exe" ;Folder selection page diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi index d5de5ee8..d72e370d 100644 --- a/Examples/Modern UI/MultiLanguage.nsi +++ b/Examples/Modern UI/MultiLanguage.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.67 +;NSIS Modern User Interface version 1.68 ;Multilingual Example Script ;Written by Joost Verburg @@ -11,7 +11,7 @@ ;Configuration ;General - Name "Modern UI Test 1.67" + Name "Modern UI Test 1.68" OutFile "MultiLanguage.exe" ;Folder selection page diff --git a/Examples/Modern UI/StartMenu.nsi b/Examples/Modern UI/StartMenu.nsi index 2e0acea3..9672a711 100644 --- a/Examples/Modern UI/StartMenu.nsi +++ b/Examples/Modern UI/StartMenu.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.67 +;NSIS Modern User Interface version 1.68 ;Start Menu Folder Selection Example Script ;Written by Joost Verburg @@ -11,7 +11,7 @@ ;Configuration ;General - Name "Modern UI Test 1.67" + Name "Modern UI Test 1.68" OutFile "StartMenu.exe" ;Folder selection page diff --git a/Examples/Modern UI/WelcomeFinish.nsi b/Examples/Modern UI/WelcomeFinish.nsi index 7a7c8d5d..43dd8386 100644 --- a/Examples/Modern UI/WelcomeFinish.nsi +++ b/Examples/Modern UI/WelcomeFinish.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.67 +;NSIS Modern User Interface version 1.68 ;Welcome/Finish Page Example Script ;Written by Joost Verburg @@ -11,7 +11,7 @@ ;Configuration ;General - Name "Modern UI Test 1.67" + Name "Modern UI Test 1.68" OutFile "WelcomeFinish.exe" ;Folder selection page diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi index c1f4996e..464aae46 100644 --- a/Examples/makensis.nsi +++ b/Examples/makensis.nsi @@ -3,7 +3,7 @@ !define VER_MAJOR 2 !define VER_MINOR 0 !define VER_REVISION 0 -!define VER_BUILD 12 +!define VER_BUILD 13 !define VER_FILE "20b5" !define VER_DISPLAY "2.0 beta 5 (CVS)" @@ -273,7 +273,6 @@ SubSection "Extra User Interfaces" SecContribUIs File "..\Contrib\Modern UI\Screenshot2.png" File "..\Contrib\Modern UI\License.txt" File "..\Contrib\Modern UI\ioSpecial.ini" - File "..\Contrib\Modern UI\ioSpecial3.ini" SetOutPath $INSTDIR\Contrib\UIs File "..\Contrib\UIs\modern.exe" @@ -283,6 +282,7 @@ SubSection "Extra User Interfaces" SecContribUIs File "..\Contrib\UIs\modern_smalldesc.exe" Delete "$INSTDIR\Contrib\Modern UI\Readme.jpg" + Delete "$INSTDIR\Contrib\Modern UI\ioSpecial3.ini" Delete "$INSTDIR\Contrib\UIs\modern2.exe" Delete "$INSTDIR\Contrib\UIs\modern3.exe"