diff gaim-installer.nsi @ 14454:22cb019456bd

[gaim-migrate @ 17168] Use NSIS' built-in language registry key stuff. This fixes the installer forgetting which language you've selected. Fill the installer file versioning information - Unfortunately, there doesn't appear to be a way to manipulate the value to use for the ProductVersion inside the NSIS script, so the Makefile needs to massage the data. committer: Tailor Script <[e-mail]>

--- a/gaim-installer.nsi	Tue Sep 05 13:55:50 2006 +0000
+++ b/gaim-installer.nsi	Tue Sep 05 15:40:24 2006 +0000
@@ -59,7 +59,6 @@
 !define HKLM_APP_PATHS_KEY			"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\gaim.exe"
 !define GAIM_STARTUP_RUN_KEY			"SOFTWARE\Microsoft\Windows\CurrentVersion\Run"
 !define GAIM_UNINST_EXE				"gaim-uninst.exe"
-!define GAIM_REG_LANG				"Installer Language"
 
 !define GTK_VERSION				"2.6.10"
 !define GTK_REG_KEY				"SOFTWARE\GTK\2.0"
@@ -75,6 +74,23 @@
 !define DOWNLOADER_URL				"http://gaim.sourceforge.net/win32/download_redir.php"
 
 ;--------------------------------
+;Version resource
+VIProductVersion "${GAIM_PRODUCT_VERSION}"
+VIAddVersionKey "ProductName" "Gaim"
+VIAddVersionKey "FileVersion" "${GAIM_VERSION}"
+VIAddVersionKey "ProductVersion" "${GAIM_VERSION}"
+VIAddVersionKey "LegalCopyright" ""
+!ifdef WITH_GTK
+VIAddVersionKey "FileDescription" "Gaim Installer (w/ GTK+ Installer)"
+!else
+!ifdef DEBUG
+VIAddVersionKey "FileDescription" "Gaim Installer (Debug Version)"
+!else
+VIAddVersionKey "FileDescription" "Gaim Installer (w/o GTK+ Installer)"
+!endif
+!endif
+
+;--------------------------------
 ;Modern UI Configuration
 
   !define MUI_ICON				".\gtk\pixmaps\gaim-install.ico"
@@ -87,6 +103,10 @@
   !define MUI_LICENSEPAGE_BUTTON		$(GAIM_LICENSE_BUTTON)
   !define MUI_LICENSEPAGE_TEXT_BOTTOM		$(GAIM_LICENSE_BOTTOM_TEXT)
 
+  !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
+  !define MUI_LANGDLL_REGISTRY_KEY ${GAIM_REG_KEY}
+  !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
+
   !define MUI_COMPONENTSPAGE_SMALLDESC
   !define MUI_ABORTWARNING
 
@@ -459,9 +479,6 @@
     StrCmp $R0 "NONE" done
     SetOverwrite off
 
-    ; Write out installer language
-    WriteRegStr HKCU "${GAIM_REG_KEY}" "${GAIM_REG_LANG}" "$LANGUAGE"
-
     ; write out uninstaller
     SetOverwrite on
     WriteUninstaller "$INSTDIR\${GAIM_UNINST_EXE}"
@@ -1184,8 +1201,8 @@
   Call un.RunCheck
   StrCpy $name "Gaim ${GAIM_VERSION}"
 
-  ; Get stored language prefrence
-  ReadRegStr $LANGUAGE HKCU ${GAIM_REG_KEY} "${GAIM_REG_LANG}"
+  ; Get stored language preference
+  !insertmacro MUI_UNGETLANGUAGE
 
 FunctionEnd