From a8797416b8215396cf12fa6d00885409637e4dab Mon Sep 17 00:00:00 2001 From: joostverburg Date: Fri, 6 Dec 2002 21:56:28 +0000 Subject: [PATCH] added define for uninstall confirm page, continue texts for uninstaller, bugfixes git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1917 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/Changelog.txt | 3 +- Contrib/Modern UI/Language files/Danish.nsh | 89 ++++++++++---------- Contrib/Modern UI/Language files/Dutch.nsh | 2 + Contrib/Modern UI/Language files/English.nsh | 4 +- Contrib/Modern UI/Readme.html | 5 +- Contrib/Modern UI/System.nsh | 72 +++++++++++++--- Examples/Modern UI/Basic.nsi | 3 + Examples/Modern UI/InstallOptions.nsi | 5 +- Examples/Modern UI/MultiLanguage.nsi | 3 + Examples/Modern UI/StartMenu.nsi | 10 ++- Examples/Modern UI/WelcomeFinish.nsi | 9 +- 11 files changed, 136 insertions(+), 69 deletions(-) diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt index 61d946eb..f8e7e49b 100644 --- a/Contrib/Modern UI/Changelog.txt +++ b/Contrib/Modern UI/Changelog.txt @@ -3,7 +3,8 @@ NSIS Modern User Interface - VERSION HISTORY 1.61 - December 5, 2002 * Final version for NSIS 2 beta 0 * modern3.exe UI without description area -* Different translation for finish page title +* Added define to show uninstall confirm page +* Added language string for finish page title and continue to uninstall * Define for parameters for the application to run on the finishpage * Bugfixes diff --git a/Contrib/Modern UI/Language files/Danish.nsh b/Contrib/Modern UI/Language files/Danish.nsh index d6608d72..026bf3ed 100644 --- a/Contrib/Modern UI/Language files/Danish.nsh +++ b/Contrib/Modern UI/Language files/Danish.nsh @@ -1,71 +1,70 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 -;Language: English (1030) -;By Christopher www.terrorscript.dynu.com &Musicmp3box@hotmail.com +;Language: Danish (1030) +;By Casper Bergenstoff ;-------------------------------- -!insertmacro MUI_LANGUAGEFILE_BEGIN "dansk" +!insertmacro MUI_LANGUAGEFILE_BEGIN "Danish" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "dansk" ;navnet af selve sproget i sig selv + !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Dansk" ;Name of the language in the language itself !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "tryk på Næste for at forsætte" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "tryk på installer for at starte installationen" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Tryk næste for at fortsætte." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Klik installer for at installere." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "velkommen til ${MUI_PRODUCT} installations guide" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "dette vil installer ${MUI_PRODUCT} på din computer.\r\n\r\nIt det anbefales at du lukker alle andre programmer før du starter installationen. dette vil sørge for at installationen til at opdater visse filer uden at genstarte din pc.\r\n\r\n" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Velkommen til ${MUI_PRODUCT} setup guide" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Dette vil installere ${MUI_PRODUCT} på din computer.\r\n\r\ndet foretrækkes at du lukker alle kørende programmer inden start af guiden . Dette vil tillade guiden at opdatere bestemte systemfiler uden genstart af dit system.\r\n\r\n" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licens aftale" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "vær venlig at kigge på lisens aftalen før de fortsætter ${MUI_PRODUCT}." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "tryk Page Down for at se resten af lisens aftalen." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "hvis du accepterer alt under aftalen, vælg jeg accepter. du skal acceptere lisens aftalen for at installer ${MUI_PRODUCT}." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licens Aftale" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Læs venligst licens reglerne før du installerer ${MUI_PRODUCT}." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Tryk Page Down for at se resten af reglerne." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "hvis du accepterer alle reglerne, klik Jeg accepterer for at komme videre. Du skal acceptere reglerne for at komme videre ${MUI_PRODUCT}." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "vælg programmer" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "vælg hvad du vil installer af ${MUI_PRODUCT}." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_TOP "vælg de kompunenter du vil installer og fjern de kompunenter du ikke vil installer." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "beskrivelse" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "kør musen over et kompunent for at se dens beskrivelse." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Vælg komponenter" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Vælg hvilke features af ${MUI_PRODUCT} du vil installere." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_TOP "Sæt hak i de komponenter du vil installere og fjern hakket i dem du ikke vil installere." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beskrivelse" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Flyt musemarkøren over et komponent for at se beskrivelsen på dette." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "vælg hvor du vil have det installeret" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "vælg hvor du vil have det installeret ${MUI_PRODUCT}." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "installationen vil installer ${MUI_PRODUCT} i følgende mappe.$\r$\n$\r$\n for at installer det i en anden mappe, tryk på gennemse og vælg en anden mappe." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Destinations mappen" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Vælg installerings placering" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Vælg hvilken mappe du vil installere i ${MUI_PRODUCT}." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Setup-guiden vil installere ${MUI_PRODUCT} i følgende mappe.$\r$\n$\r$\nÆndre til anden placering , klik gennemse og vælg en anden mappe." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Placerings mappe" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "installer nu" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "vent venlist mens ${MUI_PRODUCT} bliver installeret." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Installerer" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Vent venligst mens ${MUI_PRODUCT} bliver installeret." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_TITLE "installationen fuldført" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "installationen blev fuldført." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": alslut" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&færdig" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TITLE "fuldf?rer ${MUI_PRODUCT} installations guide" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} er blevet installeret på din pc.\r\ntryk alslut for at lukke guiden." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "din pc skal genstartes for at fuldføre installationen af ${MUI_PRODUCT}. vil du genstarte nu?" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "genstart nu" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "nej jeg vil genstarte senere" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_RUN "kør ${MUI_PRODUCT}" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SHOWREADME "vis readme" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_TITLE "Installation gennemført" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "Setup-guiden blev afsluttet med success." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Færdig" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&Færdig" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} er blevet installeret på din computer.\r\n\r\nKlik færdig for at lukke denne guide." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "Dit system skal genstartes før installeringen af ${MUI_PRODUCT} er færdig. Vil du genstarte nu?" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Genstart" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "Jeg genstarter selv på andet tidspunkt" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_RUN "Kør ${MUI_PRODUCT}" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SHOWREADME "Vis læsmig" !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_STARTMENU_WINDOWTITLE ": Start Menu mappe" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_STARTMENU_TITLE "vælg Start Menu mappe" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_STARTMENU_SUBTITLE "vælg en start menu mappe til programmet genveje." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_STARTMENU_TOP "vælg en start menu mappe til programmet genveje. du kan også skrive et navn for at lave en ny pappe." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_STARTMENU_CHECKBOX "lav ikke genveje" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_STARTMENU_TITLE "Vælg Start Menu mappe" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_STARTMENU_SUBTITLE "Vælg en Start Menu mappe til programmet's genveje." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_STARTMENU_TOP "Vælg Start Menu mappe hvor du vil lave programmets genveje. Du kan også skrive et navn til en ny mappe." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_STARTMENU_CHECKBOX "Lav ikke genveje" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "er du sikker på at du vil afstulle ${MUI_PRODUCT} installationen?" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Er du sikker på at du vil lukke ${MUI_PRODUCT} Setup-guide?" !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "afinstaller ${MUI_PRODUCT}" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "fjerne ${MUI_PRODUCT} fra din pc." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "dette vil fjerne ${MUI_PRODUCT} fra dit pc." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Fjern ${MUI_PRODUCT} fra dit system." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Dette vil afinstallere ${MUI_PRODUCT} fra dit system." !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "afinstallerer" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "vent venlist mens ${MUI_PRODUCT} bliver fjernet." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Vent venligst imens ${MUI_PRODUCT} bliver fjernet fra dit system." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "færdigt" - !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "fjernelsen var fuldført." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Færdig" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "Afinstalleringen blev afsluttet med success." !insertmacro MUI_LANGUAGEFILE_END \ No newline at end of file diff --git a/Contrib/Modern UI/Language files/Dutch.nsh b/Contrib/Modern UI/Language files/Dutch.nsh index 31061e8b..b7d83235 100644 --- a/Contrib/Modern UI/Language files/Dutch.nsh +++ b/Contrib/Modern UI/Language files/Dutch.nsh @@ -57,6 +57,8 @@ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Weet u zeker dat u ${MUI_PRODUCT} Setup wilt afsluiten?" + + !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Klik op Deïnstalleer om de deïnstallatie te starten." !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Deïnstalleer ${MUI_PRODUCT}" !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Verwijder ${MUI_PRODUCT} van uw system." diff --git a/Contrib/Modern UI/Language files/English.nsh b/Contrib/Modern UI/Language files/English.nsh index b90ac493..da5a03d7 100644 --- a/Contrib/Modern UI/Language files/English.nsh +++ b/Contrib/Modern UI/Language files/English.nsh @@ -58,9 +58,11 @@ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Are you sure you want to quit ${MUI_PRODUCT} Setup?" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Click Uninstall to start the uninstallation." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Uninstall ${MUI_PRODUCT}" !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Remove ${MUI_PRODUCT} from your computer." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "This will uninstall ${MUI_PRODUCT} from your computer." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "This application will uninstall ${MUI_PRODUCT} from your computer." !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Uninstalling" !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Please wait while ${MUI_PRODUCT} is being uninstalled." diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index 140d2fbf..7551d10d 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -199,6 +199,8 @@ add the following things (in order, from the beginning of the script):

MUI_UNINSTALLER
Define if you are using an uninstaller.

+

MUI_UNCONFIRMPAGE
+ Show the uninstall confirm page.

MUI_UNCUSTOMPAGECOMMANDS
Don't insert UninstPage commands. Use this if you are using custom UninstPage commands to add your own pages.

@@ -382,7 +384,8 @@ FunctionEnd diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index bc8ffae4..f4b2ae12 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -560,7 +560,9 @@ !verbose 3 !endif - UninstPage uninstConfirm un.SetUninstConfirm + !ifdef MUI_UNCONFIRMPAGE + UninstPage uninstConfirm un.SetUninstConfirm "" "MUI_UNINSTALLBUTTON_CONFIRM" + !endif !ifndef MUI_NOVERBOSE !verbose 4 @@ -1260,7 +1262,10 @@ !macro MUI_UNFUNCTIONS_PAGES - !insertmacro MUI_UNFUNCTIONS_CONFIRMPAGE un.SetUninstConfirm + !ifdef MUI_UNCONFIRMPAGE + !insertmacro MUI_UNFUNCTIONS_CONFIRMPAGE un.SetUninstConfirm + !endif + !insertmacro MUI_UNFUNCTIONS_INSTFILESPAGE un.SetInstFiles !macroend @@ -1336,13 +1341,19 @@ !macro MUI_SYSTEM !verbose 3 + !define MUI_NOVERBOSE + !ifndef MUI_LANGUAGEFILE_INSERTED + !error "No Modern UI language file inserted!" + !endif + !insertmacro MUI_INTERFACE !insertmacro MUI_BASIC !insertmacro MUI_UNBASIC !undef MUI_NOVERBOSE + !verbose 4 !macroend @@ -1353,7 +1364,6 @@ !verbose 3 !endif - !insertmacro MUI_PAGECOMMANDS !insertmacro MUI_FUNCTIONS_PAGES !insertmacro MUI_FUNCTIONS_GUIINIT !insertmacro MUI_FUNCTIONS_ABORTWARNING @@ -1372,7 +1382,6 @@ !ifdef MUI_UNINSTALLER - !insertmacro MUI_UNPAGECOMMANDS !insertmacro MUI_UNFUNCTIONS_PAGES !insertmacro MUI_UNFUNCTIONS_GUIINIT @@ -1397,7 +1406,7 @@ !else - !error "${LANGUAGE} included twice!" + !error "Modern UI language file ${LANGUAGE} included twice!" !endif @@ -1428,9 +1437,7 @@ LangString "${NAME}" 0 "${${NAME}}" !endif - !endif - - !ifndef "${INSTALLBUTTON}" + !else !ifdef MUI_TEXT_CONTINUE_INSTALL LangString "${NAME}" 0 "${${NAME}}${MUI_TEXT_CONTINUE_INSTALL}" @@ -1475,9 +1482,7 @@ "${COMMAND}" "${${NAME}}" !endif - !endif - - !ifdef "${INSTALLBUTTON}" + !else !ifdef MUI_TEXT_CONTINUE_INSTALL "${COMMAND}" "${${NAME}} ${MUI_TEXT_CONTINUE_INSTALL}" @@ -1491,6 +1496,31 @@ !macroend +!macro MUI_LANGUAGEFILE_UNNSISCOMMAND_CONTINUE COMMAND NAME INSTALLBUTTON + + !ifndef "${INSTALLBUTTON}" + + !ifdef MUI_TEXT_CONTINUE_NEXT + "${COMMAND}" "${${NAME}} ${MUI_TEXT_CONTINUE_NEXT}" + !else + "${COMMAND}" "${${NAME}}" + !endif + + !else + + !ifdef MUI_UNTEXT_CONTINUE_UNINSTALL + "${COMMAND}" "${${NAME}} ${MUI_UNTEXT_CONTINUE_UNINSTALL}" + !else + "${COMMAND}" "${${NAME}}" + !endif + + !endif + + !undef "${NAME}" + +!macroend + + !macro MUI_LANGUAGEFILE_DEFINE DEFINE NAME !ifndef "${DEFINE}" @@ -1501,7 +1531,19 @@ !macroend !macro MUI_LANGUAGEFILE_END + + !ifndef MUI_LANGUAGEFILE_INSERTED + + !define MUI_LANGUAGEFILE_INSERTED + !insertmacro MUI_PAGECOMMANDS + + !ifdef MUI_UNINSTALLER + !insertmacro MUI_UNPAGECOMMANDS + !endif + + !endif + !insertmacro MUI_LANGUAGEFILE_DEFINE "MUI_${LANGUAGE}_LANGNAME" "MUI_LANGNAME" !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND Name MUI_NAME @@ -1577,7 +1619,9 @@ !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_INTRO_TITLE" !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_INTRO_SUBTITLE" - !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "UninstallText" "MUI_UNINNERTEXT_INTRO" + !ifdef MUI_UNCONFIRMPAGE + !insertmacro MUI_LANGUAGEFILE_UNNSISCOMMAND_CONTINUE "UninstallText" "MUI_UNINNERTEXT_INTRO" "MUI_UNINSTALLBUTTON_CONFIRM" + !endif !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_UNINSTALLING_TITLE" !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_UNINSTALLING_SUBTITLE" @@ -1594,6 +1638,10 @@ !undef MUI_TEXT_CONTINUE_INSTALL !endif + !ifdef MUI_UNTEXT_CONTINUE_UNINSTALL + !undef MUI_UNTEXT_CONTINUE_UNINSTALL + !endif + !macroend ;-------------------------------- diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi index c6708b53..339546fb 100644 --- a/Examples/Modern UI/Basic.nsi +++ b/Examples/Modern UI/Basic.nsi @@ -13,8 +13,11 @@ !define MUI_LICENSEPAGE !define MUI_COMPONENTSPAGE !define MUI_DIRECTORYPAGE + !define MUI_ABORTWARNING + !define MUI_UNINSTALLER + !define MUI_UNCONFIRMPAGE ;Language !insertmacro MUI_LANGUAGE "English" diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi index 1c480006..b3fb6189 100644 --- a/Examples/Modern UI/InstallOptions.nsi +++ b/Examples/Modern UI/InstallOptions.nsi @@ -15,9 +15,10 @@ !define MUI_DIRECTORYPAGE !define MUI_ABORTWARNING - !define MUI_UNINSTALLER - !define MUI_CUSTOMPAGECOMMANDS + + !define MUI_UNINSTALLER + !define MUI_UNCONFIRMPAGE !define TEMP1 $R0 !define TEMP2 $R1 diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi index 5614efa9..331f64cb 100644 --- a/Examples/Modern UI/MultiLanguage.nsi +++ b/Examples/Modern UI/MultiLanguage.nsi @@ -13,8 +13,11 @@ !define MUI_LICENSEPAGE !define MUI_COMPONENTSPAGE !define MUI_DIRECTORYPAGE + !define MUI_ABORTWARNING + !define MUI_UNINSTALLER + !define MUI_UNCONFIRMPAGE ;Languages !insertmacro MUI_LANGUAGE "English" diff --git a/Examples/Modern UI/StartMenu.nsi b/Examples/Modern UI/StartMenu.nsi index c30da1bd..393161c6 100644 --- a/Examples/Modern UI/StartMenu.nsi +++ b/Examples/Modern UI/StartMenu.nsi @@ -8,7 +8,7 @@ !include "${NSISDIR}\Contrib\Modern UI\System.nsh" ;$9 is being used to store the Start Menu Folder. -;Do not use this variable in your script! +;Do not use this variable in your script (or Push/Pop it)! ;You can change this variable or the default Start Menu Folder by using ;these defines: @@ -21,11 +21,13 @@ !define MUI_LICENSEPAGE !define MUI_COMPONENTSPAGE !define MUI_DIRECTORYPAGE - !define MUI_ABORTWARNING - !define MUI_UNINSTALLER - !define MUI_STARTMENUPAGE + !define MUI_ABORTWARNING + + !define MUI_UNINSTALLER + !define MUI_UNCONFIRMPAGE + !define TEMP1 $R0 ;Language diff --git a/Examples/Modern UI/WelcomeFinish.nsi b/Examples/Modern UI/WelcomeFinish.nsi index a0c6354c..a8ad7436 100644 --- a/Examples/Modern UI/WelcomeFinish.nsi +++ b/Examples/Modern UI/WelcomeFinish.nsi @@ -11,14 +11,17 @@ ;Configuration !define MUI_WELCOMEPAGE - !define MUI_FINISHPAGE - !define MUI_FINISHPAGE_RUN "$INSTDIR\modern.exe" - !define MUI_LICENSEPAGE !define MUI_COMPONENTSPAGE !define MUI_DIRECTORYPAGE + + !define MUI_FINISHPAGE + !define MUI_FINISHPAGE_RUN "$INSTDIR\modern.exe" + !define MUI_ABORTWARNING + !define MUI_UNINSTALLER + !define MUI_UNCONFIRMPAGE ;Language !insertmacro MUI_LANGUAGE "English"