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@1570 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2002-11-03 12:50:06 +00:00
parent ce7c1170c6
commit 2fc9ed8b95
2 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Contrib/Modern UI/System.nsh
View file

@ -220,11 +220,15 @@
!macro MUI_PAGECOMMANDS !macro MUI_PAGECOMMANDS
!verbose 3 !verbose 3
!ifndef MUI_CUSTOMPAGECOMMANDS
!insertmacro MUI_PAGECOMMAND_LICENSE !insertmacro MUI_PAGECOMMAND_LICENSE
!insertmacro MUI_PAGECOMMAND_COMPONENTS !insertmacro MUI_PAGECOMMAND_COMPONENTS
!insertmacro MUI_PAGECOMMAND_DIRECTORY !insertmacro MUI_PAGECOMMAND_DIRECTORY
!insertmacro MUI_PAGECOMMAND_INSTFILES !insertmacro MUI_PAGECOMMAND_INSTFILES
!endif
!verbose 4 !verbose 4
@ -279,9 +283,13 @@
!macro MUI_UNPAGECOMMANDS !macro MUI_UNPAGECOMMANDS
!verbose 3 !verbose 3
!ifndef MUI_UNCUSTOMPAGECOMMANDS
!insertmacro MUI_UNPAGECOMMAND_CONFIRM !insertmacro MUI_UNPAGECOMMAND_CONFIRM
!insertmacro MUI_UNPAGECOMMAND_INSTFILES !insertmacro MUI_UNPAGECOMMAND_INSTFILES
!endif
!verbose 4 !verbose 4
@ -579,18 +587,6 @@
!macroend !macroend
!macro MUI_FUNCTIONS_CUSTOMPAGE_BASIC
!verbose 3
!insertmacro MUI_FUNCTIONS_PAGES
!insertmacro MUI_FUNCTIONS_GUIINIT
!insertmacro MUI_FUNCTIONS_ABORTWARNING
!verbose 4
!macroend
!macro MUI_UNFUNCTIONS_BASIC !macro MUI_UNFUNCTIONS_BASIC
!verbose 3 !verbose 3
@ -603,17 +599,6 @@
!macroend !macroend
!macro MUI_UNFUNCTIONS_CUSTOMPAGE_BASIC
!verbose 3
!insertmacro MUI_UNFUNCTIONS_PAGES
!insertmacro MUI_UNFUNCTIONS_GUIINIT
!verbose 4
!macroend
!endif !endif
!verbose 4 !verbose 4

6
Examples/Modern UI/InstallOptions.nsi
View file

@ -30,6 +30,7 @@
Name "${NAME} ${VERSION}" Name "${NAME} ${VERSION}"
;Page order ;Page order
!define MUI_CUSTOMPAGECOMMANDS
!insertmacro MUI_PAGECOMMAND_LICENSE !insertmacro MUI_PAGECOMMAND_LICENSE
Page custom SetCustomA Page custom SetCustomA
Page custom SetCustomB Page custom SetCustomB
@ -56,6 +57,7 @@
LangString TEXT_IO_SUBTITLE ${LANG_ENGLISH} "Create your own dialog!" LangString TEXT_IO_SUBTITLE ${LANG_ENGLISH} "Create your own dialog!"
;Uninstaller ;Uninstaller
!define MUI_UNCUSTOMPAGECOMMANDS
!insertmacro MUI_UNPAGECOMMAND_CONFIRM !insertmacro MUI_UNPAGECOMMAND_CONFIRM
!insertmacro MUI_UNPAGECOMMAND_INSTFILES !insertmacro MUI_UNPAGECOMMAND_INSTFILES
@ -132,7 +134,7 @@ Function SetCustomC
!insertmacro MUI_INSTALLOPTIONS_SHOW "ioC.ini" !insertmacro MUI_INSTALLOPTIONS_SHOW "ioC.ini"
FunctionEnd FunctionEnd
!insertmacro MUI_FUNCTIONS_CUSTOMPAGE_BASIC !insertmacro MUI_FUNCTIONS_BASIC
;-------------------------------- ;--------------------------------
;Uninstaller ;Uninstaller
@ -153,6 +155,6 @@ SectionEnd
;-------------------------------- ;--------------------------------
;Uninstaller Functions ;Uninstaller Functions
!insertmacro MUI_UNFUNCTIONS_CUSTOMPAGE_BASIC !insertmacro MUI_UNFUNCTIONS_BASIC
;eof ;eof