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

MUI_UNGETLANGUAGE changes, abort header fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2699 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2003-07-07 14:06:09 +00:00
parent 8d331d9ec6
commit 5bb47d08c1
1 changed files with 44 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

89
Contrib/Modern UI/System.nsh
View file

@ -239,26 +239,21 @@
!macro MUI_FINISHHEADER !macro MUI_FINISHHEADER
!ifndef MUI_FINISHPAGE
!insertmacro MUI_FINISHHEADER_DISPLAY
!else ifdef MUI_FINISHPAGE_NOAUTOCLOSE
!insertmacro MUI_FINISHHEADER_DISPLAY
!endif
!macroend
!macro MUI_FINISHHEADER_DISPLAY
IfAbort mui.finishheader_abort IfAbort mui.finishheader_abort
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_FINISH_TITLE) $(MUI_TEXT_FINISH_SUBTITLE) !ifndef MUI_FINISHPAGE
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_FINISH_TITLE) $(MUI_TEXT_FINISH_SUBTITLE)
!else ifdef MUI_FINISHPAGE_NOAUTOCLOSE
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_FINISH_TITLE) $(MUI_TEXT_FINISH_SUBTITLE)
!endif
Goto mui.finishheader_done Goto mui.finishheader_done
mui.finishheader_abort: mui.finishheader_abort:
!insertmacro MUI_HEADER_TEXT $(MUI_TEXT_ABORT_TITLE) $(MUI_TEXT_ABORT_SUBTITLE) !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_ABORT_TITLE) $(MUI_TEXT_ABORT_SUBTITLE)
mui.finishheader_done: mui.finishheader_done:
!macroend !macroend
!macro MUI_UNFINISHHEADER !macro MUI_UNFINISHHEADER
@ -573,20 +568,29 @@
!verbose 4 !verbose 4
!endif !endif
Push ${MUI_TEMP1} !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
Push ${MUI_TEMP1}
ReadRegStr ${MUI_TEMP1} "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" ReadRegStr ${MUI_TEMP1} "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}"
StrCmp ${MUI_TEMP1} "" 0 mui.ungetlanguage_setlang
!endif
StrCmp ${MUI_TEMP1} "" 0 mui.ungetlanguage_setlang !insertmacro MUI_LANGDLL_DISPLAY
!insertmacro MUI_LANGDLL_DISPLAY
!ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
Goto mui.ungetlanguage_done Goto mui.ungetlanguage_done
mui.ungetlanguage_setlang: mui.ungetlanguage_setlang:
StrCpy $LANGUAGE ${MUI_TEMP1} StrCpy $LANGUAGE ${MUI_TEMP1}
mui.ungetlanguage_done:
mui.ungetlanguage_done: Pop ${MUI_TEMP1}
Pop ${MUI_TEMP1} !endif
!ifndef MUI_MANUALVERBOSE !ifndef MUI_MANUALVERBOSE
!verbose 4 !verbose 4
@ -1958,9 +1962,25 @@
!endif !endif
!ifndef MUI_FINISHPAGE !ifndef MUI_FINISHPAGE
!insertmacro MUI_LANGUAGEFILE_END_FINISHHEADER !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_TITLE"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_SUBTITLE"
!else ifdef MUI_FINISHPAGE_NOAUTOCLOSE !else ifdef MUI_FINISHPAGE_NOAUTOCLOSE
!insertmacro MUI_LANGUAGEFILE_END_FINISHHEADER !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_TITLE"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_SUBTITLE"
!endif
!ifdef MUI_TEXT_ABORT_TITLE
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_ABORT_TITLE"
!else
;1.63 compatibility
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_CUSTOMDEFINE_NOUNDEF "MUI_TEXT_ABORT_TITLE" "MUI_TEXT_INSTALLING_TITLE"
!endif
!ifdef MUI_TEXT_ABORT_SUBTITLE
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_ABORT_SUBTITLE"
!else
;1.63 compatibility
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_CUSTOMDEFINE_NOUNDEF "MUI_TEXT_ABORT_SUBTITLE" "MUI_TEXT_INSTALLING_SUBTITLE"
!endif !endif
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_TITLE" !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_TITLE"
@ -2041,27 +2061,6 @@
!macroend !macroend
!macro MUI_LANGUAGEFILE_END_FINISHHEADER
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_TITLE"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_SUBTITLE"
!ifdef MUI_TEXT_ABORT_TITLE
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_ABORT_TITLE"
!else
;1.63 compatibility
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_CUSTOMDEFINE_NOUNDEF "MUI_TEXT_ABORT_TITLE" "MUI_TEXT_INSTALLING_TITLE"
!endif
!ifdef MUI_TEXT_ABORT_SUBTITLE
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_ABORT_SUBTITLE"
!else
;1.63 compatibility
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_CUSTOMDEFINE_NOUNDEF "MUI_TEXT_ABORT_SUBTITLE" "MUI_TEXT_INSTALLING_SUBTITLE"
!endif
!macroend
;-------------------------------- ;--------------------------------
;END ;END