installer:

- fixed powerdot.layout
- new Vista-compatible Launcher (the program that hides LyX's console window)

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

development/Win32/packaging/AltInstaller/ChangeLog.txt

@@ -1,17 +1,24 @@
-Version LyX 1.5beta3-18-05-2007
+Version LyX 1.5pre1-xx-05-2007
+- LyX 1.5 pre1 from xx-05-2007
+
+- new Windows Vista-compatible launcher for LyX
+- fixed layout file for the LaTeX-package powerdot
+
+
+Version LyX 1.5beta3-18-05-2007
 - LyX 1.5 beta3 from 18-05-2007
   - fix bug, introduced with last version, that all margin notes in
     a document are lost
-  - support for Chinese, Japanese and Korean
+  - support for Chinese, Japenese and Korean
   - support for the LaTeX-package "listings"
 
 - updated to ImageMagick 6.3.4
-- updated to Python 2.5.1
-- updated to MiKTeX 2.6 (version 2675)
+- updated to Phyton 2.5.1
+- updated to MikteX 2.6 (version 2675)
 - fix bug that LyX's menu language setting was ignored when LyX is
   started by double-clicking on a LyX-file
 - when Updating PDFs, the PDF is opened at the last viewed position
-  (only works with Acrobat/Adobe Reader version <= 7)
+  (only works with Acrobat/adobe Reader version <= 7)
 - fix hopefully the case that PDFs couldn't be updated when
   Adobe Reader 8 is used on Windows Vista
 - fix bug that MiKTeX and JabRef weren't correctly uninstalled

development/Win32/packaging/AltInstaller/Settings.nsh

@@ -3,7 +3,7 @@
 
 !define PRODUCT_DIR "D:\LyXPackage1.5"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.5beta3-18-05-2007"
+!define PRODUCT_VERSION "1.5pre1-xx-05-2007"
 !define PRODUCT_VERSION_SHORT "150svn"
 !define PRODUCT_SUBFOLDER "lyx15"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
@@ -19,12 +19,12 @@
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
 !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
 
-BrandingText "LyXWinInstaller v3.15 - ${INSTALLER_VERSION}"
+BrandingText "LyXWinInstaller v3.16 - ${INSTALLER_VERSION}"
 
 # to check later if this installer version is running at the same time
-!define INSTALLER_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER_VERSION}-3-15.exe"
-!define INSTALLER2_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER2_VERSION}-3-15.exe"
-!define INSTALLER3_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER3_VERSION}-3-15.exe"
+!define INSTALLER_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER_VERSION}-3-16.exe"
+!define INSTALLER2_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER2_VERSION}-3-16.exe"
+!define INSTALLER3_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER3_VERSION}-3-16.exe"
 !define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp"
 
 # Replaced by HKLM or HKCU depending on SetShellVarContext.
@@ -39,7 +39,7 @@ BrandingText "LyXWinInstaller v3.15 - ${INSTALLER_VERSION}"
 # definitions for the Update installer
 !if ${INSTALLER_VERSION} == "Update"
  !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX150svn"
- !define PRODUCT_VERSION_OLD "LyX 1.5svn-02-05-2007"
+ !define PRODUCT_VERSION_OLD "LyX 1.5beta3-18-05-2007"
  !define PRODUCT_UNINSTALL_EXE_OLD "$INSTDIR\LyXWinUninstall.exe"
  !define PRODUCT_VERSION_SHORT_OLD "150svn"
  !define JabRefVersion "2.2" # could be an older version

development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.cfg

@@ -0,0 +1,38 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q-
+-$R-
+-$S-
+-$T-
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-w-UNSAFE_TYPE
+-w-UNSAFE_CODE
+-w-UNSAFE_CAST

development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof

@@ -0,0 +1,139 @@
+[FileVersion]
+Version=7.0
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=1
+P=1
+Q=0
+R=0
+S=0
+T=0
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+NamespacePrefix=
+SymbolDeprecated=1
+SymbolLibrary=1
+SymbolPlatform=1
+UnitLibrary=1
+UnitPlatform=1
+UnitDeprecated=1
+HResultCompat=1
+HidingMember=1
+HiddenVirtual=1
+Garbage=1
+BoundsError=1
+ZeroNilCompat=1
+StringConstTruncated=1
+ForLoopVarVarPar=1
+TypedConstVarPar=1
+AsgToTypedConst=1
+CaseLabelRange=1
+ForVariable=1
+ConstructingAbstract=1
+ComparisonFalse=1
+ComparisonTrue=1
+ComparingSignedUnsigned=1
+CombiningSignedUnsigned=1
+UnsupportedConstruct=1
+FileOpen=1
+FileOpenUnitSrc=1
+BadGlobalSymbol=1
+DuplicateConstructorDestructor=1
+InvalidDirective=1
+PackageNoLink=1
+PackageThreadVar=1
+ImplicitImport=1
+HPPEMITIgnored=1
+NoRetVal=1
+UseBeforeDef=1
+ForLoopVarUndef=1
+UnitNameMismatch=1
+NoCFGFileFound=1
+MessageDirective=1
+ImplicitVariants=1
+UnicodeToLocale=1
+LocaleToUnicode=1
+ImagebaseMultiple=1
+SuspiciousTypecast=1
+PrivatePropAccessor=1
+UnsafeType=0
+UnsafeCode=0
+UnsafeCast=0
+[Linker]
+MapFile=0
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=
+Packages=vcl;rtl;vclx;indy;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;dbrtl;soaprtl;dsnap;VclSmp;dbexpress;vcldb;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL
+Conditionals=
+DebugSourceDirs=
+UsePackages=0
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1031
+CodePage=1252
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+[HistoryLists\hlUnitAliases]
+Count=1
+Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;

development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr

@@ -0,0 +1,133 @@
+program lyxLauncher;
+// this program opens LyX and hides its console window
+// author: Uwe Stöhr
+
+{The problematic is the following:
+ When the lyx.exe is started, also a console window is shown.
+ But closing the console window, also closes LyX,
+ therefore the console will be hidden by this program.}
+
+{$APPTYPE CONSOLE}
+
+uses
+  Windows, SysUtils, ShellApi, Forms, Dialogs;
+
+var Path : string;
+    hLyX : THandle;
+
+procedure HideWindow(ProgWin: string);
+// hides a given program window
+var
+  Handle : THandle;
+begin
+
+ // find handle of the program window
+ // Repeat until the handle is available
+ // because Lyx needs some time to start
+ Repeat
+  Handle := FindWindow(nil,Pchar(ProgWin));
+ Until Handle <> 0;
+ // minimize the window
+ // SendMessage(Handle, WM_SYSCOMMAND, SC_MINIMIZE, 1);
+ // hide the window from taskbar
+ ShowWindow(Handle, SW_HIDE);
+
+end; //end procedure
+
+procedure ReadPath(FileName: string; LaunchName: string;
+                   ExecName: string; var PathR: string);
+// reads the path to the lyx.exe from a given text file
+var InString : string;
+    FileSize,Index,Last : Int64;
+    hFile : THandle;
+    PInString : PChar;
+
+begin
+
+ try //try..except for procedure
+  // open the text file
+  hFile:= Windows.CreateFile(PChar(FileName),GENERIC_READ,0,nil,
+                            OPEN_EXISTING,
+                            FILE_FLAG_SEQUENTIAL_SCAN,0);
+  if hFile= INVALID_HANDLE_VALUE then
+  begin
+   MessageDlg('The file "' + FileName + '" could not be found!',
+               mtError,[mbOK],0);
+   exit;
+  end;
+  
+  try //try..finally for hFile
+   FileSize:= FileSeek(hFile,0,2); //get file size
+   if FileSize = -1 then
+    RaiseLastOSError;
+
+   //move file content to InString
+   FileSeek(hFile,0,0);
+   SetLength(InString,FileSize);
+   PInString:= PChar(InString);
+   FileRead(hFile,PInString^,FileSize);
+
+   //search the string backwards for the first appearance of ":"
+   Index:= FileSize;
+   Repeat
+    dec(Index);
+    if InString[Index] = ':' then
+     Break;
+   Until (InString[Index] = #10) or (Index = 1);
+
+   //if the last line of lyx.bat doesn't contain a ":" (a path)
+   if (InString[Index] = #10) or (Index = 1) then
+   begin
+    MessageDlg('The file lyx.bat is corrupted!',mtError,[mbOK],0);
+    exit;
+   end;
+
+   //jump before the ":" to the drive letter
+   dec(Index);
+   //search for the LaunchName = end of the path
+   Last:= Pos(LaunchName,InString);
+   //the InString contains between Index and Last the wanted path
+   PathR:= Copy(InString,Index,Last - Index);
+   //attach LyX's executable to the path
+   PathR:= Path + ExecName;
+
+  finally //close the text file
+   Windows.CloseHandle(hFile);
+  end; //end finally
+
+ except //when an error occurred somewhere in the procedure
+  MessageDlg('The file "' + FileName + '" is corrupted!',mtError,[mbOK],0);
+ end; //end except
+
+end; //end procedure
+
+
+begin //begin program
+
+ //hide the window of this application
+ ShowWindow(Application.Handle,SW_HIDE);
+
+ // read path of the lyxLauncher.exe from the file lyx.bat 
+ ReadPath('lyx.bat', 'lyxLauncher.exe', 'lyx.exe', Path);
+
+ // start LyX
+ hLyX:= ShellExecute(Application.Handle,PChar('open'),
+                     PChar(Path),nil,nil,SW_SHOWNORMAL);
+ if hLyX = ERROR_FILE_NOT_FOUND  then
+ begin
+  MessageDLG('The file'#13#10 + Path + #13#10
+             + 'could not be found!',mtError,[mbOK],0);
+  exit;
+ end;
+ if hLyX = SE_ERR_ACCESSDENIED  then
+ begin
+  MessageDLG('Windows denied access on the file'#13#10 + Path,
+             mtError,[mbOK],0);
+  exit;
+ end;
+
+ // hide console window of lyx.exe
+ HideWindow(Path);
+
+end. //end program
+

development/Win32/packaging/AltInstaller/specials/powerdot.layout

@@ -1,8 +1,9 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[powerdot.cls,enumitem.sty,genmisc.sty,listings.sty,xkeyval.sty]{powerdot presentation}
-# PowerDot textclass definition file. 
-# Created (29.Aug.05): Mael Hilléreau
-# Last modified: 17.Sep.05
+#  \DeclareLaTeXClass[powerdot,enumitem.sty,rotate-textures.sty,listings.sty,xkeyval.sty]{presentation (powerdot)}
+# PowerDot textclass definition file.
+# The rotate-textures.sty is part of the genmisc-package that is required by powerdot.
+# Created (29.Aug.05): Mael Hilléreau
+# Last modified: 20-May-06 by Uwe Stöhr
 #
 # ----------------------------------------------------------
 # Copyright (C) 2005 Hendri Adriaens and Christopher Ellison