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

Modern UI 1.64 - LicenseForceSelection support

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2366 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2003-03-26 19:16:51 +00:00
parent 5cc4601fe5
commit a74903197b
10 changed files with 67 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Contrib/Modern UI/System.nsh
View file

@ -1,4 +1,4 @@
;NSIS Modern User Interface version 1.63
;NSIS Modern User Interface version 1.64
;Macro System
;Written by Joost Verburg
@ -152,6 +152,14 @@
Icon "${MUI_ICON}"
!ifdef MUI_LICENSEPAGE
!ifdef MUI_LICENSEPAGE_CHECKBOX
LicenseForceSelection checkbox
!else ifdef MUI_LICENSEPAGE_RADIOBUTTONS
LicenseForceSelection radiobuttons
!endif
!endif
!ifdef MUI_UNINSTALLER
UninstallIcon "${MUI_UNICON}"
!endif
@ -535,7 +543,7 @@
!endif
!ifdef MUI_LICENSEPAGE
Page license mui.LicensePre mui.LicenseShow mui.LicenseLeave
Page license mui.LicensePre mui.LicenseShow mui.LicenseLeave "MUI_INSTALLBUTTON_LICENSE"
!endif
!ifndef MUI_NOVERBOSE && MUI_MANUALVERBOSE
@ -1771,15 +1779,27 @@
!macro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE NAME INSTALLBUTTON
!ifndef "${INSTALLBUTTON}"
LangString "${NAME}" 0 "${${NAME}}${MUI_TEXT_CONTINUE_NEXT}"
LangString "${NAME}" 0 "${${NAME}} ${MUI_TEXT_CONTINUE_NEXT}"
!else
LangString "${NAME}" 0 "${${NAME}}${MUI_TEXT_CONTINUE_INSTALL}"
LangString "${NAME}" 0 "${${NAME}} ${MUI_TEXT_CONTINUE_INSTALL}"
!endif
!undef "${NAME}"
!macroend
!macro MUI_LANGUAGEFILE_LANGSTRING_CUSTOMDEFINE_CONTINUE NAME DEFINE INSTALLBUTTON
!ifndef "${INSTALLBUTTON}"
LangString "${NAME}" 0 "${${DEFINE}} ${MUI_TEXT_CONTINUE_NEXT}"
!else
LangString "${NAME}" 0 "${${DEFINE}} ${MUI_TEXT_CONTINUE_INSTALL}"
!endif
!undef "${DEFINE}"
!macroend
!macro MUI_LANGUAGEFILE_UNLANGSTRING NAME
LangString "un.${NAME}" 0 "${${NAME}}"
@ -1875,7 +1895,18 @@
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_TITLE"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_SUBTITLE"
!insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "LicenseText" "MUI_INNERTEXT_LICENSE_TOP"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_BOTTOM"
!ifndef MUI_LICENSEPAGE_CHECKBOX && MUI_LICENSEPAGE_RADIOBUTTONS
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_BOTTOM"
!else
!ifndef MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX || MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS
!error "The ${LANGUAGE} Modern UI language file does not contain a bottom text for a license pages with a checkbox or radiobuttons. Please update this file and post your language file on the NSIS Project Page, http://nsis.sf.net."
!endif
!ifdef MUI_LICENSEPAGE_CHECKBOX
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_CUSTOMDEFINE_CONTINUE "MUI_INNERTEXT_LICENSE_BOTTOM" "MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX" "MUI_INSTALLBUTTON_LICENSE"
!else ifdef MUI_LICENSEPAGE_RADIOBUTTONS
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_CUSTOMDEFINE_CONTINUE "MUI_INNERTEXT_LICENSE_BOTTOM" "MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS" "MUI_INSTALLBUTTON_LICENSE"
!endif
!endif
!endif
!ifdef MUI_COMPONENTSPAGE