multilanguage system easier to use (using defines)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1330 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/Modern UI/Dutch.nsh

@@ -12,21 +12,21 @@
 
   ;INSTALLER
   
-  !macro MUI_DUTCH_LICENSETEXT
+  !ifdef MUI_LICENSEPAGE
      LicenseText /LANG=${LANG_DUTCH} "Druk op Page Down om de rest van de overeenkomt te zien."
-  !macroend
+  !endif
   
-  !macro MUI_DUTCH_COMPONENTTEXT
+  !ifdef MUI_COMPONENTPAGE
     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." " "
-  !macroend
+  !endif
   
-  !macro MUI_DUTCH_DIRTEXT
+  !ifdef MUI_DIRSELECTPAGE
     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." " "
-  !macroend 
+  !endif
   
-  !macro MUI_DUTCH_INSTALLBUTTONTEXT_NEXT
+  !ifdef MUI_INSTALLBUTTONTEXT_NEXT
     InstallButtonText /LANG=${LANG_DUTCH} "Volgende >"
-  !macroend
+  !endif
   
   LangString MUI_TEXT_LICENSE_TITLE ${LANG_DUTCH} "Licentie Overeenkomst"
   LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_DUTCH} "Lees de licentie overeenkomst voordat u ${NAME} installeerd."
@@ -57,13 +57,13 @@
 
   ;UNINSTALLER
   
-  !macro MUI_DUTCH_UNINSTALLTEXT
+  !ifdef MUI_UNINSTALLER
     UninstallText /LANG=${LANG_DUTCH} "Dit programma zal ${NAME} verwijderen van uw systeem."
-  !macroend
+  !endif
   
-  !macro MUI_DUTCH_UNINSTALLBUTTONTEXT_NEXT
+  !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT
     UnInstallButtonText /LANG=${LANG_DUTCH} "Volgende >"
-  !macroend
+  !endif
   
   LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_DUTCH} "Deïnstalleer ${NAME}"
   LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_DUTCH} "Verwijder ${NAME} van uw system."

Contrib/Modern UI/English.nsh

@@ -12,21 +12,21 @@
 
   ;INSTALLER
   
-  !macro MUI_ENGLISH_LICENSETEXT
+  !ifdef MUI_LICENSEPAGE
      LicenseText /LANG=${LANG_ENGLISH} "Press Page Down to see the rest of the agreement."
-  !macroend
+  !endif
   
-  !macro MUI_ENGLISH_COMPONENTTEXT
+  !ifdef MUI_COMPONENTPAGE
     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." " "
-  !macroend
+  !endif
   
-  !macro MUI_ENGLISH_DIRTEXT
+  !ifdef MUI_DIRSELECTPAGE
     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." " "
-  !macroend
+  !endif
   
-  !macro MUI_ENGLISH_INSTALLBUTTONTEXT_NEXT
+  !ifdef MUI_INSTALLBUTTONTEXT_NEXT
     InstallButtonText /LANG=${LANG_ENGLISH} "Next >"
-  !macroend
+  !endif
    
   LangString MUI_TEXT_LICENSE_TITLE ${LANG_ENGLISH} "License Agreement"  
   LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_ENGLISH} "Please review the license terms before installing ${NAME}."
@@ -57,13 +57,13 @@
   
   ;UNINSTALLER
   
-  !macro MUI_ENGLISH_UNINSTALLTEXT
+  !ifdef MUI_UNINSTALLER
     UninstallText /LANG=${LANG_ENGLISH} "This will uninstall ${NAME} from your system."
-  !macroend
+  !endif
   
-  !macro MUI_ENGLISH_UNINSTALLBUTTONTEXT_NEXT
+  !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT
     InstallButtonText /LANG=${LANG_ENGLISH} "Next >"
-  !macroend
+  !endif
   
   LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_ENGLISH} "Uninstall ${NAME}"
   LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_ENGLISH} "Remove ${NAME} from your system."

Contrib/Modern UI/French.nsh

@@ -12,21 +12,21 @@
 
   ;INSTALLER
   
-  !macro MUI_FRENCH_LICENSETEXT
+  !ifdef MUI_LICENSEPAGE
      LicenseText /LANG=${LANG_FRENCH} "Appuyez sur Page Down pour lire le reste de la licence utilisateur."
-  !macroend
+  !endif
   
-  !macro MUI_FRENCH_COMPONENTTEXT
+  !ifdef MUI_COMPONENTPAGE
     ComponentText /LANG=${LANG_FRENCH} "Cochez les composants que vous souhaitez installer, et décochez ceux que vous ne voulez pas installer. Cliquez sur Suivant pour continuer." " "
-  !macroend
+  !endif
   
-  !macro MUI_FRENCH_DIRTEXT
+  !ifdef MUI_DIRSELECTPAGE
     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." " "
-  !macroend
+  !endif
   
-  !macro MUI_FRENCH_INSTALLBUTTONTEXT_NEXT
+  !ifdef MUI_INSTALLBUTTONTEXT_NEXT
     InstallButtonText /LANG=${LANG_FRENCH} "Suivant >"
-  !macroend
+  !endif
    
   LangString MUI_TEXT_LICENSE_TITLE ${LANG_FRENCH} "Licence utilisateur"  
   LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_FRENCH} "Veuillez examiner les termes de la licence avant d'installer ${NAME}."
@@ -57,13 +57,13 @@
   
   ;UNINSTALLER
   
-  !macro MUI_FRENCH_UNINSTALLTEXT
+  !ifdef MUI_UNINSTALLER
     UninstallText /LANG=${LANG_FRENCH} "Ce programme va supprimer ${NAME} de votre ordinateur."
-  !macroend
+  !endif
   
-  !macro MUI_FRENCH_UNINSTALLBUTTONTEXT_NEXT
+  !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT
     InstallButtonText /LANG=${LANG_FRENCH} "Suivant >"
-  !macroend
+  !endif
   
   LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_FRENCH} "Désinstaller ${NAME}"
   LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_FRENCH} "Supprimer ${NAME} de votre ordinateur."

Examples/Modern UI/Basic.nsi

@@ -12,6 +12,11 @@
 ;--------------------------------
 ;Configuration
 
+  !define MUI_LICENSEPAGE
+  !define MUI_COMPONENTPAGE
+  !define MUI_DIRSELECTPAGE
+  !define MUI_UNINSTALLER
+
   ;Language
     ;English
     LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
@@ -25,21 +30,16 @@
   !insertmacro MUI_INTERFACE "modern.exe" "adni18-installer-C-no48xp.ico" "adni18-uninstall-C-no48xp.ico" "modern.bmp" "smooth" "$9" ;$9 is the variable used to store the current page, do not use this var!
 
   ;License dialog
-  !insertmacro MUI_ENGLISH_LICENSETEXT
   LicenseData "License.txt"
 
   ;Component-select dialog
-  !insertmacro MUI_ENGLISH_COMPONENTTEXT
     ;Descriptions
     LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
     LangString DESC_SecCreateUninst ${LANG_ENGLISH} "Create a uninstaller which can automatically delete ${NAME}."
 
   ;Folder-select dialog
-  !insertmacro MUI_ENGLISH_DIRTEXT
   InstallDir "$PROGRAMFILES\${NAME}"
 
-  ;Uninstaller
-  !insertmacro MUI_ENGLISH_UNINSTALLTEXT
 
 ;--------------------------------
 ;Installer Sections

Examples/Modern UI/InstallOptions.nsi

@@ -12,6 +12,12 @@
 ;--------------------------------
 ;Configuration
 
+  !define MUI_LICENSEPAGE
+  !define MUI_COMPONENTPAGE
+  !define MUI_DIRSELECTPAGE
+  !define MUI_INSTALLBUTTONTEXT_NEXT
+  !define MUI_UNINSTALLER
+
   ;Language
     ;English
     LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
@@ -26,26 +32,19 @@
   !insertmacro MUI_INSTALLOPTIONS "$7" "$8" ;Variables for the Install Options system. Do not use them in .onNext/PrevPage and SetPage
 
   ;License dialog
-  !insertmacro MUI_ENGLISH_LICENSETEXT
   LicenseData "License.txt"
 
   ;Component-select dialog
-  !insertmacro MUI_ENGLISH_COMPONENTTEXT
     ;Descriptions
     LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
     LangString DESC_SecCreateUninst ${LANG_ENGLISH} "Create a uninstaller which can automatically delete ${NAME}."
 
   ;Folder-select dialog
-  !insertmacro MUI_ENGLISH_DIRTEXT
   InstallDir "$PROGRAMFILES\${NAME}"
-  InstallButtonText "Next >" ;Install Options dialog has 'Install' button
   
   ;Install Options dialogs
   LangString MUI_TEXT_IO_TITLE ${LANG_ENGLISH} "Install Options Page"
   LangString MUI_TEXT_IO_SUBTITLE ${LANG_ENGLISH} "Create your own dialog!"
-
-  ;Uninstaller
-  !insertmacro MUI_ENGLISH_UNINSTALLTEXT
   
   ;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!

Examples/Modern UI/MultiLanguage.nsi

@@ -12,7 +12,12 @@
 ;--------------------------------
 ;Configuration
 
-  ;Language
+  !define MUI_LICENSEPAGE
+  !define MUI_COMPONENTPAGE
+  !define MUI_DIRSELECTPAGE
+  !define MUI_UNINSTALLER
+
+  ;Languages
     ;English
     LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
     !include "${NSISDIR}\Contrib\Modern UI\English.nsh"
@@ -20,44 +25,44 @@
     ;Dutch
     LoadLanguageFile "${NSISDIR}\Contrib\Language files\Dutch.nlf"
     !include "${NSISDIR}\Contrib\Modern UI\Dutch.nsh"
+    
+    ;French
+    LoadLanguageFile "${NSISDIR}\Contrib\Language files\French.nlf"
+    !include "${NSISDIR}\Contrib\Modern UI\French.nsh"
 
   ;General
   Name /LANG=${LANG_ENGLISH} "${NAME} ${VERSION}"
   Name /LANG=${LANG_DUTCH} "${NAME} ${VERSION}"
+  Name /LANG=${LANG_FRENCH} "${NAME} ${VERSION}"
   OutFile "MultiLanguage.exe"
 
   ;User interface - icons, ui file, check bitmap, progress bar etc.
   !insertmacro MUI_INTERFACE "modern.exe" "adni18-installer-C-no48xp.ico" "adni18-uninstall-C-no48xp.ico" "modern.bmp" "smooth" "$9" ;$9 is the variable used to store the current page, do not use this var!
 
   ;License dialog
-  !insertmacro MUI_ENGLISH_LICENSETEXT
-  !insertmacro MUI_DUTCH_LICENSETEXT
   LicenseData /LANG=${LANG_ENGLISH} "License.txt"
   LicenseData /LANG=${LANG_DUTCH} "License.txt"
+  LicenseData /LANG=${LANG_FRENCH} "License.txt"
 
   ;Component-select dialog
-  !insertmacro MUI_ENGLISH_COMPONENTTEXT
-  !insertmacro MUI_DUTCH_COMPONENTTEXT
     ;Titles
     LangString TITLE_SecCopyUI ${LANG_ENGLISH} "modern.exe"
     LangString TITLE_SecCopyUI ${LANG_DUTCH} "modern.exe"
+    LangString TITLE_SecCopyUI ${LANG_FRENCH} "modern.exe"
     LangString TITLE_SecCreateUninst ${LANG_ENGLISH} "Uninstaller"
     LangString TITLE_SecCreateUninst ${LANG_DUTCH} "Deïnstallatie programma"
+    LangString TITLE_SecCreateUninst ${LANG_FRENCH} "Désinstaller"
     ;Descriptions
-    LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
+    LangString DESC_SecCopyUI ${LANG_ENGLISH} "modern.exe: English description"
-    LangString DESC_SecCopyUI ${LANG_DUTCH} "Kopieër modern.exe naar de programma map."
+    LangString DESC_SecCopyUI ${LANG_DUTCH} "modern.exe: Nederlandse beschrijven"
-    LangString DESC_SecCreateUninst ${LANG_ENGLISH} "Create a uninstaller which can automatically delete ${NAME}."
+    LangString DESC_SecCopyUI ${LANG_FRENCH} "modern.exe: Description Français"
-    LangString DESC_SecCreateUninst ${LANG_DUTCH} "Maak een deïnstallatie programma dat ${NAME} automatisch kan verwijderen."
+    LangString DESC_SecCreateUninst ${LANG_ENGLISH} "Uninstaller: English description"
+    LangString DESC_SecCreateUninst ${LANG_DUTCH} "Deïnstallatie programma: Nederlandse beschrijven"
+    LangString DESC_SecCreateUninst ${LANG_FRENCH} "Désinstaller: Description Français"
 
   ;Folder-select dialog
-  !insertmacro MUI_ENGLISH_DIRTEXT
-  !insertmacro MUI_DUTCH_DIRTEXT
   InstallDir "$PROGRAMFILES\${NAME}"
-
+  
-  ;Uninstaller
-  !insertmacro MUI_ENGLISH_UNINSTALLTEXT
-  !insertmacro MUI_DUTCH_UNINSTALLTEXT
-
 ;--------------------------------
 ;Installer Sections
 
@@ -90,7 +95,7 @@ SectionEnd
 
 Function .onInit
 
-  LangDLL::LangDialog "Installer Language" "Please select a language." "2F" "English" "${LANG_ENGLISH}" "Nederlands" "${LANG_DUTCH}" "8" "Tahoma" ;2 is the number of lanugages, F means change font
+  LangDLL::LangDialog "Installer Language" "Please select a language." "3F" "English" "${LANG_ENGLISH}" "Français" "${LANG_FRENCH}" "Nederlands" "${LANG_DUTCH}" "8" "Tahoma" ;3 is the number of lanugages, F means change font
 
   Pop $LANGUAGE
   StrCmp $LANGUAGE "cancel" 0 +2

Examples/Modern UI/ioB.ini

@@ -1,8 +1,6 @@
 [Settings]
 NumFields=1
 BackEnabled=1
-BackButtonText=< Back
-NextButtonText=Next >
 
 [Field 1]
 Type=label

Examples/Modern UI/ioC.ini

@@ -1,8 +1,6 @@
 [Settings]
 NumFields=1
 BackEnabled=1
-BackButtonText=< Back
-NextButtonText=Install
 
 [Field 1]
 Type=label