dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

macro system updates

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1571 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2002-11-03 13:21:09 +00:00
parent 2fc9ed8b95
commit a436ddac6c
4 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Contrib/Modern UI/System.nsh
View file

@ -572,12 +572,24 @@
!macroend
;--------------------------------
;BASIC FUNCTIONS
;BASIC MACRO'S
!macro MUI_FUNCTIONS_BASIC
!macro MUI_SYSTEM
!verbose 3
!insertmacro MUI_BASIC
!insertmacro MUI_UNBASIC
!verbose 4
!macroend
!macro MUI_BASIC
!verbose 3
!insertmacro MUI_INTERFACE
!insertmacro MUI_PAGECOMMANDS
!insertmacro MUI_FUNCTIONS_PAGES
!insertmacro MUI_FUNCTIONS_GUIINIT
@ -587,10 +599,11 @@
!macroend
!macro MUI_UNFUNCTIONS_BASIC
!macro MUI_UNBASIC
!verbose 3
!insertmacro MUI_INTERFACE
!insertmacro MUI_UNPAGECOMMANDS
!insertmacro MUI_UNFUNCTIONS_PAGES
!insertmacro MUI_UNFUNCTIONS_GUIINIT

14
Examples/Modern UI/Basic.nsi
View file

@ -25,8 +25,6 @@
OutFile "Basic.exe"
Name "${NAME} ${VERSION}"
!insertmacro MUI_INTERFACE
;License page
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
@ -59,14 +57,15 @@ Section ""
SectionEnd
;--------------------------------
;Installer Functions
;Modern UI System
!insertmacro MUI_FUNCTIONS_BASIC
!insertmacro MUI_SYSTEM
!insertmacro MUI_FUNCTIONS_DESCRIPTION_START
!insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
;--------------------------------
;Uninstaller Section
@ -82,9 +81,4 @@ Section "Uninstall"
;Display the Finish header
!insertmacro MUI_UNFINISHHEADER
SectionEnd
;--------------------------------
;Uninstaller Functions
!insertmacro MUI_UNFUNCTIONS_BASIC
SectionEnd

14
Examples/Modern UI/InstallOptions.nsi
View file

@ -38,8 +38,6 @@
!insertmacro MUI_PAGECOMMAND_DIRECTORY
Page custom SetCustomC
!insertmacro MUI_PAGECOMMAND_INSTFILES
!insertmacro MUI_INTERFACE
;License page
LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
@ -134,10 +132,13 @@ Function SetCustomC
!insertmacro MUI_INSTALLOPTIONS_SHOW "ioC.ini"
FunctionEnd
!insertmacro MUI_FUNCTIONS_BASIC
;--------------------------------
;Modern UI System
!insertmacro MUI_SYSTEM
;--------------------------------
;Uninstaller
;Uninstaller Section
Section "Uninstall"
@ -152,9 +153,4 @@ Section "Uninstall"
SectionEnd
;--------------------------------
;Uninstaller Functions
!insertmacro MUI_UNFUNCTIONS_BASIC
;eof

11
Examples/Modern UI/MultiLanguage.nsi
View file

@ -74,8 +74,6 @@
!include "${NSISDIR}\Contrib\Modern UI\Language files\Ukrainian.nsh"
OutFile "MultiLanguage.exe"
!insertmacro MUI_INTERFACE
;Name
Name /LANG=${LANG_ENGLISH} "${NAME} ${VERSION}"
@ -217,7 +215,10 @@ Function .onInit
FunctionEnd
!insertmacro MUI_FUNCTIONS_BASIC
;--------------------------------
;Modern UI System
!insertmacro MUI_SYSTEM
!insertmacro MUI_FUNCTIONS_DESCRIPTION_START
!insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
@ -247,6 +248,4 @@ SectionEnd
Function un.onInit
ReadRegStr $LANGUAGE HKCU "Software\${NAME}" "Installer Language"
FunctionEnd
!insertmacro MUI_UNFUNCTIONS_BASIC
FunctionEnd