Changeset 7995 in vbox for trunk

Timestamp:

Apr 15, 2008 2:12:39 PM (17 years ago)

Author:

vboxsync

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

29649

Message:

FE/Qt4: Backported r29617,r29634 (New non OSE about dialog). Splited up the resource files for Non-OSE & OSE use.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxUI.pro (modified) (1 diff)
• VirtualBox.qrc (modified) (1 diff)
• VirtualBoxOSE.qrc (added)
• src/VBoxProblemReporter.cpp (modified) (3 diffs)

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

@@ -455 +455 @@
 VirtualBox_GENSRCS = \
         $(foreach moc,$(notdir $(basename $(VirtualBox_QT_MOCHDRS))), $(PATH_VirtualBox)/moc/moc_$(moc).cpp) \
-        $(foreach ui,$(notdir $(basename $(VirtualBox_QT_UISRCS3))), $(PATH_VirtualBox)/ui/$(ui).cpp $(PATH_VirtualBox)/moc/moc_$(ui).cpp) \
-        $(PATH_VirtualBox)/ui/vbox_image_collection.cpp
+        $(foreach ui,$(notdir $(basename $(VirtualBox_QT_UISRCS3))), $(PATH_VirtualBox)/ui/$(ui).cpp $(PATH_VirtualBox)/moc/moc_$(ui).cpp)
 
 # All generated headers. Note: this list MUST be in sync with Qt source
@@ -712 +711 @@
 endif
 
-
+# grep the images out of the resource file for dependency tracking
+VirtualBox_QT_RC += $(shell $(SED) '/images/!d;{s/^.*\(images\/.*\)<.*$$/\1/}' VirtualBox.qrc)
+VirtualBox_GENSRCS += $(PATH_VirtualBox)/ui/qrc_application.cpp
+
+# We have different about dialogs in OSE and PUEL. Therefor two independent
+# resource files exists.
+ifdef VBOX_OSE
+VirtualBox_QT_RC_OSE += $(shell $(SED) '/images/!d;{s/^.*\(images\/.*\)<.*$$/\1/}' VirtualBoxOSE.qrc)
+VirtualBox_GENSRCS += $(PATH_VirtualBox)/ui/qrc_application_ose.cpp
+VirtualBox_QT_UISRCS += ui/VBoxAboutDlg.ui
+else
+VirtualBox_QT_RC_NON_OSE += $(shell $(SED) '/images/!d;{s/^.*\(images\/.*\)<.*$$/\1/}' VirtualBoxNonOSE.qrc)
+VirtualBox_GENSRCS += $(PATH_VirtualBox)/ui/qrc_application_non_ose.cpp
+VirtualBox_SOURCES += src/VBoxAboutNonOSEDlg.cpp
+endif
 
 # Commit the magic.
 # (note: before custom rules that make usage of generated variables!).
 include $(PATH_KBUILD)/footer.kmk
-
 
 
@@ -917 +929 @@
 $(foreach src,$(VirtualBox_SOURCES),$(eval $(def_wrapper_deps)))
 
-# grep the images out of the resource file for dependency tracking
-VirtualBox_QT_IMAGES = $(shell $(SED) '/images/!d;{s/^.*\(images\/.*\)<.*$$/\1/}' VirtualBox.qrc)
-
-$(PATH_VirtualBox)/ui/vbox_image_collection.cpp: VirtualBox.qrc $(VirtualBox_QT_IMAGES)
+# rules for resources file creation
+$(PATH_VirtualBox)/ui/qrc_application.cpp: VirtualBox.qrc $(VirtualBox_QT_RC)
         $(call MSG_TOOL,rcc,VirtualBox,$<,$@)
         $(QUIET)$(VBOX_RCC4) -o $@  $<
 
-VirtualBox_GENSRCS += $(PATH_VirtualBox)/ui/vbox_image_collection.cpp
+$(PATH_VirtualBox)/ui/qrc_application_ose.cpp: VirtualBoxOSE.qrc $(VirtualBox_QT_RC_OSE)
+        $(call MSG_TOOL,rcc,VirtualBox,$<,$@)
+        $(QUIET)$(VBOX_RCC4) -name "OSE" -o $@  $<
+
+$(PATH_VirtualBox)/ui/qrc_application_non_ose.cpp: VirtualBoxNonOSE.qrc $(VirtualBox_QT_RC_NON_OSE)
+        $(call MSG_TOOL,rcc,VirtualBox,$<,$@)
+        $(QUIET)$(VBOX_RCC4) -name "NonOSE" -o $@  $<
 
 #

trunk/src/VBox/Frontends/VirtualBox4/VBoxUI.pro

@@ -35 +35 @@
         ui/VBoxNewHDWzd.ui \
         ui/VBoxSnapshotsWgt.ui \
-        ui/VBoxAboutDlg.ui \
         ui/VBoxVMFirstRunWzd.ui \
         ui/VBoxVMLogViewer.ui \

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

@@ -243 +243 @@
     <file alias="meditation_32px.png">images/meditation_32px.png</file>
     <file alias="welcome.png">images/welcome.png</file>
-    <file alias="about.png">images/about.png</file>
-    <file alias="about_tile.png">images/about_tile.png</file>
     <file alias="dock_1.png">images/dock_1.png</file>
     <file alias="VirtualBox_48px.png">images/VirtualBox_48px.png</file>

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp

@@ -23 +23 @@
 #include "VBoxConsoleWnd.h"
 
-#include "VBoxAboutDlg.h"
+#ifdef VBOX_OSE
+# include "VBoxAboutDlg.h"
+#else
+# include "VBoxAboutNonOSEDlg.h"
+#endif
 
 #include "QIHotKeyEdit.h"
@@ -42 +46 @@
 #include <Htmlhelp.h>
 #endif
-
 
 /**
@@ -2076 +2079 @@
     AssertWrapperOk (vbox);
 
+#if VBOX_OSE
     VBoxAboutDlg (mainWindowShown(), COMVersion).exec();
+#else
+    VBoxAboutNonOSEDlg (mainWindowShown(), COMVersion).exec();
+#endif
 }