From c700365ee8e8dc726ad309a7317e8d09560741d2 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Fri, 1 Nov 2002 20:45:53 +0000 Subject: [PATCH] Modern UI 1.4 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1538 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/Changelog.txt | 6 + Contrib/Modern UI/Language files/Arabic.nsh | 40 +- Contrib/Modern UI/Language files/Dutch.nsh | 30 +- Contrib/Modern UI/Language files/English.nsh | 34 +- Contrib/Modern UI/Language files/French.nsh | 28 +- Contrib/Modern UI/Language files/German.nsh | 34 +- Contrib/Modern UI/Language files/Greek.nsh | 36 +- Contrib/Modern UI/Language files/Italian.nsh | 36 +- Contrib/Modern UI/Language files/Japanese.nsh | 75 ++ Contrib/Modern UI/Language files/Polish.nsh | 30 +- .../Modern UI/Language files/PortugueseBR.nsh | 36 +- Contrib/Modern UI/Language files/Russian.nsh | 30 +- .../Modern UI/Language files/SimpChinese.nsh | 44 +- Contrib/Modern UI/Language files/Spanish.nsh | 30 +- .../Modern UI/Language files/TradChinese.nsh | 40 +- .../Modern UI/Language files/Ukrainian.nsh | 32 +- Contrib/Modern UI/Readme.html | 36 +- Contrib/Modern UI/System.nsh | 647 +++--------------- Examples/Modern UI/Basic.nsi | 10 +- Examples/Modern UI/InstallOptions.nsi | 223 +++--- Examples/Modern UI/MultiLanguage.nsi | 20 +- Examples/Modern UI/ioA.ini | 2 +- Examples/Modern UI/ioB.ini | 2 +- Examples/Modern UI/ioC.ini | 2 +- 24 files changed, 466 insertions(+), 1037 deletions(-) create mode 100644 Contrib/Modern UI/Language files/Japanese.nsh diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt index deae7b35..cd1ca31b 100644 --- a/Contrib/Modern UI/Changelog.txt +++ b/Contrib/Modern UI/Changelog.txt @@ -1,5 +1,11 @@ NSIS Modern User Interface - VERSION HISTORY +1.4 - October 30, 2002 +* Uses new NSIS Page command +* Macro system way smaller +* Advanced Macro System a lot easier +* Renamed some defines + 1.3 - October 27, 2002 * Easier macro system for basic scripts * New MultiLanguage system using Modern UI Language Files diff --git a/Contrib/Modern UI/Language files/Arabic.nsh b/Contrib/Modern UI/Language files/Arabic.nsh index 42d9faf6..7bdecb5a 100644 --- a/Contrib/Modern UI/Language files/Arabic.nsh +++ b/Contrib/Modern UI/Language files/Arabic.nsh @@ -1,5 +1,5 @@ -;Modern UI -; - Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: Arabic (1025) ;By asdfuae@msn.com @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_ARABIC} " ա ${NAME}." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_ARABIC} " ɡ " LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_ARABIC} " " LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_ARABIC} " ${NAME}." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_ARABIC} " " !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_ARABIC} " ${NAME} $\r$\n$\r$\n . ѡ ." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_ARABIC} " " LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_ARABIC} " ${NAME}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_ARABIC} " " !endif - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_ARABIC} " >" - !endif - LangString MUI_TEXT_INSTALLING_TITLE ${LANG_ARABIC} "" LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ARABIC} " ${NAME}." @@ -48,16 +44,13 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_ARABIC} " " !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_ARABIC} " ${NAME}" - !endif - - !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_ARABIC} "< " - LangString MUI_BUTTONTEXT_NEXT ${LANG_ARABIC} " >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_ARABIC} "" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_ARABIC} "" + LangString MUI_TEXT_ABORTWARNING ${LANG_ARABIC} " ${NAME}" !endif + !ifdef MUI_INSTALLOPTIONS + LangString MUI_TEXT_SETUPCAPTION ${LANG_ARABIC} " ${NAME} ${VERSION}" + !endif + ;UNINSTALLER @@ -72,18 +65,11 @@ LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_ARABIC} "" LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_ARABIC} " " !endif - - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_ARABIC} "& >" - !endif - + !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_ARABIC} "< " - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_ARABIC} " >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_ARABIC} "" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_ARABIC} "&" - !endif - + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ARABIC} " ${NAME} ${VERSION}" + !endif + !endif !verbose 4 \ 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 24cc342e..0416a98a 100644 --- a/Contrib/Modern UI/Language files/Dutch.nsh +++ b/Contrib/Modern UI/Language files/Dutch.nsh @@ -1,5 +1,5 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: Dutch (1043) ;By Joost Verburg @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_DUTCH} "Als u de overeenkomt accepteert, kies Akkoord om verder te gaan. U moet met de overeenkomst acceptren om ${NAME} te installeren." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_DUTCH} "Selecteer de onderdelen die u wilt installleren en deselecteer de onderdelen die u niet wilt installeren. Klik Volgende om verder te gaan." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_DUTCH} "Kies Onderdelen" LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_DUTCH} "Kies de onderdelen die u wilt installeren." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_DUTCH} "Beweeg uw muis over een onderdeel om een beschrijving te zien." !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_DUTCH} "Setup zal ${NAME} in de volgende map installeren.$\r$\n$\r$\nOm in een deze map te intalleren, klik Installeren. Om in een andere map te installeren, klik Bladeren en selecteer een andere map." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_DUTCH} "Kies Installatie Locatie" LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_DUTCH} "Kies de map waarin u ${NAME} in wilt installeren." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_DUTCH} "Installatie Map" !endif - - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_DUTCH} "&Volgende >" - !endif - + LangString MUI_TEXT_INSTALLING_TITLE ${LANG_DUTCH} "Bezig met installeren" LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_DUTCH} "Een ogenblik geduld terwijl ${NAME} wordt geinstalleerd." @@ -48,14 +44,11 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_DUTCH} "De installatie is succesvol verlopen." !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_DUTCH} "Weet u zeker dat u ${NAME} Setup wilt afsluiten?" + LangString MUI_TEXT_ABORTWARNING ${LANG_DUTCH} "Weet u zeker dat u ${NAME} Setup wilt afsluiten?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_DUTCH} "< V&orige" - LangString MUI_BUTTONTEXT_NEXT ${LANG_DUTCH} "&Volgende >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_DUTCH} "Annuleren" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_DUTCH} "&Installeren" + LangString MUI_TEXT_SETUPCAPTION ${LANG_DUTCH} "${NAME} ${VERSION} Setup" !endif @@ -73,15 +66,8 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_DUTCH} "${NAME} is verwijderd van uw systeem." !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - UnInstallButtonText /LANG=${LANG_DUTCH} "&Volgende >" - !endif - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_DUTCH} "< V&orige" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_DUTCH} "&Volgende >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_DUTCH} "Annuleren" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_DUTCH} "&Verwijderen" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_DUTCH} "${NAME} ${VERSION} Setup" !endif !endif diff --git a/Contrib/Modern UI/Language files/English.nsh b/Contrib/Modern UI/Language files/English.nsh index c23988ef..a578391e 100644 --- a/Contrib/Modern UI/Language files/English.nsh +++ b/Contrib/Modern UI/Language files/English.nsh @@ -1,5 +1,5 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;version 2 - Compatible with Modern UI 1.4 ;Language: English (1033) ;By Joost Verburg @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_ENGLISH} "If you accept all the terms of the agreement, choose I Agree to continue. You must accept the agreement to install ${NAME}." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_ENGLISH} "Check the components you want to install and uncheck the components you don't want to install. Click Next to continue." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_ENGLISH} "Choose Components" LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_ENGLISH} "Choose which features of ${NAME} you want to install." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_ENGLISH} "Hover your mouse over a component to see it's description." !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_ENGLISH} "Setup will install ${NAME} in the following folder.$\r$\n$\r$\nTo install in this folder, click Install. To install in a different folder, click Browse and select another folder." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_ENGLISH} "Choose Install Location" LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_ENGLISH} "Choose the folder in which to install ${NAME}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_ENGLISH} "Destination Folder" !endif - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_ENGLISH} "&Next >" - !endif - LangString MUI_TEXT_INSTALLING_TITLE ${LANG_ENGLISH} "Installing" LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ENGLISH} "Please wait while ${NAME} is being installed." @@ -48,17 +44,14 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_ENGLISH} "Setup was completed successfully." !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_ENGLISH} "Are you sure you want to quit ${NAME} Setup?" + LangString MUI_TEXT_ABORTWARNING ${LANG_ENGLISH} "Are you sure you want to quit ${NAME} Setup?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_ENGLISH} "< &Back" - LangString MUI_BUTTONTEXT_NEXT ${LANG_ENGLISH} "&Next >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_ENGLISH} "Cancel" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_ENGLISH} "&Install" + LangString MUI_TEXT_SETUPCAPTION ${LANG_ENGLISH} "${NAME} ${VERSION} Setup" !endif - - + + ;UNINSTALLER !ifdef MUI_UNINSTALLER @@ -73,17 +66,10 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_ENGLISH} "Uninstall was completed successfully." !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_ENGLISH} "&Next >" + !ifdef MUI_UNINSTALLOPTIONS + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ENGLISH} "${NAME} ${VERSION} Setup" !endif - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_ENGLISH} "< &Back" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_ENGLISH} "&Next >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_ENGLISH} "Cancel" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_ENGLISH} "&Uninstall" - !endif - !endif !verbose 4 \ No newline at end of file diff --git a/Contrib/Modern UI/Language files/French.nsh b/Contrib/Modern UI/Language files/French.nsh index 4bbdb94d..20ef6e06 100644 --- a/Contrib/Modern UI/Language files/French.nsh +++ b/Contrib/Modern UI/Language files/French.nsh @@ -1,5 +1,5 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: French (1036) ;By Sbastien Delahaye @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_FRENCH} "Si vous acceptez tous les termes de la licence utilisateur, cliquez sur J'accepte pour continuer. Vous devez accepter la licence utilisateur pour installer ${NAME}." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_FRENCH} "Cochez les composants que vous souhaitez installer, et dcochez ceux que vous ne voulez pas installer. Cliquez sur Suivant pour continuer." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_FRENCH} "Choisissez les composants" LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_FRENCH} "Choisissez les composants que vous souhaitez installer." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_FRENCH} "Passer le curseur de votre souris sur un composant pour voir sa description." !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_FRENCH} "Le programme d'installation va maintenant installer ${NAME} dans le dossier suivant.$\r$\n$\r$\nPour l'installer dans ce dossier, cliquez sur Installer. Pour l'installer dans un autre dossier, cliquez sur Parcourir et choisissez un autre dossier." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_FRENCH} "Choisissez le dossier d'installation" LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_FRENCH} "Choisissez le dossier dans lequel installer ${NAME}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_FRENCH} "Dossier d'installation" !endif - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_FRENCH} "&Suivant >" - !endif - LangString MUI_TEXT_INSTALLING_TITLE ${LANG_FRENCH} "Installation en cours" LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_FRENCH} "Veuillez patienter pendant que ${NAME} est en train d'tre install sur votre ordinateur." @@ -48,14 +44,11 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_FRENCH} "L'installation s'est termine avec succs." !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_FRENCH} "tes-vous sr de vouloir quitter l'installation de ${NAME} ?" + LangString MUI_TEXT_ABORTWARNING ${LANG_FRENCH} "tes-vous sr de vouloir quitter l'installation de ${NAME} ?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_FRENCH} "< &Prcdent" - LangString MUI_BUTTONTEXT_NEXT ${LANG_FRENCH} "&Suivant >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_FRENCH} "Annuler" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_FRENCH} "&Installer" + LangString MUI_TEXT_SETUPCAPTION ${LANG_FRENCH} "Installation de ${NAME} ${VERSION}" !endif @@ -73,15 +66,8 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_FRENCH} "La dsinstallation s'est termine avec succs." !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_FRENCH} "&Suivant >" - !endif - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_FRENCH} "< &Prcdent" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_FRENCH} "&Suivant >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_FRENCH} "Annuler" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_FRENCH} "&Dsinstaller" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_FRENCH} "Installation de ${NAME} ${VERSION}" !endif !endif diff --git a/Contrib/Modern UI/Language files/German.nsh b/Contrib/Modern UI/Language files/German.nsh index 60341c45..0141388a 100644 --- a/Contrib/Modern UI/Language files/German.nsh +++ b/Contrib/Modern UI/Language files/German.nsh @@ -1,5 +1,5 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: German (1031) ;By L.King @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_GERMAN} "Falls Sie alle Bedingungen des Abkommens akzeptieren, klicken Sie auf Annehmen. Sie mssen die Lizenzvereinbarungen anerkennen um ${NAME} zu installieren." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_GERMAN} "Whlen Sie die Komponenten aus, die Sie installieren mchten und whlen Sie diejenigen ab, die Sie nicht installieren wollen. Klicken Sie auf Weiter um fortzufahren." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_GERMAN} "Whlen Sie die Komponenten aus" LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_GERMAN} "Whlen Sie die Komponenten aus, die Sie installieren mchten." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_GERMAN} "Bewegen Sie den Mauszeiger ber eine Komponente um ihre Beschreibung zu sehen." !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_GERMAN} "${NAME} wird in das unten angegebene Verzeichnis installiert.$\r$\n$\r$\nKlicken Sie auf Installieren um fortzufahren. Falls Sie in ein anderes Verzeichnis installieren mchten, klicken Sie auf Durchsuchen und whlen Sie ein anderes Verzeichnis aus." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_GERMAN} "Whlen Sie das Zielverzeichnis aus" LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_GERMAN} "Whlen Sie das Verzeichnis aus, in dem ${NAME} installiert werden soll." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_GERMAN} "Zielverzeichnis" !endif - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_GERMAN} "&Weiter >" - !endif - LangString MUI_TEXT_INSTALLING_TITLE ${LANG_GERMAN} "Installiere..." LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_GERMAN} "Bitte warten Sie, whrend ${NAME} installiert wird." @@ -48,16 +44,13 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_GERMAN} "Die Installation wurde erfolgreich abgeschlossen." !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_GERMAN} "Sind Sie sicher, dass Sie die Installation von ${NAME} abbrechen wollen?" + LangString MUI_TEXT_ABORTWARNING ${LANG_GERMAN} "Sind Sie sicher, dass Sie die Installation von ${NAME} abbrechen wollen?" !endif - + !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_GERMAN} "< &Zurck" - LangString MUI_BUTTONTEXT_NEXT ${LANG_GERMAN} "&Weiter >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_GERMAN} "Abbrechen" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_GERMAN} "&Installieren" + LangString MUI_TEXT_SETUPCAPTION ${LANG_GERMAN} "${NAME} ${VERSION} Installation" !endif - + ;UNINSTALLER @@ -72,16 +65,9 @@ LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_GERMAN} "Fertig" LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_GERMAN} "Die Deinstallation von ${NAME} wurde erfolgreich abgeschlossen." !endif - - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_GERMAN} "&Weiter >" - !endif - + !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_GERMAN} "< &Zurck" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_GERMAN} "&Weiter >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_GERMAN} "Abbrechen" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_GERMAN} "&Deinstallieren" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_GERMAN} "${NAME} ${VERSION} Installation" !endif !endif diff --git a/Contrib/Modern UI/Language files/Greek.nsh b/Contrib/Modern UI/Language files/Greek.nsh index 0d9cf43d..3aca13c6 100644 --- a/Contrib/Modern UI/Language files/Greek.nsh +++ b/Contrib/Modern UI/Language files/Greek.nsh @@ -1,5 +1,5 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: Greek (1032) ;By Makidis N. Mike @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_GREEK} " . , , '${NAME}'." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_GREEK} " . ." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_GREEK} " " LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_GREEK} " ." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_GREEK} " ." !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_GREEK} " '${NAME}' .$\r$\n$\r$\n , . , ." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_GREEK} " " LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_GREEK} " '${NAME}'." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_GREEK} " " !endif - - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_GREEK} "& >" - !endif - + LangString MUI_TEXT_INSTALLING_TITLE ${LANG_GREEK} " " LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_GREEK} " '${NAME}' ." @@ -48,16 +44,13 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_GREEK} " ." !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_GREEK} " '${NAME}';" + LangString MUI_TEXT_ABORTWARNING ${LANG_GREEK} " '${NAME}';" !endif - + !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_GREEK} "< &" - LangString MUI_BUTTONTEXT_NEXT ${LANG_GREEK} "& >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_GREEK} "" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_GREEK} "&" + LangString MUI_TEXT_SETUPCAPTION ${LANG_GREEK} " '${NAME} ${VERSION}'" !endif - + ;UNINSTALLER @@ -73,17 +66,10 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_GREEK} " ." !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_GREEK} "& >" - !endif - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_GREEK} "< &" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_GREEK} "& >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_GREEK} "" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_GREEK} "&." + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_GREEK} " '${NAME} ${VERSION}'" !endif - + !endif !verbose 4 \ No newline at end of file diff --git a/Contrib/Modern UI/Language files/Italian.nsh b/Contrib/Modern UI/Language files/Italian.nsh index e0cb9350..708a13ea 100644 --- a/Contrib/Modern UI/Language files/Italian.nsh +++ b/Contrib/Modern UI/Language files/Italian.nsh @@ -1,5 +1,5 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: Italian (1040) ;By SANFACE Software @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_ITALIAN} "Se accetti i termini della licenza d'uso seleziona Accetto per continuare. Devi accettare i termini della licenza d'uso per installare ${NAME}." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_ITALIAN} "Seleziona i componenti che vuoi installare e deseleziona i componenti che non vuoi installare. Per continuare clicca su Sucessivo." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_ITALIAN} "Seleziona i componenti" LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_ITALIAN} "Seleziona i componenti che vuoi installare." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_ITALIAN} "Per leggere una descrizione pi approfondita dei componenti posiziona il puntatore del mouse sul componente di tuo interesse." !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_ITALIAN} "Il programma d'installazione installer ${NAME} nella cartella selezionata.$\r$\n$\r$\nPer installare nella cartella selezionata clicca su Installa. Per installare in una cartella differente, clicca su Sfoglia e seleziona un'altra cartella." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_ITALIAN} "Scegli la cartella di installazione" LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_ITALIAN} "Scegli la cartella dove installare ${NAME}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_ITALIAN} "Cartella d'installazione" !endif - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_ITALIAN} "&Seguente >" - !endif - LangString MUI_TEXT_INSTALLING_TITLE ${LANG_ITALIAN} "Installazione in corso" LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ITALIAN} "Per favore attendi che ${NAME} sia completamente installato." @@ -48,17 +44,14 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_ITALIAN} "L'installazione stata completata con successo." !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_ITALIAN} "Sei sicuro di voler terminare l'installazione di ${NAME} ?" + LangString MUI_TEXT_ABORTWARNING ${LANG_ITALIAN} "Sei sicuro di voler terminare l'installazione di ${NAME} ?" + !endif + + !ifdef MUI_INSTALLOPTIONS + LangString MUI_TEXT_SETUPCAPTION ${LANG_ITALIAN} "Installazione di ${NAME} ${VERSION}" !endif - !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_ITALIAN} "< &Precedente" - LangString MUI_BUTTONTEXT_NEXT ${LANG_ITALIAN} "&Seguente >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_ITALIAN} "Annula" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_ITALIAN} "&Installa" - !endif - - + ;UNINSTALLER !ifdef MUI_UNINSTALLER @@ -73,15 +66,8 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_ITALIAN} "La disinstallazione stata completata con successo." !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_ITALIAN} "&Seguente >" - !endif - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_ITALIAN} "< &Precedente" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_ITALIAN} "&Seguente >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_ITALIAN} "Annulla" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_ITALIAN} "&Disinstalla" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ITALIAN} "Installazione di ${NAME} ${VERSION}" !endif !endif diff --git a/Contrib/Modern UI/Language files/Japanese.nsh b/Contrib/Modern UI/Language files/Japanese.nsh new file mode 100644 index 00000000..be2b21ac --- /dev/null +++ b/Contrib/Modern UI/Language files/Japanese.nsh @@ -0,0 +1,75 @@ +;NSIS Modern User Interface - Language File +;version 2 - Compatible with Modern UI 1.4 + +;Language: Japanese (1041) +;By Dnanako + +;-------------------------------- +!verbose 3 + +!ifndef MUI_JAPANESE_USED + +!define MUI_JAPANESE_USED + + !define MUI_JAPANESE_LANGNAME "Japanese" ;Name of the language in the language itself (English, Deutsch, Franais etc.) + + ;INSTALLER + + !ifdef MUI_LICENSEPAGE + LicenseText /LANG=${LANG_JAPANESE} "[Page Down]Č_񏑂ׂĂǂ݂B" + LangString MUI_TEXT_LICENSE_TITLE ${LANG_JAPANESE} "CZX_" + LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_JAPANESE} " ${NAME} CXg[OɁACZXmFĂB" + LangString MUI_INNERTEXT_LICENSE ${LANG_JAPANESE} "${NAME} CXg[ɂ́A_񏑂ɓӂKv܂B$\r$\n_񏑂ׂ̂Ă̏ɓӂȂ΁A[ӂ] IŃCXg[𑱂ĂB" + !endif + + !ifdef MUI_COMPONENTSPAGE + ComponentText /LANG=${LANG_JAPANESE} "R|[lgCXg[ɂ̓`FbNAsvȂ΁A`FbNOĂB $\r$\nɂ[]ĂB" + LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_JAPANESE} "R|[lgIłB" + LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_JAPANESE} "${NAME} ̃CXg[ IvVIłB" + LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_JAPANESE} "" + LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_JAPANESE} "R|[lgɃ}EX J[\ړƁA̐\܂B" + !endif + + !ifdef MUI_DIRECTORYPAGE + DirText /LANG=${LANG_JAPANESE} "${NAME} ȉ̃tH_ɃCXg[܂B$\r$\n$\r$\ñtH_ɃCXg[ɂ́A[CXg[]ĂB$\r$\nقȂtH_ɃCXg[ɂ́A[Q]āAʂ̃tH_IĂB" " " + LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_JAPANESE} "CXg[IłB" + LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_JAPANESE} "${NAME} CXg[tH_IłB" + LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_JAPANESE} "CXg[ tH_" + !endif + + LangString MUI_TEXT_INSTALLING_TITLE ${LANG_JAPANESE} "CXg[" + LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_JAPANESE} "${NAME} CXg[Ă܂B΂炭҂B" + + LangString MUI_TEXT_FINISHED_TITLE ${LANG_JAPANESE} "" + LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_JAPANESE} "CXg[ɐ܂B" + + !ifdef MUI_ABORTWARNING + LangString MUI_TEXT_ABORTWARNING ${LANG_JAPANESE} "${NAME} ̃CXg[𒆎~܂H" + !endif + + !ifdef MUI_INSTALLOPTIONS + LangString MUI_TEXT_SETUPCAPTION ${LANG_JAPANESE} "${NAME} ${VERSION} ZbgAbv" + !endif + + + ;UNINSTALLER + + !ifdef MUI_UNINSTALLER + UninstallText /LANG=${LANG_JAPANESE} "${NAME} ̃VXeACXg[܂B" + LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_JAPANESE} "${NAME} ̃ACXg[B" + LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_JAPANESE} "${NAME} ̃VXeACXg[܂B" + + LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_JAPANESE} "ACXg[" + LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_JAPANESE} "${NAME} ACXg[Ă܂B΂炭҂B" + + LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_JAPANESE} "" + LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_JAPANESE} "ACXg[ɐ܂B" + !endif + + !ifdef MUI_UNINSTALLOPTIONS + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_JAPANESE} "${NAME} ${VERSION} ZbgAbv" + !endif + +!endif + +!verbose 4 \ No newline at end of file diff --git a/Contrib/Modern UI/Language files/Polish.nsh b/Contrib/Modern UI/Language files/Polish.nsh index 468827ca..ab77baac 100644 --- a/Contrib/Modern UI/Language files/Polish.nsh +++ b/Contrib/Modern UI/Language files/Polish.nsh @@ -1,5 +1,5 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: Polish (1045) ;By Piotr Murawski & Rafa Lampe; www.lomsel.prv.pl mailto:ppiter@skrzynka.pl @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_POLISH} "Jeeli akceptujesz wszystkie warunki umnowy wybierz Zgadzam si, aby kontynuowa. Musisz zaakceptowa warunki umowy, aby zainstalowa ${NAME}." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_POLISH} "Zaznacz komponenty, ktre chcesz zainstalowa oraz odznacz komponenty, ktre nie maj by zainstalowane. Kliknij przycisk Dalej, aby kontynuowa." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_POLISH} "Wybr komponentw" LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_POLISH} "Wybierz komponenty ${NAME}, ktre chcesz zainstalowa." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_POLISH} "Przesu kursor myszy nad komponent, aby zobaczy jego opis." !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_POLISH} "Instalator zainstaluje ${NAME} do nastpujcego folderu.$\r$\n$\r$\nAby zainstalowa w tym folderze kliknij Instaluj. Aby zainstalowa w innym folderze kliknij Przegldaj i wybierz inny folder." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_POLISH} "Wybr miejsca instalacji" LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_POLISH} "Wybierz folder, w ktrym ma by zainstalowany ${NAME}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_POLISH} "Folder docelowy" !endif - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_POLISH} "Dalej >" - !endif - LangString MUI_TEXT_INSTALLING_TITLE ${LANG_POLISH} "Instaluje" LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_POLISH} "Prosz czeka, kiedy ${NAME} jest instalowany." @@ -48,14 +44,11 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_POLISH} "Instalacja zakoczona powodzeniem." !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_POLISH} "Czy na pewno chcesz wyj z instalatora ${NAME}?" + LangString MUI_TEXT_ABORTWARNING ${LANG_POLISH} "Czy na pewno chcesz wyj z instalatora ${NAME}?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_POLISH} "< Cofnij" - LangString MUI_BUTTONTEXT_NEXT ${LANG_POLISH} "Dalej >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_POLISH} "Anuluj" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_POLISH} "Instaluj" + LangString MUI_TEXT_SETUPCAPTION ${LANG_POLISH} "${NAME} ${VERSION} Instalator" !endif @@ -73,15 +66,8 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_POLISH} "Odinstalowanie zakoczone powodzeniem." !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_POLISH} "Dalej >" - !endif - - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_POLISH} "< Cofnij" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_POLISH} "Dalej >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_POLISH} "Anuluj" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_POLISH} "Odinstaluj" + !ifdef MUI_UNINSTALLOPTIONS + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_POLISH} "${NAME} ${VERSION} Instalator" !endif !endif diff --git a/Contrib/Modern UI/Language files/PortugueseBR.nsh b/Contrib/Modern UI/Language files/PortugueseBR.nsh index 358d01e2..7ef32958 100644 --- a/Contrib/Modern UI/Language files/PortugueseBR.nsh +++ b/Contrib/Modern UI/Language files/PortugueseBR.nsh @@ -1,7 +1,7 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 -;Language: Portuguese (1046) +;Language: 'Portuguese (Brasil)' (1046) ;By Layout do Brasil www.layoutdobrasil.com ;-------------------------------- @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_PORTUGUESEBR} "Se voc aceitar todos os termos da licena, escolha Concordo para continuar. Voc deve aceitar o contrato para instalar ${NAME}." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_PORTUGUESEBR} "Marque os componentes que voc deseja instalar e desmarque os componentes que voc no deseja instalar. Clique em Avanar para continuar." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_PORTUGUESEBR} "Escolhendo Componentes" LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_PORTUGUESEBR} "Escolha as caractersticas do ${NAME} que voc deseja instalar." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_PORTUGUESEBR} "Repouse o ponteiro do mouse em cima de um componente para ver sua descrio." !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_PORTUGUESEBR} "O instalador instalar o ${NAME} na pasta abaixo.$\r$\n$\r$\nPara prosseguir e instalar nesta pasta, clique em Instalar. Para instalar em uma pasta diferente, clique Procurar... e selecione outra pasta." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_PORTUGUESEBR} "Escolhendo o Local da Instalao" LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_PORTUGUESEBR} "Escolha a pasta na qual deseja instalar ${NAME}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_PORTUGUESEBR} "Pasta de destino" !endif - - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_PORTUGUESEBR} "&Prximo >" - !endif - + LangString MUI_TEXT_INSTALLING_TITLE ${LANG_PORTUGUESEBR} "Instalando" LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_PORTUGUESEBR} "Por favor, aguarde enquanto ${NAME} est sendo instalado." @@ -48,14 +44,11 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_PORTUGUESEBR} "A instalao foi finalizada com sucesso." !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_PORTUGUESEBR} "Voc deseja realmente finalizar a instalao ${NAME}?" + LangString MUI_TEXT_ABORTWARNING ${LANG_PORTUGUESEBR} "Voc deseja realmente finalizar a instalao ${NAME}?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_PORTUGUESEBR} "< &Voltar" - LangString MUI_BUTTONTEXT_NEXT ${LANG_PORTUGUESEBR} "&Avanar >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_PORTUGUESEBR} "Cancelar" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_PORTUGUESEBR} "&Instalar" + LangString MUI_TEXT_SETUPCAPTION ${LANG_PORTUGUESEBR} "Instalao de ${NAME} ${VERSION}" !endif @@ -73,17 +66,10 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_PORTUGUESEBR} "A desinstalao foi finalizada com sucesso." !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_PORTUGUESEBR} "&Prximo >" - !endif - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_PORTUGUESEBR} "< &Voltar" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_PORTUGUESEBR} "&Avanar >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_PORTUGUESEBR} "Cancelar" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_PORTUGUESEBR} "&Desinstalar" - !endif - + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_PORTUGUESEBR} "Instalao de ${NAME} ${VERSION}" + !endif + !endif !verbose 4 \ No newline at end of file diff --git a/Contrib/Modern UI/Language files/Russian.nsh b/Contrib/Modern UI/Language files/Russian.nsh index 5a0cab65..3ef806e0 100644 --- a/Contrib/Modern UI/Language files/Russian.nsh +++ b/Contrib/Modern UI/Language files/Russian.nsh @@ -1,5 +1,5 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: Russian (1049) ;By Nik Medved (brainsucker). Fixed by Scam. @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_RUSSIAN} " , . ${NAME}." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_RUSSIAN} " , , , . ." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_RUSSIAN} " " LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_RUSSIAN} " ${NAME} ." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_RUSSIAN} " , ." !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_RUSSIAN} " ${NAME} .$\r$\n$\r$\n , . , ." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_RUSSIAN} " " LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_RUSSIAN} " ${NAME}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_RUSSIAN} " " !endif - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_RUSSIAN} "& >" - !endif - LangString MUI_TEXT_INSTALLING_TITLE ${LANG_RUSSIAN} " " LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_RUSSIAN} " , ${NAME}." @@ -48,14 +44,11 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_RUSSIAN} " ." !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_RUSSIAN} " , ${NAME}?" + LangString MUI_TEXT_ABORTWARNING ${LANG_RUSSIAN} " , ${NAME}?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_RUSSIAN} "< &" - LangString MUI_BUTTONTEXT_NEXT ${LANG_RUSSIAN} "& >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_RUSSIAN} "" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_RUSSIAN} "&" + LangString MUI_TEXT_SETUPCAPTION ${LANG_RUSSIAN} "${NAME} ${VERSION} " !endif @@ -73,16 +66,9 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_RUSSIAN} " ." !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_RUSSIAN} "& >" - !endif - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_RUSSIAN} "< &" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_RUSSIAN} "& >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_RUSSIAN} "" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_RUSSIAN} "&" - !endif + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_RUSSIAN} "${NAME} ${VERSION} " + !endif !endif diff --git a/Contrib/Modern UI/Language files/SimpChinese.nsh b/Contrib/Modern UI/Language files/SimpChinese.nsh index b402900a..490f4113 100644 --- a/Contrib/Modern UI/Language files/SimpChinese.nsh +++ b/Contrib/Modern UI/Language files/SimpChinese.nsh @@ -1,8 +1,8 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: 'Chinese (Simplified)' (2052) -;Kii Ali +;By Kii Ali ;-------------------------------- !verbose 3 @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_SIMPCHINESE} "ͬкԼеѡ [ͬ(A)] װѡ [ȡ(C)] װ򽫻رաҪȨԼܰװ ${NAME}" !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_SIMPCHINESE} "ȡҪװѲ밲װȡ [һ(N)] " LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_SIMPCHINESE} "ѡ" LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_SIMPCHINESE} "ѡ ${NAME} Ҫװ" @@ -30,34 +30,27 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_SIMPCHINESE} "ƶָ굽֮ϣɼ" !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_SIMPCHINESE} "װļУװ ${NAME} $\r$\n$\r$\nҪװļУ [װ(I)] ҪװڲͬļУ [(B)...] ѡļС" " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_SIMPCHINESE} "ѡװλ" LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_SIMPCHINESE} "ѡ ${NAME} Ҫװļλá" LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_SIMPCHINESE} "Ŀļ" !endif - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_SIMPCHINESE} "һ(&N) >" - !endif + LangString MUI_TEXT_INSTALLING_TITLE ${LANG_SIMPCHINESE} "ڰװ" + LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_SIMPCHINESE} "${NAME} ڰװȺ" - LangString MUI_TEXT_INSTALLING_TITLE ${LANG_SIMPCHINESE} "ڰװ" - LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_SIMPCHINESE} "${NAME} ڰװȺ" - - LangString MUI_TEXT_FINISHED_TITLE ${LANG_SIMPCHINESE} "" - LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_SIMPCHINESE} "װѳɹɡ" + LangString MUI_TEXT_FINISHED_TITLE ${LANG_SIMPCHINESE} "" + LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_SIMPCHINESE} "װѳɹɡ" !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_SIMPCHINESE} "ȷʵҪ˳ ${NAME} װ" + LangString MUI_TEXT_ABORTWARNING ${LANG_SIMPCHINESE} "ȷʵҪ˳ ${NAME} װ" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_SIMPCHINESE} "< һ(&P)" - LangString MUI_BUTTONTEXT_NEXT ${LANG_SIMPCHINESE} "һ(&N) >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_SIMPCHINESE} "ȡ(&C)" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_SIMPCHINESE} "װ(&I)" + LangString MUI_TEXT_SETUPCAPTION ${LANG_SIMPCHINESE} "${NAME} ${VERSION} װ" !endif - + ;UNINSTALLER @@ -73,17 +66,10 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_SIMPCHINESE} "${NAME} Ѵϵͳװ" !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_SIMPCHINESE} "һ(&N) >" - !endif - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_SIMPCHINESE} "< һ(&P)" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_SIMPCHINESE} "һ(&N) >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_SIMPCHINESE} "ȡ(&C)" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_SIMPCHINESE} "װ(&U)" - !endif - + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_SIMPCHINESE} "${NAME} ${VERSION} װ" + !endif + !endif !verbose 4 \ No newline at end of file diff --git a/Contrib/Modern UI/Language files/Spanish.nsh b/Contrib/Modern UI/Language files/Spanish.nsh index bfd4c6c3..529e27b1 100644 --- a/Contrib/Modern UI/Language files/Spanish.nsh +++ b/Contrib/Modern UI/Language files/Spanish.nsh @@ -1,5 +1,5 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: Spanish (1034) ;By MoNKi @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_SPANISH} "Si acepta todos los trminos del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para instalar ${NAME}." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_SPANISH} "Marque los componentes que desea instalar y desmarque los componentes que no desea instalar. Presione Siguiente para continuar." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_SPANISH} "Seleccin de componentes" LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_SPANISH} "Seleccione que caractersticas de ${NAME} desea instalar." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_SPANISH} "Situe el ratn encima de un componente para ver su descripcin." !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_SPANISH} "Se instalar ${NAME} en el siguiente directorio.$\r$\n$\r$\nPara instalar en este directorio, presione Instalar. Para instalar en un directorio distinto, presione Examinar y seleccione otro directorio." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_SPANISH} "Elegir lugar de instalacin" LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_SPANISH} "Elija el directorio en el que instalar ${NAME}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_SPANISH} "Directorio de destino" !endif - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_SPANISH} "&Siguiente >" - !endif - LangString MUI_TEXT_INSTALLING_TITLE ${LANG_SPANISH} "Instalando" LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_SPANISH} "Por favor espere mientas ${NAME} se instala." @@ -48,16 +44,13 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_SPANISH} "La instalacin se ha completado correctamente." !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_SPANISH} "Est seguro de que desea salir de la instalacin de ${NAME}?" + LangString MUI_TEXT_ABORTWARNING ${LANG_SPANISH} "Est seguro de que desea salir de la instalacin de ${NAME}?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_SPANISH} "< &Atrs" - LangString MUI_BUTTONTEXT_NEXT ${LANG_SPANISH} "&Siguiente >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_SPANISH} "Cancelar" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_SPANISH} "&Instalar" + LangString MUI_TEXT_SETUPCAPTION ${LANG_SPANISH} "Instalacin de ${NAME} ${VERSION}" !endif - + ;UNINSTALLER @@ -73,15 +66,8 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_SPANISH} "La desinstalacin se ha completado correctamente." !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_SPANISH} "&Siguiente >" - !endif - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_SPANISH} "< &Atrs" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_SPANISH} "&Siguiente >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_SPANISH} "Cancelar" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_SPANISH} "&Desinstalar" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_SPANISH} "Instalacin de ${NAME} ${VERSION}" !endif !endif diff --git a/Contrib/Modern UI/Language files/TradChinese.nsh b/Contrib/Modern UI/Language files/TradChinese.nsh index 26bd75e6..c0069415 100644 --- a/Contrib/Modern UI/Language files/TradChinese.nsh +++ b/Contrib/Modern UI/Language files/TradChinese.nsh @@ -1,8 +1,8 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: 'Chinese (Traditional)' (1028) -;Kii Ali +;By Kii Ali ;-------------------------------- !verbose 3 @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_TRADCHINESE} "pGAPNҦXڡA [ڦPN(A)] ~wˡCpGA [(C)] Aw˵{N|CnvX~w ${NAME}C" !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_TRADCHINESE} "֨Qnw˪Aç⤣Qw˪Ѱ֨C [U@B(N)] ~C" LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_TRADCHINESE} "" LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_TRADCHINESE} " ${NAME} AQnw˪C" @@ -30,32 +30,25 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_TRADCHINESE} "ʧAƹШ줸󤧤WAKi쥦yzC" !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_TRADCHINESE} "w˵{NbUCƧAw ${NAME} C$\r$\n$\r$\nnw˨oӸƧA@U [w(I)] Cnw˦bPƧA@U [s(B)...] ÿܨLƧC" " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_TRADCHINESE} "w˦m" LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_TRADCHINESE} " ${NAME} nw˪ƧmC" LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_TRADCHINESE} "تƧ" !endif - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_TRADCHINESE} "U@B(&N) >" - !endif + LangString MUI_TEXT_INSTALLING_TITLE ${LANG_TRADCHINESE} "bw" + LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_TRADCHINESE} "${NAME} bwˡAеԡC" - LangString MUI_TEXT_INSTALLING_TITLE ${LANG_TRADCHINESE} "bw" - LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_TRADCHINESE} "${NAME} bwˡAеԡC" - - LangString MUI_TEXT_FINISHED_TITLE ${LANG_TRADCHINESE} "" - LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "w˵{w\a槹C" + LangString MUI_TEXT_FINISHED_TITLE ${LANG_TRADCHINESE} "" + LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "w˵{w\a槹C" !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_TRADCHINESE} "ATwn} ${NAME} w˵{H" + LangString MUI_TEXT_ABORTWARNING ${LANG_TRADCHINESE} "ATwn} ${NAME} w˵{H" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_TRADCHINESE} "< W@B(&P)" - LangString MUI_BUTTONTEXT_NEXT ${LANG_TRADCHINESE} "U@B(&N) >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_TRADCHINESE} "(&C)" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_TRADCHINESE} "w(&I)" + LangString MUI_TEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${NAME} ${VERSION} w" !endif @@ -73,16 +66,9 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "${NAME} wqAtθѰwˡC" !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_TRADCHINESE} "U@B(&N) >" - !endif - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_TRADCHINESE} "< W@B(&P)" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_TRADCHINESE} "U@B(&N) >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_TRADCHINESE} "(&C)" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_TRADCHINESE} "Ѱw(&U)" - !endif + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${NAME} ${VERSION} w" + !endif !endif diff --git a/Contrib/Modern UI/Language files/Ukrainian.nsh b/Contrib/Modern UI/Language files/Ukrainian.nsh index 2d66435b..69a3fb20 100644 --- a/Contrib/Modern UI/Language files/Ukrainian.nsh +++ b/Contrib/Modern UI/Language files/Ukrainian.nsh @@ -1,5 +1,5 @@ -;Modern UI Language File -;version 1 - Compatible with Modern UI 1.3 +;NSIS Modern User Interface - Language File +;Compatible with Modern UI 1.4 ;Language: Ukrainian (1058) ;By Yuri Holubow, Our Soft (http://www.ns.lviv.ua) @@ -22,7 +22,7 @@ LangString MUI_INNERTEXT_LICENSE ${LANG_UKRAINIAN} " i , i . i ii ${NAME}." !endif - !ifdef MUI_COMPONENTPAGE + !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_UKRAINIAN} "ii i , i , i ii ii , i . i i ." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_UKRAINIAN} "i " LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_UKRAINIAN} "i i i ${NAME} ." @@ -30,17 +30,13 @@ LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_UKRAINIAN} "ii , ." !endif - !ifdef MUI_DIRSELECTPAGE + !ifdef MUI_DIRECTORYPAGE DirText /LANG=${LANG_UKRAINIAN} "I ${NAME} .$\r$\n$\r$\n , i . i i i i i ." " " LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_UKRAINIAN} "i i " LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_UKRAINIAN} "i ${NAME}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_UKRAINIAN} " " !endif - !ifdef MUI_INSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_UKRAINIAN} "&i >" - !endif - LangString MUI_TEXT_INSTALLING_TITLE ${LANG_UKRAINIAN} " " LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_UKRAINIAN} "- , ${NAME}." @@ -48,16 +44,13 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_UKRAINIAN} " i ." !ifdef MUI_ABORTWARNING - LangString MUI_MSGTEXT_ABORTWARNING ${LANG_UKRAINIAN} " i ${NAME}?" + LangString MUI_TEXT_ABORTWARNING ${LANG_UKRAINIAN} " i ${NAME}?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_BUTTONTEXT_BACK ${LANG_UKRAINIAN} "< &" - LangString MUI_BUTTONTEXT_NEXT ${LANG_UKRAINIAN} "&i >" - LangString MUI_BUTTONTEXT_CANCEL ${LANG_UKRAINIAN} "" - LangString MUI_BUTTONTEXT_INSTALL ${LANG_UKRAINIAN} "&" + LangString MUI_TEXT_SETUPCAPTION ${LANG_UKRAINIAN} "${VERSION} " !endif - + ;UNINSTALLER @@ -73,16 +66,9 @@ LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_UKRAINIAN} " i ." !endif - !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT - InstallButtonText /LANG=${LANG_UKRAINIAN} "&i >" - !endif - !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_BUTTONTEXT_BACK ${LANG_UKRAINIAN} "< &" - LangString un.MUI_BUTTONTEXT_NEXT ${LANG_UKRAINIAN} "&i >" - LangString un.MUI_BUTTONTEXT_CANCEL ${LANG_UKRAINIAN} "" - LangString un.MUI_BUTTONTEXT_UNINSTALL ${LANG_UKRAINIAN} "&" - !endif + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_UKRAINIAN} "${VERSION} " + !endif !endif diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index 9156e3d3..af4ae366 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -124,17 +124,20 @@ a:hover macro system inserts all code and functions for you. For an example, have a look at Basic.nsi.

To remove certain default NSIS pages (such as the License page), - remove a define before the language files (for example, remove - !define MUI_LICENSEPAGE), and remove the other instruction for + remove a define at the top of the page (for example, remove + !define MUI_LICENSEPAGE), and remove the other instructions for the page (for example, LicenseData).

Advanced Macro System, Install Options
- If you want put your code in certain NSIS functions or want to - use custom installer pages, use the Advanced Macro System. - The code will still be inserted using the macro's, but - you can customize a lot of things, add your own code or - add new pages.
+ If you want put your own code in certain NSIS functions or + want to use custom installer pages, use the Advanced Macro + System. The code will still be inserted using the macro's, + but you can customize a lot of things, add your own code or + add new pages.

Using the Install Options macro's, it's also very easy to use - custom pages in your installer.
+ custom pages in your installer. Just add a new Page command + between the other page commands: Page [function name] and call + Install Options in [function name] using the + MUI_INSTALLOPTIONS_SHOW macro.

Have a look at InstallOptions.nsi for an example of the Install Options and the Advanced Macro System.

@@ -148,7 +151,7 @@ a:hover for a multilanguage example using the Basic Macro System.

The interface

Modern.exe and modern2.exe
- There are two different version of the interface. + There are two different versions of the interface. Modern.exe contains the dialogs of the standard interface. If you have an installer with a lot of subsections or long section names, use modern2.exe, which has a different @@ -190,17 +193,12 @@ a:hover To change them, you need to edit this file and recompile NSIS.

Version history

    -
  • 1.3 - October 27, 2002 +
  • 1.4 - October 30, 2002
      -
    • Easier macro system for basic scripts -
    • New MultiLanguage system using Modern UI Language Files -
    • 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 -
    • New Install Options macro's to read/write IO INI file values +
    • Uses new NSIS Page command +
    • Macro system way smaller +
    • Advanced Macro System a lot easier +
    • Renamed some defines

Complete version history

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 82c210d7..68e542d8 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.3 +;NSIS Modern User Interface version 1.4 ;Macro System ;Written by Joost Verburg @@ -14,9 +14,6 @@ !include "${NSISDIR}\Examples\WinMessages.nsh" -!define MUI_INSTALLOPTIONS_DIRECTION_NEXT 1 -!define MUI_INSTALLOPTIONS_DIRECTION_PREV 2 - !define MUI_TEMP1 $R0 !define MUI_TEMP2 $R1 @@ -79,231 +76,39 @@ !macroend -!macro MUI_INNERDIALOG_INIT - - !verbose 3 - - Push ${MUI_TEMP1} - - !verbose 4 - -!macroend - -!macro MUI_INNERDIALOG_START PAGE - - !verbose 3 - - StrCmp ${CURRENTPAGE} ${PAGE} "" done_${PAGE} - - !verbose 4 - -!macroend - !macro MUI_INNERDIALOG_TEXT CONTROL TEXT !verbose 3 - ;Text on inner dialogs components - - FindWindow ${MUI_TEMP1} "#32770" "" $HWNDPARENT - GetDlgItem ${MUI_TEMP1} ${MUI_TEMP1} ${CONTROL} - SendMessage ${MUI_TEMP1} ${WM_SETTEXT} 0 "STR:${TEXT}" + ;Set text on inner dialogs component + Push ${MUI_TEMP1} + + FindWindow ${MUI_TEMP1} "#32770" "" $HWNDPARENT + GetDlgItem ${MUI_TEMP1} ${MUI_TEMP1} ${CONTROL} + SendMessage ${MUI_TEMP1} ${WM_SETTEXT} 0 "STR:${TEXT}" + + Pop ${MUI_TEMP1} !verbose 4 !macroend -!macro MUI_INNERDIALOG_STOP PAGE - - !verbose 3 - - Goto done - done_${PAGE}: - - !verbose 4 - -!macroend - -!macro MUI_INNERDIALOG_END - - !verbose 3 - - done: - Pop ${MUI_TEMP1} - - !verbose 4 - -!macroend - -!macro MUI_NEXTPAGE - - !verbose 3 - - ;Set backgrounds & fonts for the outer dialog (only once) - StrCmp ${CURRENTPAGE} "" "" no_first_run - - Push ${MUI_TEMP1} - Push ${MUI_TEMP2} - - GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1037 - CreateFont ${MUI_TEMP2} "Tahoma" 10 700 - SendMessage ${MUI_TEMP1} ${WM_SETFONT} ${MUI_TEMP2} 0 - SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF - - GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1038 - SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF - - GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1034 - SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF - - GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1039 - SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF - - Pop ${MUI_TEMP2} - Pop ${MUI_TEMP1} - - no_first_run: - - IntOp ${CURRENTPAGE} ${CURRENTPAGE} + 1 - - !ifndef MUI_SETPAGE_FUNCTIONNAME - !error "Modern UI Error: SetPage function name (MUI_SETPAGE_FUNCTIONNAME) not defined!" - !endif - - Call "${MUI_SETPAGE_FUNCTIONNAME}" - - !verbose 4 - -!macroend - -!macro MUI_UNNEXTPAGE - - !verbose 3 - - ;Set backgrounds & fonts for the outer dialog (only once) - StrCmp ${CURRENTPAGE} "" "" no_first_run - - Push ${MUI_TEMP1} - Push ${MUI_TEMP2} - - GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1037 - CreateFont ${MUI_TEMP2} "Tahoma" 10 700 - SendMessage ${MUI_TEMP1} ${WM_SETFONT} ${MUI_TEMP2} 0 - SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF - - GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1038 - SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF - - GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1034 - SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF - - GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1039 - SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF - - Pop ${MUI_TEMP2} - Pop ${MUI_TEMP1} - - no_first_run: - - IntOp ${CURRENTPAGE} ${CURRENTPAGE} + 1 - - !ifndef MUI_UNSETPAGE_FUNCTIONNAME - !error "Modern UI Error: Uninstall SetPage function name (MUI_UNSETPAGE_FUNCTIONNAME) not defined!" - !endif - - Call "${MUI_UNSETPAGE_FUNCTIONNAME}" - - !verbose 4 - -!macroend - -!macro MUI_PREVPAGE - - !verbose 3 - - IntOp ${CURRENTPAGE} ${CURRENTPAGE} - 1 - - !ifndef MUI_SETPAGE_FUNCTIONNAME - !error "Modern UI Error: SetPage function name (MUI_SETPAGE_FUNCTIONNAME) not defined!" - !endif - - Call "${MUI_SETPAGE_FUNCTIONNAME}" - - !verbose 4 - -!macroend - -!macro MUI_UNPREVPAGE - - !verbose 3 - - IntOp ${CURRENTPAGE} ${CURRENTPAGE} - 1 - - !ifndef MUI_UNSETPAGE_FUNCTIONNAME - !error "Modern UI Error: Uninstall SetPage function name (MUI_UNSETPAGE_FUNCTIONNAME) not defined!" - !endif - - Call "${MUI_UNSETPAGE_FUNCTIONNAME}" - - !verbose 4 - -!macroend - -!macro MUI_PAGE_INIT - - !verbose 3 - - Push ${MUI_TEMP1} - - !verbose 4 - -!macroend - -!macro MUI_PAGE_START PAGE - - !verbose 3 - - StrCmp ${CURRENTPAGE} ${PAGE} "" done_${PAGE} - - !verbose 4 - -!macroend - !macro MUI_HEADER_TEXT TEXT SUBTEXT !verbose 3 - ;Text on the white rectangle - - GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1037 - SendMessage ${MUI_TEMP1} ${WM_SETTEXT} 0 "STR:${TEXT}" - GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1038 - SendMessage ${MUI_TEMP1} ${WM_SETTEXT} 0 "STR:${SUBTEXT}" + ;Set text on the white rectangle + Push ${MUI_TEMP1} - !verbose 4 - -!macroend - -!macro MUI_PAGE_STOP PAGE - - !verbose 3 - - Goto done - done_${PAGE}: - - !verbose 4 - -!macroend - -!macro MUI_PAGE_END - - !verbose 3 - - done: + GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1037 + SendMessage ${MUI_TEMP1} ${WM_SETTEXT} 0 "STR:${TEXT}" + GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1038 + SendMessage ${MUI_TEMP1} ${WM_SETTEXT} 0 "STR:${SUBTEXT}" + Pop ${MUI_TEMP1} !verbose 4 - + !macroend !macro MUI_DESCRIPTION_INIT @@ -349,14 +154,7 @@ !verbose 3 ;Finish text on the header (white rectangle) - - IntOp ${CURRENTPAGE} ${CURRENTPAGE} + 1 - - !ifndef MUI_SETPAGE_FUNCTIONNAME - !error "Modern UI Error: SetPage function name (MUI_SETPAGE_FUNCTIONNAME) not defined!" - !endif - - Call "${MUI_SETPAGE_FUNCTIONNAME}" + !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_FINISHED_TITLE) $(MUI_TEXT_FINISHED_SUBTITLE) !verbose 4 @@ -367,14 +165,7 @@ !verbose 3 ;Finish text on the header (white rectangle) - - IntOp ${CURRENTPAGE} ${CURRENTPAGE} + 1 - - !ifndef MUI_UNSETPAGE_FUNCTIONNAME - !error "Modern UI Error: Uninstall SetPage function name (MUI_UNSETPAGE_FUNCTIONNAME) not defined!" - !endif - - Call "${MUI_UNSETPAGE_FUNCTIONNAME}" + !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_FINISHED_TITLE) $(MUI_UNTEXT_FINISHED_SUBTITLE) !verbose 4 @@ -386,7 +177,7 @@ ;Warning when Cancel button is pressed - MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(MUI_MSGTEXT_ABORTWARNING)" IDYES quit + MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(MUI_TEXT_ABORTWARNING)" IDYES quit Abort quit: @@ -394,20 +185,33 @@ !macroend +!macro MUI_GUIINIT + + Push ${MUI_TEMP1} + Push ${MUI_TEMP2} + + GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1037 + CreateFont ${MUI_TEMP2} "Tahoma" 10 700 + SendMessage ${MUI_TEMP1} ${WM_SETFONT} ${MUI_TEMP2} 0 + SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF + + GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1038 + SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF + + GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1034 + SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF + + GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1039 + SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF + + Pop ${MUI_TEMP2} + Pop ${MUI_TEMP1} + +!macroend + ;-------------------------------- ;INSTALL OPTIONS -!macro MUI_INSTALLOPTIONS DIRECTIONVAR NOSETDIRECTIONVAR - - !verbose 3 - - !define IO_NOSETDIRECTION ${DIRECTIONVAR} - !define IO_DIRECTION ${NOSETDIRECTIONVAR} - - !verbose 4 - -!macroend - !macro MUI_INSTALLOPTIONS_EXTRACT FILE !verbose 3 @@ -442,185 +246,23 @@ !macroend -!macro MUI_INSTALLOPTIONS_SETDIRECTION DIRECTION +!macro MUI_INSTALLOPTIONS_SHOW FILE !verbose 3 - - StrCpy ${IO_DIRECTION} "${DIRECTION}" - - !verbose 4 - -!macroend - -!macro MUI_INSTALLOPTIONS_NEXTPAGE - - !verbose 3 - - StrCmp ${IO_NOSETDIRECTION} "1" no_setdirection - !insertmacro MUI_INSTALLOPTIONS_SETDIRECTION ${MUI_INSTALLOPTIONS_DIRECTION_NEXT} - no_setdirection: - StrCpy ${IO_NOSETDIRECTION} "0" - - !verbose 4 - -!macroend - -!macro MUI_INSTALLOPTIONS_PREVPAGE - - !verbose 3 - - StrCmp ${IO_NOSETDIRECTION} "1" no_setdirection - !insertmacro MUI_INSTALLOPTIONS_SETDIRECTION ${MUI_INSTALLOPTIONS_DIRECTION_PREV} - no_setdirection: - StrCpy ${IO_NOSETDIRECTION} "0" - - !verbose 4 - -!macroend - -!macro MUI_INSTALLOPTIONS_SHOW PAGE FILE IOBACK IONEXT - - !verbose 3 - - InstallOptions::dialog "$PLUGINSDIR\${FILE}" - Pop ${MUI_TEMP1} - - StrCmp ${MUI_TEMP1} "cancel" "" +2 - Quit - - StrCmp ${MUI_TEMP1} "back" "" noback_${PAGE} - !insertmacro MUI_INSTALLOPTIONS_${IOBACK}BACK - noback_${PAGE}: - - !insertmacro MUI_INSTALLOPTIONS_${IONEXT}NEXT - - !verbose 4 - -!macroend - -!macro MUI_INSTALLOPTIONS_UNSHOW PAGE FILE IOBACK IONEXT - - !verbose 3 - - InstallOptions::dialog "$PLUGINSDIR\${FILE}" - Pop ${MUI_TEMP1} - - StrCmp ${MUI_TEMP1} "cancel" "" +2 - Quit - - StrCmp ${MUI_TEMP1} "back" "" noback_${PAGE} - !insertmacro MUI_INSTALLOPTIONS_UN${IOBACK}BACK - noback_${PAGE}: - - !insertmacro MUI_INSTALLOPTIONS_UN${IONEXT}NEXT - - !verbose 4 - -!macroend - -!macro MUI_INSTALLOPTIONS_BACK - - !verbose 3 - - StrCmp ${IO_DIRECTION} "${MUI_INSTALLOPTIONS_DIRECTION_NEXT}" "" +3 - Call .onPrevPage - Abort - StrCmp ${IO_DIRECTION} "${MUI_INSTALLOPTIONS_DIRECTION_PREV}" "" +3 - Call .onPrevPage - Goto done - - !verbose 4 - -!macroend - -!macro MUI_INSTALLOPTIONS_NEXT - - !verbose 3 - - StrCmp ${IO_DIRECTION} ${MUI_INSTALLOPTIONS_DIRECTION_NEXT} "" +3 - Call .onNextPage - Goto done - StrCmp ${IO_DIRECTION} ${MUI_INSTALLOPTIONS_DIRECTION_PREV} "" +3 - Call .onNextPage - Abort - - !verbose 4 - -!macroend - -!macro MUI_INSTALLOPTIONS_IOBACK - - !verbose 3 - - StrCpy ${IO_NOSETDIRECTION} "1" - Call .onPrevPage - Goto done - - !verbose 4 - -!macroend - -!macro MUI_INSTALLOPTIONS_IONEXT - - !verbose 3 - - StrCpy ${IO_NOSETDIRECTION} "1" - Call .onNextPage - Goto done - !verbose 4 + Push ${MUI_TEMP1} -!macroend + InstallOptions::dialog "$PLUGINSDIR\${FILE}" + Pop ${MUI_TEMP1} -!macro MUI_INSTALLOPTIONS_UNBACK + StrCmp ${MUI_TEMP1} "cancel" "" +2 + Quit - !verbose 3 - - StrCmp ${IO_DIRECTION} "${MUI_INSTALLOPTIONS_DIRECTION_NEXT}" "" +3 - Call un.onPrevPage + StrCmp ${MUI_TEMP1} "back" "" +3 + Pop ${MUI_TEMP1} Abort - StrCmp ${IO_DIRECTION} "${MUI_INSTALLOPTIONS_DIRECTION_PREV}" "" +3 - Call un.onPrevPage - Goto done - - !verbose 4 - -!macroend - -!macro MUI_INSTALLOPTIONS_UNNEXT - - !verbose 3 - - StrCmp ${IO_DIRECTION} ${MUI_INSTALLOPTIONS_DIRECTION_NEXT} "" +3 - Call un.onNextPage - Goto done - StrCmp ${IO_DIRECTION} ${MUI_INSTALLOPTIONS_DIRECTION_PREV} "" +3 - Call un.onNextPage - Abort - - !verbose 4 - -!macroend - -!macro MUI_INSTALLOPTIONS_UNIOBACK - - !verbose 3 - - StrCpy ${IO_NOSETDIRECTION} "1" - Call .onPrevPage - Goto done - - !verbose 4 - -!macroend - -!macro MUI_INSTALLOPTIONS_UNIONEXT - - !verbose 3 - - StrCpy ${IO_NOSETDIRECTION} "1" - Call .onNextPage - Goto done + + Pop ${MUI_TEMP1} !verbose 4 @@ -649,109 +291,57 @@ ;-------------------------------- ;BASIC FUNCTIONS -!macro MUI_BASICFUNCTIONS_INIT - - !verbose 3 - - !define MUI_SETPAGE_FUNCTIONNAME "SetPage" - !define MUI_UNSETPAGE_FUNCTIONNAME "un.SetPage" - - !verbose 4 - -!macroend - !macro MUI_BASICFUNCTIONS - -!verbose 3 - -Function .onNextPage - !insertmacro MUI_NEXTPAGE -FunctionEnd - -Function .onPrevPage - !insertmacro MUI_PREVPAGE -FunctionEnd - -Function .onInitDialog - - !insertmacro MUI_INNERDIALOG_INIT - StrCpy ${MUI_TEMP1} 0 + !ifdef MUI_LICENSEPAGE + Page license SetLicense SetLicenseDialog + !endif + !ifdef MUI_COMPONENTSPAGE + Page components SetComponents SetComponentsDialog + !endif + !ifdef MUI_DIRECTORYPAGE + Page directory SetDirectory SetDirectoryDialog + !endif + Page instfiles SetInstFiles - !ifdef MUI_LICENSEPAGE - IntOp ${MUI_TEMP1} ${MUI_TEMP1} + 1 - StrCmp ${CURRENTPAGE} ${MUI_TEMP1} "" done_licensepage - !insertmacro MUI_INNERDIALOG_TEXT 1040 $(MUI_INNERTEXT_LICENSE) - Goto done - done_licensepage: - !endif - - !ifdef MUI_COMPONENTPAGE - IntOp ${MUI_TEMP1} ${MUI_TEMP1} + 1 - StrCmp ${CURRENTPAGE} ${MUI_TEMP1} "" done_componentpage - !insertmacro MUI_INNERDIALOG_TEXT 1042 $(MUI_INNERTEXT_DESCRIPTION_TITLE) - !insertmacro MUI_INNERDIALOG_TEXT 1043 $(MUI_INNERTEXT_DESCRIPTION_INFO) - Goto done - done_componentpage: - !endif - - !ifdef MUI_DIRSELECTPAGE - IntOp ${MUI_TEMP1} ${MUI_TEMP1} + 1 - StrCmp ${CURRENTPAGE} ${MUI_TEMP1} "" done_dirselectpage - !insertmacro MUI_INNERDIALOG_TEXT 1041 $(MUI_INNERTEXT_DESTINATIONFOLDER) - Goto done - done_dirselectpage: - !endif - - !insertmacro MUI_INNERDIALOG_END - -FunctionEnd - -Function SetPage - - !insertmacro MUI_PAGE_INIT - - StrCpy ${MUI_TEMP1} 0 - - !ifdef MUI_LICENSEPAGE - IntOp ${MUI_TEMP1} ${MUI_TEMP1} + 1 - StrCmp ${CURRENTPAGE} ${MUI_TEMP1} "" done_licensepage - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_LICENSE_TITLE) $(MUI_TEXT_LICENSE_SUBTITLE) - Goto done - done_licensepage: - !endif - - !ifdef MUI_COMPONENTPAGE - IntOp ${MUI_TEMP1} ${MUI_TEMP1} + 1 - StrCmp ${CURRENTPAGE} ${MUI_TEMP1} "" done_componentpage - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_COMPONENTS_TITLE) $(MUI_TEXT_COMPONENTS_SUBTITLE) - Goto done - done_componentpage: - !endif - - !ifdef MUI_DIRSELECTPAGE - IntOp ${MUI_TEMP1} ${MUI_TEMP1} + 1 - StrCmp ${CURRENTPAGE} ${MUI_TEMP1} "" done_dirselectpage - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_DIRSELECT_TITLE) $(MUI_TEXT_DIRSELECT_SUBTITLE) - Goto done - done_dirselectpage: - !endif - - IntOp ${MUI_TEMP1} ${MUI_TEMP1} + 1 - StrCmp ${CURRENTPAGE} ${MUI_TEMP1} "" done_installingpage - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_INSTALLING_TITLE) $(MUI_TEXT_INSTALLING_SUBTITLE) - Goto done - done_installingpage: + !ifdef MUI_LICENSEPAGE + Function SetLicense + !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_LICENSE_TITLE) $(MUI_TEXT_LICENSE_SUBTITLE) + FunctionEnd + !endif + + !ifdef MUI_COMPONENTSPAGE + Function SetComponents + !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_COMPONENTS_TITLE) $(MUI_TEXT_COMPONENTS_SUBTITLE) + FunctionEnd + !endif + + !ifdef MUI_DIRECTORYPAGE + Function SetDirectory + !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_DIRSELECT_TITLE) $(MUI_TEXT_DIRSELECT_SUBTITLE) + FunctionEnd + !endif + + Function SetInstFiles + !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_INSTALLING_TITLE) $(MUI_TEXT_INSTALLING_SUBTITLE) + FunctionEnd - IntOp ${MUI_TEMP1} ${MUI_TEMP1} + 1 - StrCmp ${CURRENTPAGE} ${MUI_TEMP1} "" done_finishedpage - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_FINISHED_TITLE) $(MUI_TEXT_FINISHED_SUBTITLE) - Goto done - done_finishedpage: - - !insertmacro MUI_PAGE_END - -FunctionEnd + Function SetLicenseDialog + !insertmacro MUI_INNERDIALOG_TEXT 1040 $(MUI_INNERTEXT_LICENSE) + FunctionEnd + + Function SetComponentsDialog + !insertmacro MUI_INNERDIALOG_TEXT 1042 $(MUI_INNERTEXT_DESCRIPTION_TITLE) + !insertmacro MUI_INNERDIALOG_TEXT 1043 $(MUI_INNERTEXT_DESCRIPTION_INFO) + FunctionEnd + + Function SetDirectoryDialog + !insertmacro MUI_INNERDIALOG_TEXT 1041 $(MUI_INNERTEXT_DESTINATIONFOLDER) + FunctionEnd + + Function .onGUIInit + !insertmacro MUI_GUIINIT + FunctionEnd !verbose 4 @@ -795,31 +385,20 @@ FunctionEnd !verbose 3 -Function un.onNextPage +UninstPage uninstConfirm un.SetUninstConfirm +UninstPage instfiles un.SetInstFiles - !insertmacro MUI_UNNEXTPAGE + Function un.SetUninstConfirm + !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_INTRO_TITLE) $(MUI_UNTEXT_INTRO_SUBTITLE) + FunctionEnd + + Function un.SetInstFiles + !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_UNINSTALLING_TITLE) $(MUI_UNTEXT_UNINSTALLING_SUBTITLE) + FunctionEnd -FunctionEnd - -Function un.SetPage - - !insertmacro MUI_PAGE_INIT - - !insertmacro MUI_PAGE_START 1 - !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_INTRO_TITLE) $(MUI_UNTEXT_INTRO_SUBTITLE) - !insertmacro MUI_PAGE_STOP 1 - - !insertmacro MUI_PAGE_START 2 - !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_UNINSTALLING_TITLE) $(MUI_UNTEXT_UNINSTALLING_SUBTITLE) - !insertmacro MUI_PAGE_STOP 2 - - !insertmacro MUI_PAGE_START 3 - !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_FINISHED_TITLE) $(MUI_UNTEXT_FINISHED_SUBTITLE) - !insertmacro MUI_PAGE_STOP 3 - - !insertmacro MUI_PAGE_END - -FunctionEnd + Function un.onGUIInit + !insertmacro MUI_GUIINIT + FunctionEnd !verbose 4 diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi index 294e94c7..8361a4d9 100644 --- a/Examples/Modern UI/Basic.nsi +++ b/Examples/Modern UI/Basic.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.3 +;NSIS Modern User Interface version 1.4 ;Basic Macro System Example Script ;Written by Joost Verburg @@ -12,11 +12,9 @@ ;-------------------------------- ;Configuration - !insertmacro MUI_BASICFUNCTIONS_INIT - !define MUI_LICENSEPAGE - !define MUI_COMPONENTPAGE - !define MUI_DIRSELECTPAGE + !define MUI_COMPONENTSPAGE + !define MUI_DIRECTORYPAGE !define MUI_ABORTWARNING !define MUI_UNINSTALLER @@ -26,8 +24,8 @@ !include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh" ;General - Name "${NAME} ${VERSION}" OutFile "Basic.exe" + Name "${NAME} ${VERSION}" !insertmacro MUI_INTERFACE diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi index 8d00c849..f57ed771 100644 --- a/Examples/Modern UI/InstallOptions.nsi +++ b/Examples/Modern UI/InstallOptions.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.3 +;NSIS Modern User Interface version 1.4 ;Advanced Macro System & Install Options Example Script ;Written by Joost Verburg @@ -13,15 +13,11 @@ !define MUI_INSTALLOPTIONS !define MUI_LICENSEPAGE - !define MUI_COMPONENTPAGE - !define MUI_DIRSELECTPAGE - !define MUI_INSTALLBUTTONTEXT_NEXT + !define MUI_COMPONENTSPAGE + !define MUI_DIRECTORYPAGE !define MUI_ABORTWARNING !define MUI_UNINSTALLER - !define MUI_SETPAGE_FUNCTIONNAME "SetPage" - !define MUI_UNSETPAGE_FUNCTIONNAME "un.SetPage" - !define TEMP1 $R0 ;Language @@ -30,12 +26,25 @@ !include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh" ;General - Name "${NAME} ${VERSION}" OutFile "InstallOptions.exe" + Name "${NAME} ${VERSION}" + + !ifdef MUI_LICENSEPAGE + Page license SetLicense SetLicenseDialog + !endif + Page custom SetCustomA + Page custom SetCustomB + !ifdef MUI_COMPONENTSPAGE + Page components SetComponents SetComponentsDialog + !endif + !ifdef MUI_DIRECTORYPAGE + Page directory SetDirectory SetDirectoryDialog + !endif + Page custom SetCustomC + Page instfiles SetInstFiles !insertmacro MUI_INTERFACE - !insertmacro MUI_INSTALLOPTIONS "$7" "$8" ;Variables for the Install Options system. Do not use them in .onNext/PrevPage and SetPage - + ;License page LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt" @@ -48,8 +57,12 @@ InstallDir "$PROGRAMFILES\${NAME}" ;Install Options pages - LangString MUI_TEXT_IO_TITLE ${LANG_ENGLISH} "Install Options Page" - LangString MUI_TEXT_IO_SUBTITLE ${LANG_ENGLISH} "Create your own dialog!" + LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Install Options Page" + LangString TEXT_IO_SUBTITLE ${LANG_ENGLISH} "Create your own dialog!" + + ;Uninstaller + UninstPage uninstConfirm un.SetUninstConfirm + UninstPage instfiles un.SetInstFiles ;Things that need to be extracted on startup (keep these lines before any File command!) ;Use ReserveFile for your own Install Options ini files too! @@ -62,12 +75,23 @@ ;Installer Sections Function .onInit - ;Init InstallOptions !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioA.ini" !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioB.ini" !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioC.ini" - + ;Titles for Install Options dialogs + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "Title" "$(MUI_TEXT_SETUPCAPTION): Custom page A" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "Title" "$(MUI_TEXT_SETUPCAPTION): Custom page B" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "Title" "$(MUI_TEXT_SETUPCAPTION): Custom page C" + !ifdef MUI_ABORTWARNING + ;Abort warnings for Install Options dialogs + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "CancelConfirm" "$(MUI_TEXT_ABORTWARNING)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "CancelConfirmCaption" "$(MUI_TEXT_SETUPCAPTION)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "CancelConfirm" "$(MUI_TEXT_ABORTWARNING)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "CancelConfirmCaption" "$(MUI_TEXT_SETUPCAPTION)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "CancelConfirm" "$(MUI_TEXT_ABORTWARNING)" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "CancelConfirmCaption" "$(MUI_TEXT_SETUPCAPTION)" + !endif FunctionEnd Section "modern.exe" SecCopyUI @@ -103,121 +127,73 @@ SectionEnd ;-------------------------------- ;Installer Functions -Function .onInitDialog +!ifdef MUI_LICENSEPAGE + Function SetLicense + !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_LICENSE_TITLE) $(MUI_TEXT_LICENSE_SUBTITLE) + FunctionEnd +!endif - !insertmacro MUI_INNERDIALOG_INIT - - !insertmacro MUI_INNERDIALOG_START 1 - !insertmacro MUI_INNERDIALOG_TEXT 1040 $(MUI_INNERTEXT_LICENSE) - !insertmacro MUI_INNERDIALOG_STOP 1 - - !insertmacro MUI_INNERDIALOG_START 4 - !insertmacro MUI_INNERDIALOG_TEXT 1042 $(MUI_INNERTEXT_DESCRIPTION_TITLE) - !insertmacro MUI_INNERDIALOG_TEXT 1043 $(MUI_INNERTEXT_DESCRIPTION_INFO) - !insertmacro MUI_INNERDIALOG_STOP 4 - - !insertmacro MUI_INNERDIALOG_START 5 - !insertmacro MUI_INNERDIALOG_TEXT 1041 $(MUI_INNERTEXT_DESTINATIONFOLDER) - !insertmacro MUI_INNERDIALOG_STOP 5 - - !insertmacro MUI_INNERDIALOG_END - +Function SetCustomA + !insertmacro MUI_HEADER_TEXT $(TEXT_IO_TITLE) $(TEXT_IO_SUBTITLE) + !insertmacro MUI_INSTALLOPTIONS_SHOW "ioA.ini" FunctionEnd -Function .onNextPage - - !insertmacro MUI_INSTALLOPTIONS_NEXTPAGE - !insertmacro MUI_NEXTPAGE +Function SetCustomB + !insertmacro MUI_HEADER_TEXT $(TEXT_IO_TITLE) $(TEXT_IO_SUBTITLE) + !insertmacro MUI_INSTALLOPTIONS_SHOW "ioB.ini" +FunctionEnd +!ifdef MUI_COMPONENTSPAGE + Function SetComponents + !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_COMPONENTS_TITLE) $(MUI_TEXT_COMPONENTS_SUBTITLE) + FunctionEnd +!endif + +!ifdef MUI_DIRECTORYPAGE + Function SetDirectory + !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_DIRSELECT_TITLE) $(MUI_TEXT_DIRSELECT_SUBTITLE) + FunctionEnd +!endif + +Function SetCustomC + !insertmacro MUI_HEADER_TEXT $(TEXT_IO_TITLE) $(TEXT_IO_SUBTITLE) + !insertmacro MUI_INSTALLOPTIONS_SHOW "ioC.ini" FunctionEnd -Function .onPrevPage - - !insertmacro MUI_INSTALLOPTIONS_PREVPAGE - !insertmacro MUI_PREVPAGE - +Function SetInstFiles + !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_INSTALLING_TITLE) $(MUI_TEXT_INSTALLING_SUBTITLE) FunctionEnd - -Function SetPage - - !insertmacro MUI_PAGE_INIT - - !insertmacro MUI_PAGE_START 1 - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_LICENSE_TITLE) $(MUI_TEXT_LICENSE_SUBTITLE) - !insertmacro MUI_PAGE_STOP 1 - - !insertmacro MUI_PAGE_START 2 - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_IO_TITLE) $(MUI_TEXT_IO_SUBTITLE) - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "Title" "${NAME} ${VERSION} Setup: Install Options A" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "CancelConfirm" "Are you sure you want to quit ${NAME} Setup?" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "CancelConfirmCaption" "${NAME} ${VERSION} Setup" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "CancelConfirmFlags" "MB_ICONEXCLAMATION" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "BackButtonText" $(MUI_BUTTONTEXT_BACK) - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "NextButtonText" $(MUI_BUTTONTEXT_NEXT) - !insertmacro MUI_INSTALLOPTIONS_SHOW 2 "ioA.ini" "" "IO" ;Next page is an IO page - !insertmacro MUI_PAGE_STOP 2 - - !insertmacro MUI_PAGE_START 3 - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_IO_TITLE) $(MUI_TEXT_IO_SUBTITLE) - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "Title" "${NAME} ${VERSION} Setup: Install Options B" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "CancelConfirm" "Are you sure you want to quit ${NAME} Setup?" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "CancelConfirmCaption" "${NAME} ${VERSION} Setup" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "CancelConfirmFlags" "MB_ICONEXCLAMATION" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "BackButtonText" $(MUI_BUTTONTEXT_BACK) - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "NextButtonText" $(MUI_BUTTONTEXT_NEXT) - !insertmacro MUI_INSTALLOPTIONS_SHOW 3 "ioB.ini" "IO" "" ;Previous page is an IO page - !insertmacro MUI_PAGE_STOP 3 - - !insertmacro MUI_PAGE_START 4 - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_COMPONENTS_TITLE) $(MUI_TEXT_COMPONENTS_SUBTITLE) - !insertmacro MUI_PAGE_STOP 4 - - !insertmacro MUI_PAGE_START 5 - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_DIRSELECT_TITLE) $(MUI_TEXT_DIRSELECT_SUBTITLE) - !insertmacro MUI_PAGE_STOP 5 - - !insertmacro MUI_PAGE_START 6 - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_IO_TITLE) $(MUI_TEXT_IO_SUBTITLE) - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "Title" "${NAME} ${VERSION} Setup: Install Options C" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "CancelConfirm" "Are you sure you want to quit ${NAME} Setup?" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "CancelConfirmCaption" "${NAME} ${VERSION} Setup" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "CancelConfirmFlags" "MB_ICONEXCLAMATION" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "BackButtonText" $(MUI_BUTTONTEXT_BACK) - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "NextButtonText" $(MUI_BUTTONTEXT_INSTALL) - !insertmacro MUI_INSTALLOPTIONS_SHOW 6 "ioC.ini" "" "" ;Next/previous pages are no IO pages - !insertmacro MUI_PAGE_STOP 6 - - !insertmacro MUI_PAGE_START 7 - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_INSTALLING_TITLE) $(MUI_TEXT_INSTALLING_SUBTITLE) - !insertmacro MUI_PAGE_STOP 7 - - !insertmacro MUI_PAGE_START 8 - !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_FINISHED_TITLE) $(MUI_TEXT_FINISHED_SUBTITLE) - !insertmacro MUI_PAGE_STOP 8 - - !insertmacro MUI_PAGE_END - + +Function SetLicenseDialog + !insertmacro MUI_INNERDIALOG_TEXT 1040 $(MUI_INNERTEXT_LICENSE) +FunctionEnd + +Function SetComponentsDialog + !insertmacro MUI_INNERDIALOG_TEXT 1042 $(MUI_INNERTEXT_DESCRIPTION_TITLE) + !insertmacro MUI_INNERDIALOG_TEXT 1043 $(MUI_INNERTEXT_DESCRIPTION_INFO) +FunctionEnd + +Function SetDirectoryDialog + !insertmacro MUI_INNERDIALOG_TEXT 1041 $(MUI_INNERTEXT_DESTINATIONFOLDER) +FunctionEnd + +Function .onGUIInit + !insertmacro MUI_GUIINIT FunctionEnd Function .onMouseOverSection - !insertmacro MUI_DESCRIPTION_INIT - !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI) !insertmacro MUI_DESCRIPTION_TEXT ${SecCreateUninst} $(DESC_SecCreateUninst) - !insertmacro MUI_DESCRIPTION_END - FunctionEnd Function .onUserAbort - !insertmacro MUI_ABORTWARNING - FunctionEnd ;-------------------------------- -;Uninstaller Section +;Uninstaller Section "Uninstall" @@ -235,31 +211,16 @@ SectionEnd ;-------------------------------- ;Uninstaller Functions -Function un.onNextPage - - !insertmacro MUI_INSTALLOPTIONS_NEXTPAGE - !insertmacro MUI_UNNEXTPAGE - +Function un.SetUninstConfirm + !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_INTRO_TITLE) $(MUI_UNTEXT_INTRO_SUBTITLE) +FunctionEnd + +Function un.SetInstFiles + !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_UNINSTALLING_TITLE) $(MUI_UNTEXT_UNINSTALLING_SUBTITLE) FunctionEnd -Function un.SetPage - - !insertmacro MUI_PAGE_INIT - - !insertmacro MUI_PAGE_START 1 - !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_INTRO_TITLE) $(MUI_UNTEXT_INTRO_SUBTITLE) - !insertmacro MUI_PAGE_STOP 1 - - !insertmacro MUI_PAGE_START 2 - !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_UNINSTALLING_TITLE) $(MUI_UNTEXT_UNINSTALLING_SUBTITLE) - !insertmacro MUI_PAGE_STOP 2 - - !insertmacro MUI_PAGE_START 3 - !insertmacro MUI_HEADER_TEXT $(MUI_UNTEXT_FINISHED_TITLE) $(MUI_UNTEXT_FINISHED_SUBTITLE) - !insertmacro MUI_PAGE_STOP 3 - - !insertmacro MUI_PAGE_END - +Function un.onGUIInit + !insertmacro MUI_GUIINIT FunctionEnd ;eof \ No newline at end of file diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi index be687c07..3ae73598 100644 --- a/Examples/Modern UI/MultiLanguage.nsi +++ b/Examples/Modern UI/MultiLanguage.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.3 +;NSIS Modern User Interface version 1.4 ;Basic Macro System & MultiLanguage Example Script ;Written by Joost Verburg @@ -12,11 +12,9 @@ ;-------------------------------- ;Configuration - !insertmacro MUI_BASICFUNCTIONS_INIT - !define MUI_LICENSEPAGE - !define MUI_COMPONENTPAGE - !define MUI_DIRSELECTPAGE + !define MUI_COMPONENTSPAGE + !define MUI_DIRECTORYPAGE !define MUI_ABORTWARNING !define MUI_UNINSTALLER @@ -45,6 +43,10 @@ LoadLanguageFile "${NSISDIR}\Contrib\Language files\TradChinese.nlf" !include "${NSISDIR}\Contrib\Modern UI\Language files\TradChinese.nsh" + ;Japanese + LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf" + !include "${NSISDIR}\Contrib\Modern UI\Language files\Japanese.nsh" + ;Italian LoadLanguageFile "${NSISDIR}\Contrib\Language files\Italian.nlf" !include "${NSISDIR}\Contrib\Modern UI\Language files\Italian.nsh" @@ -84,6 +86,7 @@ Name /LANG=${LANG_SPANISH} "${NAME} ${VERSION}" Name /LANG=${LANG_SIMPCHINESE} "${NAME} ${VERSION}" Name /LANG=${LANG_TRADCHINESE} "${NAME} ${VERSION}" + Name /LANG=${LANG_JAPANESE} "${NAME} ${VERSION}" Name /LANG=${LANG_ITALIAN} "${NAME} ${VERSION}" Name /LANG=${LANG_DUTCH} "${NAME} ${VERSION}" Name /LANG=${LANG_POLISH} "${NAME} ${VERSION}" @@ -99,6 +102,7 @@ LicenseData /LANG=${LANG_SPANISH} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_SIMPCHINESE} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_TRADCHINESE} "${NSISDIR}\Contrib\Modern UI\License.txt" + LicenseData /LANG=${LANG_JAPANESE} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_ITALIAN} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_DUTCH} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_POLISH} "${NSISDIR}\Contrib\Modern UI\License.txt" @@ -115,6 +119,7 @@ LangString TITLE_SecCopyUI ${LANG_SPANISH} "modern.exe" LangString TITLE_SecCopyUI ${LANG_SIMPCHINESE} "modern.exe" LangString TITLE_SecCopyUI ${LANG_TRADCHINESE} "modern.exe" + LangString TITLE_SecCopyUI ${LANG_JAPANESE} "modern.exe" LangString TITLE_SecCopyUI ${LANG_ITALIAN} "modern.exe" LangString TITLE_SecCopyUI ${LANG_DUTCH} "modern.exe" LangString TITLE_SecCopyUI ${LANG_POLISH} "modern.exe" @@ -130,6 +135,7 @@ LangString DESC_SecCopyUI ${LANG_SPANISH} "modern.exe: Spanish description" LangString DESC_SecCopyUI ${LANG_SIMPCHINESE} "modern.exe: Simplified Chinese description" LangString DESC_SecCopyUI ${LANG_TRADCHINESE} "modern.exe: Traditional Chinese description" + LangString DESC_SecCopyUI ${LANG_JAPANESE} "modern.exe: Japanese description" LangString DESC_SecCopyUI ${LANG_ITALIAN} "modern.exe: Italian description" LangString DESC_SecCopyUI ${LANG_DUTCH} "modern.exe: Dutch description" LangString DESC_SecCopyUI ${LANG_POLISH} "modern.exe: Polish description" @@ -186,6 +192,8 @@ Function .onInit Push "${MUI_TRADCHINESE_LANGNAME}" Push ${LANG_SIMPCHINESE} Push "${MUI_SIMPCHINESE_LANGNAME}" + Push ${LANG_JAPANESE} + Push "${MUI_JAPANESE_LANGNAME}" Push ${LANG_ITALIAN} Push "${MUI_ITALIAN_LANGNAME}" Push ${LANG_DUTCH} @@ -201,7 +209,7 @@ Function .onInit Push ${LANG_UKRAINIAN} Push "${MUI_UKRAINIAN_LANGNAME}" - Push 13F ;13 = number of languages, F = change font + Push 14F ;14 = number of languages, F = change font LangDLL::LangDialog "Installer Language" "Please select a language." diff --git a/Examples/Modern UI/ioA.ini b/Examples/Modern UI/ioA.ini index a726014b..d3a8681f 100644 --- a/Examples/Modern UI/ioA.ini +++ b/Examples/Modern UI/ioA.ini @@ -1,6 +1,6 @@ [Settings] NumFields=1 -BackEnabled=1 +CancelConfirmFlags=MB_ICONEXCLAMATION [Field 1] Type=label diff --git a/Examples/Modern UI/ioB.ini b/Examples/Modern UI/ioB.ini index 8d205b44..df146031 100644 --- a/Examples/Modern UI/ioB.ini +++ b/Examples/Modern UI/ioB.ini @@ -1,6 +1,6 @@ [Settings] NumFields=1 -BackEnabled=1 +CancelConfirmFlags=MB_ICONEXCLAMATION [Field 1] Type=label diff --git a/Examples/Modern UI/ioC.ini b/Examples/Modern UI/ioC.ini index 91b71ff6..f1bbd0ca 100644 --- a/Examples/Modern UI/ioC.ini +++ b/Examples/Modern UI/ioC.ini @@ -1,6 +1,6 @@ [Settings] NumFields=2 -BackEnabled=1 +CancelConfirmFlags=MB_ICONEXCLAMATION [Field 1] Type=label