[vidalia-svn] r3063: Display the "Firefox is not installed" warning page after th (vidalia/trunk/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-09-12 01:41:26 -0400 (Fri, 12 Sep 2008)
New Revision: 3063

Modified:
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
Log:
Display the "Firefox is not installed" warning page after the welcome page
if the bundle installer thinks it can't find Firefox.


Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-09-12 05:40:15 UTC (rev 3062)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-09-12 05:41:26 UTC (rev 3063)
@@ -87,6 +87,7 @@
 ;--------------------------------
 ; Pages
 !insertmacro MUI_PAGE_WELCOME
+Page custom FirefoxWarningPage
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
@@ -424,6 +425,7 @@
 ; Functions
 Function .onInit
   !insertmacro MUI_LANGDLL_DISPLAY
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "@Vidalia_SOURCE_DIR@\pkg\win32\firefox-warning.ini" "firefox-warning.ini"
 
   ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" ""
   StrCmp $1 "" FirefoxNotFound FirefoxFound
@@ -458,6 +460,17 @@
   Pop $0
 FunctionEnd
 
+Function FirefoxWarningPage
+  ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" ""
+  StrCmp $1 "" FirefoxNotFound FirefoxFound
+
+  FirefoxNotFound:
+    !insertmacro MUI_HEADER_TEXT "Firefox is not installed" "We recommend that you install Firefox before continuing, for best safety." 
+    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "firefox-warning.ini"
+
+  FirefoxFound:
+FunctionEnd
+
 Function CustomFinishFn
     IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
     run_vidalia: