startmenu: changed define names, pre/leave custom functions, checkbox can be disabled, documentation updates
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2222 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
991dcd5a92
commit
90b11cdccc
3 changed files with 55 additions and 34 deletions
|
@ -409,7 +409,7 @@
|
|||
|
||||
Push ${MUI_TEMP1}
|
||||
|
||||
StrCpy ${MUI_TEMP1} ${MUI_STARTMENU_VARIABLE} 1
|
||||
StrCpy ${MUI_TEMP1} ${MUI_STARTMENUPAGE_VARIABLE} 1
|
||||
StrCmp ${MUI_TEMP1} ">" no_startmenu_shortcuts
|
||||
|
||||
Pop ${MUI_TEMP1}
|
||||
|
@ -978,10 +978,10 @@
|
|||
!endif
|
||||
|
||||
Function "${PRE}"
|
||||
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_LICENSE_TITLE) $(MUI_TEXT_LICENSE_SUBTITLE)
|
||||
!ifdef MUI_CUSTOMFUNCTION_LICENSE_PRE
|
||||
Call "${MUI_CUSTOMFUNCTION_LICENSE_PRE}"
|
||||
!endif
|
||||
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_LICENSE_TITLE) $(MUI_TEXT_LICENSE_SUBTITLE)
|
||||
FunctionEnd
|
||||
|
||||
Function "${SHOW}"
|
||||
|
@ -1014,10 +1014,10 @@
|
|||
!endif
|
||||
|
||||
Function "${PRE}"
|
||||
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_COMPONENTS_TITLE) $(MUI_TEXT_COMPONENTS_SUBTITLE)
|
||||
!ifdef MUI_CUSTOMFUNCTION_COMPONENTS_PRE
|
||||
Call "${MUI_CUSTOMFUNCTION_COMPONENTS_PRE}"
|
||||
!endif
|
||||
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_COMPONENTS_TITLE) $(MUI_TEXT_COMPONENTS_SUBTITLE)
|
||||
FunctionEnd
|
||||
|
||||
Function "${SHOW}"
|
||||
|
@ -1051,10 +1051,10 @@
|
|||
!endif
|
||||
|
||||
Function "${PRE}"
|
||||
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_DIRECTORY_TITLE) $(MUI_TEXT_DIRECTORY_SUBTITLE)
|
||||
!ifdef MUI_CUSTOMFUNCTION_DIRECTORY_PRE
|
||||
Call "${MUI_CUSTOMFUNCTION_DIRECTORY_PRE}"
|
||||
!endif
|
||||
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_DIRECTORY_TITLE) $(MUI_TEXT_DIRECTORY_SUBTITLE)
|
||||
FunctionEnd
|
||||
|
||||
Function "${SHOW}"
|
||||
|
@ -1087,44 +1087,52 @@
|
|||
!endif
|
||||
|
||||
;Check defines
|
||||
!ifndef MUI_STARTMENU_VARIABLE
|
||||
!define MUI_STARTMENU_VARIABLE "$9"
|
||||
!ifndef MUI_STARTMENUPAGE_VARIABLE
|
||||
!define MUI_STARTMENUPAGE_VARIABLE "$9"
|
||||
!endif
|
||||
!ifndef MUI_STARTMENU_DEFAULTFOLDER
|
||||
!define MUI_STARTMENU_DEFAULTFOLDER "${MUI_PRODUCT}"
|
||||
!ifndef MUI_STARTMENUPAGE_DEFAULTFOLDER
|
||||
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${MUI_PRODUCT}"
|
||||
!endif
|
||||
|
||||
Function "${FUNCTION}"
|
||||
|
||||
!ifdef MUI_CUSTOMFUNCTION_STARTMENU_PRE
|
||||
Call "${MUI_CUSTOMFUNCTION_STARTMENU_PRE}"
|
||||
!endif
|
||||
|
||||
Push ${MUI_TEMP1}
|
||||
|
||||
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_STARTMENU_TITLE) $(MUI_TEXT_STARTMENU_SUBTITLE)
|
||||
|
||||
!ifdef MUI_STARTMENU_REGISTRY_ROOT
|
||||
!ifdef MUI_STARTMENU_REGISTRY_KEY
|
||||
!ifdef MUI_STARTMENU_REGISTRY_VALUENAME
|
||||
!ifdef MUI_STARTMENUPAGE_REGISTRY_ROOT
|
||||
!ifdef MUI_STARTMENUPAGE_REGISTRY_KEY
|
||||
!ifdef MUI_STARTMENUPAGE_REGISTRY_VALUENAME
|
||||
|
||||
StrCmp "${MUI_STARTMENU_VARIABLE}" "" "" +4
|
||||
StrCmp "${MUI_STARTMENUPAGE_VARIABLE}" "" "" +4
|
||||
|
||||
ReadRegStr ${MUI_TEMP1} "${MUI_STARTMENU_REGISTRY_ROOT}" "${MUI_STARTMENU_REGISTRY_KEY}" "${MUI_STARTMENU_REGISTRY_VALUENAME}"
|
||||
ReadRegStr ${MUI_TEMP1} "${MUI_STARTMENUPAGE_REGISTRY_ROOT}" "${MUI_STARTMENUPAGE_REGISTRY_KEY}" "${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}"
|
||||
StrCmp ${MUI_TEMP1} "" +2
|
||||
StrCpy "${MUI_STARTMENU_VARIABLE}" ${MUI_TEMP1}
|
||||
StrCpy "${MUI_STARTMENUPAGE_VARIABLE}" ${MUI_TEMP1}
|
||||
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
|
||||
StartMenu::Select /noicon /autoadd /text "$(MUI_INNERTEXT_STARTMENU_TOP)" /lastused "${MUI_STARTMENU_VARIABLE}" /checknoshortcuts "$(MUI_INNERTEXT_STARTMENU_CHECKBOX)" "${MUI_STARTMENU_DEFAULTFOLDER}"
|
||||
!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}
|
||||
|
||||
StrCmp ${MUI_TEMP1} "success" 0 +2
|
||||
Pop "${MUI_STARTMENU_VARIABLE}"
|
||||
Pop "${MUI_STARTMENUPAGE_VARIABLE}"
|
||||
|
||||
Pop ${MUI_TEMP1}
|
||||
|
||||
!ifdef MUI_CUSTOMFUNCTION_STARTMENU
|
||||
Call "${MUI_CUSTOMFUNCTION_STARTMENU}"
|
||||
!ifdef MUI_CUSTOMFUNCTION_STARTMENU_LEAVE
|
||||
Call "${MUI_CUSTOMFUNCTION_STARTMENU_LEAVE}"
|
||||
!endif
|
||||
|
||||
FunctionEnd
|
||||
|
@ -1146,10 +1154,10 @@
|
|||
!endif
|
||||
|
||||
Function "${PRE}"
|
||||
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_INSTALLING_TITLE) $(MUI_TEXT_INSTALLING_SUBTITLE)
|
||||
!ifdef MUI_CUSTOMFUNCTION_INSTFILES_PRE
|
||||
Call "${MUI_CUSTOMFUNCTION_INSTFILES_PRE}"
|
||||
!endif
|
||||
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_INSTALLING_TITLE) $(MUI_TEXT_INSTALLING_SUBTITLE)
|
||||
FunctionEnd
|
||||
|
||||
Function "${SHOW}"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue