Modern UI 1.64 - LicenseForceSelection support

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2366 212acab6-be3b-0410-9dea-997c60f758d6
2003-03-26 19:16:51 +00:00 · 2003-03-26 19:16:51 +00:00 · a74903197b
commit a74903197b
parent 5cc4601fe5
10 changed files with 67 additions and 13 deletions
--- a/UI/Changelog.txt
+++ b/UI/Changelog.txt
@ -1,5 +1,10 @@
 NSIS Modern User Interface - VERSION HISTORY

+1.64 - March 26, 2003
+* Support for license page with checkbox or radiobuttons to let the
+user accept the agreement or not
+* Language files have to be updated
+
 1.63 - March 9, 2003
 * Support for a bitmap in the wizard header
 * New defines to change the description area
--- a/files/English.nsh
+++ b/files/English.nsh
@ -1,5 +1,5 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.63
+;Compatible with Modern UI 1.64

 ;Language: English (1033)
 ;By Joost Verburg
@ -21,7 +21,9 @@
  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "License Agreement"  
  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Please review the license terms before installing ${MUI_PRODUCT}."
  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Press Page Down to see the rest of the agreement."
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "If you accept all the terms of the agreement, choose I Agree to continue. You must accept the agreement to install ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "If you accept the terms of the agreement, click I Agree to continue. You must accept the agreement to install ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "If you accept the terms of the agreement, click the check box below. You must accept the agreement to install ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "If you accept the terms of the agreement, select the first option below. You must accept the agreement to install ${MUI_PRODUCT}."
  
  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Choose Components"
  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Choose which features of ${MUI_PRODUCT} you want to install."
--- a/UI/Readme.html
+++ b/UI/Readme.html
@ -162,6 +162,13 @@ follow these steps:</p>
  and shows information for the user.</p>
  <p class="text"><span class="bold">MUI_LICENSEPAGE</span><br />
  Show the license page.</p>
+  <div class="margin">
+  <p class="text"><span class="bold">MUI_LICENSEPAGE_CHECKBOX</span><br />
+  Display a checkbox the user has to check to agree with the license terms.</p>
+  <p class="text"><span class="bold">MUI_LICENSEPAGE_RADIOBUTTONS</span><br />
+  Display two radiobuttons to allow the user to choose between accepting the
+  license terms or not.</p>
+  </div>
  <p class="text"><span class="bold">MUI_COMPONENTSPAGE</span><br />
  Show the component selection page.</p>
  <div class="margin">
@ -584,6 +591,15 @@ MUI_UNCUSTOMFUNCTION_INSTFILES_LEAVE
 </p>
 <p class="header">Version history</p>
 <ul>
+<li>1.64 - March 26, 2003
+  <ul>
+    <li>Support for license page with checkbox or radiobuttons to
+    let the user accept the agreement or not</li>
+    <li>Language files have to be updated</li>
+  </ul></li>
+</ul>
+<p class="text"></p>
+<ul>
 <li>1.63 - March 9, 2003
  <ul>
    <li>Support for a bitmap in the wizard header</li>
--- a/Contrib/Modern
+++ b/Contrib/Modern
@ -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
--- a/Examples/Modern
+++ b/Examples/Modern
@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.63
+;NSIS Modern User Interface version 1.64
 ;Basic Example Script
 ;Written by Joost Verburg

--- a/UI/HeaderBitmap.nsi
+++ b/UI/HeaderBitmap.nsi
@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.63
+;NSIS Modern User Interface version 1.64
 ;Header Bitmap Example Script
 ;Written by Joost Verburg

--- a/UI/InstallOptions.nsi
+++ b/UI/InstallOptions.nsi
@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.63
+;NSIS Modern User Interface version 1.64
 ;InstallOptions Example Script
 ;Written by Joost Verburg

--- a/UI/MultiLanguage.nsi
+++ b/UI/MultiLanguage.nsi
@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.63
+;NSIS Modern User Interface version 1.64
 ;MultiLanguage Example Script
 ;Written by Joost Verburg

--- a/UI/StartMenu.nsi
+++ b/UI/StartMenu.nsi
@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.63
+;NSIS Modern User Interface version 1.64
 ;Start Menu Folder Selection Example Script
 ;Written by Joost Verburg

--- a/UI/WelcomeFinish.nsi
+++ b/UI/WelcomeFinish.nsi
@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.63
+;NSIS Modern User Interface version 1.64
 ;Welcome/Finish Page Example Script
 ;Written by Joost Verburg