From 3e54d8b6bf677eed34fee3c12c2b0a8319a3cfd3 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Wed, 29 Jun 2005 23:51:37 +0000
Subject: [PATCH] Small bits

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10109 a592a061-630c-0410-9148-cb99ea01b6c8
---
 .../packaging/installer/lyx_installer.nsi     | 58 +++++++++----------
 .../installer/lyx_languages/english.nsh       |  2 +-
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/development/Win32/packaging/installer/lyx_installer.nsi b/development/Win32/packaging/installer/lyx_installer.nsi
index a51965b9e7..c184bfd438 100644
--- a/development/Win32/packaging/installer/lyx_installer.nsi
+++ b/development/Win32/packaging/installer/lyx_installer.nsi
@@ -20,7 +20,7 @@
 CRCCheck force
 
 ; Make the installer as small as possible.
-;SetCompressor lzma
+SetCompressor lzma
 
 ;--------------------------------
 ; You should need to change only these macros...
@@ -287,7 +287,7 @@ Section "-Installation actions" SecInstallation
       "${PRODUCT_NAME}" \
       "${PRODUCT_NAME} Document" \
       "${PRODUCT_EXE},1" \
-      "${PRODUCT_EXE}"
+      "${PRODUCT_BAT}"
 
     ${CreateFileAssociation} "${PRODUCT_EXT}" "${PRODUCT_NAME}" "${PRODUCT_MIME_TYPE}"
   ${endif}
@@ -365,7 +365,7 @@ FunctionEnd
 
 ; Sets the value of the global $MinSYSPath variable.
 Function SearchMinSYS
-  ; This function manipulates the $0, $1, $2 and $2 registers,
+  ; This function manipulates the registers $0-$3,
   ; so push their current content onto the stack.
   Push $0
   Push $1
@@ -664,36 +664,10 @@ FunctionEnd
 
 ;--------------------------------
 
-Function SelectMenuLanguage
-  StrCpy $LangName ""
-
-  ;tranlate NSIS's language code to the language name; macro from lyx_utils.nsh
-  !insertmacro TranslateLangCode $LangName $Language
-
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "io_ui_language.ini" "Field 2" "State" "$LangName"
-
-  !insertmacro MUI_HEADER_TEXT "$(UILangageTitle)" "$(UILangageDescription)"
-  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "io_ui_language.ini"
-FunctionEnd
-
-;--------------------------------
-
-Function SelectMenuLanguage_LeaveFunction
-  !insertmacro MUI_INSTALLOPTIONS_READ $LangName "io_ui_language.ini" "Field 2" "State"
-
-  ;Get the language code; macro from lyx_utils.nsh
-  StrCpy $LangCode ""
-  !insertmacro GetLangCode $LangCode $LangName
-FunctionEnd
-
-;--------------------------------
-
 ; Sets the value of the global $PDFViewerPath and $PDFViewerProg variables.
 Function SearchPDFViewer
   StrCpy $PDFViewerPath ""
   !insertmacro GetFileExtProg $PDFViewerPath $PDFViewerProg ".pdf" "a"
-
-  MessageBox MB_OK "PDF viewer '$PDFViewerPath' '$PDFViewerProg'"
 FunctionEnd
 
 ;--------------------------------
@@ -735,8 +709,6 @@ Function SearchPSViewer
     ${StrStrAdv} $PSViewerProg $PSViewerProg "\" "<" ">" "0" "0" "0"
   ${endif}
 
-  MessageBox MB_OK "PS viewer '$PSViewerPath' '$PSViewerProg'"
-
   ; Return the $0 and $1 registers to their original states
   Pop $1
   Pop $0
@@ -793,6 +765,30 @@ Function SummariseDownloads_LeaveFunction
   ${endif}
 FunctionEnd
 
+;--------------------------------
+
+Function SelectMenuLanguage
+  StrCpy $LangName ""
+
+  ;tranlate NSIS's language code to the language name; macro from lyx_utils.nsh
+  !insertmacro TranslateLangCode $LangName $Language
+
+  !insertmacro MUI_INSTALLOPTIONS_WRITE "io_ui_language.ini" "Field 2" "State" "$LangName"
+
+  !insertmacro MUI_HEADER_TEXT "$(UILangageTitle)" "$(UILangageDescription)"
+  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "io_ui_language.ini"
+FunctionEnd
+
+;--------------------------------
+
+Function SelectMenuLanguage_LeaveFunction
+  !insertmacro MUI_INSTALLOPTIONS_READ $LangName "io_ui_language.ini" "Field 2" "State"
+
+  ;Get the language code; macro from lyx_utils.nsh
+  StrCpy $LangCode ""
+  !insertmacro GetLangCode $LangCode $LangName
+FunctionEnd
+
 ;--------------------------------
 ; The Uninstaller
 
diff --git a/development/Win32/packaging/installer/lyx_languages/english.nsh b/development/Win32/packaging/installer/lyx_languages/english.nsh
index f99603d098..362453d6e9 100644
--- a/development/Win32/packaging/installer/lyx_languages/english.nsh
+++ b/development/Win32/packaging/installer/lyx_languages/english.nsh
@@ -62,7 +62,7 @@ LangString ImageMagickDownloadLabel "${LYX_LANG}" "&Download ImageMagick"
 LangString ImageMagickFolderLabel "${LYX_LANG}" "&Folder containing convert.exe"
 
 LangString GhostscriptHeader "${LYX_LANG}" "Ghostscript"
-LangString GhostscriptDescription "${LYX_LANG}" "Ghostscript (http://www.cs.wisc.edu/~ghost/) is used to convert images to/from PostScript."
+LangString GhostscriptDescription "${LYX_LANG}" "Ghostscript (www.cs.wisc.edu/~ghost/) is used to convert images to/from PostScript."
 LangString EnterGhostscriptFolder "${LYX_LANG}" "Please input the path to the folder containing gswin32c.exe"
 LangString InvalidGhostscriptFolder "${LYX_LANG}" "Unable to find gswin32c.exe"
 LangString GhostscriptDownloadLabel "${LYX_LANG}" "&Download Ghostscript"