From 80c1de2d6e47cf3bd3d3e26438d7d6de4f1dddff Mon Sep 17 00:00:00 2001 From: joostverburg Date: Thu, 5 Dec 2002 16:29:41 +0000 Subject: [PATCH] Modern UI 1.61 - final version for beta 0 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1888 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/Changelog.txt | 5 +++++ Contrib/Modern UI/Language files/Arabic.nsh | 2 +- .../Modern UI/Language files/Bulgarian.nsh | 4 ++-- Contrib/Modern UI/Language files/Czech.nsh | 2 +- Contrib/Modern UI/Language files/Danish.nsh | 2 +- Contrib/Modern UI/Language files/Dutch.nsh | 2 +- Contrib/Modern UI/Language files/English.nsh | 2 +- Contrib/Modern UI/Language files/French.nsh | 2 +- Contrib/Modern UI/Language files/German.nsh | 2 +- Contrib/Modern UI/Language files/Greek.nsh | 2 +- .../Modern UI/Language files/Hungarian.nsh | 2 +- Contrib/Modern UI/Language files/Italian.nsh | 2 +- Contrib/Modern UI/Language files/Japanese.nsh | 2 +- Contrib/Modern UI/Language files/Korean.nsh | 2 +- Contrib/Modern UI/Language files/Polish.nsh | 2 +- .../Modern UI/Language files/PortugueseBR.nsh | 2 +- Contrib/Modern UI/Language files/Russian.nsh | 2 +- .../Modern UI/Language files/SimpChinese.nsh | 2 +- Contrib/Modern UI/Language files/Spanish.nsh | 2 +- .../Modern UI/Language files/TradChinese.nsh | 2 +- .../Modern UI/Language files/Ukrainian.nsh | 2 +- Contrib/Modern UI/Readme.html | 22 ++++++++++++++++--- Contrib/Modern UI/System.nsh | 2 +- Examples/Modern UI/Basic.nsi | 6 +++-- Examples/Modern UI/InstallOptions.nsi | 10 ++++----- Examples/Modern UI/MultiLanguage.nsi | 6 +++-- Examples/Modern UI/StartMenu.nsi | 6 +++-- Examples/Modern UI/WelcomeFinish.nsi | 6 ++--- 28 files changed, 65 insertions(+), 40 deletions(-) diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt index ee43cf9e..422114b8 100644 --- a/Contrib/Modern UI/Changelog.txt +++ b/Contrib/Modern UI/Changelog.txt @@ -1,5 +1,10 @@ NSIS Modern User Interface - VERSION HISTORY +1.61 - December 5, 2002 +* Final version for NSIS 2 beta 0 +* Different translation for finish page title +* Bugfixes + 1.6 - November 18, 2002 * Welcome / Finish pages * Automatic ask for reboot on finish page diff --git a/Contrib/Modern UI/Language files/Arabic.nsh b/Contrib/Modern UI/Language files/Arabic.nsh index 927f0a3a..0309969a 100644 --- a/Contrib/Modern UI/Language files/Arabic.nsh +++ b/Contrib/Modern UI/Language files/Arabic.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Arabic (1025) ;By asdfuae@msn.com diff --git a/Contrib/Modern UI/Language files/Bulgarian.nsh b/Contrib/Modern UI/Language files/Bulgarian.nsh index 4da9a7b1..833c2b6f 100644 --- a/Contrib/Modern UI/Language files/Bulgarian.nsh +++ b/Contrib/Modern UI/Language files/Bulgarian.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Bulgarian (1026) ;Translated by Asparouh Kalyandjiev [acnapyx@sbline.net] @@ -21,7 +21,7 @@ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Лицензно споразумение" !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Моля прегледайте лицензните условия преди инсталирането на ${MUI_PRODUCT}." !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Натиснете 'Page Down', за да видите останалата част от споразумението." - !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Ако приемане всички условия от споразумението, Изберете 'Съгласен съм', за да продължите. Трябва да приемете споразумението, за да инсталирате ${MUI_PRODUCT}." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Ако приемате всички условия от споразумението, Изберете 'Съгласен', за да продължите. Трябва да приемете споразумението, за да инсталирате ${MUI_PRODUCT}." !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Изберете компонентите" !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Изберете кои функции на ${MUI_PRODUCT} желаете да бъдат инсталирани." diff --git a/Contrib/Modern UI/Language files/Czech.nsh b/Contrib/Modern UI/Language files/Czech.nsh index 35ad8b74..835703a0 100644 --- a/Contrib/Modern UI/Language files/Czech.nsh +++ b/Contrib/Modern UI/Language files/Czech.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Czech (1029) ;By T.V. Zuggy (http://zuggy.wz.cz/) diff --git a/Contrib/Modern UI/Language files/Danish.nsh b/Contrib/Modern UI/Language files/Danish.nsh index f84a49bd..026bf3ed 100644 --- a/Contrib/Modern UI/Language files/Danish.nsh +++ b/Contrib/Modern UI/Language files/Danish.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Danish (1030) ;By Casper Bergenstoff diff --git a/Contrib/Modern UI/Language files/Dutch.nsh b/Contrib/Modern UI/Language files/Dutch.nsh index b080f5c2..31061e8b 100644 --- a/Contrib/Modern UI/Language files/Dutch.nsh +++ b/Contrib/Modern UI/Language files/Dutch.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Dutch (1043) ;By Joost Verburg diff --git a/Contrib/Modern UI/Language files/English.nsh b/Contrib/Modern UI/Language files/English.nsh index 4779a376..b90ac493 100644 --- a/Contrib/Modern UI/Language files/English.nsh +++ b/Contrib/Modern UI/Language files/English.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: English (1033) ;By Joost Verburg diff --git a/Contrib/Modern UI/Language files/French.nsh b/Contrib/Modern UI/Language files/French.nsh index 4a3245b3..937b0b0d 100644 --- a/Contrib/Modern UI/Language files/French.nsh +++ b/Contrib/Modern UI/Language files/French.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: French (1036) ;By Sйbastien Delahaye diff --git a/Contrib/Modern UI/Language files/German.nsh b/Contrib/Modern UI/Language files/German.nsh index e4d57e94..f0f3b858 100644 --- a/Contrib/Modern UI/Language files/German.nsh +++ b/Contrib/Modern UI/Language files/German.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: German (1031) ;By L.King diff --git a/Contrib/Modern UI/Language files/Greek.nsh b/Contrib/Modern UI/Language files/Greek.nsh index 6d1a68ea..a6b1083e 100644 --- a/Contrib/Modern UI/Language files/Greek.nsh +++ b/Contrib/Modern UI/Language files/Greek.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Greek (1032) ;By Makidis N. Mike diff --git a/Contrib/Modern UI/Language files/Hungarian.nsh b/Contrib/Modern UI/Language files/Hungarian.nsh index 3c7e355c..bb4e636f 100644 --- a/Contrib/Modern UI/Language files/Hungarian.nsh +++ b/Contrib/Modern UI/Language files/Hungarian.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Hungarian (1038) ;By Jozsef Tamas Herczeg diff --git a/Contrib/Modern UI/Language files/Italian.nsh b/Contrib/Modern UI/Language files/Italian.nsh index 37a1e1b8..00b89876 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 -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Italian (1040) ;By SANFACE Software diff --git a/Contrib/Modern UI/Language files/Japanese.nsh b/Contrib/Modern UI/Language files/Japanese.nsh index 3ffe4846..684c05c7 100644 --- a/Contrib/Modern UI/Language files/Japanese.nsh +++ b/Contrib/Modern UI/Language files/Japanese.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Japanese (1041) ;By Dnanako diff --git a/Contrib/Modern UI/Language files/Korean.nsh b/Contrib/Modern UI/Language files/Korean.nsh index 40dca711..e6607c9e 100644 --- a/Contrib/Modern UI/Language files/Korean.nsh +++ b/Contrib/Modern UI/Language files/Korean.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Korea (1042) ;By Hobin linak@korea.com diff --git a/Contrib/Modern UI/Language files/Polish.nsh b/Contrib/Modern UI/Language files/Polish.nsh index ccceb445..d869954a 100644 --- a/Contrib/Modern UI/Language files/Polish.nsh +++ b/Contrib/Modern UI/Language files/Polish.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.4 and Basic Modern UI 1.6 scripts (needs te be updated!) +;Compatible with Modern UI 1.4 and Basic Modern UI 1.61 scripts (needs te be updated!) ;Language: Polish (1045) ;By Piotr Murawski & Rafaі Lampe; www.lomsel.prv.pl mailto:ppiter@skrzynka.pl diff --git a/Contrib/Modern UI/Language files/PortugueseBR.nsh b/Contrib/Modern UI/Language files/PortugueseBR.nsh index 6f0bb9a6..b1bf52eb 100644 --- a/Contrib/Modern UI/Language files/PortugueseBR.nsh +++ b/Contrib/Modern UI/Language files/PortugueseBR.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.4 and Basic Modern UI 1.6 scripts (needs te be updated!) +;Compatible with Modern UI 1.4 and Basic Modern UI 1.61 scripts (needs te be updated!) ;Language: 'Portuguese (Brasil)' (1046) ;By Layout do Brasil www.layoutdobrasil.com diff --git a/Contrib/Modern UI/Language files/Russian.nsh b/Contrib/Modern UI/Language files/Russian.nsh index 57d682c0..d9eac21a 100644 --- a/Contrib/Modern UI/Language files/Russian.nsh +++ b/Contrib/Modern UI/Language files/Russian.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Russian (1049) ;By Nik Medved (brainsucker). Fixed by Scam (1.5). diff --git a/Contrib/Modern UI/Language files/SimpChinese.nsh b/Contrib/Modern UI/Language files/SimpChinese.nsh index 41fdd7fd..e0472304 100644 --- a/Contrib/Modern UI/Language files/SimpChinese.nsh +++ b/Contrib/Modern UI/Language files/SimpChinese.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: 'Chinese (Simplified)' (2052) ;Kii Ali diff --git a/Contrib/Modern UI/Language files/Spanish.nsh b/Contrib/Modern UI/Language files/Spanish.nsh index 48bbfd15..8a1aace7 100644 --- a/Contrib/Modern UI/Language files/Spanish.nsh +++ b/Contrib/Modern UI/Language files/Spanish.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Spanish (1034) ;By MoNKi diff --git a/Contrib/Modern UI/Language files/TradChinese.nsh b/Contrib/Modern UI/Language files/TradChinese.nsh index 6b407318..466d03e2 100644 --- a/Contrib/Modern UI/Language files/TradChinese.nsh +++ b/Contrib/Modern UI/Language files/TradChinese.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: 'Chinese (Traditional)' (1028) ;Kii Ali diff --git a/Contrib/Modern UI/Language files/Ukrainian.nsh b/Contrib/Modern UI/Language files/Ukrainian.nsh index 902bf67d..b1519f59 100644 --- a/Contrib/Modern UI/Language files/Ukrainian.nsh +++ b/Contrib/Modern UI/Language files/Ukrainian.nsh @@ -1,5 +1,5 @@ ;NSIS Modern User Interface - Language File -;Compatible with Modern UI 1.6 +;Compatible with Modern UI 1.61 ;Language: Ukrainian (1058) ;By Yuri Holubow http://www.ns.lviv.ua/home diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index fe8120c3..4337717b 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -133,26 +133,35 @@ you should always escape it ($\"), because the Modern UI macro's use " !define MUI_PRODUCT "Test Software" ;Define your own software name here !define MUI_VERSION "1.0" ;Define your own software version here -

3. Define which elements you are using

+

3. Define settings

The Modern UI should know which things it should insert. Use the following defines:

 !define MUI_WELCOMEPAGE ;Welcome page
 !define MUI_LICENSEPAGE ;License page
 !define MUI_COMPONENTSPAGE ;Component-selection page
 !define MUI_DIRECTORYPAGE ;Directory-selection page
+
 !define MUI_STARTMENUPAGE ;Start Menu Folder selection page
+  !define MUI_STARTMENU_VARIABLE "$VARNAME" ;The variable to store the current
+                                            ;Start Menu Folder
+  !define MUI_STARTMENU_DEFAULTFOLDER "Folder Name" ;The default Start Menu Folder
+
 !define MUI_FINISHPAGE ;Finish page with options to run the program or reboot
   !define MUI_FINISHPAGE_RUN "$INSTDIR\File.exe" ;Option to run a file
   !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\Readme.txt" ;Option to show a Readme
+  !define MUI_FINISHPAGE_NOAUTOCLOSE ;Do not automatically jump to the finish page,
+                                     ;to allow the user to check the log
   !define MUI_FINISHPAGE_NOREBOOTSUPPORT ;Disables support for a reboot option.
                                          ;Use this if you are not using /REBOOTOK
                                          ;or SetRebootFlag.
 
 !define MUI_ABORTWARNING ;Abort warning messagebox
+
 !define MUI_CUSTOMPAGECOMMANDS ;Use customized pages
 !define MUI_CUSTOMGUIINIT ;Use customized .onGUIInit function
 
 !define MUI_UNINSTALLER ;Uninstaller
+
 !define MUI_UNCUSTOMPAGECOMMANDS ;Use customized uninstaller pages
 !define MUI_UNCUSTOMGUIINIT ;Use customized un.onGUIInit function
@@ -182,7 +191,7 @@ LangString FILE_README ${LANG_ENGLISH} "$INSTDIR\Readme-English.txt" Please help to translate the new strings and post them at the NSIS Forum.

5. Define interface settings (optional)

-

You can change the settings of the interface by usings defines:

+

You can also change the settings of the interface by usings defines:

!define MUI_UI "${NSISDIR}\Contrib\UIs\modern2.exe"

If you don't define a setting, the default will be used.

The following settings are available: (default values)

@@ -208,7 +217,7 @@ LangString FILE_README ${LANG_ENGLISH} "$INSTDIR\Readme-English.txt" The hexadecimal colors of the details screen ("foreground" "background")

MUI_PROGRESSBAR (smooth)
The style of the progress bar ("colored" to use the MUI_INSTALLCOLORS or "" for a old-school windows look)

-

MUI_SPECIALINI (${NSISDIR}\Contrib\ioSpecial.ini)
+

MUI_SPECIALINI (${NSISDIR}\Contrib\Modern UI\ioSpecial.ini)
Install Options INI File for the Welcome and Finish pages

MUI_SPECIALBITMAP (${NSISDIR}\Contrib\Icons\modern-wizard.bmp)
Bitmap for the Welcome and Finish pages

@@ -342,6 +351,13 @@ FunctionEnd

Version history

    +
  • 1.61 - December 5, 2002 +
      +
    • Final version for NSIS 2 beta 0 +
    • Different translation for finish page title +
    • Bugfixes +
    +

  • 1.6 - November 18, 2002
    • Welcome / Finish pages diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 9c6e106e..0c183e50 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.6 +;NSIS Modern User Interface version 1.61 ;Macro System ;Written by Joost Verburg diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi index 4230974b..c6708b53 100644 --- a/Examples/Modern UI/Basic.nsi +++ b/Examples/Modern UI/Basic.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.6 +;NSIS Modern User Interface version 1.61 ;Basic Example Script ;Written by Joost Verburg @@ -51,7 +51,9 @@ Section "modern.exe" SecCopyUI SectionEnd -!insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections +;Display the Finish header +;Insert this macro after the sections if you are not using a finish page +!insertmacro MUI_SECTIONS_FINISHHEADER ;-------------------------------- ;Descriptions diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi index 6b90cb66..1c480006 100644 --- a/Examples/Modern UI/InstallOptions.nsi +++ b/Examples/Modern UI/InstallOptions.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.6 +;NSIS Modern User Interface version 1.61 ;Install Options Example Script ;Written by Joost Verburg @@ -92,7 +92,9 @@ Section "modern.exe" SecCopyUI SectionEnd -!insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections +;Display the Finish header +;Insert this macro after the sections if you are not using a finish page +!insertmacro MUI_SECTIONS_FINISHHEADER ;-------------------------------- ;Descriptions @@ -143,6 +145,4 @@ Section "Uninstall" !insertmacro MUI_UNFINISHHEADER -SectionEnd - -;eof \ No newline at end of file +SectionEnd \ No newline at end of file diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi index 1c2796fc..5614efa9 100644 --- a/Examples/Modern UI/MultiLanguage.nsi +++ b/Examples/Modern UI/MultiLanguage.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.6 +;NSIS Modern User Interface version 1.61 ;MultiLanguage Example Script ;Written by Joost Verburg @@ -116,7 +116,9 @@ Section $(TITLE_SecCopyUI) SecCopyUI SectionEnd -!insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections +;Display the Finish header +;Insert this macro after the sections if you are not using a finish page +!insertmacro MUI_SECTIONS_FINISHHEADER ;-------------------------------- ;Installer Functions diff --git a/Examples/Modern UI/StartMenu.nsi b/Examples/Modern UI/StartMenu.nsi index ec988f43..c30da1bd 100644 --- a/Examples/Modern UI/StartMenu.nsi +++ b/Examples/Modern UI/StartMenu.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.6 +;NSIS Modern User Interface version 1.61 ;Start Menu Folder Selection Example Script ;Written by Joost Verburg @@ -75,7 +75,9 @@ Section "modern.exe" SecCopyUI SectionEnd -!insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections +;Display the Finish header +;Insert this macro after the sections if you are not using a finish page +!insertmacro MUI_SECTIONS_FINISHHEADER ;-------------------------------- ;Descriptions diff --git a/Examples/Modern UI/WelcomeFinish.nsi b/Examples/Modern UI/WelcomeFinish.nsi index 965a6b03..a0c6354c 100644 --- a/Examples/Modern UI/WelcomeFinish.nsi +++ b/Examples/Modern UI/WelcomeFinish.nsi @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.6 +;NSIS Modern User Interface version 1.61 ;Welcome/Finish Page Example Script ;Written by Joost Verburg @@ -84,6 +84,4 @@ Section "Uninstall" !insertmacro MUI_UNFINISHHEADER -SectionEnd - -;eof \ No newline at end of file +SectionEnd \ No newline at end of file