Changeset 17377 in vbox

Timestamp:

Mar 5, 2009 9:23:48 AM (16 years ago)

Author:

vboxsync

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

43778

Message:

FE/Qt4-OSX: minor Cocoa updates

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxAboutDlg.h (modified) (1 diff)
• src/VBoxAboutDlg.cpp (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxAboutDlg.h

@@ -25 +25 @@
 
 #include "QIWithRetranslateUI.h"
+#include "QIDialog.h"
 
 /* Qt includes */
-#include <QDialog>
 #include <QPixmap>
 
 class QEvent;
 
-class VBoxAboutDlg: public QIWithRetranslateUI2<QDialog>
+class VBoxAboutDlg: public QIWithRetranslateUI2<QIDialog>
 {
     Q_OBJECT;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp

@@ -28 +28 @@
 
 VBoxAboutDlg::VBoxAboutDlg (QWidget* aParent, const QString &aVersion)
-    : QIWithRetranslateUI2 <QDialog> (aParent, Qt::CustomizeWindowHint |
-                                      Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+    : QIWithRetranslateUI2 <QIDialog> (aParent, Qt::CustomizeWindowHint |
+                                       Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
     mVersion (aVersion),
     mBgImage (":/about.png")
@@ -40 +40 @@
     if (aEvent->type() == QEvent::Polish)
         setFixedSize (mBgImage.size());
-    return QDialog::event (aEvent);
+    return QIDialog::event (aEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -707 +707 @@
 
 #ifdef Q_WS_MAC
+    /* For the status bar on Cocoa */
+    setUnifiedTitleAndToolBarOnMac (true);
+
 # ifdef VBOX_WITH_ICHAT_THEATER
 //    int setAttr[] = { kHIWindowBitDoesNotShowBadgeInDock, 0 };