installer: install Qt plugin DLLs correctly

- also remove support metafile2eps because:
  - it is outdated
  - unnecessary third-party program since ImageMagick can do this too
  - needs unnecessarily installation time

diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh
index 5d1bbc303ace275efa6c3ee242fb0019ea99e7fc..e215625f0cd36915e4939272c1892541d25d6292 100644 (file)
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -132,12 +132,6 @@ Lists of files to include in the installer
   
 !macroend
 
-!macro FileListMetaFile2EPS COMMAND DIRECTORY
-
-  ${FILE}metafile2eps.exe"
-
-!macroend
-
 !macro FileListImageMagick COMMAND DIRECTORY
 
 # FIXME: simply copy the whole directory!

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 831f28c5d00dc8184d8f2c9173cd29a0b805d1a9..ef0be17297dc82f945932649ee1ab8720182461b 100644 (file)
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -104,7 +104,10 @@ Section -Configure
    # .lyx16
    WriteRegStr SHCTX "Software\Classes\${APP_EXT}16" "" "${APP_REGNAME_DOC}"
    WriteRegStr SHCTX "Software\Classes\${APP_EXT}16" "Content Type" "${APP_MIME_TYPE}"
-   # .lyx20 don't set this, because this is designed to be opened with LyX 2.0.x
+   # .lyx20
+   WriteRegStr SHCTX "Software\Classes\${APP_EXT}20" "" "${APP_REGNAME_DOC}"
+   WriteRegStr SHCTX "Software\Classes\${APP_EXT}20" "Content Type" "${APP_MIME_TYPE}"
+   # .lyx21 don't set this, because this is designed to be opened with LyX 2.1.x
   
    # Refresh shell
    ${RefreshShellIcons}
@@ -165,6 +168,11 @@ Section -Configure
                 \format "pdf2" "pdf" "PDF (pdflatex)" "F" "pdfview" "" "document,vector,menu=export" "application/pdf"$\r$\n\
                 \format "pdf" "pdf" "PDF (ps2pdf)" "P" "pdfview" "" "document,vector,menu=export" "application/pdf"$\r$\n'
 
+  # for the wmf image type we need to specify a resolution for the converter
+  # otherwise 1024 dpi are used and eps2pdf takes ages
+  # 300 dpi are a good compromise for speed and size
+  FileWrite $R1 '\converter "wmf" "eps" "convert -density 300 $$$$i $$$$o" ""$\r$\n\'
+  
   # if LilyPondPath was found
   # we need to add these entris because python scripts can only be executed
   # if the full path is given
@@ -191,23 +199,6 @@ Section -Configure
 
 SectionEnd
 
-#--------------------------------
-# Postscript printer for metafile to EPS converter
-
-Section -PSPrinter
-
-  ${if} $MultiUser.Privileges == "Admin"
-  ${orif} $MultiUser.Privileges == "Power"
-   # Delete printer
-   ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"'
-   # Install printer and driver
-   ExecWait '$PrinterConf /if /f "$WINDIR\inf\ntprint.inf" /b "Metafile to EPS Converter" /r "FILE:" /m "MS Publisher Imagesetter"'
-  ${else}
-   MessageBox MB_OK|MB_ICONINFORMATION "$(MetafileNotAvailable)" /SD IDOK
-  ${endif}
-
-SectionEnd
-
 #--------------------------------
 # Run the LyX configure.py script, so MiKTeX can download its packages
 

diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index 2ebe6415a88025ba34ac577e0546ef4af8928fc4..d350c58684ceada857a07c732814e74c96c299a5 100644 (file)
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -47,8 +47,6 @@ Section -ProgramFiles SecProgramFiles
   SetOutPath "$INSTDIR\bin"
   !insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
   !insertmacro FileListQtBin File "${FILES_QT}\bin\"
-  !insertmacro FileListQtImageformats File "${FILES_QT}\plugins\imageformats\"
-  !insertmacro FileListQtIconengines File "${FILES_QT}\plugins\iconengines\"
   !insertmacro FileListDll File "${FILES_DEPS}\bin\"
   !insertmacro FileListMSVC File "${FILES_MSVC}\"
   !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
@@ -57,7 +55,12 @@ Section -ProgramFiles SecProgramFiles
   !insertmacro FileListDvipostBin File "${FILES_DVIPOST}\"
   !insertmacro FileListPDFViewBin File "${FILES_PDFVIEW}\"
   !insertmacro FileListPDFToolsBin File "${FILES_PDFTOOLS}\"
-  !insertmacro FileListMetaFile2EPS File "${FILES_METAFILE2EPS}\"
+  
+  # Qt plugin DLLs
+  SetOutPath "$INSTDIR\bin\imageformats"
+  !insertmacro FileListQtImageformats File "${FILES_QT}\plugins\imageformats\"
+  SetOutPath "$INSTDIR\bin\iconengines"
+  !insertmacro FileListQtIconengines File "${FILES_QT}\plugins\iconengines\"
   
   # Resources
   SetOutPath "$INSTDIR"