[vidalia-svn] r3623: Back out r3111, r3145 and r3324. (vidalia/trunk/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-03-16 17:43:49 -0400 (Mon, 16 Mar 2009)
New Revision: 3623

Removed:
   vidalia/trunk/pkg/win32/header.bmp
   vidalia/trunk/pkg/win32/msi-header.bmp
   vidalia/trunk/pkg/win32/msi-welcome.bmp
   vidalia/trunk/pkg/win32/welcome-bundle.bmp
   vidalia/trunk/pkg/win32/welcome.bmp
Modified:
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
   vidalia/trunk/pkg/win32/vidalia.nsi.in
   vidalia/trunk/pkg/win32/vidalia.wxs.in
Log:

Back out r3111, r3145 and r3324.


Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-03-16 19:45:20 UTC (rev 3622)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-03-16 21:43:49 UTC (rev 3623)
@@ -71,13 +71,11 @@
 ; MUI Options
 !define MUI_WELCOMEPAGE_TITLE "$(BundleWelcomeTitle)"
 !define MUI_WELCOMEPAGE_TEXT  "$(BundleWelcomeText)"
-!define MUI_WELCOMEFINISHPAGE_BITMAP "@Vidalia_SOURCE_DIR@\pkg\win32\welcome-bundle.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "@Vidalia_SOURCE_DIR@\pkg\win32\welcome-bundle.bmp"
 !define MUI_ABORTWARNING
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_HEADERIMAGE_BITMAP "@Vidalia_SOURCE_DIR@\pkg\win32\header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
 !define MUI_HEADERIMAGE
 !define MUI_FINISHPAGE_TEXT "$(BundleFinishText)"
 !define MUI_FINISHPAGE_RUN

Modified: vidalia/trunk/pkg/win32/vidalia.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia.nsi.in	2009-03-16 19:45:20 UTC (rev 3622)
+++ vidalia/trunk/pkg/win32/vidalia.nsi.in	2009-03-16 21:43:49 UTC (rev 3623)
@@ -63,13 +63,11 @@
 ; MUI Options
 !define MUI_WELCOMEPAGE_TITLE "$(VidaliaWelcomeTitle)"
 !define MUI_WELCOMEPAGE_TEXT  "$(VidaliaWelcomeText)"
-!define MUI_WELCOMEFINISHPAGE_BITMAP "@Vidalia_SOURCE_DIR@\pkg\win32\welcome.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "@Vidalia_SOURCE_DIR@\pkg\win32\welcome.bmp"
 !define MUI_ABORTWARNING
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_HEADERIMAGE_BITMAP "@Vidalia_SOURCE_DIR@\pkg\win32\header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
 !define MUI_HEADERIMAGE
 !define MUI_FINISHPAGE_RUN "$INSTDIR\${VIDALIA_EXEC}"
 !define MUI_FINISHPAGE_RUN_TEXT "$(VidaliaRunNow)"

Modified: vidalia/trunk/pkg/win32/vidalia.wxs.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia.wxs.in	2009-03-16 19:45:20 UTC (rev 3622)
+++ vidalia/trunk/pkg/win32/vidalia.wxs.in	2009-03-16 21:43:49 UTC (rev 3623)
@@ -328,7 +328,5 @@
     <!-- Set the UI options -->
     <UIRef Id="WixUI_Custom" />
     <Icon Id="vidalia.ico" SourceFile="@Vidalia_SOURCE_DIR@\src\vidalia\res\icons\vidalia.ico" />
-    <WixVariable Id="WixUIBannerBmp" Value="@Vidalia_SOURCE_DIR@\pkg\win32\msi-header.bmp" />
-    <WixVariable Id="WixUIDialogBmp" Value="@Vidalia_SOURCE_DIR@\pkg\win32\msi-welcome.bmp" />
   </Product>
 </Wix>