Changeset 35166 in vbox

Timestamp:

Dec 16, 2010 10:10:51 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

69003

Message:

Windows host installer: Fixed corrupted dialog image, overall size of installer was shrunk again by using compressed JPG files.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Installer/win/Binary/Banner.bmp (deleted)
• src/VBox/Installer/win/Binary/Dialog.bmp (deleted)
• src/VBox/Installer/win/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/win/UserInterface.wxi (modified) (2 diffs)
• src/VBox/Installer/win/VirtualBox.wxs (modified) (1 diff)

trunk/Config.kmk

@@ -695 +695 @@
 VBOX_BRAND_GUI_VBOX_48PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_48px.png
 VBOX_BRAND_GUI_VBOX_64PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_64px.png
-VBOX_BRAND_WIN_INST_DLGBMP           := $(PATH_ROOT)/src/VBox/Installer/win/Binary/Dialog.bmp
+VBOX_BRAND_WIN_INST_DLGJPG           := $(PATH_ROOT)/src/VBox/Installer/win/Binary/Dialog.jpg
 VBOX_BRAND_WIN_INST_EXT              :=
 VBOX_BRAND_WIN_ADD_INST_DLGBMP       := $(PATH_ROOT)/src/VBox/Additions/WINNT/Installer/welcome.bmp

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -345 +345 @@
                 -E 'PATH_MULTIARCH_GUEST_ADDITIONS_ISO=$(subst /,\\,$(PATH_MULTIARCH_GUEST_ADDITIONS_ISO))' \
                 -E 'VBOX_PATH_WIN_INST_SRC=$(subst /,\\,$(VBOX_PATH_WIN_INST_SRC))' \
-                -E 'VBOX_BRAND_WIN_INST_DLGBMP=$(subst /,\\,$(VBOX_BRAND_WIN_INST_DLGBMP))' \
+                -E 'VBOX_BRAND_WIN_INST_DLGJPG=$(subst /,\\,$(VBOX_BRAND_WIN_INST_DLGJPG))' \
                 -E 'VBOX_ADD_LANGUAGES=$(VBOX_INSTALLER_ADD_LANGUAGES)' \
                 -E 'VBOX_BRAND_LICENSE_RTF=$(subst /,\\,$(VBOX_BRAND_LICENSE_RTF))' \

trunk/src/VBox/Installer/win/UserInterface.wxi

@@ -1 +1 @@
 <?xml version="1.0" ?>
 <!--
-   User Interface Include for VirtualBox WiX script
-
-     Copyright (C) 2006-2010 Oracle Corporation
-
-     This file is part of VirtualBox Open Source Edition (OSE), as
-     available from http://www.virtualbox.org. This file is free software;
-     you can redistribute it and/or modify it under the terms of the GNU
-     General Public License (GPL) as published by the Free Software
-     Foundation, in version 2 as it comes in the "COPYING" file of the
-     VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+    User Interface Include for VirtualBox WiX script
+
+    Copyright (C) 2006-2010 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 -->
 
@@ -1073 +1073 @@
         <Binary Id="foldernewico" src="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\New.ico" />
 
-        <!-- Aliases for the BMP files -->
-        <Property Id="DialogBitmap">dlgbmp</Property>
-        <Property Id="BannerBitmap">bannrbmp</Property>
+        <!-- Graphic files used for the UI -->
+        <!-- See: http://wix.sourceforge.net/manual-wix3/WixUI_customizations.htm -->
+        <Binary Id="bannerjpg" src="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Banner.jpg" />
+        <Binary Id="dlgjpg" src="$(env.VBOX_BRAND_WIN_INST_DLGJPG)" />
+
+        <!-- Aliases for the graphic files -->
+        <Property Id="DialogBitmap">dlgjpg</Property>
+        <Property Id="BannerBitmap">bannerjpg</Property>
         <Property Id="FolderUp">folderupico</Property>
         <Property Id="FolderNew">foldernewico</Property>
-
-        <!-- BMP files used for the UI -->
-        <Binary Id="bannrbmp" src="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Banner.bmp" />
-        <Binary Id="dlgbmp" src="$(env.VBOX_BRAND_WIN_INST_DLGBMP)" />
 
         <Binary Id="wixca" src="wixca.dll"/>

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -1 +1 @@
 <?xml version="1.0"?>
 <!--
-     VirtualBox Windows Installation Script (WiX)
-
-     Copyright (C) 2006-2010 Oracle Corporation
-
-     This file is part of VirtualBox Open Source Edition (OSE), as
-     available from http://www.virtualbox.org. This file is free software;
-     you can redistribute it and/or modify it under the terms of the GNU
-     General Public License (GPL) as published by the Free Software
-     Foundation, in version 2 as it comes in the "COPYING" file of the
-     VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+    VirtualBox Windows Installation Script (WiX)
+
+    Copyright (C) 2006-2010 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 -->