diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt index 5e21ed20..28801268 100644 --- a/Contrib/Modern UI/Changelog.txt +++ b/Contrib/Modern UI/Changelog.txt @@ -1,15 +1,21 @@ NSIS Modern User Interface - VERSION HISTORY -1.62 - December 17, 2002 -* No problems anymore when using both 'Run program' and 'Show Readme' on the finish page +1.62 - December 20, 2002 +* 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 -* Support for multilingual branding texts * More ReserveFile macro's * Background color can be changed with a define -* Interface settings should be defined before inserting the langauge files - +* 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 + 1.61 - December 5, 2002 * Final version for NSIS 2 beta 0 * modern3.exe UI without description area @@ -27,13 +33,17 @@ 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 language + files * 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 macro's 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 +* Install Options macro's 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 macro's and defines * Some small fixes @@ -51,13 +61,16 @@ 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 macro's for install/uninstall -* Interface settings can be definend (for example, MUI_ICON), no parameters for MUI_INTERFACE anymore +* Different NextPage/PrevPage/FinishHeader macro's for + install/uninstall +* Interface settings can be definend (for example, MUI_ICON), no + parameters for MUI_INTERFACE anymore * New Install Options macro's to read/write IO INI file value 1.21 - September 30, 2002 * Temp vars set in Modern UI header -* Currentpage & Install Options vars should be set using parameters of the MUI_INTERFACE and * MUI_INSTALLOPTIONS macro's +* Currentpage & Install Options vars should be set using + parameters of the MUI_INTERFACE and * MUI_INSTALLOPTIONS macro's * MultiLanguage.nsi uses the new language strings 1.2 - September 22, 2002 @@ -65,7 +78,9 @@ NSIS Modern User Interface - VERSION HISTORY * InstallOptions support in macro system * Added Modern UI + InstallOptions example (InstallOptions.nsi) * MUI_NEXTPAGE_OUTER integrated in MUI_NEXTPAGE -* No hard-coded function names anymore (you should give MUI_PREVPAGE a parameter with the set page function name (for example, MUI_PREVPAGE SetPage) +* No hard-coded function names anymore (you should give + MUI_PREVPAGE a parameter with the set page function name + (for example, MUI_PREVPAGE SetPage) * Examples use ReserveFile for faster startup 1.19 - Semtember 19, 2002 @@ -79,10 +94,12 @@ NSIS Modern User Interface - VERSION HISTORY * Win9x font weight bug fixed (font of title in white rect) 1.16 - Semtember 6, 2002 -* Change text 'Scroll down' on license page to 'Press Page Down', because the RichEdit control has focus by default now +* Change text 'Scroll down' on license page to 'Press Page Down', + 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) @@ -98,8 +115,10 @@ 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 @@ -108,7 +127,8 @@ 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/Readme.html b/Contrib/Modern UI/Readme.html index a140936f..5d347489 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -241,11 +241,13 @@ follow these steps:

Bitmap for the Welcome and Finish page.

MUI_BGCOLOR (0xFFFFFF)
Background color for the header, Welcome page and Finish page, hexadecimal. (0xBBGGRR)

-

5. Insert custom pages (optional)

+

6. Insert the MUI_SYSTEM macro

+ 
!insertmacro MUI_SYSTEM
+

7. Insert custom pages (optional)

If you want to use custom pages (define MUI_CUSTOMPAGECOMMANDS - or MUI_UNCUSTOMPAGECOMMANDS!), you should insert them now.

+ or MUI_UNCUSTOMPAGECOMMANDS!), insert them before inserting the language files.

More info...

-

6. Insert language files

+

7. Insert language files

Insert the Modern UI language files for the languages you are using:

!insertmacro MUI_LANGUAGE "English"

The Modern UI language files load the NLF language files, @@ -263,8 +265,6 @@ follow these steps:

pages and the language file does not contain these strings, you should always define them.
Please help to translate the new strings and post them at the NSIS Forum.

-

7. Insert the MUI_SYSTEM macro

- 
!insertmacro MUI_SYSTEM

8. Insert the MUI_SECTIONS_FINISHHEADER macro

If you are not using a Finish page without defining MUI_FINISHPAGE_NOAUTOCLOSEWINDOW and have not set AutoCloseWindow @@ -441,18 +441,22 @@ FunctionEnd

Version history

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index cb95078f..f6848aa0 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -7,7 +7,9 @@ ;-------------------------------- -!verbose 3 +!ifndef MUI_MANUALVERBOSE + !verbose 3 +!endif !ifndef MUI_MACROS_USED @@ -22,7 +24,9 @@ !macro MUI_INTERFACE !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ;User interface @@ -112,7 +116,9 @@ InstProgressFlags ${MUI_PROGRESSBAR} !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -120,7 +126,9 @@ !macro MUI_INNERDIALOG_TEXT CONTROL TEXT !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ;Set text on inner dialogs component @@ -133,7 +141,9 @@ Pop ${MUI_TEMP1} !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -141,7 +151,9 @@ !macro MUI_HEADER_TEXT TEXT SUBTEXT !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ;Set text on the white rectangle @@ -155,7 +167,9 @@ Pop ${MUI_TEMP1} !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -163,7 +177,9 @@ !macro MUI_DESCRIPTION_BEGIN !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Push ${MUI_TEMP1} @@ -172,7 +188,9 @@ GetDlgItem ${MUI_TEMP1} ${MUI_TEMP1} 1043 !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -180,7 +198,9 @@ !macro MUI_DESCRIPTION_TEXT VAR TEXT !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ;Set text on the Description frame @@ -190,7 +210,9 @@ Goto done !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -198,14 +220,18 @@ !macro MUI_DESCRIPTION_END !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif done: Pop ${MUI_TEMP1} !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -213,37 +239,47 @@ !macro MUI_FINISHHEADER !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ;Finish text on the header (white rectangle) !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_FINISH_TITLE) $(MUI_TEXT_FINISH_SUBTITLE) !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend !macro MUI_UNFINISHHEADER - !ifndef MUI_NOVERBOSE + !ifndef MUI_MANUALVERBOSE !verbose 3 - !define MUI_NOVERBOSE !endif - + + !define MUI_NOVERBOSE + ;Finish text on the header (white rectangle) - !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_FINISHED_TITLE) $(MUI_UNTEXT_FINISHED_SUBTITLE) + !insertmacro MUI_HEADER_TEXT $(un.MUI_UNTEXT_FINISHED_TITLE) $(un.MUI_UNTEXT_FINISHED_SUBTITLE) !undef MUI_NOVERBOSE - !verbose 4 + + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !macroend !macro MUI_ABORTWARNING !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ;Warning when Cancel button is pressed @@ -253,7 +289,9 @@ quit: !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -261,7 +299,9 @@ !macro MUI_GUIINIT !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifdef MUI_WELCOMEPAGE @@ -295,7 +335,9 @@ Pop ${MUI_TEMP1} !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -303,7 +345,9 @@ !macro MUI_UNGUIINIT !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Push ${MUI_TEMP1} @@ -327,7 +371,9 @@ Pop ${MUI_TEMP1} !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -351,22 +397,30 @@ !macro MUI_LANGUAGE LANGUAGE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !include "${NSISDIR}\Contrib\Modern UI\Language files\${LANGUAGE}.nsh" - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !macroend !macro MUI_LANGDLL_PUSH LANGUAGE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif Push "${LANG_${LANGUAGE}}" Push "${MUI_${LANGUAGE}_LANGNAME}" - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !macroend @@ -401,7 +455,9 @@ !macro MUI_PAGECOMMANDS !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifndef MUI_CUSTOMPAGECOMMANDS @@ -417,7 +473,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -425,7 +483,9 @@ !macro MUI_PAGECOMMAND_WELCOME !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifdef MUI_WELCOMEPAGE @@ -433,7 +493,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -441,7 +503,9 @@ !macro MUI_PAGECOMMAND_LICENSE !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifdef MUI_LICENSEPAGE @@ -449,7 +513,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -457,7 +523,9 @@ !macro MUI_PAGECOMMAND_COMPONENTS !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifdef MUI_COMPONENTSPAGE @@ -465,7 +533,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -473,7 +543,9 @@ !macro MUI_PAGECOMMAND_DIRECTORY !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifdef MUI_DIRECTORYPAGE @@ -481,7 +553,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -489,7 +563,9 @@ !macro MUI_PAGECOMMAND_STARTMENU !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifdef MUI_STARTMENUPAGE @@ -497,7 +573,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -505,13 +583,17 @@ !macro MUI_PAGECOMMAND_INSTFILES !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Page instfiles SetInstFiles !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -519,7 +601,9 @@ !macro MUI_PAGECOMMAND_FINISH !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifdef MUI_FINISHPAGE @@ -527,7 +611,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -535,7 +621,9 @@ !macro MUI_UNPAGECOMMANDS !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifndef MUI_UNCUSTOMPAGECOMMANDS @@ -544,7 +632,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -552,7 +642,9 @@ !macro MUI_UNPAGECOMMAND_CONFIRM !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifdef MUI_UNCONFIRMPAGE @@ -560,7 +652,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -568,13 +662,17 @@ !macro MUI_UNPAGECOMMAND_INSTFILES !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif UninstPage instfiles un.SetInstFiles !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -585,7 +683,9 @@ !macro MUI_INSTALLOPTIONS_EXTRACT FILE !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ;Init plugin system @@ -594,7 +694,9 @@ File "/oname=$PLUGINSDIR\${FILE}" "${FILE}" !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -602,7 +704,9 @@ !macro MUI_INSTALLOPTIONS_EXTRACT_CUSTOMNAME FILE FILENAME !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ;Init plugin system @@ -611,7 +715,9 @@ File "/oname=$PLUGINSDIR\${FILENAME}" "${FILE}" !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -619,7 +725,9 @@ !macro MUI_INSTALLOPTIONS_DISPLAY FILE !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Push ${MUI_TEMP1} @@ -630,7 +738,9 @@ Pop ${MUI_TEMP1} !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -638,13 +748,17 @@ !macro MUI_INSTALLOPTIONS_INITDIALOG FILE !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif InstallOptions::initDialog /NOUNLOAD "$PLUGINSDIR\${FILE}" !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -652,13 +766,17 @@ !macro MUI_INSTALLOPTIONS_SHOW !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif InstallOptions::show !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -666,13 +784,17 @@ !macro MUI_INSTALLOPTIONS_READ VAR FILE SECTION KEY !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ReadIniStr ${VAR} "$PLUGINSDIR\${FILE}" "${SECTION}" "${KEY}" !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -680,13 +802,17 @@ !macro MUI_INSTALLOPTIONS_WRITE FILE SECTION KEY VALUE !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif WriteIniStr "$PLUGINSDIR\${FILE}" "${SECTION}" "${KEY}" "${VALUE}" !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -696,10 +822,11 @@ !macro MUI_SECTIONS_FINISHHEADER - !ifndef MUI_NOVERBOSE + !ifndef MUI_MANUALVERBOSE !verbose 3 - !define MUI_NOVERBOSE !endif + + !define MUI_NOVERBOSE Section "" @@ -709,7 +836,10 @@ SectionEnd !undef MUI_NOVERBOSE - !verbose 4 + + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !macroend @@ -719,7 +849,9 @@ !macro MUI_FUNCTIONS_GUIINIT !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifndef MUI_CUSTOMGUIINIT @@ -731,7 +863,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -739,7 +873,9 @@ !macro MUI_FUNCTIONS_PAGES !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifdef MUI_WELCOMEPAGE @@ -769,7 +905,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -777,7 +915,9 @@ !macro MUI_FUNCTIONS_WELCOMEPAGE SETWELCOME !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Function "${SETWELCOME}" @@ -827,7 +967,9 @@ FunctionEnd !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -835,7 +977,9 @@ !macro MUI_FUNCTIONS_LICENSEPAGE SETLICENSE SETLICENSEDIALOG !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Function "${SETLICENSE}" @@ -847,7 +991,9 @@ FunctionEnd !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -855,7 +1001,9 @@ !macro MUI_FUNCTIONS_COMPONENTSPAGE SETCOMPONENTS SETCOMPONENTSDIALOG !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Function "${SETCOMPONENTS}" @@ -868,7 +1016,9 @@ FunctionEnd !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -876,7 +1026,9 @@ !macro MUI_FUNCTIONS_DIRECTORYPAGE SETDIRECTORY SETDIRECTORYDIALOG !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Function "${SETDIRECTORY}" @@ -888,7 +1040,9 @@ FunctionEnd !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -896,7 +1050,9 @@ !macro MUI_FUNCTIONS_STARTMENUPAGE SETSTARTMENU !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ;Check defines @@ -917,7 +1073,9 @@ FunctionEnd !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -925,7 +1083,9 @@ !macro MUI_FUNCTIONS_INSTFILESPAGE SETINSTFILES !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Function "${SETINSTFILES}" @@ -933,7 +1093,9 @@ FunctionEnd !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -941,7 +1103,9 @@ !macro MUI_FUNCTIONS_FINISHPAGE SETFINISH !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Function "${SETFINISH}" @@ -1169,45 +1333,53 @@ FunctionEnd !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend !macro MUI_FUNCTIONS_DESCRIPTION_BEGIN - !ifndef MUI_NOVERBOSE + !ifndef MUI_MANUALVERBOSE !verbose 3 - !define MUI_NOVERBOSE !endif + + !define MUI_NOVERBOSE Function .onMouseOverSection !insertmacro MUI_DESCRIPTION_BEGIN !undef MUI_NOVERBOSE - !verbose 4 + + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !macroend !macro MUI_FUNCTIONS_DESCRIPTION_END - !ifndef MUI_NOVERBOSE + !ifndef MUI_MANUALVERBOSE !verbose 3 - !define MUI_NOVERBOSE !endif !insertmacro MUI_DESCRIPTION_END FunctionEnd - !undef MUI_NOVERBOSE - !verbose 4 - + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif + !macroend !macro MUI_FUNCTIONS_ABORTWARNING !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifdef MUI_ABORTWARNING @@ -1217,7 +1389,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -1225,7 +1399,9 @@ !macro MUI_UNFUNCTIONS_GUIINIT !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifndef MUI_UNCUSTOMGUIINIT @@ -1237,7 +1413,9 @@ !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -1255,15 +1433,19 @@ !macro MUI_UNFUNCTIONS_CONFIRMPAGE UNSETUNINSTCONFIRM !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Function "${UNSETUNINSTCONFIRM}" - !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_INTRO_TITLE) $(MUI_UNTEXT_INTRO_SUBTITLE) + !insertmacro MUI_HEADER_TEXT $(un.MUI_UNTEXT_INTRO_TITLE) $(un.MUI_UNTEXT_INTRO_SUBTITLE) FunctionEnd !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -1271,15 +1453,19 @@ !macro MUI_UNFUNCTIONS_INSTFILESPAGE UNSETINSTFILES !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif Function ${UNSETINSTFILES} - !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_UNINSTALLING_TITLE) $(MUI_UNTEXT_UNINSTALLING_SUBTITLE) + !insertmacro MUI_HEADER_TEXT $(un.MUI_UNTEXT_UNINSTALLING_TITLE) $(un.MUI_UNTEXT_UNINSTALLING_SUBTITLE) FunctionEnd !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -1306,13 +1492,17 @@ !macro MUI_RESERVEFILE_INSTALLOPTIONS !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -1320,13 +1510,17 @@ !macro MUI_RESERVEFILE_SPECIALINI !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ReserveFile "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -1334,13 +1528,17 @@ !macro MUI_RESERVEFILE_SPECIALBITMAP !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif ReserveFile "${NSISDIR}\Contrib\Icons\modern-wizard.bmp" !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -1360,35 +1558,41 @@ !macro MUI_SYSTEM - !verbose 3 - - !define MUI_NOVERBOSE - - !ifndef MUI_LANGUAGEFILE_INSERTED - !error "No Modern UI language file inserted!" + !ifndef MUI_MANUALVERBOSE + !verbose 3 !endif + !define MUI_NOVERBOSE + + !insertmacro MUI_INTERFACE !insertmacro MUI_BASIC !insertmacro MUI_UNBASIC !undef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !macroend !macro MUI_BASIC !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif + !insertmacro MUI_PAGECOMMANDS !insertmacro MUI_FUNCTIONS_PAGES !insertmacro MUI_FUNCTIONS_GUIINIT !insertmacro MUI_FUNCTIONS_ABORTWARNING !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -1396,18 +1600,23 @@ !macro MUI_UNBASIC !ifndef MUI_NOVERBOSE - !verbose 3 + !ifndef MUI_MANUALVERBOSE + !verbose 3 + !endif !endif !ifdef MUI_UNINSTALLER + !insertmacro MUI_UNPAGECOMMANDS !insertmacro MUI_UNFUNCTIONS_PAGES !insertmacro MUI_UNFUNCTIONS_GUIINIT !endif !ifndef MUI_NOVERBOSE - !verbose 4 + !ifndef MUI_MANUALVERBOSE + !verbose 4 + !endif !endif !macroend @@ -1559,24 +1768,6 @@ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_WINDOWTITLE" !endif - !ifndef MUI_LANGUAGEFILE_INSERTED - - !define MUI_LANGUAGEFILE_INSERTED - - !define MUI_NOVERBOSE - - !insertmacro MUI_INTERFACE - - !insertmacro MUI_PAGECOMMANDS - - !ifdef MUI_UNINSTALLER - !insertmacro MUI_UNPAGECOMMANDS - !endif - - !undef MUI_NOVERBOSE - - !endif - !insertmacro MUI_LANGUAGEFILE_DEFINE "MUI_${LANGUAGE}_LANGNAME" "MUI_LANGNAME" !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "Name" "MUI_NAME" @@ -1685,4 +1876,6 @@ !endif -!verbose 4 \ No newline at end of file +!ifndef MUI_MANUALVERBOSE + !verbose 4 +!endif \ No newline at end of file