Modern UI 1.66: support for uninst comp page, multiple pages, new language & page system
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2824 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
74ea2dc585
commit
9ee58d14f8
11 changed files with 926 additions and 991 deletions
|
@ -25,10 +25,15 @@
|
|||
;Get install folder from registry if available
|
||||
InstallDirRegKey HKCU "Software\${MUI_PRODUCT}" ""
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_ABORTWARNING
|
||||
|
||||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_LICENSE
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
@ -36,21 +41,11 @@
|
|||
!insertmacro MUI_UNPAGE_CONFIRM
|
||||
!insertmacro MUI_UNPAGE_INSTFILES
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_ABORTWARNING
|
||||
|
||||
;--------------------------------
|
||||
;Languages
|
||||
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
;--------------------------------
|
||||
;Data
|
||||
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;--------------------------------
|
||||
;Installer Sections
|
||||
|
||||
|
@ -73,9 +68,9 @@ SectionEnd
|
|||
|
||||
LangString DESC_SecDummy ${LANG_ENGLISH} "A test section."
|
||||
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
|
||||
;--------------------------------
|
||||
;Uninstaller Section
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
;NSIS Modern User Interface version 1.65
|
||||
;NSIS Modern User Interface version 1.66
|
||||
;Header Bitmap Example Script
|
||||
;Written by Joost Verburg
|
||||
|
||||
|
@ -25,10 +25,16 @@
|
|||
;Get install folder from registry if available
|
||||
InstallDirRegKey HKCU "Software\${MUI_PRODUCT}" ""
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_HEADERBITMAP "${NSISDIR}\Contrib\Icons\modern-header.bmp"
|
||||
!define MUI_ABORTWARNING
|
||||
|
||||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_LICENSE
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
@ -36,22 +42,11 @@
|
|||
!insertmacro MUI_UNPAGE_CONFIRM
|
||||
!insertmacro MUI_UNPAGE_INSTFILES
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_HEADERBITMAP "${NSISDIR}\Contrib\Icons\modern-header.bmp"
|
||||
!define MUI_ABORTWARNING
|
||||
|
||||
;--------------------------------
|
||||
;Languages
|
||||
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
;--------------------------------
|
||||
;Data
|
||||
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;--------------------------------
|
||||
;Reserve Files
|
||||
|
||||
|
@ -82,9 +77,9 @@ SectionEnd
|
|||
|
||||
LangString DESC_SecDummy ${LANG_ENGLISH} "A test section."
|
||||
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
|
||||
;--------------------------------
|
||||
;Uninstaller Section
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
;NSIS Modern User Interface version 1.65
|
||||
;NSIS Modern User Interface version 1.66
|
||||
;InstallOptions Example Script
|
||||
;Written by Joost Verburg
|
||||
|
||||
|
@ -33,7 +33,7 @@
|
|||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_LICENSE
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
Page custom CustomPageA
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
Page custom CustomPageB
|
||||
|
@ -54,11 +54,6 @@
|
|||
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
;--------------------------------
|
||||
;Data
|
||||
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;--------------------------------
|
||||
;Reserve Files
|
||||
|
||||
|
@ -135,9 +130,9 @@ FunctionEnd
|
|||
|
||||
LangString DESC_SecDummy ${LANG_ENGLISH} "A test section."
|
||||
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
|
||||
;--------------------------------
|
||||
;Uninstaller Section
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
;NSIS Modern User Interface version 1.65
|
||||
;NSIS Modern User Interface version 1.66
|
||||
;Multilingual Example Script
|
||||
;Written by Joost Verburg
|
||||
|
||||
|
@ -24,17 +24,7 @@
|
|||
|
||||
;Get install folder from registry if available
|
||||
InstallDirRegKey HKCU "Software\${MUI_PRODUCT}" ""
|
||||
|
||||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
||||
!insertmacro MUI_UNPAGE_CONFIRM
|
||||
!insertmacro MUI_UNPAGE_INSTFILES
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
|
@ -45,6 +35,16 @@
|
|||
|
||||
!define MUI_ABORTWARNING
|
||||
|
||||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
||||
!insertmacro MUI_UNPAGE_CONFIRM
|
||||
!insertmacro MUI_UNPAGE_INSTFILES
|
||||
|
||||
;--------------------------------
|
||||
;Languages
|
||||
|
||||
|
@ -148,9 +148,9 @@ FunctionEnd
|
|||
LangString DESC_SecDummy ${LANG_CATALAN} "Test section: Catalan description"
|
||||
LangString DESC_SecDummy ${LANG_SERBIAN} "Test section: Serbian description"
|
||||
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
|
||||
;--------------------------------
|
||||
;Uninstaller Section
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
;NSIS Modern User Interface version 1.65
|
||||
;NSIS Modern User Interface version 1.66
|
||||
;Start Menu Folder Selection Example Script
|
||||
;Written by Joost Verburg
|
||||
|
||||
|
@ -30,38 +30,35 @@
|
|||
|
||||
Var MUI_TEMP
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_ABORTWARNING
|
||||
|
||||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_LICENSE
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
|
||||
;Start Menu Folder Page Configuration
|
||||
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
|
||||
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${MUI_PRODUCT}"
|
||||
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
|
||||
|
||||
!insertmacro MUI_PAGE_STARTMENU
|
||||
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
||||
!insertmacro MUI_UNPAGE_CONFIRM
|
||||
!insertmacro MUI_UNPAGE_INSTFILES
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_ABORTWARNING
|
||||
|
||||
;Remember the Start Menu Folder
|
||||
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
|
||||
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${MUI_PRODUCT}"
|
||||
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
|
||||
|
||||
;--------------------------------
|
||||
;Languages
|
||||
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
;--------------------------------
|
||||
;Data
|
||||
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;--------------------------------
|
||||
;Reserve Files
|
||||
|
||||
|
@ -99,9 +96,9 @@ SectionEnd
|
|||
|
||||
LangString DESC_SecDummy ${LANG_ENGLISH} "A test section."
|
||||
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
|
||||
;--------------------------------
|
||||
;Uninstaller Section
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
;NSIS Modern User Interface version 1.65
|
||||
;NSIS Modern User Interface version 1.66
|
||||
;Welcome/Finish Page Example Script
|
||||
;Written by Joost Verburg
|
||||
|
||||
|
@ -25,11 +25,16 @@
|
|||
;Get install folder from registry if available
|
||||
InstallDirRegKey HKCU "Software\${MUI_PRODUCT}" ""
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_ABORTWARNING
|
||||
|
||||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_WELCOME
|
||||
!insertmacro MUI_PAGE_LICENSE
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
@ -38,21 +43,11 @@
|
|||
!insertmacro MUI_UNPAGE_CONFIRM
|
||||
!insertmacro MUI_UNPAGE_INSTFILES
|
||||
|
||||
;--------------------------------
|
||||
;Modern UI Configuration
|
||||
|
||||
!define MUI_ABORTWARNING
|
||||
|
||||
;--------------------------------
|
||||
;Languages
|
||||
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
;--------------------------------
|
||||
;Data
|
||||
|
||||
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
|
||||
;--------------------------------
|
||||
;Reserve Files
|
||||
|
||||
|
@ -83,9 +78,9 @@ SectionEnd
|
|||
|
||||
LangString DESC_SecDummy ${LANG_ENGLISH} "A test section."
|
||||
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
|
||||
!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
|
||||
;--------------------------------
|
||||
;Uninstaller Section
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue