better format, cleanup, right order of elements
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1999 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg
parent
e4d3f6a3ad
commit
ee687e4b3f
5 changed files with 170 additions and 145 deletions
|
|
@ -10,6 +10,15 @@
|
|||
;--------------------------------
|
||||
;Configuration
|
||||
|
||||
;General
|
||||
OutFile "Basic.exe"
|
||||
|
||||
;Folder selection page
|
||||
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_LICENSEPAGE
|
||||
!define MUI_COMPONENTSPAGE
|
||||
!define MUI_DIRECTORYPAGE
|
||||
|
|
@ -19,25 +28,24 @@
|
|||
!define MUI_UNINSTALLER
|
||||
!define MUI_UNCONFIRMPAGE
|
||||
|
||||
;Language
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
;General
|
||||
OutFile "Basic.exe"
|
||||
|
||||
;License page
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;Descriptions
|
||||
LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
|
||||
|
||||
;Folder selection page
|
||||
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
|
||||
;Modern UI System
|
||||
!insertmacro MUI_SYSTEM
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI System
|
||||
;Languages
|
||||
|
||||
!insertmacro MUI_SYSTEM
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
;--------------------------------
|
||||
;Language Strings
|
||||
|
||||
;Description
|
||||
LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
|
||||
|
||||
;--------------------------------
|
||||
;Data
|
||||
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;--------------------------------
|
||||
;Installer Sections
|
||||
|
|
|
|||
|
|
@ -7,29 +7,44 @@
|
|||
|
||||
!include "${NSISDIR}\Contrib\Modern UI\System.nsh"
|
||||
|
||||
!define TEMP $R0
|
||||
|
||||
;--------------------------------
|
||||
;Configuration
|
||||
|
||||
;General
|
||||
OutFile "Basic.exe"
|
||||
|
||||
;Folder selection page
|
||||
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_CUSTOMPAGECOMMANDS
|
||||
|
||||
!define MUI_LICENSEPAGE
|
||||
!define MUI_COMPONENTSPAGE
|
||||
!define MUI_DIRECTORYPAGE
|
||||
!define MUI_ABORTWARNING
|
||||
|
||||
!define MUI_CUSTOMPAGECOMMANDS
|
||||
!define MUI_ABORTWARNING
|
||||
|
||||
!define MUI_UNINSTALLER
|
||||
!define MUI_UNCONFIRMPAGE
|
||||
|
||||
!define TEMP1 $R0
|
||||
!define TEMP2 $R1
|
||||
;Modern UI System
|
||||
!insertmacro MUI_SYSTEM
|
||||
|
||||
;--------------------------------
|
||||
;Languages
|
||||
|
||||
;Language
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
;General
|
||||
OutFile "InstallOptions.exe"
|
||||
;--------------------------------
|
||||
;Language Strings
|
||||
|
||||
;InstallOptions pages
|
||||
;Description
|
||||
LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
|
||||
|
||||
;Header
|
||||
LangString TEXT_IO_TITLE ${LANG_ENGLISH} "InstallOptions Page"
|
||||
|
|
@ -40,7 +55,14 @@
|
|||
LangString TEXT_IO_PAGETITLE_B ${LANG_ENGLISH} ": Custom Page B"
|
||||
LangString TEXT_IO_PAGETITLE_C ${LANG_ENGLISH} ": Custom Page C"
|
||||
|
||||
;Page order
|
||||
;--------------------------------
|
||||
;Data
|
||||
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGECOMMAND_LICENSE
|
||||
Page custom SetCustomA "$(TEXT_IO_PAGETITLE_A)"
|
||||
Page custom SetCustomB "$(TEXT_IO_PAGETITLE_B)"
|
||||
|
|
@ -49,29 +71,17 @@
|
|||
Page custom SetCustomC "$(TEXT_IO_PAGETITLE_C)"
|
||||
!insertmacro MUI_PAGECOMMAND_INSTFILES
|
||||
|
||||
;License page
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
;--------------------------------
|
||||
;Reserve Files
|
||||
|
||||
;Component selection page
|
||||
;Descriptions
|
||||
LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
|
||||
|
||||
;Folder selection page
|
||||
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
|
||||
|
||||
;Things that need to be extracted on startup (keep these lines before any File command!)
|
||||
;Things that need to be extracted on first (keep these lines before any File command!)
|
||||
;Only useful for BZIP2 compression
|
||||
;Use ReserveFile for your own InstallOptions INI files too!
|
||||
|
||||
ReserveFile "ioA.ini"
|
||||
ReserveFile "ioB.ini"
|
||||
ReserveFile "ioC.ini"
|
||||
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI System
|
||||
|
||||
!insertmacro MUI_SYSTEM
|
||||
|
||||
;--------------------------------
|
||||
;Installer Sections
|
||||
|
||||
|
|
@ -83,8 +93,8 @@ Section "modern.exe" SecCopyUI
|
|||
File "${NSISDIR}\Contrib\UIs\modern.exe"
|
||||
|
||||
;Read a value from an InstallOptions INI File
|
||||
!insertmacro MUI_INSTALLOPTIONS_READ ${TEMP1} "ioC.ini" "Field 2" "State"
|
||||
StrCmp ${TEMP1} "1" "" +2
|
||||
!insertmacro MUI_INSTALLOPTIONS_READ ${TEMP} "ioC.ini" "Field 2" "State"
|
||||
StrCmp ${TEMP} "1" "" +2
|
||||
;Checked
|
||||
MessageBox MB_OK "A MessageBox..."
|
||||
|
||||
|
|
@ -129,7 +139,6 @@ FunctionEnd
|
|||
Function SetCustomC
|
||||
!insertmacro MUI_HEADER_TEXT "$(TEXT_IO_TITLE)" "$(TEXT_IO_SUBTITLE)"
|
||||
!insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioC.ini"
|
||||
|
||||
FunctionEnd
|
||||
|
||||
;--------------------------------
|
||||
|
|
|
|||
|
|
@ -10,6 +10,15 @@
|
|||
;--------------------------------
|
||||
;Configuration
|
||||
|
||||
;General
|
||||
OutFile "Basic.exe"
|
||||
|
||||
;Folder selection page
|
||||
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_LICENSEPAGE
|
||||
!define MUI_COMPONENTSPAGE
|
||||
!define MUI_DIRECTORYPAGE
|
||||
|
|
@ -19,7 +28,12 @@
|
|||
!define MUI_UNINSTALLER
|
||||
!define MUI_UNCONFIRMPAGE
|
||||
|
||||
;Modern UI System
|
||||
!insertmacro MUI_SYSTEM
|
||||
|
||||
;--------------------------------
|
||||
;Languages
|
||||
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
!insertmacro MUI_LANGUAGE "French"
|
||||
!insertmacro MUI_LANGUAGE "German"
|
||||
|
|
@ -39,48 +53,8 @@
|
|||
!insertmacro MUI_LANGUAGE "Thai"
|
||||
!insertmacro MUI_LANGUAGE "Romanian"
|
||||
|
||||
OutFile "MultiLanguage.exe"
|
||||
|
||||
;License page
|
||||
LicenseData /LANG=${LANG_ENGLISH} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_FRENCH} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_GERMAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
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"
|
||||
LicenseData /LANG=${LANG_GREEK} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_RUSSIAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_PORTUGUESEBR} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_UKRAINIAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_CZECH} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_BULGARIAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_THAI} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_ROMANIAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;Component selection page
|
||||
;Titles
|
||||
LangString TITLE_SecCopyUI ${LANG_ENGLISH} "modern.exe"
|
||||
LangString TITLE_SecCopyUI ${LANG_FRENCH} "modern.exe"
|
||||
LangString TITLE_SecCopyUI ${LANG_GERMAN} "modern.exe"
|
||||
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"
|
||||
LangString TITLE_SecCopyUI ${LANG_GREEK} "modern.exe"
|
||||
LangString TITLE_SecCopyUI ${LANG_RUSSIAN} "modern.exe"
|
||||
LangString TITLE_SecCopyUI ${LANG_PORTUGUESEBR} "modern.exe"
|
||||
LangString TITLE_SecCopyUI ${LANG_UKRAINIAN} "modern.exe"
|
||||
LangString TITLE_SecCopyUI ${LANG_CZECH} "modern.exe"
|
||||
LangString TITLE_SecCopyUI ${LANG_BULGARIAN} "modern.exe"
|
||||
LangString TITLE_SecCopyUI ${LANG_THAI} "modern.exe"
|
||||
LangString TITLE_SecCopyUI ${LANG_ROMANIAN} "modern.exe"
|
||||
;--------------------------------
|
||||
;Language Strings
|
||||
|
||||
;Descriptions
|
||||
LangString DESC_SecCopyUI ${LANG_ENGLISH} "modern.exe: English description"
|
||||
|
|
@ -100,24 +74,41 @@
|
|||
LangString DESC_SecCopyUI ${LANG_CZECH} "modern.exe: Czechian description"
|
||||
LangString DESC_SecCopyUI ${LANG_BULGARIAN} "modern.exe: Bulgarian description"
|
||||
LangString DESC_SecCopyUI ${LANG_THAI} "modern.exe: Thai description"
|
||||
LangString DESC_SecCopyUI ${LANG_ROMANIAN} "modern.exe: Thai description"
|
||||
LangString DESC_SecCopyUI ${LANG_ROMANIAN} "modern.exe: Romanian description"
|
||||
|
||||
;Folder selection page
|
||||
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
|
||||
;--------------------------------
|
||||
;Data
|
||||
|
||||
LicenseData /LANG=${LANG_ENGLISH} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_FRENCH} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_GERMAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
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"
|
||||
LicenseData /LANG=${LANG_GREEK} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_RUSSIAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_PORTUGUESEBR} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_UKRAINIAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_CZECH} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_BULGARIAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_THAI} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
LicenseData /LANG=${LANG_ROMANIAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;--------------------------------
|
||||
;Reserve Files
|
||||
|
||||
;Things that need to be extracted on first (keep these lines before any File command!)
|
||||
;Only useful for BZIP2 compression
|
||||
!insertmacro MUI_RESERVEFILE_LANGDLL
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI System
|
||||
|
||||
!insertmacro MUI_SYSTEM
|
||||
|
||||
;--------------------------------
|
||||
;Installer Sections
|
||||
|
||||
Section $(TITLE_SecCopyUI) SecCopyUI
|
||||
Section "modern.exe" SecCopyUI
|
||||
|
||||
;ADD YOUR OWN STUFF HERE!
|
||||
|
||||
|
|
|
|||
|
|
@ -15,9 +15,20 @@
|
|||
;!define MUI_STARTMENU_VARIABLE "$VAR"
|
||||
;!define MUI_STARTMENU_DEFAULTFOLDER "Folder Name"
|
||||
|
||||
!define TEMP $R0
|
||||
|
||||
;--------------------------------
|
||||
;Configuration
|
||||
|
||||
;General
|
||||
OutFile "Basic.exe"
|
||||
|
||||
;Folder selection page
|
||||
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_LICENSEPAGE
|
||||
!define MUI_COMPONENTSPAGE
|
||||
!define MUI_DIRECTORYPAGE
|
||||
|
|
@ -28,27 +39,24 @@
|
|||
!define MUI_UNINSTALLER
|
||||
!define MUI_UNCONFIRMPAGE
|
||||
|
||||
!define TEMP1 $R0
|
||||
|
||||
;Language
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
;General
|
||||
OutFile "StartMenu.exe"
|
||||
|
||||
;License page
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;Descriptions
|
||||
LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
|
||||
|
||||
;Folder-selection page
|
||||
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
|
||||
;Modern UI System
|
||||
!insertmacro MUI_SYSTEM
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI System
|
||||
;Languages
|
||||
|
||||
!insertmacro MUI_SYSTEM
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
;--------------------------------
|
||||
;Language Strings
|
||||
|
||||
;Description
|
||||
LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
|
||||
|
||||
;--------------------------------
|
||||
;Data
|
||||
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;--------------------------------
|
||||
;Installer Sections
|
||||
|
|
@ -99,13 +107,13 @@ Section "Uninstall"
|
|||
Delete "$INSTDIR\Uninstall.exe"
|
||||
|
||||
;Remove shortcut
|
||||
ReadRegStr ${TEMP1} HKCU "Software\${MUI_PRODUCT}" "Start Menu Folder"
|
||||
ReadRegStr ${TEMP} HKCU "Software\${MUI_PRODUCT}" "Start Menu Folder"
|
||||
|
||||
StrCmp ${TEMP1} "" noshortcuts
|
||||
StrCmp ${TEMP} "" noshortcuts
|
||||
|
||||
Delete "$SMPROGRAMS\${TEMP1}\Modern UI.lnk"
|
||||
Delete "$SMPROGRAMS\${TEMP1}\Uninstall.lnk"
|
||||
RMDir "$SMPROGRAMS\${TEMP1}" ;Only if empty, so it won't delete other shortcuts
|
||||
Delete "$SMPROGRAMS\${TEMP}\Modern UI.lnk"
|
||||
Delete "$SMPROGRAMS\${TEMP}\Uninstall.lnk"
|
||||
RMDir "$SMPROGRAMS\${TEMP}" ;Only if empty, so it won't delete other shortcuts
|
||||
|
||||
noshortcuts:
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,19 @@
|
|||
;--------------------------------
|
||||
;Configuration
|
||||
|
||||
;General
|
||||
OutFile "Basic.exe"
|
||||
|
||||
;Folder selection page
|
||||
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_WELCOMEPAGE
|
||||
!define MUI_LICENSEPAGE
|
||||
!define MUI_COMPONENTSPAGE
|
||||
!define MUI_DIRECTORYPAGE
|
||||
|
||||
!define MUI_FINISHPAGE
|
||||
!define MUI_FINISHPAGE_RUN "$INSTDIR\modern.exe"
|
||||
|
||||
|
|
@ -23,31 +31,32 @@
|
|||
!define MUI_UNINSTALLER
|
||||
!define MUI_UNCONFIRMPAGE
|
||||
|
||||
;Language
|
||||
;Modern UI System
|
||||
!insertmacro MUI_SYSTEM
|
||||
|
||||
;--------------------------------
|
||||
;Languages
|
||||
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
;General
|
||||
OutFile "WelcomeFinish.exe"
|
||||
;--------------------------------
|
||||
;Language Strings
|
||||
|
||||
;License page
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;Component selection page
|
||||
;Descriptions
|
||||
;Description
|
||||
LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
|
||||
|
||||
;Folder selection page
|
||||
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
|
||||
;--------------------------------
|
||||
;Data
|
||||
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;--------------------------------
|
||||
;Reserve Files
|
||||
|
||||
;Things that need to be extracted on first (keep these lines before any File command!)
|
||||
;Only useful for BZIP2 compression
|
||||
!insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI System
|
||||
|
||||
!insertmacro MUI_SYSTEM
|
||||
|
||||
;--------------------------------
|
||||
;Installer Sections
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue