From e9aaff38b81d9c913927d40563470af10166fb6f Mon Sep 17 00:00:00 2001 From: joostverburg Date: Sun, 13 Oct 2002 18:25:07 +0000 Subject: [PATCH] better usage of defines, no more wasted space for unused LangStrings git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1402 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/Language files/English.nsh | 64 ++++++++++---------- Examples/Modern UI/InstallOptions.nsi | 2 + 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Contrib/Modern UI/Language files/English.nsh b/Contrib/Modern UI/Language files/English.nsh index c49c0ff9..8599ef40 100644 --- a/Contrib/Modern UI/Language files/English.nsh +++ b/Contrib/Modern UI/Language files/English.nsh @@ -16,32 +16,29 @@ !ifdef MUI_LICENSEPAGE LicenseText /LANG=${LANG_ENGLISH} "Press Page Down to see the rest of the agreement." + LangString MUI_TEXT_LICENSE_TITLE ${LANG_ENGLISH} "License Agreement" + LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_ENGLISH} "Please review the license terms before installing ${NAME}." + 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 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." + LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_ENGLISH} "Description" + LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_ENGLISH} "Hover your mouse over a component to see it's description." !endif !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." " " + 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_LICENSE_TITLE ${LANG_ENGLISH} "License Agreement" - LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_ENGLISH} "Please review the license terms before installing ${NAME}." - 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}." - - 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." - LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_ENGLISH} "Description" - LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_ENGLISH} "Hover your mouse over a component to see it's description." - - 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" LangString MUI_TEXT_INSTALLING_TITLE ${LANG_ENGLISH} "Installing" LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ENGLISH} "Please wait while ${NAME} is being installed." @@ -50,35 +47,38 @@ LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_ENGLISH} "Setup was completed successfully." LangString MUI_MSGTEXT_ABORTWARNING ${LANG_ENGLISH} "Are you sure you want to quit ${NAME} Setup?" - - 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" - + !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" + !endif + + ;UNINSTALLER !ifdef MUI_UNINSTALLER UninstallText /LANG=${LANG_ENGLISH} "This will uninstall ${NAME} from your system." + LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_ENGLISH} "Uninstall ${NAME}" + LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_ENGLISH} "Remove ${NAME} from your system." + + LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_ENGLISH} "Uninstalling" + LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_ENGLISH} "Please wait while ${NAME} is being uninstalled." + + LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_ENGLISH} "Finished" + LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_ENGLISH} "Uninstall was completed successfully." !endif !ifdef MUI_UNINSTALLBUTTONTEXT_NEXT InstallButtonText /LANG=${LANG_ENGLISH} "Next >" !endif - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_ENGLISH} "Uninstall ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_ENGLISH} "Remove ${NAME} from your system." - - LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_ENGLISH} "Uninstalling" - LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_ENGLISH} "Please wait while ${NAME} is being uninstalled." - - LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_ENGLISH} "Finished" - LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_ENGLISH} "Uninstall was completed successfully." - - 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" + !ifdef MUI_INSTALLOPTIONS + 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 \ No newline at end of file diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi index 355bd180..b1ebee28 100644 --- a/Examples/Modern UI/InstallOptions.nsi +++ b/Examples/Modern UI/InstallOptions.nsi @@ -12,6 +12,8 @@ ;-------------------------------- ;Configuration + !define MUI_INSTALLOPTIONS + !define MUI_LICENSEPAGE !define MUI_COMPONENTPAGE !define MUI_DIRSELECTPAGE