diff --git a/Contrib/UltraModernUI/Language files/English.nsh b/Contrib/UltraModernUI/Language files/English.nsh index 388cf59..adef81c 100644 --- a/Contrib/UltraModernUI/Language files/English.nsh +++ b/Contrib/UltraModernUI/Language files/English.nsh @@ -123,7 +123,7 @@ !ifdef UMUI_ADDITIONALTASKSPAGE | UMUI_UNADDITIONALTASKSPAGE ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_TITLE "Additional Tasks" ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_SUBTITLE "Which are the additional tasks which must be carried out?" - ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_ADDITIONAL_ICONS "Additionnal Icons:" + ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_ADDITIONAL_ICONS "Additional Icons:" ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_CREATE_DESKTOP_ICON "Create a desktop icon" ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_CREATE_QUICK_LAUNCH_ICON "Create a Quick Launch icon" ${LangFileString} UMUI_TEXT_ADDITIONALTASKS_ADVANCED_PARAMETERS "Advanced parameters:" diff --git a/Contrib/UltraModernUI/UMUI.nsh b/Contrib/UltraModernUI/UMUI.nsh index 285e8e0..8991f31 100644 --- a/Contrib/UltraModernUI/UMUI.nsh +++ b/Contrib/UltraModernUI/UMUI.nsh @@ -1,18 +1,18 @@ /* -NSIS UltraModern User Interface version 2.0 beta 3 -Copyright 2005-2017 SuperPat +NSIS UltraModern User Interface version 2.0 beta 4 +Copyright 2005-2018 SuperPat Based on: NSIS Modern User Interface version 1.8 (Git version: d20b99c082a99304a542c2fa6cf4abd381ca263a) - Copyright 2002-2017 Joost Verburg + Copyright 2002-2018 Joost Verburg */ !ifndef MUI_INCLUDED -!echo "NSIS Ultra-Modern User Interface version 2.0 beta 3 - Copyright 2005-2017 SuperPat" +!echo "NSIS Ultra-Modern User Interface version 2.0 beta 4 - Copyright 2005-2018 SuperPat" !echo " (Bugfixes and some additions: 2015-2016 - Bodenseematze)" -!echo "Based on: NSIS Modern User Interface version 1.8 - Copyright 2002-2017 Joost Verburg" +!echo "Based on: NSIS Modern User Interface version 1.8 - Copyright 2002-2018 Joost Verburg" ;-------------------------------- !verbose push 3 @@ -21,7 +21,7 @@ Based on: !define MUI_INCLUDED -!define UMUI_SYSVERSION "2.0 beta 3" +!define UMUI_SYSVERSION "2.0 beta 4" !define MUI_SYSVERSION "1.8" ;-------------------------------- @@ -4255,9 +4255,9 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !macro MUI_FUNCTION_FINISHPAGE PRE LEAVE !ifndef UMUI_WELCOMEFINISHABORTPAGE_USE_IMAGE - !define UMUI_INTERNAL_FNUMFIELDS_3ADDITIONNALCONTROLS 5 - !define UMUI_INTERNAL_FNUMFIELDS_2ADDITIONNALCONTROLS 4 - !define UMUI_INTERNAL_FNUMFIELDS_1ADDITIONNALCONTROLS 3 + !define UMUI_INTERNAL_FNUMFIELDS_3ADDITIONALCONTROLS 5 + !define UMUI_INTERNAL_FNUMFIELDS_2ADDITIONALCONTROLS 4 + !define UMUI_INTERNAL_FNUMFIELDS_1ADDITIONALCONTROLS 3 !define UMUI_INTERNAL_FIELDTITLE 1 !define UMUI_INTERNAL_FIELDTEXT 2 !define UMUI_INTERNAL_FIELDTHIRD 3 @@ -4271,9 +4271,9 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !define UMUI_INTERNAL_FPOSLINKLEFT 22 !define UMUI_INTERNAL_FOPTIONCHECKLEFT 26 !else - !define UMUI_INTERNAL_FNUMFIELDS_3ADDITIONNALCONTROLS 6 - !define UMUI_INTERNAL_FNUMFIELDS_2ADDITIONNALCONTROLS 5 - !define UMUI_INTERNAL_FNUMFIELDS_1ADDITIONNALCONTROLS 4 + !define UMUI_INTERNAL_FNUMFIELDS_3ADDITIONALCONTROLS 6 + !define UMUI_INTERNAL_FNUMFIELDS_2ADDITIONALCONTROLS 5 + !define UMUI_INTERNAL_FNUMFIELDS_1ADDITIONALCONTROLS 4 !define UMUI_INTERNAL_FIELDTITLE 2 !define UMUI_INTERNAL_FIELDTEXT 3 !define UMUI_INTERNAL_FIELDTHIRD 4 @@ -4375,7 +4375,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !insertmacro MUI_INSTALLOPTIONS_WRITE_DEFAULTCONVERT "ioSpecial.ini" "Field ${UMUI_INTERNAL_FIELDTEXT}" "Text" "MUI_FINISHPAGE_TEXT_REBOOT" - !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_2ADDITIONNALCONTROLS}" + !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_2ADDITIONALCONTROLS}" !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field ${UMUI_INTERNAL_FIELDTHIRD}" "Type" "RadioButton" !insertmacro MUI_INSTALLOPTIONS_WRITE_DEFAULTCONVERT "ioSpecial.ini" "Field ${UMUI_INTERNAL_FIELDTHIRD}" "Text" "MUI_FINISHPAGE_TEXT_REBOOTNOW" @@ -4594,15 +4594,15 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !ifdef MUI_FINISHPAGE_RUN & MUI_FINISHPAGE_SHOWREADME & MUI_FINISHPAGE_LINK - !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_3ADDITIONNALCONTROLS}" + !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_3ADDITIONALCONTROLS}" !else ifdef MUI_FINISHPAGE_RUN & MUI_FINISHPAGE_SHOWREADME - !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_2ADDITIONNALCONTROLS}" + !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_2ADDITIONALCONTROLS}" !else ifdef MUI_FINISHPAGE_RUN & MUI_FINISHPAGE_LINK - !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_2ADDITIONNALCONTROLS}" + !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_2ADDITIONALCONTROLS}" !else ifdef MUI_FINISHPAGE_SHOWREADME & MUI_FINISHPAGE_LINK - !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_2ADDITIONNALCONTROLS}" + !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_2ADDITIONALCONTROLS}" !else ifdef MUI_FINISHPAGE_RUN | MUI_FINISHPAGE_SHOWREADME | MUI_FINISHPAGE_LINK - !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_1ADDITIONNALCONTROLS}" + !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "${UMUI_INTERNAL_FNUMFIELDS_1ADDITIONALCONTROLS}" !endif @@ -4831,9 +4831,9 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here FunctionEnd - !undef UMUI_INTERNAL_FNUMFIELDS_3ADDITIONNALCONTROLS - !undef UMUI_INTERNAL_FNUMFIELDS_2ADDITIONNALCONTROLS - !undef UMUI_INTERNAL_FNUMFIELDS_1ADDITIONNALCONTROLS + !undef UMUI_INTERNAL_FNUMFIELDS_3ADDITIONALCONTROLS + !undef UMUI_INTERNAL_FNUMFIELDS_2ADDITIONALCONTROLS + !undef UMUI_INTERNAL_FNUMFIELDS_1ADDITIONALCONTROLS !undef UMUI_INTERNAL_FIELDTITLE !undef UMUI_INTERNAL_FIELDTEXT !undef UMUI_INTERNAL_FIELDTHIRD @@ -9194,7 +9194,7 @@ Var UMUI_INSTALLFLAG ; Contains a OR of all the flags define here !macroend -; Additionnal Installoptions functions +; Additional Installoptions functions ; ------------------------------------ !macro UMUI_INSTALLOPTIONSEX_SETFOCUS HWND diff --git a/CreateZipUMUI.bat b/CreateZipUMUI.bat index 8104161..933e8e3 100644 --- a/CreateZipUMUI.bat +++ b/CreateZipUMUI.bat @@ -1,7 +1,7 @@ @echo off @echo Creating UltraModernUI zip archive - del /Q UltraModernUI_2.0b3.zip + del /Q UltraModernUI_2.0b4.zip rmdir /S /Q temp mkdir temp @@ -113,7 +113,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.0b3.zip * + "C:\Program Files\7-Zip\7z.exe" a -tzip -mx9 ..\UltraModernUI_2.0b4.zip * cd .. rmdir /S /Q temp diff --git a/Docs/InstallOptionsEx/License.txt b/Docs/InstallOptionsEx/License.txt index 2ab8864..a3cb22f 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-2017 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-2018 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 650c2be..070d05e 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-2017 SuperPat +IOEx DLL (starting at v.2.4.5) Copyright © 2006-2018 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 7d66998..6b69b5d 100644 --- a/Docs/SkinnedControls/Readme.html +++ b/Docs/SkinnedControls/Readme.html @@ -366,7 +366,7 @@

License

[+] License Terms

- 
Copyright © 2005-2017 SuperPat
+ 
Copyright © 2005-2018 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.
@@ -394,7 +394,7 @@ 
[+]
 
-    
© 2005-2017 SuperPat

+    
© 2005-2018 SuperPat
diff --git a/Docs/SkinnedControls/license.txt b/Docs/SkinnedControls/license.txt index 2905fdb..d323c80 100644 --- a/Docs/SkinnedControls/license.txt +++ b/Docs/SkinnedControls/license.txt @@ -1,4 +1,4 @@ -Copyright © 2005-2017 SuperPat +Copyright � 2005-2018 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. diff --git a/Docs/UltraModernUI/License.txt b/Docs/UltraModernUI/License.txt index 3511f44..f310b4a 100644 --- a/Docs/UltraModernUI/License.txt +++ b/Docs/UltraModernUI/License.txt @@ -1,4 +1,4 @@ -Copyright © 2005-2017 SuperPat +Copyright � 2005-2018 SuperPat UltraModernUI is based on the ModernUI of Joost Verburg and inspired of the ExperienceUI of dandaman32 diff --git a/Docs/UltraModernUI/ReadMe.rtf b/Docs/UltraModernUI/ReadMe.rtf index 79b66f1..e0a2028 100644 --- a/Docs/UltraModernUI/ReadMe.rtf +++ b/Docs/UltraModernUI/ReadMe.rtf @@ -110,8 +110,8 @@ ttp://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\ma the tool that allows programmers to create such installers for Windows. UltraModernUI 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, AdditionnalTasks, Info\hich\af0\dbch\af31505\loch\f0 -rmation, Maintenance, Update, StupType, Serial Number...). +\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 \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. diff --git a/Docs/UltraModernUI/ReadMe.txt b/Docs/UltraModernUI/ReadMe.txt index 5a616b6..f5ca35c 100644 --- a/Docs/UltraModernUI/ReadMe.txt +++ b/Docs/UltraModernUI/ReadMe.txt @@ -5,7 +5,7 @@ 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 also features new pages (Confirm, Abort, AlternativeStartMenu, AdditionnalTasks, Information, Maintenance, Update, StupType, Serial Number...). +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. diff --git a/Docs/UltraModernUI/Readme.html b/Docs/UltraModernUI/Readme.html index 85b1654..9e90c75 100644 --- a/Docs/UltraModernUI/Readme.html +++ b/Docs/UltraModernUI/Readme.html @@ -30,8 +30,8 @@

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 also features new pages (Confirm, Abort, AlternativeStartMenu, AdditionalTasks, Information, Maintenance, Update, StupType...). 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 thith a little more options.

+

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.

@@ -2642,7 +2642,7 @@

Example Scripts

Version History