X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2FWin32%2Fpackaging%2Finstaller%2Fsetup%2Fconfigure.nsh;h=e6e908be7dc415e5fe7d20391c26ba4fdbd7c747;hb=96956421bbce481bc08286c73b042894215f757c;hp=1afa534a096b8f8f3099a28410c23b3e056f7023;hpb=afd7bd46086ef65c7c82a2ea17659052de7243f0;p=lyx.git

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 1afa534a09..e6e908be7d 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -22,7 +22,7 @@ Section -FileAssociations
   !define REG_FILETYPE 'WriteRegStr SHELL_CONTEXT "Software\Classes\${APP_REGNAME_DOC}'
   
   ${REG_FILETYPE}" "" "${APP_NAME} Document"
-  ${REG_FILETYPE}\DefaultIcon" "" "$INSTDIR\bin\lyx.exe,0"
+  ${REG_FILETYPE}\DefaultIcon" "" "$INSTDIR\bin\LyXLauncher.exe,0"
   ${REG_FILETYPE}\Shell\open\command" "" '"$INSTDIR\${APP_RUN}" "%1"'
   
   !define REG_FILEEXT 'WriteRegStr SHELL_CONTEXT "Software\Classes\${APP_EXT}"'
@@ -31,7 +31,7 @@ Section -FileAssociations
   ${REG_FILEEXT} "Content Type" "${APP_MIME_TYPE}"  
   
   # Refresh shell
-  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
+  ${RefreshShellIcons}
 
 SectionEnd
 
@@ -64,7 +64,7 @@ Section -InstallData
   
   ${REG_UNINSTALL} "UninstallString" '"$INSTDIR\${SETUP_UNINSTALLER}"'
   ${REG_UNINSTALL} "DisplayVersion" "${APP_VERSION}"
-  ${REG_UNINSTALL} "DisplayIcon" "$INSTDIR\bin\lyx.exe,0"
+  ${REG_UNINSTALL} "DisplayIcon" "$INSTDIR\bin\LyXLauncher,0"
   ${REG_UNINSTALL} "URLUpdateInfo" "http://www.lyx.org/"
   ${REG_UNINSTALL} "URLInfoAbout" "http://www.lyx.org/about/"
   ${REG_UNINSTALL} "Publisher" "LyX Team"
@@ -86,6 +86,13 @@ Section -Configure
 
   StrCpy $PathPrefix "$INSTDIR\bin;$INSTDIR\python"
   
+  !ifdef BUNDLE_IMAGEMAGICK
+    StrCpy $PathImageMagick "$INSTDIR\imagemagick"
+  !endif
+  !ifdef BUNDLE_GHOSTSCRIPT
+    StrCpy $PathGhostscript "$INSTDIR\ghostscript\bin"
+  !endif  
+  
   ${If} $PathLaTeX != ""
     StrCpy $PathPrefix "$PathPrefix;$PathLaTeX"
   ${EndIf}
@@ -95,6 +102,9 @@ Section -Configure
   ${If} $PathImageMagick != ""
     StrCpy $PathPrefix "$PathPrefix;$PathImageMagick"
   ${EndIf}
+  ${If} $PathBibTeXEditor != ""
+    StrCpy $PathPrefix "$PathPrefix;$PathBibTeXEditor"
+  ${EndIf}  
 
   FileWrite $DistFile '\path_prefix "$PathPrefix"$\r$\n'
 
@@ -144,8 +154,8 @@ SectionEnd
 
 Section -PSPrinter
 
-  ${If} $MultiUser.Privileges != "Admin"
-    ${OrIf} $MultiUser.Privileges != "Power"
+  ${If} $MultiUser.Privileges == "Admin"
+    ${OrIf} $MultiUser.Privileges == "Power"
 
     # Delete printer
     ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"'
@@ -166,13 +176,13 @@ SectionEnd
 #--------------------------------
 # Run the LyX configure.py script, so MiKTeX can download its packages
 
-Var PythonReturn
+Var ConfigureReturn
 
 Section -ConfigureScript
 
   DetailPrint $(TEXT_CONFIGURE_LYX)
   nsExec::ExecToLog '"$INSTDIR\python\python.exe" "$INSTDIR\Resources\configure.py"'
-  Pop $PythonReturn # Return value
+  Pop $ConfigureReturn # Return value
 
 SectionEnd