From 6ce16ab2c4aa2c65b8a1c7c9ff565d64104e46c4 Mon Sep 17 00:00:00 2001 From: SuperPat Date: Tue, 1 Jan 2019 14:25:45 +0100 Subject: [PATCH] Release 2.0b5 Ultra-Modern UI is resynchronized under Modern UI version 1.81. Consequently, The UMUI_TEXT_COLOR define was renamed in MUI_TEXTCOLOR. UMUI now provide an extended NSIS Menu with links for UMUI and extra plugins documentations. Consequently, UMUI installers no more create extra shortcuts on the start menu, but replace the original NSIS menu shortcuts. Fixed bug when the Additional Tasks page is skipped, options where not affected... Fixed bug when the Licence page text is unreadable with the Windows high contrast mode. Minor Fixes. --- .vscode/settings.json | 5 + .../UltraModernUI/Language files/French.nsh | 4 +- .../UltraModernUI/Language files/Hindi.nsh | 0 Contrib/UltraModernUI/Skins/SoftBlue.nsh | 2 +- Contrib/UltraModernUI/Skins/SoftBrown.nsh | 2 +- Contrib/UltraModernUI/Skins/SoftGray.nsh | 2 +- Contrib/UltraModernUI/Skins/SoftGreen.nsh | 2 +- Contrib/UltraModernUI/Skins/SoftPurple.nsh | 2 +- Contrib/UltraModernUI/Skins/SoftRed.nsh | 2 +- Contrib/UltraModernUI/Skins/blue.nsh | 2 +- Contrib/UltraModernUI/Skins/blue2.nsh | 2 +- Contrib/UltraModernUI/Skins/brown.nsh | 2 +- Contrib/UltraModernUI/Skins/brown2.nsh | 2 +- Contrib/UltraModernUI/Skins/darkgreen.nsh | 2 +- Contrib/UltraModernUI/Skins/darkgreen2.nsh | 2 +- Contrib/UltraModernUI/Skins/gray.nsh | 2 +- Contrib/UltraModernUI/Skins/gray2.nsh | 2 +- Contrib/UltraModernUI/Skins/green.nsh | 2 +- Contrib/UltraModernUI/Skins/green2.nsh | 2 +- Contrib/UltraModernUI/Skins/purple.nsh | 2 +- Contrib/UltraModernUI/Skins/purple2.nsh | 2 +- Contrib/UltraModernUI/Skins/red.nsh | 2 +- Contrib/UltraModernUI/Skins/red2.nsh | 2 +- Contrib/UltraModernUI/UMUI.nsh | 201 +++++---- CreateZipUMUI.bat | 5 +- Docs/InstallOptionsEx/License.txt | 10 +- Docs/InstallOptionsEx/Readme.html | 2 +- Docs/SkinnedControls/Readme.html | 6 +- Docs/SkinnedControls/license.txt | 4 +- Docs/UltraModernUI/License.txt | 4 +- Docs/UltraModernUI/ReadMe.rtf | 18 +- Docs/UltraModernUI/ReadMe.txt | 18 +- Docs/UltraModernUI/Readme.html | 139 +++--- .../InstallOptionsEx/InstallOptionsEx.nsi | 5 +- Examples/SkinnedControls/SkinnedControls.nsi | 5 +- Examples/UltraModernUI/AdditionalTasks.nsi | 14 +- Examples/UltraModernUI/HeaderBGImageEx.nsi | 2 +- Examples/UltraModernUI/MultiLanguage.nsi | 3 +- Examples/UltraModernUI/NSISUMUIMenu.nsi | 314 ++++++++++++++ Examples/UltraModernUI/NSISUltraModernUI.nsi | 410 ++++++++++-------- Examples/UltraModernUI/UltraModernUI.nsi | 284 +++++++----- LICENSE.md | 2 +- NSISUMUI.exe | Bin 0 -> 89652 bytes README.md | 20 +- 44 files changed, 1008 insertions(+), 507 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 Contrib/UltraModernUI/Language files/Hindi.nsh create mode 100644 Examples/UltraModernUI/NSISUMUIMenu.nsi create mode 100644 NSISUMUI.exe diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..3b31cb7 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.autoGuessEncoding": true, + "nsis.bridlensis.nsisHome": "C:\\ProgramData\\NSIS", + "nsis.pathToMakensis": "C:\\ProgramData\\NSIS\\Bin\\makensis.exe" +} \ No newline at end of file diff --git a/Contrib/UltraModernUI/Language files/French.nsh b/Contrib/UltraModernUI/Language files/French.nsh index 7723974..cd56c41 100644 --- a/Contrib/UltraModernUI/Language files/French.nsh +++ b/Contrib/UltraModernUI/Language files/French.nsh @@ -123,8 +123,8 @@ ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_TITLE "Tâches supplémentaires" ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_SUBTITLE "Quelles sont les tâches supplémentaires qui doivent être effectuées?" ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_ADDITIONAL_ICONS "Icônes Additionnelles:" - ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_CREATE_DESKTOP_ICON "Créer une icône de bureau" - ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_CREATE_QUICK_LAUNCH_ICON "Créer une icône de lancement rapide" + ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_CREATE_DESKTOP_ICON "Créer une icône sur le bureau" + ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_CREATE_QUICK_LAUNCH_ICON "Créer une icône dans la barre de lancement rapide" ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_ADVANCED_PARAMETERS "Paramètres avancés:" ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_LAUNCH_PROGRAM_AT_WINDOWS_STARTUP "Lancer $(^NameDA) au démarrage de Windows" ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_FILE_ASSOCIATION "Association de fichier:" diff --git a/Contrib/UltraModernUI/Language files/Hindi.nsh b/Contrib/UltraModernUI/Language files/Hindi.nsh new file mode 100644 index 0000000..e69de29 diff --git a/Contrib/UltraModernUI/Skins/SoftBlue.nsh b/Contrib/UltraModernUI/Skins/SoftBlue.nsh index cf8566c..43b8d0a 100644 --- a/Contrib/UltraModernUI/Skins/SoftBlue.nsh +++ b/Contrib/UltraModernUI/Skins/SoftBlue.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR 3d66ab +!define /IfNDef MUI_TEXTCOLOR 3d66ab !define /IfNDef MUI_BGCOLOR e8f1f9 !define /IfNDef UMUI_TEXT_LIGHTCOLOR 0000FF !define /IfNDef UMUI_HEADERTEXT_COLOR 335182 diff --git a/Contrib/UltraModernUI/Skins/SoftBrown.nsh b/Contrib/UltraModernUI/Skins/SoftBrown.nsh index 8c5edfd..066fa42 100644 --- a/Contrib/UltraModernUI/Skins/SoftBrown.nsh +++ b/Contrib/UltraModernUI/Skins/SoftBrown.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR ab663d +!define /IfNDef MUI_TEXTCOLOR ab663d !define /IfNDef MUI_BGCOLOR F9F1E8 !define /IfNDef UMUI_TEXT_LIGHTCOLOR FF0000 !define /IfNDef UMUI_HEADERTEXT_COLOR 825133 diff --git a/Contrib/UltraModernUI/Skins/SoftGray.nsh b/Contrib/UltraModernUI/Skins/SoftGray.nsh index d58bd87..2bb1b7c 100644 --- a/Contrib/UltraModernUI/Skins/SoftGray.nsh +++ b/Contrib/UltraModernUI/Skins/SoftGray.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR 3d66ab +!define /IfNDef MUI_TEXTCOLOR 3d66ab !define /IfNDef MUI_BGCOLOR F9F9F9 !define /IfNDef UMUI_TEXT_LIGHTCOLOR 0000FF !define /IfNDef UMUI_HEADERTEXT_COLOR 335182 diff --git a/Contrib/UltraModernUI/Skins/SoftGreen.nsh b/Contrib/UltraModernUI/Skins/SoftGreen.nsh index 779e4f6..aa68bdc 100644 --- a/Contrib/UltraModernUI/Skins/SoftGreen.nsh +++ b/Contrib/UltraModernUI/Skins/SoftGreen.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR 3dab66 +!define /IfNDef MUI_TEXTCOLOR 3dab66 !define /IfNDef MUI_BGCOLOR E8F9F1 !define /IfNDef UMUI_TEXT_LIGHTCOLOR 008000 !define /IfNDef UMUI_HEADERTEXT_COLOR 338251 diff --git a/Contrib/UltraModernUI/Skins/SoftPurple.nsh b/Contrib/UltraModernUI/Skins/SoftPurple.nsh index 102b95d..677ae61 100644 --- a/Contrib/UltraModernUI/Skins/SoftPurple.nsh +++ b/Contrib/UltraModernUI/Skins/SoftPurple.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR 663dab +!define /IfNDef MUI_TEXTCOLOR 663dab !define /IfNDef MUI_BGCOLOR F1E8F9 !define /IfNDef UMUI_TEXT_LIGHTCOLOR 0000FF !define /IfNDef UMUI_HEADERTEXT_COLOR 513382 diff --git a/Contrib/UltraModernUI/Skins/SoftRed.nsh b/Contrib/UltraModernUI/Skins/SoftRed.nsh index 4eb86e8..d327302 100644 --- a/Contrib/UltraModernUI/Skins/SoftRed.nsh +++ b/Contrib/UltraModernUI/Skins/SoftRed.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR ab3d66 +!define /IfNDef MUI_TEXTCOLOR ab3d66 !define /IfNDef MUI_BGCOLOR F9E8F1 !define /IfNDef UMUI_TEXT_LIGHTCOLOR FF0000 !define /IfNDef UMUI_HEADERTEXT_COLOR 823351 diff --git a/Contrib/UltraModernUI/Skins/blue.nsh b/Contrib/UltraModernUI/Skins/blue.nsh index 920cf9c..928027d 100644 --- a/Contrib/UltraModernUI/Skins/blue.nsh +++ b/Contrib/UltraModernUI/Skins/blue.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR 4C72B2 !define /IfNDef UMUI_TEXT_LIGHTCOLOR FFFF00 !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/Skins/blue2.nsh b/Contrib/UltraModernUI/Skins/blue2.nsh index 252e43c..3afb207 100644 --- a/Contrib/UltraModernUI/Skins/blue2.nsh +++ b/Contrib/UltraModernUI/Skins/blue2.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR 4C72B2 !define /IfNDef UMUI_TEXT_LIGHTCOLOR FFFF00 !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/Skins/brown.nsh b/Contrib/UltraModernUI/Skins/brown.nsh index d4c1e77..84e7c9c 100644 --- a/Contrib/UltraModernUI/Skins/brown.nsh +++ b/Contrib/UltraModernUI/Skins/brown.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR B2724C !define /IfNDef UMUI_TEXT_LIGHTCOLOR 00FFFF !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/Skins/brown2.nsh b/Contrib/UltraModernUI/Skins/brown2.nsh index b76ea6b..ff07fcf 100644 --- a/Contrib/UltraModernUI/Skins/brown2.nsh +++ b/Contrib/UltraModernUI/Skins/brown2.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR B2724C !define /IfNDef UMUI_TEXT_LIGHTCOLOR 00FFFF !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/Skins/darkgreen.nsh b/Contrib/UltraModernUI/Skins/darkgreen.nsh index f060401..06291bc 100644 --- a/Contrib/UltraModernUI/Skins/darkgreen.nsh +++ b/Contrib/UltraModernUI/Skins/darkgreen.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR 36744D !define /IfNDef UMUI_TEXT_LIGHTCOLOR b5d300 !define /IfNDef UMUI_BRANDINGTEXTFRONTCOLOR 8ba48c diff --git a/Contrib/UltraModernUI/Skins/darkgreen2.nsh b/Contrib/UltraModernUI/Skins/darkgreen2.nsh index 802448a..0502043 100644 --- a/Contrib/UltraModernUI/Skins/darkgreen2.nsh +++ b/Contrib/UltraModernUI/Skins/darkgreen2.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR 36744D !define /IfNDef UMUI_TEXT_LIGHTCOLOR b5d300 !define /IfNDef UMUI_BRANDINGTEXTFRONTCOLOR 8ba48c diff --git a/Contrib/UltraModernUI/Skins/gray.nsh b/Contrib/UltraModernUI/Skins/gray.nsh index baf1b62..2932841 100644 --- a/Contrib/UltraModernUI/Skins/gray.nsh +++ b/Contrib/UltraModernUI/Skins/gray.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR 6D6D6D !define /IfNDef UMUI_TEXT_LIGHTCOLOR FFFF00 !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/Skins/gray2.nsh b/Contrib/UltraModernUI/Skins/gray2.nsh index befa0f9..39eb170 100644 --- a/Contrib/UltraModernUI/Skins/gray2.nsh +++ b/Contrib/UltraModernUI/Skins/gray2.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR 6D6D6D !define /IfNDef UMUI_TEXT_LIGHTCOLOR FFFF00 !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/Skins/green.nsh b/Contrib/UltraModernUI/Skins/green.nsh index c2f4921..2e70d9d 100644 --- a/Contrib/UltraModernUI/Skins/green.nsh +++ b/Contrib/UltraModernUI/Skins/green.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR 4CB272 !define /IfNDef UMUI_TEXT_LIGHTCOLOR FF00FF !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/Skins/green2.nsh b/Contrib/UltraModernUI/Skins/green2.nsh index c558c35..19242f8 100644 --- a/Contrib/UltraModernUI/Skins/green2.nsh +++ b/Contrib/UltraModernUI/Skins/green2.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR 4CB272 !define /IfNDef UMUI_TEXT_LIGHTCOLOR FF00FF !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/Skins/purple.nsh b/Contrib/UltraModernUI/Skins/purple.nsh index a449c9c..af4f669 100644 --- a/Contrib/UltraModernUI/Skins/purple.nsh +++ b/Contrib/UltraModernUI/Skins/purple.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR 724CB2 !define /IfNDef UMUI_TEXT_LIGHTCOLOR FFFF00 !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/Skins/purple2.nsh b/Contrib/UltraModernUI/Skins/purple2.nsh index 975518c..c55555a 100644 --- a/Contrib/UltraModernUI/Skins/purple2.nsh +++ b/Contrib/UltraModernUI/Skins/purple2.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR 724CB2 !define /IfNDef UMUI_TEXT_LIGHTCOLOR FFFF00 !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/Skins/red.nsh b/Contrib/UltraModernUI/Skins/red.nsh index 472b9f3..b3f723a 100644 --- a/Contrib/UltraModernUI/Skins/red.nsh +++ b/Contrib/UltraModernUI/Skins/red.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR B24C72 !define /IfNDef UMUI_TEXT_LIGHTCOLOR 00FFFF !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/Skins/red2.nsh b/Contrib/UltraModernUI/Skins/red2.nsh index 690cfbe..80730e0 100644 --- a/Contrib/UltraModernUI/Skins/red2.nsh +++ b/Contrib/UltraModernUI/Skins/red2.nsh @@ -1,4 +1,4 @@ -!define /IfNDef UMUI_TEXT_COLOR FFFFFF +!define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef MUI_BGCOLOR B24C72 !define /IfNDef UMUI_TEXT_LIGHTCOLOR 00FFFF !define /IfNDef UMUI_HEADERTEXT_COLOR FFFFFF diff --git a/Contrib/UltraModernUI/UMUI.nsh b/Contrib/UltraModernUI/UMUI.nsh index e2a1e81..2e648ff 100644 --- a/Contrib/UltraModernUI/UMUI.nsh +++ b/Contrib/UltraModernUI/UMUI.nsh @@ -1,33 +1,34 @@ /* -NSIS UltraModern User Interface version 2.0 beta 4 -Copyright 2005-2018 SuperPat +NSIS Ultra-Modern User Interface version 2.0 beta 5 +Copyright 2005-2019 SuperPat Based on: - NSIS Modern User Interface version 1.8 (Git version: d20b99c082a99304a542c2fa6cf4abd381ca263a) - Copyright 2002-2018 Joost Verburg + NSIS Modern User Interface version 1.81 (Git version: 6b4148e215433dddd1a954291364ef52e44d12e5) + Copyright 2002-2019 Joost Verburg */ !ifndef MUI_INCLUDED -!echo "NSIS Ultra-Modern User Interface version 2.0 beta 4 - Copyright 2005-2018 SuperPat" +!verbose push 3 +!define MUI_INCLUDED +!define UMUI_SYSVERSION "2.0 beta 5" +!define MUI_SYSVERSION "1.81" +!verbose pop +!echo "NSIS Ultra-Modern User Interface version 2.0 beta 5 - Copyright 2005-2019 SuperPat" !echo " (Bugfixes and some additions: 2015-2016 - Bodenseematze)" -!echo "Based on: NSIS Modern User Interface version 1.8 - Copyright 2002-2018 Joost Verburg" +!echo "Based on: NSIS Modern User Interface version 1.81 - Copyright 2002-2019 Joost Verburg" ;-------------------------------- !verbose push 3 !define /IfNDef MUI_VERBOSE 3 !verbose ${MUI_VERBOSE} -!define MUI_INCLUDED - -!define UMUI_SYSVERSION "2.0 beta 4" -!define MUI_SYSVERSION "1.8" - ;-------------------------------- ;HEADER FILES, DECLARATIONS !include WinMessages.nsh +!include LogicLib.nsh !define UMUI_HIDEFIRSTBACKBUTTON ;don't show the "Back" button on the first shown page, ;even if it is not the first page defined @@ -180,15 +181,18 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !define UMUI_LANGUAGE_REGISTRY_VALUENAME "${MUI_LANGDLL_REGISTRY_VALUENAME}" !endif - !ifndef UMUI_TEXT_COLOR - !ifdef MUI_TEXT_COLOR - !warning "Deprecated: The MUI_TEXT_COLOR define was renamed in UMUI_TEXT_COLOR since UltraModernUI 1.00 beta 2" - !define UMUI_TEXT_COLOR "${MUI_TEXT_COLOR}" + !ifndef MUI_TEXTCOLOR + !ifdef UMUI_TEXT_COLOR + !warning "Deprecated: The UMUI_TEXT_COLOR define was renamed in MUI_TEXTCOLOR since Ultra-Modern UI 2.0 beta 5" + !define MUI_TEXTCOLOR "${UMUI_TEXT_COLOR}" + !else ifdef MUI_TEXT_COLOR + !warning "Deprecated: The MUI_TEXT_COLOR define was renamed in MUI_TEXTCOLOR since Ultra-Modern UI 1.00 beta 2" + !define MUI_TEXTCOLOR "${MUI_TEXT_COLOR}" !endif !endif !ifdef UMUI_UI_COMPONENTSPAGE_SMALLDESC | UMUI_UI_COMPONENTSPAGE_NODESC - !warning "Deprecated: The UMUI_UI_COMPONENTSPAGE_SMALLDESC and UMUI_UI_COMPONENTSPAGE_NODESC define were renamed in MUI_UI_COMPONENTSPAGE_SMALLDESC and MUI_UI_COMPONENTSPAGE_NODESC since UltraModernUI 1.00 beta 2" + !warning "Deprecated: The UMUI_UI_COMPONENTSPAGE_SMALLDESC and UMUI_UI_COMPONENTSPAGE_NODESC define were renamed in MUI_UI_COMPONENTSPAGE_SMALLDESC and MUI_UI_COMPONENTSPAGE_NODESC since Ultra-Modern UI 1.00 beta 2" !ifdef UMUI_UI_COMPONENTSPAGE_SMALLDESC !define /IfNDef MUI_UI_COMPONENTSPAGE_SMALLDESC "${UMUI_UI_COMPONENTSPAGE_SMALLDESC}" !endif @@ -217,7 +221,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !endif !ifdef UMUI_HEADERIMAGE_BMP | UMUI_UNHEADERIMAGE_BMP - !warning "Deprecated: The UMUI_HEADERIMAGE_BMP and UMUI_UNHEADERIMAGE_BMP defines were renamed by UMUI_HEADERBGIMAGE_BMP and UMUI_UNHEADERBGIMAGE_BMP since UltraModernUI 1.00 beta 2." + !warning "Deprecated: The UMUI_HEADERIMAGE_BMP and UMUI_UNHEADERIMAGE_BMP defines were renamed by UMUI_HEADERBGIMAGE_BMP and UMUI_UNHEADERBGIMAGE_BMP since Ultra-Modern UI 1.00 beta 2." !ifdef UMUI_HEADERIMAGE_BMP !define /IfNDef UMUI_HEADERBGIMAGE_BMP "${UMUI_HEADERIMAGE_BMP}" !endif @@ -263,13 +267,13 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !define /IfNDef MUI_ICON "${NSISDIR}\Contrib\Graphics\UltraModernUI\Icon.ico" !define /IfNDef MUI_UNICON "${NSISDIR}\Contrib\Graphics\UltraModernUI\UnIcon.ico" - !define /IfNDef UMUI_TEXT_COLOR FFFFFF !define /IfNDef MUI_BGCOLOR 4C72B2 + !define /IfNDef MUI_TEXTCOLOR FFFFFF !define /IfNDef UMUI_TEXT_LIGHTCOLOR FFFF00 - !define /IfNDef UMUI_HEADERTEXT_COLOR "${UMUI_TEXT_COLOR}" + !define /IfNDef UMUI_HEADERTEXT_COLOR "${MUI_TEXTCOLOR}" - !define /IfNDef MUI_LICENSEPAGE_BGCOLOR FFFFFF - !define /IfNDef MUI_INSTFILESPAGE_COLORS "${UMUI_TEXT_COLOR} ${MUI_BGCOLOR}" + !define /IfNDef MUI_LICENSEPAGE_BGCOLOR "/windows" + !define /IfNDef MUI_INSTFILESPAGE_COLORS "${MUI_TEXTCOLOR} ${MUI_BGCOLOR}" !define /IfNDef MUI_INSTFILESPAGE_PROGRESSBAR "smooth" !define /IfNDef UMUI_LEFTIMAGE_BMP "${NSISDIR}\Contrib\UltraModernUI\Skins\blue\Left.bmp" @@ -340,7 +344,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here ;------- !ifdef UMUI_SKIN - !warning "The UMUI_SKIN define is not used in ModernUIEx. Define ignored." + !warning "The UMUI_SKIN define is not used in Modern UIEx. Define ignored." !undef UMUI_SKIN !endif !insertmacro MUI_UNSET UMUI_PAGEBGIMAGE @@ -371,10 +375,10 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !define /IfNDef MUI_INSTFILESPAGE_COLORS "/windows" !define /IfNDef MUI_INSTFILESPAGE_PROGRESSBAR "smooth" - !define /IfNDef UMUI_TEXT_COLOR "000000" !define /IfNDef MUI_BGCOLOR "FFFFFF" + !define /IfNDef MUI_TEXTCOLOR "000000" !define /IfNDef UMUI_TEXT_LIGHTCOLOR "000000" - !define /IfNDef UMUI_HEADERTEXT_COLOR "${UMUI_TEXT_COLOR}" + !define /IfNDef UMUI_HEADERTEXT_COLOR "${MUI_TEXTCOLOR}" !define /IfNDef UMUI_HEADERBGIMAGE_BMP "${NSISDIR}\Contrib\Graphics\UltraModernUI\HeaderBG.bmp" !define /IfNDef UMUI_UNHEADERBGIMAGE_BMP "${UMUI_HEADERBGIMAGE_BMP}" @@ -559,7 +563,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !ifndef USE_MUIEx ;---------------- FindWindow $MUI_TEMP1 "#32770" "" $HWNDPARENT - SetCtlColors $MUI_TEMP1 ${MUI_BGCOLOR} ${MUI_BGCOLOR} + SetCtlColors $MUI_TEMP1 "${MUI_BGCOLOR}" "${MUI_BGCOLOR}" !endif ;----- !macroend @@ -572,7 +576,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !ifdef UMUI_${MUI_PAGE_UNINSTALLER_PREFIX}PAGEBGIMAGE SetCtlColors $MUI_TEMP1 "transparent" "transparent" !else - SetCtlColors $MUI_TEMP1 ${MUI_BGCOLOR} ${MUI_BGCOLOR} + SetCtlColors $MUI_TEMP1 "${MUI_BGCOLOR}" "${MUI_BGCOLOR}" !endif !endif ;----- @@ -584,7 +588,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here ;----------------- FindWindow $MUI_TEMP1 "#32770" "" $HWNDPARENT GetDlgItem $MUI_TEMP1 $MUI_TEMP1 ${ID} - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_COLOR} ${MUI_BGCOLOR} + SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif ;----- !macroend @@ -596,9 +600,9 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here FindWindow $MUI_TEMP1 "#32770" "" $HWNDPARENT GetDlgItem $MUI_TEMP1 $MUI_TEMP1 ${ID} !ifdef UMUI_${MUI_PAGE_UNINSTALLER_PREFIX}PAGEBGIMAGE - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_COLOR} "transparent" + SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "transparent" !else - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_COLOR} ${MUI_BGCOLOR} + SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif !endif ;----- @@ -610,7 +614,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here ;----------------- FindWindow $MUI_TEMP1 "#32770" "" $HWNDPARENT GetDlgItem $MUI_TEMP1 $MUI_TEMP1 ${ID} - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_LIGHTCOLOR} ${MUI_BGCOLOR} + SetCtlColors $MUI_TEMP1 "${UMUI_TEXT_LIGHTCOLOR}" "${MUI_BGCOLOR}" !endif ;----- !macroend @@ -622,9 +626,9 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here FindWindow $MUI_TEMP1 "#32770" "" $HWNDPARENT GetDlgItem $MUI_TEMP1 $MUI_TEMP1 ${ID} !ifdef UMUI_${MUI_PAGE_UNINSTALLER_PREFIX}PAGEBGIMAGE - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_LIGHTCOLOR} "transparent" + SetCtlColors $MUI_TEMP1 "${UMUI_TEXT_LIGHTCOLOR}" "transparent" !else - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_LIGHTCOLOR} ${MUI_BGCOLOR} + SetCtlColors $MUI_TEMP1 "${UMUI_TEXT_LIGHTCOLOR}" "${MUI_BGCOLOR}" !endif !endif ;----- @@ -634,7 +638,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !macro UMUI_PAGEINPUTCTL_INIT ID FindWindow $MUI_TEMP1 "#32770" "" $HWNDPARENT GetDlgItem $MUI_TEMP1 $MUI_TEMP1 ${ID} - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_INPUTCOLOR} ${UMUI_BGINPUTCOLOR} + SetCtlColors $MUI_TEMP1 "${UMUI_TEXT_INPUTCOLOR}" "${UMUI_BGINPUTCOLOR}" !macroend ; Change the background on the Welcome/Finish/Abort Pages @@ -645,14 +649,14 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !ifndef UMUI_NO_WFA_BGTRANSPARENT SetCtlColors ${HWND} "" "transparent" !else - SetCtlColors ${HWND} "" ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif !else - SetCtlColors ${HWND} "" ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif !else ;----- - SetCtlColors ${HWND} "" ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif ;----- !macroend @@ -665,10 +669,10 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !ifndef UMUI_IONOBGTRANSPARENT SetCtlColors ${HWND} "" "transparent" !else - SetCtlColors ${HWND} "" ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif !else - SetCtlColors ${HWND} "" ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif !endif ;----- @@ -679,7 +683,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !macro UMUI_IOPAGEBG_INIT HWND !ifndef USE_MUIEx ;---------------- - SetCtlColors ${HWND} "" ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif ;----- !macroend @@ -689,30 +693,30 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !ifndef USE_MUIEx ;----------------- !ifdef UMUI_${MUI_PAGE_UNINSTALLER_PREFIX}PAGEBGIMAGE - SetCtlColors ${HWND} ${UMUI_TEXT_COLOR} "transparent" + SetCtlColors ${HWND} "${MUI_TEXTCOLOR}" "transparent" !else - SetCtlColors ${HWND} ${UMUI_TEXT_COLOR} ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif !else ;----- - SetCtlColors ${HWND} ${UMUI_TEXT_COLOR} ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif ;----- !macroend ; Change the background color of the IO Controls !macro UMUI_IOPAGECTL_INIT HWND - SetCtlColors ${HWND} ${UMUI_TEXT_COLOR} ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !macroend ; Set the background and text colors of the IO Input Controls !macro UMUI_IOPAGEINPUTCTL_INIT HWND - SetCtlColors ${HWND} ${UMUI_TEXT_INPUTCOLOR} ${UMUI_BGINPUTCOLOR} + SetCtlColors ${HWND} "${UMUI_TEXT_INPUTCOLOR}" "${UMUI_BGINPUTCOLOR}" !macroend ; Set the background color and the light text color of the IO Controls !macro UMUI_IOPAGECTLLIGHT_INIT HWND - SetCtlColors ${HWND} ${UMUI_TEXT_LIGHTCOLOR} ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${UMUI_TEXT_LIGHTCOLOR}" "${MUI_BGCOLOR}" !macroend ; Set transparent the background and the light text color of the IO Controls @@ -720,13 +724,13 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !ifndef USE_MUIEx ;----------------- !ifdef UMUI_${MUI_PAGE_UNINSTALLER_PREFIX}PAGEBGIMAGE - SetCtlColors ${HWND} ${UMUI_TEXT_LIGHTCOLOR} "transparent" + SetCtlColors ${HWND} "${UMUI_TEXT_LIGHTCOLOR}" "transparent" !else - SetCtlColors ${HWND} ${UMUI_TEXT_LIGHTCOLOR} ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${UMUI_TEXT_LIGHTCOLOR}" "${MUI_BGCOLOR}" !endif !else ;----- - SetCtlColors ${HWND} ${UMUI_TEXT_LIGHTCOLOR} ${MUI_BGCOLOR} + SetCtlColors ${HWND} "${UMUI_TEXT_LIGHTCOLOR}" "${MUI_BGCOLOR}" !endif ;----- !macroend @@ -1042,10 +1046,10 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037 CreateFont $MUI_TEMP2 "$(^Font)" "$(^FontSize)" "700" SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0 - SetCtlColors $MUI_TEMP1 ${UMUI_HEADERTEXT_COLOR} "transparent" + SetCtlColors $MUI_TEMP1 "${UMUI_HEADERTEXT_COLOR}" "transparent" GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 - SetCtlColors $MUI_TEMP1 ${UMUI_HEADERTEXT_COLOR} "transparent" + SetCtlColors $MUI_TEMP1 "${UMUI_HEADERTEXT_COLOR}" "transparent" GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028 CreateFont $MUI_TEMP2 Arial 10 1400 @@ -1059,7 +1063,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here SendMessage $MUI_TEMP1 ${WM_SETFONT} "$MUI_TEMP2" 0 SendMessage $MUI_TEMP1 ${WM_SETTEXT} 0 "STR:$(^Branding) " - SetCtlColors $HWNDPARENT ${MUI_BGCOLOR} ${MUI_BGCOLOR} + SetCtlColors $HWNDPARENT "${MUI_BGCOLOR}" "${MUI_BGCOLOR}" !ifndef UMUI_${UNPREFIX}UNIQUEBGIMAGE @@ -1078,7 +1082,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here SetBrandingImage /IMGID=1034 /RESIZETOFIT "$PLUGINSDIR\Header.bmp" !else GetDlgItem $MUI_TEMP1 $HWNDPARENT 1034 - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_COLOR} "${MUI_BGCOLOR}" + SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif !ifdef UMUI_${UNPREFIX}BOTTOMIMAGE_BMP @@ -1121,10 +1125,10 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !endif GetDlgItem $MUI_TEMP1 $HWNDPARENT 1018 - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_COLOR} ${MUI_BGCOLOR} + SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045 ShowWindow $MUI_TEMP1 ${SW_HIDE} - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_COLOR} ${MUI_BGCOLOR} + SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !else ;----------------- @@ -1135,17 +1139,17 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !ifndef MUI_HEADER_TRANSPARENT_TEXT - SetCtlColors $MUI_TEMP1 ${UMUI_HEADERTEXT_COLOR} "${MUI_BGCOLOR}" + SetCtlColors $MUI_TEMP1 "${UMUI_HEADERTEXT_COLOR}" "${MUI_BGCOLOR}" GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 - SetCtlColors $MUI_TEMP1 ${UMUI_HEADERTEXT_COLOR} "${MUI_BGCOLOR}" + SetCtlColors $MUI_TEMP1 "${UMUI_HEADERTEXT_COLOR}" "${MUI_BGCOLOR}" !else - SetCtlColors $MUI_TEMP1 ${UMUI_HEADERTEXT_COLOR} "transparent" + SetCtlColors $MUI_TEMP1 "${UMUI_HEADERTEXT_COLOR}" "transparent" GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 - SetCtlColors $MUI_TEMP1 ${UMUI_HEADERTEXT_COLOR} "transparent" + SetCtlColors $MUI_TEMP1 "${UMUI_HEADERTEXT_COLOR}" "transparent" !endif @@ -1158,14 +1162,14 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !else - GetDlgItem $MUI_TEMP1 $HWNDPARENT 1034 - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_COLOR} "${MUI_BGCOLOR}" + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1034 ; Header background + SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" !endif - GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039 - SetCtlColors $MUI_TEMP1 ${UMUI_TEXT_COLOR} "${MUI_BGCOLOR}" + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039 ; Header image + SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}" GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028 SetCtlColors $MUI_TEMP1 /BRANDING @@ -1689,6 +1693,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !endif !endif + ClearErrors ReadRegStr $MUI_TEMP2 ${UMUI_SHELLVARCONTEXT_REGISTRY_ROOT} "${UMUI_SHELLVARCONTEXT_REGISTRY_KEY}" "${UMUI_SHELLVARCONTEXT_REGISTRY_VALUENAME}" IfErrors +2 0 StrCpy $MUI_TEMP1 $MUI_TEMP2 @@ -1745,6 +1750,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !endif Push $R0 + ClearErrors ReadRegStr $R0 ${UMUI_INSTALLDIR_REGISTRY_ROOT} "${UMUI_INSTALLDIR_REGISTRY_KEY}" "${UMUI_INSTALLDIR_REGISTRY_VALUENAME}" IfErrors +2 0 StrCpy $INSTDIR $R0 @@ -2279,6 +2285,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !macro UMUI_MAINTENANCE_PARAMETERS_GET + ClearErrors !insertmacro UMUI_PARAMETERISSET "/remove" Pop $MUI_TEMP1 IfErrors noremove 0 @@ -2534,7 +2541,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !macro UMUI_PAGE_LEFTMESSAGEBOX A B C - !warning "The UMUI_PAGE_LEFTMESSAGEBOX and UMUI_UNPAGE_LEFTMESSAGEBOX macros were removed since UltraModernUI 1.00 beta 2." + !warning "The UMUI_PAGE_LEFTMESSAGEBOX and UMUI_UNPAGE_LEFTMESSAGEBOX macros were removed since Ultra-Modern UI 1.00 beta 2." !insertmacro MUI_UNSET UMUI_LEFTMESSAGEBOX_VAR !insertmacro MUI_UNSET UMUI_LEFTMESSAGEBOX_LEFTFUNC @@ -2542,13 +2549,13 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !macro UMUI_LEFT_TEXTE A B - !warning "The UMUI_LEFT_TEXTE macro was removed since UltraModernUI 1.00 beta 2." + !warning "The UMUI_LEFT_TEXTE macro was removed since Ultra-Modern UI 1.00 beta 2." !macroend !macro UMUI_LEFT_SETTIME A - !warning "The UMUI_LEFT_SETTIME macro was removed since UltraModernUI 1.00 beta 2." + !warning "The UMUI_LEFT_SETTIME macro was removed since Ultra-Modern UI 1.00 beta 2." !macroend @@ -4010,9 +4017,10 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !insertmacro UMUI_PAGECTLLIGHT_INIT 1020 !ifdef MUI_DIRECTORYPAGE_BGCOLOR + !insertmacro MUI_DEFAULT MUI_DIRECTORYPAGE_TEXTCOLOR "" FindWindow $MUI_TEMP1 "#32770" "" $HWNDPARENT GetDlgItem $MUI_TEMP1 $MUI_TEMP1 1019 - SetCtlColors $MUI_TEMP1 "" "${MUI_DIRECTORYPAGE_BGCOLOR}" + SetCtlColors $MUI_TEMP1 "${MUI_DIRECTORYPAGE_TEXTCOLOR}" "${MUI_DIRECTORYPAGE_BGCOLOR}" !else !insertmacro UMUI_PAGEINPUTCTL_INIT 1019 !endif @@ -4085,10 +4093,11 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here ;----- !ifdef MUI_STARTMENUPAGE_BGCOLOR + !insertmacro MUI_DEFAULT MUI_STARTMENUPAGE_TEXTCOLOR "" GetDlgItem $MUI_TEMP1 $MUI_HWND 1002 - SetCtlColors $MUI_TEMP1 "" "${MUI_STARTMENUPAGE_BGCOLOR}" + SetCtlColors $MUI_TEMP1 "${MUI_STARTMENUPAGE_TEXTCOLOR}" "${MUI_STARTMENUPAGE_BGCOLOR}" GetDlgItem $MUI_TEMP1 $MUI_HWND 1004 - SetCtlColors $MUI_TEMP1 "" "${MUI_STARTMENUPAGE_BGCOLOR}" + SetCtlColors $MUI_TEMP1 "${MUI_STARTMENUPAGE_TEXTCOLOR}" "${MUI_STARTMENUPAGE_BGCOLOR}" !else GetDlgItem $MUI_TEMP1 $MUI_HWND 1002 !insertmacro UMUI_IOPAGEINPUTCTL_INIT $MUI_TEMP1 @@ -4232,10 +4241,10 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !ifndef MUI_UNINSTALLER !ifdef UMUI_PREUNINSTALL_FUNCTION - !ifndef UMUI_${MUI_PAGE_UNINSTALLER_PREFIX}SECTION_PREUNINSTALL - !define UMUI_${MUI_PAGE_UNINSTALLER_PREFIX}SECTION_PREUNINSTALL + !ifndef UMUI_SECTION_PREUNINSTALL + !define UMUI_SECTION_PREUNINSTALL - Section "${MUI_PAGE_UNINSTALLER_FUNCPREFIX}" + Section "" ClearErrors IfFileExists $INSTDIR 0 end @@ -4721,6 +4730,29 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here mui.finish_show: !endif + !if "${UMUI_XPSTYLE}" == "On" + !ifndef MUI_FORCECLASSICCONTROLS + ${If} ${IsHighContrastModeActive} + !endif + ; SetCtlColors does not change the check/radio text color (bug #443) + !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT + GetDlgItem $MUI_TEMP1 $MUI_HWND ${UMUI_INTERNAL_FIDTHIRD} + System::Call 'UXTHEME::SetWindowTheme(p$MUI_TEMP1,w" ",w" ")' + GetDlgItem $MUI_TEMP1 $MUI_HWND ${UMUI_INTERNAL_FIDFOURTH} + System::Call 'UXTHEME::SetWindowTheme(p$MUI_TEMP1,w" ",w" ")' + !else ifdef MUI_FINISHPAGE_RUN | MUI_FINISHPAGE_SHOWREADME + GetDlgItem $MUI_TEMP1 $MUI_HWND ${UMUI_INTERNAL_FIDTHIRD} + System::Call 'UXTHEME::SetWindowTheme(p$MUI_TEMP1,w" ",w" ")' + !ifdef MUI_FINISHPAGE_RUN & MUI_FINISHPAGE_SHOWREADME + GetDlgItem $MUI_TEMP1 $MUI_HWND ${UMUI_INTERNAL_FIDFOURTH} + System::Call 'UXTHEME::SetWindowTheme(p$MUI_TEMP1,w" ",w" ")' + !endif + !endif + !ifndef MUI_FORCECLASSICCONTROLS + ${EndIf} + !endif + !endif + GetDlgItem $MUI_TEMP1 $HWNDPARENT 3 ShowWindow $MUI_TEMP1 ${SW_HIDE} GetDlgItem $MUI_TEMP1 $HWNDPARENT 2 @@ -5000,8 +5032,9 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here StrCpy $UMUI_TEMP3 $LANGUAGE StrCmp $UMUI_LANGLIST "" 0 +2 - MessageBox MB_OK|MB_ICONSTOP "UltraModernUI error: You have forgotten to insert the UMUI_MULTILANG_GET macro in your ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}.oninit function." + MessageBox MB_OK|MB_ICONSTOP "Ultra-Modern UI error: You have forgotten to insert the UMUI_MULTILANG_GET macro in your ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}.oninit function." + ClearErrors ; Get the current language id nsArray::Get LangMap $LANGUAGE Pop $MUI_TEMP1 @@ -6193,11 +6226,12 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here IntOp $UMUI_TEMP4 $UMUI_TEMP4 + 12 !insertmacro INSTALLOPTIONS_WRITE "$MUI_TEMP1" "Field $UMUI_TEMP3" Bottom "$UMUI_TEMP4" + !insertmacro INSTALLOPTIONS_READ $MUI_TEMP2 "$MUI_TEMP1" "Field $UMUI_TEMP3" State + !insertmacro INSTALLOPTIONS_WRITE "AdditionalTasksList.ini" "Task ${ID}" State "$MUI_TEMP2" + !insertmacro INSTALLOPTIONS_READ $MUI_TEMP2 "AdditionalTasksList.ini" "Settings" NumTasks StrCmp $MUI_TEMP2 "" 0 +2 StrCpy $MUI_TEMP2 0 - - !insertmacro INSTALLOPTIONS_WRITE "AdditionalTasksList.ini" "Task ${ID}" State "" !insertmacro INSTALLOPTIONS_WRITE "AdditionalTasksList.ini" "$MUI_TEMP2" TaskID "${ID}" IntOp $MUI_TEMP2 $MUI_TEMP2 + 1 !insertmacro INSTALLOPTIONS_WRITE "AdditionalTasksList.ini" "Settings" NumTasks "$MUI_TEMP2" @@ -6242,11 +6276,12 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !undef UMUI_NEWGROUP !endif + !insertmacro INSTALLOPTIONS_READ $MUI_TEMP2 "$MUI_TEMP1" "Field $UMUI_TEMP3" State + !insertmacro INSTALLOPTIONS_WRITE "AdditionalTasksList.ini" "Task ${ID}" State "$MUI_TEMP2" + !insertmacro INSTALLOPTIONS_READ $MUI_TEMP2 "AdditionalTasksList.ini" "Settings" NumTasks StrCmp $MUI_TEMP2 "" 0 +2 StrCpy $MUI_TEMP2 0 - - !insertmacro INSTALLOPTIONS_WRITE "AdditionalTasksList.ini" "Task ${ID}" State "" !insertmacro INSTALLOPTIONS_WRITE "AdditionalTasksList.ini" "$MUI_TEMP2" TaskID "${ID}" IntOp $MUI_TEMP2 $MUI_TEMP2 + 1 !insertmacro INSTALLOPTIONS_WRITE "AdditionalTasksList.ini" "Settings" NumTasks "$MUI_TEMP2" @@ -6528,6 +6563,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here ; $3 : back/next field number ; $4 : HWND of the back/next field + ClearErrors !insertmacro INSTALLOPTIONS_READ $MUI_TEMP1 "SerialNumber_${SERIAL_FUNC}.ini" "Settings" State StrCmp $MUI_TEMP1 "0" ok 0 @@ -6595,20 +6631,20 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !macro UMUI_SERIALNUMBERPAGE_GET_WINDOWS_REGISTRED_OWNER VAR + ClearErrors ; Windows NT ReadRegStr $${VAR} HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" "RegisteredOwner" - IfErrors 0 +3 - ClearErrors + IfErrors 0 +2 ; Windows 9x ReadRegStr $${VAR} HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion" "RegisteredOwner" ClearErrors !macroend !macro UMUI_SERIALNUMBERPAGE_GET_WINDOWS_REGISTRED_ORGANIZATION VAR + ClearErrors ; Windows NT ReadRegStr $${VAR} HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" "RegisteredOrganization" - IfErrors 0 +3 - ClearErrors + IfErrors 0 +2 ; Windows 9x ReadRegStr $${VAR} HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion" "RegisteredOrganization" ClearErrors @@ -6693,7 +6729,6 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !insertmacro INSTALLOPTIONS_READ $9 "${FILE}" "Field $9" NextField IfErrors 0 loopSerialApplyFlags - ClearErrors Goto loopApplyFlags endApplyFlags: @@ -9522,7 +9557,9 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here ; MUI_PAGE_UNINSTALLER_PREFIX is undefined by uninstaller pages so we check MUI_UNINSTALLER as well !ifndef MUI_PAGE_UNINSTALLER_PREFIX && MUI_UNINSTALLER - !warning "MUI_LANGUAGE should be inserted after the [U]MUI_[UN]PAGE_* macros" + !ifndef MUI_DISABLE_INSERT_LANGUAGE_AFTER_PAGES_WARNING ; Define this to avoid the warning if you only have custom pages + !warning "MUI_LANGUAGE should be inserted after the MUI_[UN]PAGE_* macros" + !endif !endif !insertmacro MUI_INSERT diff --git a/CreateZipUMUI.bat b/CreateZipUMUI.bat index 933e8e3..7e6ba7a 100644 --- a/CreateZipUMUI.bat +++ b/CreateZipUMUI.bat @@ -1,10 +1,11 @@ @echo off @echo Creating UltraModernUI zip archive - del /Q UltraModernUI_2.0b4.zip + del /Q UltraModernUI_2.0b5.zip rmdir /S /Q temp mkdir temp + copy NSISUMUI.exe temp mkdir "temp\Contrib\UltraModernUI\" copy Contrib\UltraModernUI\UMUI.nsh temp\Contrib\UltraModernUI @@ -113,7 +114,7 @@ rem mkdir "temp\Include\" copy Contrib\nsArray\*.* temp\Contrib\nsArray cd temp - "C:\Program Files\7-Zip\7z.exe" a -tzip -mx9 ..\UltraModernUI_2.0b4.zip * + "C:\Program Files\7-Zip\7z.exe" a -tzip -mx9 ..\UltraModernUI_2.0b5.zip * cd .. rmdir /S /Q temp diff --git a/Docs/InstallOptionsEx/License.txt b/Docs/InstallOptionsEx/License.txt index a3cb22f..8dbd95b 100644 --- a/Docs/InstallOptionsEx/License.txt +++ b/Docs/InstallOptionsEx/License.txt @@ -1,8 +1,8 @@ -Original IO version Copyright � 2001 Michael Bishop -IO DLL version 1 Copyright � 2001-2002 Nullsoft, Inc., ORTIM -IO DLL version 2 Copyright � 2003-2009 Amir Szekely, Joost Verburg, Dave Laundon -IOEx DLL (changed from original IO 2) Copyright � 2004-2005 Diego Pedroso -IOEx DLL (starting at v.2.4.5) Copyright � 2006-2018 SuperPat +Original IO version Copyright © 2001 Michael Bishop +IO DLL version 1 Copyright © 2001-2002 Nullsoft, Inc., ORTIM +IO DLL version 2 Copyright © 2003-2009 Amir Szekely, Joost Verburg, Dave Laundon +IOEx DLL (changed from original IO 2) Copyright © 2004-2005 Diego Pedroso +IOEx DLL (starting at v.2.4.5) Copyright © 2006-2019 SuperPat This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/Docs/InstallOptionsEx/Readme.html b/Docs/InstallOptionsEx/Readme.html index 070d05e..0df402d 100644 --- a/Docs/InstallOptionsEx/Readme.html +++ b/Docs/InstallOptionsEx/Readme.html @@ -5669,7 +5669,7 @@

2.4.5 beta 3

IO DLL version 1 Copyright © 2001-2002 Nullsoft, Inc., ORTIM IO DLL version 2 Copyright © 2003-2009 Amir Szekely, Joost Verburg, Dave Laundon IOEx DLL (changed from original IO 2) Copyright © 2004-2005 Diego Pedroso -IOEx DLL (starting at v.2.4.5) Copyright © 2006-2018 SuperPat +IOEx DLL (starting at v.2.4.5) Copyright © 2006-2019 SuperPat This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/Docs/SkinnedControls/Readme.html b/Docs/SkinnedControls/Readme.html index 6b69b5d..23ceb64 100644 --- a/Docs/SkinnedControls/Readme.html +++ b/Docs/SkinnedControls/Readme.html @@ -366,11 +366,11 @@

License

[+] License Terms

- 
Copyright © 2005-2018 SuperPat
+ 
Copyright © 2005-2019 SuperPat
Based on wansis, a Plug-in written by Saivert that skins NSIS like Winamp
 and use the wa_dlg.h courtesy of Nullsoft, Inc.
-as well as the Cool Scrollbar Library Copyright (c) J Brown 2001.
+as well as the Cool Scrollbar Library Copyright © J Brown 2001. 
This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -394,7 +394,7 @@ 
[+]
 
-    
© 2005-2018 SuperPat

+    
© 2005-2019 SuperPat
diff --git a/Docs/SkinnedControls/license.txt b/Docs/SkinnedControls/license.txt index d323c80..ebef2d0 100644 --- a/Docs/SkinnedControls/license.txt +++ b/Docs/SkinnedControls/license.txt @@ -1,8 +1,8 @@ -Copyright � 2005-2018 SuperPat +Copyright © 2005-2019 SuperPat Based on wansis, a Plug-in written by Saivert that skins NSIS like Winamp and use the wa_dlg.h courtesy of Nullsoft, Inc. -as well as the Cool Scrollbar Library Copyright (c) J Brown 2001. +as well as the Cool Scrollbar Library Copyright © J Brown 2001. Skinned Controls plugin is based on the wansis plugin of Saivert (http://nsis.sourceforge.net/Wansis_plug-in) and it use the wa_dlg.h courtesy of Nullsoft, Inc. diff --git a/Docs/UltraModernUI/License.txt b/Docs/UltraModernUI/License.txt index f310b4a..98d544d 100644 --- a/Docs/UltraModernUI/License.txt +++ b/Docs/UltraModernUI/License.txt @@ -1,6 +1,6 @@ -Copyright � 2005-2018 SuperPat +Copyright © 2005-2019 SuperPat -UltraModernUI is based on the ModernUI of Joost Verburg and inspired of the ExperienceUI of dandaman32 +Ultra-Modern UI is based on the ModernUI of Joost Verburg and inspired of the ExperienceUI of dandaman32 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Docs/UltraModernUI/ReadMe.rtf b/Docs/UltraModernUI/ReadMe.rtf index e0a2028..5e00496 100644 --- a/Docs/UltraModernUI/ReadMe.rtf +++ b/Docs/UltraModernUI/ReadMe.rtf @@ -99,41 +99,41 @@ ttp://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\ma {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (} {\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9 \pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\qc \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 -\fs24\lang1036\langfe255\loch\af0\hich\af0\dbch\af31505\cgrid\langnp1036\langfenp255 {\rtlch\fcs1 \ab\af0 \ltrch\fcs0 \b\lang1033\langfe255\langnp1033\insrsid11944112\charrsid4531012 \hich\af0\dbch\af31505\loch\f0 UltraModernUI }{\rtlch\fcs1 \ab\af0 +\fs24\lang1036\langfe255\loch\af0\hich\af0\dbch\af31505\cgrid\langnp1036\langfenp255 {\rtlch\fcs1 \ab\af0 \ltrch\fcs0 \b\lang1033\langfe255\langnp1033\insrsid11944112\charrsid4531012 \hich\af0\dbch\af31505\loch\f0 Ultra-Modern UI }{\rtlch\fcs1 \ab\af0 \ltrch\fcs0 \b\lang1033\langfe255\langnp1033\insrsid7804262 \hich\af0\dbch\af31505\loch\f0 Informations}{\rtlch\fcs1 \ab\af0 \ltrch\fcs0 \b\lang1033\langfe255\langnp1033\insrsid11944112\charrsid4531012 \par }\pard \ltrpar\qj \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid924724 {\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid11944112\charrsid4531012 \par \par }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid11944112\charrsid924724 \hich\af0\dbch\af31505\loch\f0 The }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid6518900\charrsid924724 \hich\af0\dbch\af31505\loch\f0 Ultra-Modern}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid11944112\charrsid924724 \hich\af0\dbch\af31505\loch\f0 User Interface is a new interface with a style like the most recent installers for NSIS }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid6168175\charrsid924724 \hich\af0\dbch\af31505\loch\f0 3}{\rtlch\fcs1 \af0\afs20 -\ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid11944112\charrsid924724 \hich\af0\dbch\af31505\loch\f0 (Nullsoft Scriptable Install System), \hich\af0\dbch\af31505\loch\f0 -the tool that allows programmers to create such installers for Windows. UltraModernUI and NSIS are released under an open source license. +\ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid11944112\charrsid924724 \hich\af0\dbch\af31505\loch\f0 (Nullsoft Scriptable Install System) x86 edition, \hich\af0\dbch\af31505\loch\f0 +the tool that allows programmers to create such installers for Windows. Ultra-Modern UI and NSIS are released under an open source license. \par \par \hich\af0\dbch\af31505\loch\f0 The }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid6518900\charrsid924724 \hich\af0\dbch\af31505\loch\f0 Ultra-Modern}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid11944112\charrsid924724 \hich\af0\dbch\af31505\loch\f0 User Interface also features new pages (Confirm, Abort, AlternativeStartMenu, AdditionalTasks, Info\hich\af0\dbch\af31505\loch\f0 rmation, Maintenance, Update, SetupType, Serial Number...). \par -\par \hich\af0\dbch\af31505\loch\f0 UltraModernUI include also ModernUIEx. ModernUIEx is the same User Interface as the original Modern UI style but with the support of the new Ultra}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 +\par \hich\af0\dbch\af31505\loch\f0 Ultra-Modern UI include also Modern UIEx. Modern UIEx is the same User Interface as the original Modern UI style but with the support of the new Ultra}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid2833028 -}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid11944112\charrsid924724 \hich\af0\dbch\af31505\loch\f0 Modern pages. \par -\par \hich\af0\dbch\af31505\loch\f0 Using the UltraModernUI macros and\hich\af0\dbch\af31505\loch\f0 language files, writing scripts with a}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid13071767\charrsid924724 +\par \hich\af0\dbch\af31505\loch\f0 Using the Ultra-Modern UI macros and\hich\af0\dbch\af31505\loch\f0 language files, writing scripts with a}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid13071767\charrsid924724 \hich\af0\dbch\af31505\loch\f0 n }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid6518900\charrsid924724 \hich\af0\dbch\af31505\loch\f0 ultra-modern}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid11944112\charrsid924724 \hich\af0\dbch\af31505\loch\f0 interface is easy. }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid924724\charrsid924724 \hich\af0\dbch\af31505\loch\f0 A lot of examples are available}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang9\langfe255\langnp9\insrsid924724\charrsid924724 \hich\af0\dbch\af31505\loch\f0 to show the different features}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid924724\charrsid924724 \hich\af0\dbch\af31505\loch\f0 and the}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid11944112\charrsid924724 \hich\af0\dbch\af31505\loch\f0 document}{ \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid924724\charrsid924724 \hich\af0\dbch\af31505\loch\f0 ation}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid11944112\charrsid924724 -\hich\af0\dbch\af31505\loch\f0 contains all information about writing UltraModernUI scripts and a reference of all settings. +\hich\af0\dbch\af31505\loch\f0 contains all information about writing Ultra-Modern UI scripts and a reference of all settings. \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid924724 {\rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\fs20\lang1033\langfe255\langnp1033\insrsid8088776 \par }{\rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\fs20\lang1033\langfe255\langnp1033\insrsid5582561\charrsid4531012 \par }{\rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\fs20\lang1033\langfe255\langnp1033\insrsid4531012\charrsid4531012 \hich\af0\dbch\af31505\loch\f0 Wh\hich\af0\dbch\af31505\loch\f0 at\hich\f0 \rquote \loch\f0 s new in }{\rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 -\b\fs20\lang1033\langfe255\langnp1033\insrsid4531012 \hich\af0\dbch\af31505\loch\f0 UltraModernUI}{\rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\fs20\lang1033\langfe255\langnp1033\insrsid4531012\charrsid4531012 \hich\af0\dbch\af31505\loch\f0 }{\rtlch\fcs1 +\b\fs20\lang1033\langfe255\langnp1033\insrsid4531012 \hich\af0\dbch\af31505\loch\f0 Ultra-Modern UI}{\rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\fs20\lang1033\langfe255\langnp1033\insrsid4531012\charrsid4531012 \hich\af0\dbch\af31505\loch\f0 }{\rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\fs20\lang1033\langfe255\langnp1033\insrsid5376604\charrsid4531012 \hich\af0\dbch\af31505\loch\f0 version}{\rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\fs20\lang1033\langfe255\langnp1033\insrsid5376604 \hich\af0\dbch\af31505\loch\f0 }{\rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\fs20\lang1033\langfe255\langnp1033\insrsid4531012\charrsid4531012 \hich\af0\dbch\af31505\loch\f0 2.0?}{\rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\fs20\lang1033\langfe255\langnp1033\insrsid11944112\charrsid4531012 \par }{\rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\fs20\lang1033\langfe255\langnp1033\insrsid4531012\charrsid4531012 \par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \f2\fs20\lang1033\langfe255\langnp1033\langfenp255\insrsid12264924\charrsid12264924 \hich\af2\dbch\af31505\loch\f2 o\tab}}\pard \ltrpar \ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls4\rin0\lin720\itap0\pararsid15076262 {\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid12264924\charrsid12264924 \hich\af0\dbch\af31505\loch\f0 -UltraModernUI is now fully compatible with NSIS version 3 x86 edition and now with the large string special build; +Ultra-Modern UI is now fully compatible with NSIS version 3 x86 edition and now with the large string special build; \par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \f2\fs20\lang1033\langfe255\langnp1033\langfenp255\insrsid12264924\charrsid12264924 \hich\af2\dbch\af31505\loch\f2 o\tab}\hich\af0\dbch\af31505\loch\f0 The NSISArray }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid13314899 \hich\af0\dbch\af31505\loch\f0 plug-in}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid12264924\charrsid12264924 \hich\af0\dbch\af31505\loch\f0 was replaced by the new nsArray }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid13314899 \hich\af0\dbch\af31505\loch\f0 plug-in}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 @@ -217,7 +217,7 @@ Reduced weight of skin images;}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang103 \fs20\lang1033\langfe255\langnp1033\insrsid6518900\charrsid12264924 \par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \f2\fs20\lang1033\langfe255\langnp1033\langfenp255\insrsid12264924\charrsid12264924 \hich\af2\dbch\af31505\loch\f2 o\tab}}\pard \ltrpar \ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls4\rin0\lin720\itap0\pararsid15076262 {\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid12264924\charrsid12264924 \hich\af0\dbch\af31505\loch\f0 -The default install directory for the NSIS + UltraModernUI package is now C:\\ProgramData on Windows Vista and upper to allow examples to be compiled without access rights errors; +The default install directory for the NSIS + Ultra-Modern UI package is now C:\\ProgramData on Windows Vista and upper to allow examples to be compiled without access rights errors; \par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \f2\fs20\lang1033\langfe255\langnp1033\langfenp255\insrsid12264924\charrsid12264924 \hich\af2\dbch\af31505\loch\f2 o\tab}}\pard \ltrpar \ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls4\rin0\lin720\itap0\pararsid9052808 {\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid12264924\charrsid12264924 \hich\af0\dbch\af31505\loch\f0 A lot \hich\af0\dbch\af31505\loch\f0 of bug fixes and optimizations}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1033\langfe255\langnp1033\insrsid9052808\charrsid9052808 \hich\af0\dbch\af31505\loch\f0 ; diff --git a/Docs/UltraModernUI/ReadMe.txt b/Docs/UltraModernUI/ReadMe.txt index f5ca35c..e443806 100644 --- a/Docs/UltraModernUI/ReadMe.txt +++ b/Docs/UltraModernUI/ReadMe.txt @@ -1,21 +1,21 @@ - UltraModernUI Informations - ========================== + Ultra-Modern UI Informations + ============================ -The Ultra-Modern User Interface is a new interface with a style like the most recent installers for NSIS 3 (Nullsoft Scriptable Install System), the tool that allows programmers to create such installers for Windows. UltraModernUI and NSIS are released under an open source license. +The Ultra-Modern User Interface is a new interface with a style like the most recent installers for NSIS 3 (Nullsoft Scriptable Install System) x86 edition, the tool that allows programmers to create such installers for Windows. Ultra-Modern UI and NSIS are released under an open source license. The Ultra-Modern User Interface also features new pages (Confirm, Abort, AlternativeStartMenu, AdditionalTasks, Information, Maintenance, Update, SetupType, Serial Number...). -UltraModernUI include also ModernUIEx. ModernUIEx is the same User Interface as the original Modern UI style but with the support of the new Ultra-Modern pages. +Ultra-Modern UI include also Modern UIEx. Modern UIEx is the same User Interface as the original Modern UI style but with the support of the new Ultra-Modern pages. -Using the UltraModernUI macros and language files, writing scripts with an ultra-modern interface is easy. A lot of examples are available to show the different features and the documentation contains all information about writing UltraModernUI scripts and a reference of all settings. +Using the Ultra-Modern UI macros and language files, writing scripts with an ultra-modern interface is easy. A lot of examples are available to show the different features and the documentation contains all information about writing Ultra-Modern UI scripts and a reference of all settings. -What's new in UltraModernUI version 2.0? ----------------------------------------- +What's new in Ultra-Modern UI version 2.0? +------------------------------------------ - o UltraModernUI is now fully compatible with NSIS version 3 x86 edition and now with the large string special build; + o Ultra-Modern UI is now fully compatible with NSIS version 3 x86 edition and now with the large string special build; o The NSISArray plug-in was replaced by the new nsArray plug-in in version 1.1.1.7 who is faster and uses less memory; o Updated the InstallOptionsEx plug-in to version 2.4.5 beta 3 with full unicode support; o Updated the SkinnedControls plug-in to version 1.4 with support of the new NSIS plug-in API, ignore case parameters name support, unicode support, rewritten documentation and button image size are no more limited to allow smoother gradients; @@ -36,7 +36,7 @@ What's new in UltraModernUI version 2.0? o Reduced weight of skin images; o Updated and completed documentation; o Added an example for nsDialogs based custom page and documentation; - o The default install directory for the NSIS + UltraModernUI package is now C:\ProgramData on Windows Vista and upper to allow examples to be compiled without access rights errors; + o The default install directory for the NSIS + Ultra-Modern UI package is now C:\ProgramData on Windows Vista and upper to allow examples to be compiled without access rights errors; o A lot of bug fixes and optimizations; o Source code now on GitHub: https://github.com/SuperPat45/UltraModernUI. \ No newline at end of file diff --git a/Docs/UltraModernUI/Readme.html b/Docs/UltraModernUI/Readme.html index 04ed022..6fab79d 100644 --- a/Docs/UltraModernUI/Readme.html +++ b/Docs/UltraModernUI/Readme.html @@ -29,17 +29,17 @@

Introduction

-

The Ultra-Modern User Interface is a new interface with a style like the most recent installers for NSIS 3 (Nullsoft Scriptable Install System), the tool that allows programmers to create such installers for Windows. UltraModernUI and NSIS are released under an open source license.

+

The Ultra-Modern User Interface is a new interface with a style like the most recent installers for NSIS 3 (Nullsoft Scriptable Install System) x86 edition, the tool that allows programmers to create such installers for Windows. Ultra-Modern UI and NSIS are released under an open source license.

The Ultra-Modern User Interface also features new pages (Confirm, Abort, AlternativeStartMenu, AdditionalTasks, Information, Maintenance, Update, SetupType...). The interface and the graphics can be customized using the provided settings and the new skins system.

-

UltraModernUI include also an other User Interface named ModernUIEx. ModernUIEx is the same User Interface as the original Modern UI style but with the support of the new ultra-modern pages and with a little more options.

-

Using the UltraModernUI macros and language files, writing scripts with a ultra-modern interface is easy. A lot of examples are available to show the different features and this document contains all information about writing UltraModernUI scripts and a reference of all settings.

-

The issue of UltraModernUI is to be the most compatible with the existing Modern UI scripts. Because of it is based on the Modern UI of Joost Verburg, it use the same macro a define and provide new one. The new macro and define use the prefix UMUI_ instead of MUI_.

-

Please be aware that the UltraModernUI and the Modern UI interfaces settings are different compared to the classic interface. This means that you should not use settings like LicenseText, Icon, CheckBitmap, InstallColors etc. but the ones that are documented here.

-

UltraModernUI include three NSIS plug-ins:

+

Ultra-Modern UI include also an other User Interface named Modern UIEx. Modern UIEx is the same User Interface as the original Modern UI style but with the support of the new ultra-modern pages and with a little more options.

+

Using the Ultra-Modern UI macros and language files, writing scripts with a ultra-modern interface is easy. A lot of examples are available to show the different features and this document contains all information about writing Ultra-Modern UI scripts and a reference of all settings.

+

The issue of Ultra-Modern UI is to be the most compatible with the existing Modern UI scripts. Because of it is based on the Modern UI of Joost Verburg, it use the same macro a define and provide new one. The new macro and define use the prefix UMUI_ instead of MUI_.

+

Please be aware that the Ultra-Modern UI and the Modern UI interfaces settings are different compared to the classic interface. This means that you should not use settings like LicenseText, Icon, CheckBitmap, InstallColors etc. but the ones that are documented here.

+

Ultra-Modern UI include three NSIS plug-ins:

[+] Screenshots

@@ -49,7 +49,7 @@

[+] Multi language page with default skin Welcome page with blue skin with alternative text and alternative style options - Maintenace page with blue2 skin with page background image option + Maintenance page with blue2 skin with page background image option Update page with SoftBlue skin with page background image option License page with SoftRed skin Information page in RTF file with SoftBrown skin @@ -63,16 +63,16 @@

[+] Welcome page with the small page option Directory page with the small page option - Multi language page with the ModernUIEx interface - Setup type page with the ModernUIEx interface - Additional tasks page with the ModernUIEx interface - Serial number page with the ModernUIEx interface + Multi language page with the Modern UIEx interface + Setup type page with the Modern UIEx interface + Additional tasks page with the Modern UIEx interface + Serial number page with the Modern UIEx interface

-

The colors, that are used in this document, correspond to the differences between UltraModernUI / ModernUIEx and the original Modern UI:

+

The colors, that are used in this document, correspond to the differences between Ultra-Modern UI / Modern UIEx and the original Modern UI:

@@ -2648,6 +2647,18 @@

Example Scripts

Version History