* All ImageMagick and Ghostscript resources are no longer installed as separate files...

[lyx.git] / development / Win32 / packaging / installer / include / gui.nsh

diff --git a/development/Win32/packaging/installer/include/gui.nsh b/development/Win32/packaging/installer/include/gui.nsh
index bfd400f5ad96a52466bc5fd5dbfbc2488f32b207..4815a74c01878c9da00ea2ec532b64326aff309c 100644 (file)
--- a/development/Win32/packaging/installer/include/gui.nsh
+++ b/development/Win32/packaging/installer/include/gui.nsh
@@ -12,9 +12,6 @@ Installer user interface settings
 Name "${APP_NAME} ${APP_VERSION}"\r
 BrandingText " "\r
 \r
-# Default installation folder\r
-InstallDir "${SETUP_DEFAULT_DIRECTORY}"\r
-\r
 #--------------------------------\r
 # Interface settings\r
 \r
@@ -26,7 +23,6 @@ InstallDir "${SETUP_DEFAULT_DIRECTORY}"
 !define MUI_HEADERIMAGE_RIGHT\r
 !define MUI_WELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"\r
 !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"\r
-!define MUI_CUSTOMFUNCTION_GUIINIT InitInterface\r
 !define MUI_COMPONENTSPAGE_NODESC\r
 \r
 #--------------------------------\r
@@ -35,15 +31,19 @@ InstallDir "${SETUP_DEFAULT_DIRECTORY}"
 # Installer\r
 \r
 !define MUI_WELCOMEPAGE_TITLE_3LINES\r
-!define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME_${SETUPTYPE_NAME})\r
+!define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME)\r
 !insertmacro MUI_PAGE_WELCOME\r
 !insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}"\r
 !insertmacro MULTIUSER_PAGE_INSTALLMODE\r
 \r
 Page custom PageReinstall PageReinstallValidate\r
 Page custom PageExternalLaTeX PageExternalLaTeXValidate\r
+!ifndef BUNDLE_IMAGEMAGICK\r
 Page custom PageExternalImageMagick PageExternalImageMagickValidate\r
+!endif\r
+!ifndef BUNDLE_GHOSTSCRIPT\r
 Page custom PageExternalGhostscript PageExternalGhostscriptValidate\r
+!endif\r
 Page custom PageLanguage PageLanguageValidate\r
 \r
 !define MUI_PAGE_HEADER_TEXT $(TEXT_DICT_TITLE)\r
@@ -99,18 +99,3 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${APP_INFO}"\r
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}"\r
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "${APP_COPYRIGHT}"\r
-\r
-#--------------------------------\r
-# Interface initialization\r
-\r
-Function InitInterface\r
-\r
-  # Warn the user when no Administrator or Power user privileges are available\r
-  # These privileges are required to install ImageMagick or Ghostscript\r
-\r
-  ${If} $MultiUser.Privileges != "Admin"\r
-  ${andif} $MultiUser.Privileges != "Power"\r
-    MessageBox MB_OK|MB_ICONEXCLAMATION $(TEXT_NO_PRIVILEDGES)\r
-  ${EndIf}\r
-\r
-FunctionEnd\r