Modern UI 1.69
* All uninstaller pages work without installer pages * Fixed top text on uninstaller license page git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3368 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg
parent
91574fa7ec
commit
f806c7ce4c
9 changed files with 94 additions and 87 deletions
|
|
@ -1,4 +1,4 @@
|
|||
;NSIS Modern User Interface version 1.68
|
||||
;NSIS Modern User Interface version 1.69
|
||||
;Macro System
|
||||
;Written by Joost Verburg
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
;License: License.txt
|
||||
;Examples: Examples\Modern UI
|
||||
|
||||
!echo "NSIS Modern User Interface version 1.68 - © 2002-2003 Joost Verburg"
|
||||
!echo "NSIS Modern User Interface version 1.69 - © 2002-2004 Joost Verburg"
|
||||
|
||||
;--------------------------------
|
||||
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
!include "WinMessages.nsh"
|
||||
!verbose pop
|
||||
|
||||
!define MUI_SYSVERSION "1.68"
|
||||
!define MUI_SYSVERSION "1.69"
|
||||
|
||||
Var MUI_TEMP1
|
||||
Var MUI_TEMP2
|
||||
|
|
@ -691,7 +691,7 @@ Var MUI_TEMP2
|
|||
|
||||
!insertmacro MUI_SET MUI_${MUI_PAGE_UNINSTALLER_PREFIX}LICENSEPAGE
|
||||
|
||||
!insertmacro MUI_DEFAULT MUI_LICENSEPAGE_TEXT_TOP "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}INNERTEXT_LICENSE_TOP)"
|
||||
!insertmacro MUI_DEFAULT MUI_LICENSEPAGE_TEXT_TOP "$(MUI_INNERTEXT_LICENSE_TOP)"
|
||||
!insertmacro MUI_DEFAULT MUI_LICENSEPAGE_BUTTON ""
|
||||
!insertmacro MUI_DEFAULT MUI_LICENSEPAGE_CHECKBOX_TEXT ""
|
||||
!insertmacro MUI_DEFAULT MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_ACCEPT ""
|
||||
|
|
@ -924,8 +924,10 @@ Var MUI_TEMP2
|
|||
!define MUI_VAR_HWND
|
||||
!endif
|
||||
|
||||
!ifndef MUI_FINISHPAGE_NOAUTOCLOSE
|
||||
AutoCloseWindow true
|
||||
!ifndef MUI_PAGE_UNINSTALLER
|
||||
!ifndef MUI_FINISHPAGE_NOAUTOCLOSE
|
||||
AutoCloseWindow true
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifdef MUI_FINISHPAGE_RUN | MUI_FINISHPAGE_SHOWREADME
|
||||
|
|
@ -2091,9 +2093,23 @@ Var MUI_TEMP2
|
|||
|
||||
!macroend
|
||||
|
||||
!macro MUI_LANGUAGEFILE_LANGSTRING_NOUNDEF NAME
|
||||
!macro MUI_LANGUAGEFILE_MULTILANGSTRING_PAGE PAGE NAME
|
||||
|
||||
LangString "${NAME}" 0 "${${NAME}}"
|
||||
!ifdef MUI_${PAGE}PAGE | MUI_UN${PAGE}PAGE
|
||||
LangString "${NAME}" 0 "${${NAME}}"
|
||||
!undef "${NAME}"
|
||||
!else
|
||||
!undef "${NAME}"
|
||||
!endif
|
||||
|
||||
!macroend
|
||||
|
||||
!macro MUI_LANGUAGEFILE_LANGSTRING_DEFINE DEFINE NAME
|
||||
|
||||
!ifdef "${DEFINE}"
|
||||
LangString "${NAME}" 0 "${${NAME}}"
|
||||
!endif
|
||||
!undef "${NAME}"
|
||||
|
||||
!macroend
|
||||
|
||||
|
|
@ -2126,25 +2142,22 @@ Var MUI_TEMP2
|
|||
!undef MUI_LANGDLL_PUSHLIST
|
||||
!define MUI_LANGDLL_PUSHLIST "'${MUI_${LANGUAGE}_LANGNAME}' ${LANG_${LANGUAGE}} ${MUI_LANGDLL_PUSHLIST_TEMP}"
|
||||
!endif
|
||||
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_NOUNDEF "MUI_BGCOLOR"
|
||||
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE WELCOME "MUI_TEXT_WELCOME_INFO_TITLE"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE WELCOME "MUI_TEXT_WELCOME_INFO_TEXT"
|
||||
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE LICENSE "MUI_TEXT_LICENSE_TITLE"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE LICENSE "MUI_TEXT_LICENSE_SUBTITLE"
|
||||
!ifdef MUI_LICENSEPAGE
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_NOUNDEF "MUI_INNERTEXT_LICENSE_TOP"
|
||||
!endif
|
||||
!insertmacro MUI_LANGUAGEFILE_MULTILANGSTRING_PAGE LICENSE "MUI_INNERTEXT_LICENSE_TOP"
|
||||
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE LICENSE "MUI_INNERTEXT_LICENSE_BOTTOM"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE LICENSE "MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE LICENSE "MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS"
|
||||
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE COMPONENTS "MUI_TEXT_COMPONENTS_TITLE"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE COMPONENTS "MUI_TEXT_COMPONENTS_SUBTITLE"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE COMPONENTS "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE COMPONENTS "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO"
|
||||
!insertmacro MUI_LANGUAGEFILE_MULTILANGSTRING_PAGE COMPONENTS "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE"
|
||||
!insertmacro MUI_LANGUAGEFILE_MULTILANGSTRING_PAGE COMPONENTS "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO"
|
||||
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE DIRECTORY "MUI_TEXT_DIRECTORY_TITLE"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE DIRECTORY "MUI_TEXT_DIRECTORY_SUBTITLE"
|
||||
|
|
@ -2163,20 +2176,17 @@ Var MUI_TEMP2
|
|||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE INSTFILES "MUI_TEXT_ABORT_TITLE"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE INSTFILES "MUI_TEXT_ABORT_SUBTITLE"
|
||||
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE FINISH "MUI_BUTTONTEXT_FINISH"
|
||||
!insertmacro MUI_LANGUAGEFILE_MULTILANGSTRING_PAGE FINISH "MUI_BUTTONTEXT_FINISH"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE FINISH "MUI_TEXT_FINISH_INFO_TITLE"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE FINISH "MUI_TEXT_FINISH_INFO_TEXT"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE FINISH "MUI_TEXT_FINISH_INFO_REBOOT"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE FINISH "MUI_TEXT_FINISH_REBOOTNOW"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE FINISH "MUI_TEXT_FINISH_REBOOTLATER"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE FINISH "MUI_TEXT_FINISH_RUN"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE FINISH "MUI_TEXT_FINISH_SHOWREADME"
|
||||
!insertmacro MUI_LANGUAGEFILE_MULTILANGSTRING_PAGE FINISH "MUI_TEXT_FINISH_REBOOTNOW"
|
||||
!insertmacro MUI_LANGUAGEFILE_MULTILANGSTRING_PAGE FINISH "MUI_TEXT_FINISH_REBOOTLATER"
|
||||
!insertmacro MUI_LANGUAGEFILE_MULTILANGSTRING_PAGE FINISH "MUI_TEXT_FINISH_RUN"
|
||||
!insertmacro MUI_LANGUAGEFILE_MULTILANGSTRING_PAGE FINISH "MUI_TEXT_FINISH_SHOWREADME"
|
||||
|
||||
!ifdef MUI_ABORTWARNING
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_ABORTWARNING"
|
||||
!else
|
||||
!undef MUI_TEXT_ABORTWARNING
|
||||
!endif
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_DEFINE MUI_ABORTWARNING "MUI_TEXT_ABORTWARNING"
|
||||
|
||||
|
||||
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE WELCOME "MUI_UNTEXT_WELCOME_INFO_TITLE"
|
||||
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE WELCOME "MUI_UNTEXT_WELCOME_INFO_TEXT"
|
||||
|
|
@ -2186,11 +2196,7 @@ Var MUI_TEMP2
|
|||
|
||||
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNTEXT_LICENSE_TITLE"
|
||||
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNTEXT_LICENSE_SUBTITLE"
|
||||
!ifndef MUI_LICENSEPAGE
|
||||
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_INNERTEXT_LICENSE_TOP"
|
||||
!else
|
||||
!undef MUI_INNERTEXT_LICENSE_TOP
|
||||
!endif
|
||||
|
||||
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM"
|
||||
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX"
|
||||
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS"
|
||||
|
|
@ -2214,11 +2220,7 @@ Var MUI_TEMP2
|
|||
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE FINISH "MUI_UNTEXT_FINISH_INFO_TEXT"
|
||||
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE FINISH "MUI_UNTEXT_FINISH_INFO_REBOOT"
|
||||
|
||||
!ifdef MUI_UNABORTWARNING
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_ABORTWARNING"
|
||||
!else
|
||||
!undef MUI_UNTEXT_ABORTWARNING
|
||||
!endif
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_DEFINE MUI_UNABORTWARNING "MUI_UNTEXT_ABORTWARNING"
|
||||
|
||||
!macroend
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue