fixes: header text, 3 lines welcome/finish title, alternative comp page, docs

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3043 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2003-10-23 12:43:49 +00:00
parent 8442558574
commit 4a9dac930a
3 changed files with 32 additions and 45 deletions

View file

@ -44,11 +44,11 @@ Var MUI_TEMP2
!endif
!ifndef MUI_UI_COMPONENTSPAGE_SMALLDESC
!define MUI_UI_SMALLDESC "${NSISDIR}\Contrib\UIs\modern_smalldesc.exe"
!define MUI_UI_COMPONENTSPAGE_SMALLDESC "${NSISDIR}\Contrib\UIs\modern_smalldesc.exe"
!endif
!ifndef MUI_UI_COMPONENTSPAGE_NODESC
!define MUI_UI_NODESCRIPTION "${NSISDIR}\Contrib\UIs\modern_nodesc.exe"
!define MUI_UI_COMPONENTSPAGE_NODESC "${NSISDIR}\Contrib\UIs\modern_nodesc.exe"
!endif
!ifndef MUI_ICON
@ -120,9 +120,9 @@ Var MUI_TEMP2
!endif
!endif
!ifdef MUI_COMPONENTSPAGE_SMALLDESC
ChangeUI IDD_SELCOM "${MUI_UI_SMALLDESCRIPTION}"
ChangeUI IDD_SELCOM "${MUI_UI_COMPONENTSPAGE_SMALLDESC}"
!else ifdef MUI_COMPONENTSPAGE_NODESC
ChangeUI IDD_SELCOM "${MUI_UI_NODESCRIPTION}"
ChangeUI IDD_SELCOM "${MUI_UI_COMPONENTSPAGE_NODESC}"
!endif
Icon "${MUI_ICON}"
@ -231,11 +231,11 @@ Var MUI_TEMP2
!undef MUI_INSTFILESPAGE_FINISHHEADER_TEXT
!undef MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT
!else
!insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_FINISHHEADER_TEXT}" ""
!insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_FINISHHEADER_TEXT}" "$(MUI_${MUI_PAGE_UNINSTALLER}TEXT_FINISH_SUBTITLE)"
!undef MUI_INSTFILESPAGE_FINISHHEADER_TEXT
!endif
!else
!insertmacro MUI_HEADER_TEXT "$(MUI_TEXT_FINISH_TITLE)" "$(MUI_TEXT_FINISH_SUBTITLE)"
!insertmacro MUI_HEADER_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER}TEXT_FINISH_TITLE)" "$(MUI_${MUI_PAGE_UNINSTALLER}TEXT_FINISH_SUBTITLE)"
!endif
Goto mui.finishheader_done
@ -246,51 +246,16 @@ Var MUI_TEMP2
!ifdef MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT
!insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" "${MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT}"
!else
!insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" ""
!insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" "$(MUI_${MUI_PAGE_UNINSTALLER}TEXT_FINISH_SUBTITLE)"
!endif
!else
!insertmacro MUI_HEADER_TEXT "$(MUI_TEXT_ABORT_TITLE)" "$(MUI_TEXT_ABORT_SUBTITLE)"
!insertmacro MUI_HEADER_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER}TEXT_ABORT_TITLE)" "$(MUI_${MUI_PAGE_UNINSTALLER}TEXT_FINISH_SUBTITLE)"
!endif
mui.finishheader_done:
!macroend
!macro MUI_UNFINISHHEADER
IfAbort mui.finishheader_abort
!ifdef MUI_INSTFILESPAGE_FINISHHEADER_TEXT
!ifdef MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT
!insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_FINISHHEADER_TEXT}" "${MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT}"
!undef MUI_INSTFILESPAGE_FINISHHEADER_TEXT
!undef MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT
!else
!insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_FINISHHEADER_TEXT}" ""
!undef MUI_INSTFILESPAGE_FINISHHEADER_TEXT
!endif
!else
!insertmacro MUI_HEADER_TEXT "$(MUI_UNTEXT_FINISH_TITLE)" "$(MUI_UNTEXT_FINISH_SUBTITLE)"
!endif
Goto mui.finishheader_done
mui.finishheader_abort:
!ifdef MUI_INSTFILESPAGE_ABORTHEADER_TEXT
!ifdef MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT
!insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" "${MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT}"
!else
!insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" ""
!endif
!else
!insertmacro MUI_HEADER_TEXT "$(MUI_UNTEXT_ABORT_TITLE)" "$(MUI_UNTEXT_ABORT_SUBTITLE)"
!endif
mui.finishheader_done:
!macroend
!macro MUI_ABORTWARNING
!ifdef MUI_ABORTWARNING_TEXT