MUI_CUSTOMFUNCTION_STARTMENU_LEAVE: use Leave function
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2676 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
973a61fbcf
commit
b0f87bd459
1 changed files with 35 additions and 31 deletions
|
@ -670,7 +670,7 @@
|
||||||
!define MUI_STARTMENUPAGE
|
!define MUI_STARTMENUPAGE
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
Page custom mui.Startmenu "" "" "MUI_INSTALLBUTTON_STARTMENU"
|
Page custom mui.StartmenuPre mui.StartmenuLeave "" "MUI_INSTALLBUTTON_STARTMENU"
|
||||||
|
|
||||||
!ifndef MUI_NOVERBOSE & MUI_MANUALVERBOSE
|
!ifndef MUI_NOVERBOSE & MUI_MANUALVERBOSE
|
||||||
!verbose 4
|
!verbose 4
|
||||||
|
@ -931,7 +931,7 @@
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
!ifdef MUI_STARTMENUPAGE
|
!ifdef MUI_STARTMENUPAGE
|
||||||
!insertmacro MUI_FUNCTIONS_STARTMENUPAGE mui.Startmenu
|
!insertmacro MUI_FUNCTIONS_STARTMENUPAGE mui.StartmenuPre mui.StartmenuLeave
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
!insertmacro MUI_FUNCTIONS_INSTFILESPAGE mui.InstFilesPre mui.InstFilesShow mui.InstFilesLeave
|
!insertmacro MUI_FUNCTIONS_INSTFILESPAGE mui.InstFilesPre mui.InstFilesShow mui.InstFilesLeave
|
||||||
|
@ -1079,44 +1079,48 @@
|
||||||
|
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro MUI_FUNCTIONS_STARTMENUPAGE FUNCTION
|
!macro MUI_FUNCTIONS_STARTMENUPAGE PRE LEAVE
|
||||||
|
|
||||||
Function "${FUNCTION}"
|
Function "${PRE}"
|
||||||
|
|
||||||
!ifdef MUI_CUSTOMFUNCTION_STARTMENU_PRE
|
!ifdef MUI_CUSTOMFUNCTION_STARTMENU_PRE
|
||||||
Call "${MUI_CUSTOMFUNCTION_STARTMENU_PRE}"
|
Call "${MUI_CUSTOMFUNCTION_STARTMENU_PRE}"
|
||||||
!endif
|
|
||||||
|
|
||||||
Push ${MUI_TEMP1}
|
|
||||||
|
|
||||||
!ifdef MUI_STARTMENUPAGE_REGISTRY_ROOT & MUI_STARTMENUPAGE_REGISTRY_KEY & MUI_STARTMENUPAGE_REGISTRY_VALUENAME
|
|
||||||
|
|
||||||
StrCmp "${MUI_STARTMENUPAGE_VARIABLE}" "" 0 +4
|
|
||||||
|
|
||||||
ReadRegStr ${MUI_TEMP1} "${MUI_STARTMENUPAGE_REGISTRY_ROOT}" "${MUI_STARTMENUPAGE_REGISTRY_KEY}" "${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}"
|
|
||||||
StrCmp ${MUI_TEMP1} "" +2
|
|
||||||
StrCpy "${MUI_STARTMENUPAGE_VARIABLE}" ${MUI_TEMP1}
|
|
||||||
|
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
|
Push ${MUI_TEMP1}
|
||||||
|
|
||||||
|
!ifdef MUI_STARTMENUPAGE_REGISTRY_ROOT & MUI_STARTMENUPAGE_REGISTRY_KEY & MUI_STARTMENUPAGE_REGISTRY_VALUENAME
|
||||||
|
|
||||||
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_STARTMENU_TITLE) $(MUI_TEXT_STARTMENU_SUBTITLE)
|
StrCmp "${MUI_STARTMENUPAGE_VARIABLE}" "" 0 +4
|
||||||
|
|
||||||
|
ReadRegStr ${MUI_TEMP1} "${MUI_STARTMENUPAGE_REGISTRY_ROOT}" "${MUI_STARTMENUPAGE_REGISTRY_KEY}" "${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}"
|
||||||
|
StrCmp ${MUI_TEMP1} "" +2
|
||||||
|
StrCpy "${MUI_STARTMENUPAGE_VARIABLE}" ${MUI_TEMP1}
|
||||||
|
|
||||||
!ifndef MUI_STARTMENUPAGE_NODISABLE
|
!endif
|
||||||
StartMenu::Select /noicon /autoadd /text "$(MUI_INNERTEXT_STARTMENU_TOP)" /lastused "${MUI_STARTMENUPAGE_VARIABLE}" /checknoshortcuts "$(MUI_INNERTEXT_STARTMENU_CHECKBOX)" "${MUI_STARTMENUPAGE_DEFAULTFOLDER}"
|
|
||||||
!else
|
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_STARTMENU_TITLE) $(MUI_TEXT_STARTMENU_SUBTITLE)
|
||||||
StartMenu::Select /noicon /autoadd /text "$(MUI_INNERTEXT_STARTMENU_TOP)" /lastused "${MUI_STARTMENUPAGE_VARIABLE}" "${MUI_STARTMENUPAGE_DEFAULTFOLDER}"
|
|
||||||
!endif
|
!ifndef MUI_STARTMENUPAGE_NODISABLE
|
||||||
|
StartMenu::Select /noicon /autoadd /text "$(MUI_INNERTEXT_STARTMENU_TOP)" /lastused "${MUI_STARTMENUPAGE_VARIABLE}" /checknoshortcuts "$(MUI_INNERTEXT_STARTMENU_CHECKBOX)" "${MUI_STARTMENUPAGE_DEFAULTFOLDER}"
|
||||||
|
!else
|
||||||
|
StartMenu::Select /noicon /autoadd /text "$(MUI_INNERTEXT_STARTMENU_TOP)" /lastused "${MUI_STARTMENUPAGE_VARIABLE}" "${MUI_STARTMENUPAGE_DEFAULTFOLDER}"
|
||||||
|
!endif
|
||||||
|
|
||||||
Pop ${MUI_TEMP1}
|
Pop ${MUI_TEMP1}
|
||||||
|
|
||||||
StrCmp ${MUI_TEMP1} "success" 0 +2
|
StrCmp ${MUI_TEMP1} "success" 0 +2
|
||||||
Pop "${MUI_STARTMENUPAGE_VARIABLE}"
|
Pop "${MUI_STARTMENUPAGE_VARIABLE}"
|
||||||
|
|
||||||
Pop ${MUI_TEMP1}
|
Pop ${MUI_TEMP1}
|
||||||
|
|
||||||
|
FunctionEnd
|
||||||
|
|
||||||
!ifdef MUI_CUSTOMFUNCTION_STARTMENU_LEAVE
|
Function "${LEAVE}"
|
||||||
Call "${MUI_CUSTOMFUNCTION_STARTMENU_LEAVE}"
|
|
||||||
!endif
|
!ifdef MUI_CUSTOMFUNCTION_STARTMENU_LEAVE
|
||||||
|
Call "${MUI_CUSTOMFUNCTION_STARTMENU_LEAVE}"
|
||||||
|
!endif
|
||||||
|
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue