diff --git a/Contrib/Language files/Dutch.nlf b/Contrib/Language files/Dutch.nlf index 7bd712cc..53ee2526 100644 --- a/Contrib/Language files/Dutch.nlf +++ b/Contrib/Language files/Dutch.nlf @@ -115,7 +115,7 @@ Selecteer de map om $(^Name) uit te verwijderen: # ^SpaceRequired "Vereiste ruimte: " # ^UninstallingText -Deze wizard zal $(^Name) van uw systeem verwijderen. $_CLICK +$(^Name) zal uit de volgende map worden verwijderd. $_CLICK # ^UninstallingSubText Verwijderen uit: # ^FileError diff --git a/Contrib/Language files/English.nlf b/Contrib/Language files/English.nlf index cdd586e4..6dca5ad1 100644 --- a/Contrib/Language files/English.nlf +++ b/Contrib/Language files/English.nlf @@ -116,7 +116,7 @@ Select the folder to uninstall $(^Name) from: # ^SpaceRequired "Space required: " # ^UninstallingText -This wizard will uninstall $(^Name) from your computer. $_CLICK +$(^Name) will be uninstalled from the following folder. $_CLICK # ^UninstallingSubText Uninstalling from: # ^FileError diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt index 5c1e0f1b..cd113898 100644 --- a/Contrib/Modern UI/Changelog.txt +++ b/Contrib/Modern UI/Changelog.txt @@ -1,5 +1,13 @@ NSIS Modern User Interface - VERSION HISTORY +1.67 - October 27, 2003 +* Support for uninstaller Welcome- and Finish pages +* Renamed a few settings +* Default header image +* Support for uninstaller abort warning +* Setting for 3 line text on Welcome- and Finish page +* Langauge file backwards compatibility: English for missing strings + 1.66 - October 7, 2003 * New system for page settings and custom pages * Support for uninstaller components page diff --git a/Contrib/Modern UI/Language files/Default.nsh b/Contrib/Modern UI/Language files/Default.nsh index 259cb326..d1b0e601 100644 --- a/Contrib/Modern UI/Language files/Default.nsh +++ b/Contrib/Modern UI/Language files/Default.nsh @@ -47,6 +47,9 @@ !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_TEXT_ABORTWARNING "Are you sure you want to quit $(^Name) Setup?" + !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_CONFIRM_TITLE "Uninstall $(^Name)" !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_CONFIRM_SUBTITLE "Remove $(^Name) from your computer." @@ -69,4 +72,9 @@ !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_FINISH_SUBTITLE "Uninstall was completed successfully." !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_ABORT_TITLE "Uninstallation Aborted" - !insertmacro MUI_LANGUAGEFILE_DEFAULT MUI_UNTEXT_ABORT_SUBTITLE "Uninstall was not completed successfully." \ No newline at end of file + !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_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 7d65bf73..5c8f5032 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.66 +;Compatible with Modern UI 1.67 ;Language: Dutch (1043) ;By Joost Verburg @@ -54,6 +54,9 @@ !define MUI_TEXT_ABORTWARNING "Weet u zeker dat u $(^Name) Setup wilt afsluiten?" + !define MUI_UNTEXT_WELCOME_INFO_TITLE "Welkom bij de $(^Name) Deïnstallatie Wizard" + !define MUI_UNTEXT_WELCOME_INFO_TEXT "Deze wizard zal $(^Name) van uw syteem verwijderen.\r\n\r\nControleer voordat u begint met verwijderen dat $(^Name) is afgesloten.\r\n\r\n$_CLICK" + !define MUI_UNTEXT_CONFIRM_TITLE "Verwijder $(^Name)" !define MUI_UNTEXT_CONFIRM_SUBTITLE "Verwijder $(^Name) van uw system." @@ -72,10 +75,15 @@ !define MUI_UNTEXT_UNINSTALLING_TITLE "Bezig met verwijderen" !define MUI_UNTEXT_UNINSTALLING_SUBTITLE "Een ogenblik geduld a.u.b. terwijl $(^Name) van uw systeem wordt verwijderd." - !define MUI_UNTEXT_FINISH_TITLE "Verwijderen Gereed" + !define MUI_UNTEXT_FINISH_TITLE "Deïnstallatie Gereed" !define MUI_UNTEXT_FINISH_SUBTITLE "$(^Name) is verwijderd van uw systeem." - !define MUI_UNTEXT_ABORT_TITLE "Verwijderen Afgebroken" + !define MUI_UNTEXT_ABORT_TITLE "Deïnstallatie Afgebroken" !define MUI_UNTEXT_ABORT_SUBTITLE "$(^Name) is niet volledig verwijderd van uw systeem." + !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_ABORTWARNING "Weet u zeker dat u $(^Name) Deïnstallatie wilt afsluiten?" + !insertmacro MUI_LANGUAGEFILE_END \ No newline at end of file diff --git a/Contrib/Modern UI/Language files/English.nsh b/Contrib/Modern UI/Language files/English.nsh index ab58a3c7..f4fd4a17 100644 --- a/Contrib/Modern UI/Language files/English.nsh +++ b/Contrib/Modern UI/Language files/English.nsh @@ -54,6 +54,9 @@ !define MUI_TEXT_ABORTWARNING "Are you sure you want to quit $(^Name) Setup?" + !define MUI_UNTEXT_WELCOME_INFO_TITLE "Welcome to the $(^Name) Uninstall Wizard" + !define 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" + !define MUI_UNTEXT_CONFIRM_TITLE "Uninstall $(^Name)" !define MUI_UNTEXT_CONFIRM_SUBTITLE "Remove $(^Name) from your computer." @@ -78,4 +81,9 @@ !define MUI_UNTEXT_ABORT_TITLE "Uninstallation Aborted" !define MUI_UNTEXT_ABORT_SUBTITLE "Uninstall was not completed successfully." + !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_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 16ae1cff..e5ce80f2 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -174,17 +174,6 @@ will also help you to learn more about the Modern UI.

For UI elements that are enabled by default, the default value will be used when a setting has not been defined.

-

MUI_UI ui_file
- The interface file with the dialog resources. Change this if you have made your own customized UI.
- Default: ${NSISDIR}\Contrib\UIs\modern.exe

-

MUI_UI_HEADERBITMAP ui_file
- MUI_UI_HEADERBITMAP_RIGHT ui_file
- The interface files with the dialog resource IDD_INST that contains a bitmap control and space for - the header bitmap.
Defaults: ${NSISDIR}\Contrib\UIs\modern-headerbmp.exe, - ${NSISDIR}\Contrib\UIs\modern-headerbmpr.exe

-

MUI_UI_SMALLDESCRIPTION
MUI_UI_NODESCRIPTION
- The interface files with a customized dialog resource IDD_SELCOM for a small or no description area.
- Defaults: {NSISDIR}\Contrib\UIs\modern-smalldesc.exe, {NSISDIR}\Contrib\UIs\modern-nodesc.exe

MUI_ICON icon_file
The icon of the installer.
Default: ${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico

MUI_UNICON icon_file
@@ -192,32 +181,77 @@ will also help you to learn more about the Modern UI.

MUI_CHECKBITMAP bitmap_file
The bitmap with images for the checks of the component select treeview.
Default: ${NSISDIR}\Contrib\Graphics\Checks\modern.bmp

-

MUI_HEADERBITMAP bmp_file
- Bitmap to display in the white header (recommended size: 150x57 pixels). The NSIS Setup uses the bitmap - ${NSISDIR}\Contrib\Graphics\Header\nsis.bmp, but can also make one with your own logo.

+

MUI_HEADERIMAGE
+ Display an image on the header of page.

-

MUI_HEADERBITMAP_RIGHT
+

MUI_HEADERIMAGE_BITMAP bmp_file
+ Bitmap image to display on the header of the page (recommended size: 150x57 pixels).
+ Default: ${NSISDIR}\Contrib\Graphics\Header\nsis.bmp

+

MUI_HEADERIMAGE_RIGHT
Display the header image on the right side instead of the left side.

-

MUI_HEADERBITMAP_NOSTRETCH
+

MUI_HEADERIMAGE_NOSTRETCH
Do not stretch the header bitmap to fit the size of the field. Use this option only if you have an image that does not use the whole space. If you have a full size bitmap that fits exactly, you should not use this option because the size of the field will be different if the user has a custom DPI setting.

-

MUI_SPECIALINI ini_file
- InstallOptions INI file for the Welcome and Finish page.
+

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

+
+

User Interface Resource Settings

+
+

MUI_UI ui_file
+ The interface file with the dialog resources. Change this if you have made your own customized UI.
+ Default: ${NSISDIR}\Contrib\UIs\modern.exe

+

MUI_UI_HEADERIMAGE ui_file
+ The interface files with the dialog resource IDD_INST that contains a bitmap control and space for + the header bitmap.
+ Default: ${NSISDIR}\Contrib\UIs\modern-headerbmp.exe

+

MUI_UI_HEADERIMAGE_RIGHT ui_file
+ The interface files with the dialog resource IDD_INST that contains a bitmap control and space for + the header bitmap on the right side.
+ Default: ${NSISDIR}\Contrib\UIs\modern-headerbmpr.exe

+

MUI_UI_COMPONENTSPAGE_SMALLDESC ui_file
+ The interface files with a customized dialog resource IDD_SELCOM with a small description area.
+ Default: {NSISDIR}\Contrib\UIs\modern-smalldesc.exe

+

MUI_UI_COMPONENTSPAGE_NODESC ui_file
+ The interface files with a customized dialog resource IDD_SELCOM without a description area.
+ Default: {NSISDIR}\Contrib\UIs\modern-nodesc.exe

+
+

Welcome/Finish Page Interface Settings

+

MUI_WELCOMEFINISHPAGE_3LINES ini_file
+ 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

-

MUI_SPECIALBITMAP bmp_file
- Bitmap for the Welcome and Finish page (recommended size: 164x314 pixels).
+

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

-

MUI_SPECIALBITMAP_NOSTRETCH
+

MUI_WELCOMEFINISHPAGE_NOSTRETCH
Do not stretch the bitmap for the Welcome and Finish page to fit the size of the field. Use this option only if you have an image that does not use the whole space. If you have a full size bitmap that fits exactly, you should not use this option because the size of the field will be different if the user has a custom DPI setting.

-

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

+

Uninstaller Welcome/Finish Page Interface 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).
+ Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini

+

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

+
+

MUI_UNWELCOMEFINISHPAGE_NOSTRETCH
+ Do not stretch the bitmap for the Welcome and Finish page to fit the size of the field. + Use this option only if you have an image that does not use the whole space. If you have a full size + bitmap that fits exactly, you should not use this option because the size of the field will be different + if the user has a custom DPI setting.

License Page Interface Settings

@@ -226,7 +260,6 @@ will also help you to learn more about the Modern UI.

The background color for the license textbox. Use /windows for the default text background (usually white). Use the /grey for the standard window background (usually grey).
Default: /windows

-

Components Page Interface Settings

MUI_COMPONENTSPAGE_SMALLDESC
A small description area on the bottom of the page. Use this layout @@ -248,14 +281,31 @@ will also help you to learn more about the Modern UI.

MUI_FINISHPAGE_NOAUTOCLOSE
Do not automatically jump to the finish page, to allow the user to - check the log.

+ check the install log.

-

Abort Warning Message Settings

+

Uninstaller Finish Page Interface Settings

+
+

MUI_FINISHPAGE_NOAUTOCLOSE
+ Do not automatically jump to the finish page, to allow the user to + check the uninstall log.

+
+

Abort Warning Settings

MUI_ABORTWARNING
Show a message box with a warning when the user wants to close the installer.

+

MUI_ABORTWARNING_TEXT text
- Texts to display next to the abort warning messagebox.

+ Texts to display on the abort warning messagebox.

+
+
+

Uninstaller Abort Warning Settings

+
+

MUI_UNABORTWARNING
+ Show a message box with a warning when the user wants to close the uninstaller.

+
+

MUI_UNABORTWARNING_TEXT text
+ Texts to display on the abort warning messagebox.

+

3. Pages

Insert the following macros to set the pages you want to use. @@ -280,11 +330,13 @@ will also help you to learn more about the Modern UI.

Uninstaller Pages
+ MUI_UNPAGE_WELCOME
MUI_UNPAGE_CONFIRM
MUI_UNPAGE_LICENSE text/rtf_file
MUI_UNPAGE_COMPONENTS
MUI_UNPAGE_DIRECTORY
MUI_UNPAGE_INSTFILES
+ MUI_UNPAGE_FINISH

Page Settings

@@ -690,7 +742,8 @@ FunctionEnd

These defines should be set before inserting a the language macros.

MUI_CUSTOMFUNCTION_GUIINIT function
MUI_CUSTOMFUNCTION_UNGUIINIT function
- MUI_CUSTOMFUNCTION_ABORT function

+ MUI_CUSTOMFUNCTION_ABORT function
+ MUI_CUSTOMFUNCTION_UNABORT function

Page Custom Functions

@@ -708,6 +761,17 @@ FunctionEnd

Version history

+