added MUI_(UN)WELCOMEFINISHPAGE_INI_3LINES, welcome page after installation works, doc fixes

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3102 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2003-11-05 16:02:44 +00:00
parent 5fa5a34e45
commit f9700baff3
2 changed files with 48 additions and 27 deletions

View file

@ -80,19 +80,19 @@ Var MUI_TEMP2
!endif
!ifndef MUI_WELCOMEFINISHPAGE_INI
!ifndef MUI_WELCOMEFINISHPAGE_3LINES
!define MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
!else
!define MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini"
!endif
!define MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
!endif
!ifndef MUI_WELCOMEFINISHPAGE_INI_3LINES
!define MUI_WELCOMEFINISHPAGE_INI_3LINES "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini"
!endif
!ifndef MUI_UNWELCOMEFINISHPAGE_INI
!ifndef MUI_UNWELCOMEFINISHPAGE_3LINES
!define MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
!else
!define MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini"
!endif
!define MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
!endif
!ifndef MUI_UNWELCOMEFINISHPAGE_INI_3LINES
!define MUI_UNWELCOMEFINISHPAGE_INI_3LINES "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini"
!endif
!ifndef MUI_WELCOMEFINISHPAGE_BITMAP
@ -359,8 +359,12 @@ Var MUI_TEMP2
!macro MUI_WELCOMEFINISHPAGE_INIT
!ifdef MUI_WELCOMEPAGE | MUI_FINISHPAGE
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_WELCOMEFINISHPAGE_INI}" "ioSpecial.ini"
!ifndef MUI_WELCOMEFINISHPAGE_3LINES
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_WELCOMEFINISHPAGE_INI}" "ioSpecial.ini"
!else
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_WELCOMEFINISHPAGE_INI_3LINES}" "ioSpecial.ini"
!endif
File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_WELCOMEFINISHPAGE_BITMAP}"
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
@ -377,7 +381,11 @@ Var MUI_TEMP2
!ifdef MUI_UNWELCOMEPAGE | UNMUI_FINISHPAGE
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_UNWELCOMEFINISHPAGE_INI}" "ioSpecial.ini"
!ifndef MUI_UNWELCOMEFINISHPAGE_3LINES
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_UNWELCOMEFINISHPAGE_INI}" "ioSpecial.ini"
!else
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_UNWELCOMEFINISHPAGE_INI_3LINES}" "ioSpecial.ini"
!endif
File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_UNWELCOMEFINISHPAGE_BITMAP}"
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
@ -1105,6 +1113,9 @@ Var MUI_TEMP2
Function "${PRE}"
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "NextButtonText" ""
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "CancelEnabled" ""
!ifndef MUI_WELCOMEPAGE_TITLE
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_${MUI_PAGE_UNINSTALLER}TEXT_WELCOME_INFO_TITLE)"
!else