Changeset 26187 in vbox for trunk/src/VBox

Timestamp:

Feb 3, 2010 1:08:04 PM (15 years ago)

Author:

vboxsync

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

57206

Message:

FE/Qt4-OSX: new wizard background images

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• VirtualBox1.qrc (modified) (2 diffs)
• VirtualBoxMac.qrc (added)
• images/vmw_first_run_bg.png (added)
• images/vmw_new_harddisk_bg.png (added)
• images/vmw_new_user_bg.png (added)
• images/vmw_new_welcome_bg.png (added)
• images/vmw_ovf_export_bg.png (added)
• images/vmw_ovf_import_bg.png (added)
• src/extensions/QIWizard.cpp (modified) (1 diff)
• src/extensions/QIWizard.h (modified) (1 diff)
• src/wizards/exportappliance/UIExportApplianceWzd.cpp (modified) (1 diff)
• src/wizards/firstrun/UIFirstRunWzd.cpp (modified) (1 diff)
• src/wizards/importappliance/UIImportApplianceWzd.cpp (modified) (1 diff)
• src/wizards/newhd/UINewHDWzd.cpp (modified) (1 diff)
• src/wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)
• src/wizards/registration/UIRegistrationWzd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -539 +539 @@
 VirtualBox_SOURCES += VirtualBox2.qrc
 VirtualBox2.qrc_RCCFLAGS = -name BASIC2
+ifeq ($(KBUILD_TARGET),darwin)
+ VirtualBox_SOURCES += VirtualBoxMac.qrc
+ VirtualBoxMac.qrc_RCCFLAGS = -name MAC
+endif
 VirtualBox_SOURCES += $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc
 $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND
@@ -644 +648 @@
 VirtualBox_INCS          <= $(VirtualBox_0_OUTDIR)/include
 VirtualBox_DEFS          += VBOX_WITH_PRECOMPILED_HEADERS
-VirtualBox_CXXFLAGS      += -Winvalid-pch -fpch-preprocess 
+VirtualBox_CXXFLAGS      += -Winvalid-pch -fpch-preprocess
 VirtualBox_INTERMEDIATES += $(VirtualBox_0_OUTDIR)/include/precomp.h.gch
 
@@ -776 +780 @@
                 -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
                 -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
+                -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
+                -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
+                -e 's/@VBOX_CURRENT_YEAR@/$(VBOX_CURRENT_YEAR)/g' \
                 $< > $@
 
@@ -796 +803 @@
                 -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
                 -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
+                -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
+                -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
+                -e 's/@VBOX_CURRENT_YEAR@/$(VBOX_CURRENT_YEAR)/g' \
                 --output $@ $<
 endif # darwin

trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc

@@ -31 +31 @@
     <file alias="vmw_new_harddisk.png">images/vmw_new_harddisk.png</file>
     <file alias="vmw_new_user.png">images/vmw_new_user.png</file>
+    <file alias="vmw_ovf_import.png">images/vmw_ovf_import.png</file>
     <file alias="machine_16px.png">images/machine_16px.png</file>
     <file alias="machine_32px.png">images/machine_32px.png</file>
@@ -227 +228 @@
     <file alias="import_16px.png">images/import_16px.png</file>
     <file alias="export_16px.png">images/export_16px.png</file>
-    <file alias="vmw_ovf_import.png">images/vmw_ovf_import.png</file>
     <file alias="connect_16px.png">images/connect_16px.png</file>
     <file alias="disconnect_16px.png">images/disconnect_16px.png</file>

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.cpp

@@ -100 +100 @@
 }
 
+void QIWizard::assignBackground(const QString &strBg)
+{
+    setPixmap(QWizard::BackgroundPixmap, strBg);
+}
+
 void QIWizard::resizeAccordingLabelWidth(int iLabelsWidth)
 {

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.h

@@ -45 +45 @@
     void resizeToGoldenRatio();
     void assignWatermark(const QString &strWaterMark);
+    void assignBackground(const QString &strBg);
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp

@@ -62 +62 @@
     resizeToGoldenRatio();
 
+#ifdef Q_WS_MAC
+    /* Assign background image */
+    assignBackground(":/vmw_ovf_export_bg.png");
+#else /* Q_WS_MAC */
     /* Assign watermark */
     assignWatermark(":/vmw_ovf_import.png");
+#endif /* Q_WS_MAC */
 
     /* Setup connections */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzd.cpp

@@ -53 +53 @@
     resizeToGoldenRatio();
 
+#ifdef Q_WS_MAC
+    /* Assign background image */
+    assignBackground(":/vmw_first_run_bg.png");
+#else /* Q_WS_MAC */
     /* Assign watermark */
     assignWatermark(":/vmw_new_welcome.png");
+#endif /* Q_WS_MAC */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp

@@ -118 +118 @@
 
     /* Assign watermark */
+#ifdef Q_WS_MAC
+    /* Assign background image */
+    assignBackground(":/vmw_ovf_import_bg.png");
+#else /* Q_WS_MAC */
     assignWatermark(":/vmw_ovf_import.png");
+#endif /* Q_WS_MAC */
 
     /* Configure 'Restore Defaults' button */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWzd.cpp

@@ -45 +45 @@
     resizeToGoldenRatio();
 
+#ifdef Q_WS_MAC
+    /* Assign background image */
+    assignBackground(":/vmw_new_harddisk_bg.png");
+#else /* Q_WS_MAC */
     /* Assign watermark */
     assignWatermark(":/vmw_new_harddisk.png");
+#endif /* Q_WS_MAC */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -44 +44 @@
     resizeToGoldenRatio();
 
+#ifdef Q_WS_MAC
+    /* Assign background image */
+    assignBackground(":/vmw_new_welcome_bg.png");
+#else /* Q_WS_MAC */
     /* Assign watermark */
     assignWatermark(":/vmw_new_welcome.png");
+#endif /* Q_WS_MAC */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/registration/UIRegistrationWzd.cpp

@@ -413 +413 @@
     resizeToGoldenRatio();
 
+#ifdef Q_WS_MAC
+    /* Assign background image */
+    assignBackground(":/vmw_new_user_bg.png");
+#else /* Q_WS_MAC */
     /* Assign watermark */
     assignWatermark(":/vmw_new_user.png");
+#endif /* Q_WS_MAC */
 
     /* Setup connections */