From 5f799621b91554f5562ed43281ebdde1f766241f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Thu, 24 Apr 2008 01:34:33 +0000
Subject: [PATCH] installer: final preparation prepare for the alpha 2 release

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24480 a592a061-630c-0410-9148-cb99ea01b6c8
---
 .../Win32/packaging/AltInstaller/ConfigLyX.nsh   |  2 +-
 .../Win32/packaging/AltInstaller/Settings.nsh    |  5 +++--
 .../Win32/packaging/AltInstaller/Uninstall.nsh   | 16 +++++++++-------
 .../packaging/AltInstaller/specials/session      |  4 ++--
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
index ff4c50fb50..fa763ca423 100644
--- a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
+++ b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
@@ -106,7 +106,7 @@ Function ConfigureLyX
 
   # register the extension .lyx
   ${if} $CreateFileAssociations == "true"
-   WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to test if they were registered by this LyX version
+   WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to test if they were registered by this LyX version
    # write informations about file type
    WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}" "" "${PRODUCT_NAME} Document"
    WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\DefaultIcon" "" "${PRODUCT_EXE}"
diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh
index 323f255da5..c38df17bf5 100644
--- a/development/Win32/packaging/AltInstaller/Settings.nsh
+++ b/development/Win32/packaging/AltInstaller/Settings.nsh
@@ -3,7 +3,7 @@
 
 !define PRODUCT_DIR "D:\LyXPackage1.6"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.6alpha2"
+!define PRODUCT_VERSION "1.6.0alpha2"
 !define PRODUCT_VERSION_SHORT "16svn3"
 !define PRODUCT_SUBFOLDER "lyx16"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
@@ -35,10 +35,11 @@ BrandingText "LyXWinInstaller v4.03 - ${INSTALLER_VERSION}"
 !define SHCNF_IDLIST 0
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\lyx.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX${PRODUCT_VERSION_SHORT}"
+!define PRODUCT_DIR_REGKEY_2 "Software\LyX\LyX-${PRODUCT_VERSION}"
 
 # definitions for the Update installer
 !if ${INSTALLER_VERSION} == "Update"
- !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX153"
+ !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX16svn2"
  !define PRODUCT_VERSION_OLD "LyX 1.6svn-r24066"
  !define PRODUCT_VERSION_SHORT_OLD "16svn2"
  !define JabRefVersion "2.3.1" # could be an older version
diff --git a/development/Win32/packaging/AltInstaller/Uninstall.nsh b/development/Win32/packaging/AltInstaller/Uninstall.nsh
index 88053902b6..6001eccee2 100644
--- a/development/Win32/packaging/AltInstaller/Uninstall.nsh
+++ b/development/Win32/packaging/AltInstaller/Uninstall.nsh
@@ -115,13 +115,7 @@ Section "un.LyX" un.SecUnProgramFiles
   RMDir /r "$0"
   # delete desktop icon
   Delete "$DESKTOP\LyX ${PRODUCT_VERSION}.lnk"
-  # delete registry entries
-  DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey SHCTX "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"
-  DeleteRegKey HKCR "Applications\lyx.exe"
-  DeleteRegKey HKCR "Applications\lyx.bat"
-
+  
   # Aiksaurus
   !insertmacro FileCheck $5 "meanings.dat" "${AiksaurusDir}" # macro from LyXUtils.nsh
   ${if} $5 == "True"
@@ -144,6 +138,14 @@ Section "un.LyX" un.SecUnProgramFiles
     DeleteRegKey SHCTX "Software\Classes\${PRODUCT_REGNAME}"
    ${endif}
   ${endif}
+  
+  # delete registry entries
+  DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey SHCTX "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"
+  DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY_2}"
+  DeleteRegKey HKCR "Applications\lyx.exe"
+  DeleteRegKey HKCR "Applications\lyx.bat"
 
   # the following can only be done with admin permissions
   ${if} $Answer == "yes" # if admin
diff --git a/development/Win32/packaging/AltInstaller/specials/session b/development/Win32/packaging/AltInstaller/specials/session
index 048386527c..ac6ec365a6 100644
--- a/development/Win32/packaging/AltInstaller/specials/session
+++ b/development/Win32/packaging/AltInstaller/specials/session
@@ -4,10 +4,10 @@
 [toolbars]
 standard = 0 0 0 21
 extra = 0 0 0 55
-view/update = 0 3 1245 89
+view/update = 0 3 780 89
 minibuffer = 1 1 0 0
 review = 2 0 0 0
-table = 2 1 0 911
 mathmacrotemplate = 2 1 0 0
 math = 2 1 0 0
 math_panels = 2 1 0 0
+table = 2 1 0 0