Changeset 12580 in vbox for trunk/src

Timestamp:

Sep 18, 2008 4:03:56 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Removed the old about dialog & merged VBoxAboutDlg & VBoxAboutNonOSEDlg.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (3 diffs)
• images/OSE/about.png (modified) ( previous)
• images/OSE/about_tile.png (deleted)
• include/VBoxAboutDlg.h (deleted)
• src/VBoxAboutDlg.cpp (deleted)
• src/VBoxProblemReporter.cpp (modified) (2 diffs)
• ui/VBoxAboutDlg.ui (deleted)

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

@@ -236 +236 @@
         include/VBoxDownloaderWgt.h \
         include/VBoxNetworkFramework.h \
-        include/VBoxAboutDlg.h \
+        include/VBoxAboutNonOSEDlg.h \
         include/VBoxCloseVMDlg.h \
         include/VBoxNewVMWzd.h \
@@ -313 +313 @@
         src/HappyHttp.cpp \
         src/VBoxNetworkFramework.cpp \
-        src/VBoxAboutDlg.cpp \
+        src/VBoxAboutNonOSEDlg.cpp \
         src/VBoxCloseVMDlg.cpp \
         src/VBoxNewVMWzd.cpp \
@@ -387 +387 @@
 
 # Import QDesigner UI sources and translations from VBoxUI.pro.
-# Note that the OSE about dialog is always required by lupdate/lrelease.
 ifndef VBOX_WITH_REGISTRATION
  FORMS := $(filter-out ui/VBoxRegistrationDlg.ui,$(FORMS))
 endif
-$(eval VirtualBox4_SOURCES += \
-        $(FORMS) \
-        ui/VBoxAboutDlg.ui )
 
 # Resource files with some OSE differences (VirtualBoxBrand.qrc is created further down).
 VirtualBox4_SOURCES += VirtualBox.qrc
 VirtualBox4_SOURCES += $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc
-ifdef VBOX_OSE
- $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name OSE
-else
- VirtualBox4_SOURCES += src/VBoxAboutNonOSEDlg.cpp
- VirtualBox4_QT_MOCHDRS += include/VBoxAboutNonOSEDlg.h
- $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name NonOSE
-endif
-
+$(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND
 
 # Import the translation source from VBoxUI.pro and add the qt_xx_YY counterparts

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

@@ -27 +27 @@
 #include "VBoxConsoleWnd.h"
 
-#ifdef VBOX_OSE
-# include "VBoxAboutDlg.h"
-#else
-# include "VBoxAboutNonOSEDlg.h"
-#endif
+#include "VBoxAboutNonOSEDlg.h"
 
 #include "QIHotKeyEdit.h"
@@ -2247 +2243 @@
 
     // this (QWidget*) cast is necessary to work around a gcc-3.2 bug */
-#if VBOX_OSE
-    VBoxAboutDlg ((QWidget*)mainWindowShown(), COMVersion).exec();
-#else
     VBoxAboutNonOSEDlg ((QWidget*)mainWindowShown(), COMVersion).exec();
-#endif
 }