* Bring the NSIS install and update scripts somewhat in sync

  * Rename all .xhtml output files to .html as on Windows by default .xhtml isn't associated with anything while .html is associated with the default browser
  * Change the output file names (of the generated installers) for the 2.0.8 updaters to the same filenames that are used for the downloads
  * Comment out the radio button license selection (people will still have to select "I Agree", though now through a button, not through option boxes)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/branches/2.0@2958 4a71c877-e1ca-e34f-864e-861f7616d084

nsis/warzone2100.nsi

@@ -47,7 +47,10 @@ VIAddVersionKey "ProductVersion"	"${VERSION}"
   !define MUI_ABORTWARNING
 
   ; Settings for MUI_PAGE_LICENSE
-  !define MUI_LICENSEPAGE_RADIOBUTTONS
+  ; Purposefully commented out, as we do _not_ want to trouble users with an
+  ; additional mouse click (while otherwise pressing "return" continuously
+  ; would satisfy)
+;  !define MUI_LICENSEPAGE_RADIOBUTTONS
 
   ;Start Menu Folder Page Configuration (for MUI_PAGE_STARTMENU)
   !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
@@ -130,8 +133,8 @@ Section $(TEXT_SecBase) SecBase
   File "/oname=License.txt" "..\COPYING"
   File "/oname=Readme.en.txt" "..\doc\Readme.en"
   File "/oname=Readme.de.txt" "..\doc\Readme.de"
-  File "/oname=Readme.en.xhtml" "..\doc\Readme.en.xhtml"
-  File "/oname=Readme.de.xhtml" "..\doc\Readme.de.xhtml"
+  File "/oname=Readme.en.html" "..\doc\Readme.en.xhtml"
+  File "/oname=Readme.de.html" "..\doc\Readme.de.xhtml"
 
 
   ;Store installation folder
@@ -242,8 +245,8 @@ FunctionEnd
   LangString TEXT_RunWarzone ${LANG_GERMAN} "Starte Warzone 2100"
 
 
-  LangString TEXT_Readme ${LANG_ENGLISH} "$INSTDIR\Readme.en.xhtml"
-  LangString TEXT_Readme ${LANG_GERMAN} "$INSTDIR\Readme.de.xhtml"
+  LangString TEXT_Readme ${LANG_ENGLISH} "$INSTDIR\Readme.en.html"
+  LangString TEXT_Readme ${LANG_GERMAN} "$INSTDIR\Readme.de.html"
 
 
   ;Assign language strings to sections
@@ -277,8 +280,8 @@ Section "Uninstall"
 
   Delete "$INSTDIR\Readme.en.txt"
   Delete "$INSTDIR\Readme.de.txt"
-  Delete "$INSTDIR\Readme.en.xhtml"
-  Delete "$INSTDIR\Readme.de.xhtml"
+  Delete "$INSTDIR\Readme.en.html"
+  Delete "$INSTDIR\Readme.de.html"
 
   Delete "$INSTDIR\License.txt"
   Delete "$INSTDIR\Authors.txt"

nsis/warzone2100.update.nsi

@@ -51,7 +51,10 @@ VIAddVersionKey "ProductVersion"	"${VERSION}"
   !define MUI_ABORTWARNING
 
   ; Settings for MUI_PAGE_LICENSE
-  !define MUI_LICENSEPAGE_RADIOBUTTONS
+  ; Purposefully commented out, as we do _not_ want to trouble users with an
+  ; additional mouse click (while otherwise pressing "return" continuously
+  ; would satisfy)
+;  !define MUI_LICENSEPAGE_RADIOBUTTONS
 
   ;Start Menu Folder Page Configuration (for MUI_PAGE_STARTMENU)
   !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
@@ -139,8 +142,8 @@ Section $(TEXT_SecBase) SecBase
   File "/oname=License.txt" "..\COPYING"
   File "/oname=Readme.en.txt" "..\doc\Readme.en"
   File "/oname=Readme.de.txt" "..\doc\Readme.de"
-  File "/oname=Readme.en.xhtml" "..\doc\Readme.en.xhtml"
-  File "/oname=Readme.de.xhtml" "..\doc\Readme.de.xhtml"
+  File "/oname=Readme.en.html" "..\doc\Readme.en.xhtml"
+  File "/oname=Readme.de.html" "..\doc\Readme.de.xhtml"
 
 
   ;Store installation folder
@@ -252,8 +255,8 @@ FunctionEnd
   LangString TEXT_RunWarzone ${LANG_GERMAN} "Starte Warzone 2100"
 
 
-  LangString TEXT_Readme ${LANG_ENGLISH} "$INSTDIR\Readme.en.xhtml"
-  LangString TEXT_Readme ${LANG_GERMAN} "$INSTDIR\Readme.de.xhtml"
+  LangString TEXT_Readme ${LANG_ENGLISH} "$INSTDIR\Readme.en.html"
+  LangString TEXT_Readme ${LANG_GERMAN} "$INSTDIR\Readme.de.html"
 
 
   ;Assign language strings to sections
@@ -287,8 +290,8 @@ Section "Uninstall"
 
   Delete "$INSTDIR\Readme.en.txt"
   Delete "$INSTDIR\Readme.de.txt"
-  Delete "$INSTDIR\Readme.en.xhtml"
-  Delete "$INSTDIR\Readme.de.xhtml"
+  Delete "$INSTDIR\Readme.en.html"
+  Delete "$INSTDIR\Readme.de.html"
 
   Delete "$INSTDIR\License.txt"
   Delete "$INSTDIR\Authors.txt"