Changeset 7983 in vbox

Timestamp:

Apr 15, 2008 12:33:57 PM (17 years ago)

Author:

vboxsync

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

29634

Message:

FE/Qt: New non OSE about dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -266 +266 @@
 endif
 
+ifndef VBOX_OSE
+VirtualBox_QT_IMAGES += images/about_sun.png
+VirtualBox_SOURCES += src/VBoxAboutNonOSEDlg.cpp
+else
+VirtualBox_QT_UISRCS += ui/VBoxAboutDlg.ui
+endif
+
 ifneq ($(BUILD_TARGET),win)
 src/HappyHttp.cpp_CXXFLAGS += -fexceptions

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

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

trunk/src/VBox/Frontends/VirtualBox/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"
@@ -44 +48 @@
 #include <Htmlhelp.h>
 #endif
-
 
 /**
@@ -2068 +2071 @@
     AssertWrapperOk (vbox);
 
+#if VBOX_OSE
     VBoxAboutDlg dlg (mainWindowShown(), "VBoxAboutDlg");
+#else
+    VBoxAboutNonOSEDlg dlg (mainWindowShown());
+#endif
     dlg.setup (COMVersion);
     dlg.exec();