From: Joost Verburg <joostverburg@users.sourceforge.net>
Date: Thu, 17 Feb 2011 19:26:53 +0000 (+0000)
Subject: lyxrc.dist with the standard Windows defaults has been moved to the dependencies... 
X-Git-Tag: 2.0.0~700
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=82ec2df760932e9daabdc67a95b5ce89b52c4e19;p=features.git

lyxrc.dist with the standard Windows defaults has been moved to the dependencies package. installer writes path_prefix with LaTeX system and BiBTeX editor location.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37720 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 8a7424aa63..6cfe4857bc 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -75,14 +75,16 @@ SectionEnd
 
 Section -Configure
 
-  # Windows specific configuration in lyxrc.dist
+  # Set path prefix in lyxrc.dist
 
-  Delete "$INSTDIR\Resources\lyxrc.dist"
-  FileOpen $DistFile "$INSTDIR\Resources\lyxrc.dist" w
+  # Install standard lyxrc.dist file
+  SetOutPath "$INSTDIR\Resources"
+  File "${FILES_DEPS}\Resources\lyxrc.dist"
 
-  # Path prefix
+  # Append path prefix
+  FileOpen $DistFile "$INSTDIR\Resources\lxrc.dist" a
 
-  StrCpy $PathPrefix "$INSTDIR\bin;$INSTDIR\python;$INSTDIR\imagemagick;$INSTDIR\ghostscript"
+  StrCpy $PathPrefix "$LyXDir\bin;$LyXDir\python;$LyXDir\imagemagick;$LyXDir\ghostscript"
   
   ${If} $PathLaTeX != ""
     StrCpy $PathPrefix "$PathPrefix;$PathLaTeX"
@@ -93,16 +95,6 @@ Section -Configure
 
   FileWrite $DistFile '\path_prefix "$PathPrefix"$\r$\n'
 
-  # Default screen fonts
-  FileWrite $DistFile '\screen_font_roman "Times New Roman"$\r$\n'
-  FileWrite $DistFile '\screen_font_sans "Arial"$\r$\n'
-  FileWrite $DistFile '\screen_font_typewriter "Courier New"$\r$\n'
-  FileWrite $DistFile '\preview_scale_factor 1.0$\r$\n' # Fit instant preview font size to screen fonts
-  # PDF view helper
-  FileWrite $DistFile '\format "pdf" "pdf" "PDF (ps2pdf)" "P" "pdfview" "" "document,vector"$\r$\n'  
-  FileWrite $DistFile '\format "pdf2" "pdf" "PDF (pdflatex)" "F" "pdfview" "" "document,vector"$\r$\n'
-  FileWrite $DistFile '\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "pdfview" "" "document,vector"$\r$\n'
-
   FileClose $DistFile
 
 SectionEnd