Changeset 32789 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 28, 2010 12:55:42 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: added a Window menu for the selector window

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/VBoxMediaManagerDlg.cpp (modified) (3 diffs)
• src/darwin/UIWindowMenuManager.cpp (added)
• src/darwin/UIWindowMenuManager.h (added)
• src/selector/VBoxSelectorWnd.cpp (modified) (4 diffs)

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

@@ -362 +362 @@
         src/runtime/seamless/UIMachineWindowSeamless.h
 
-ifdef VBOX_WITH_REGISTRATION
- VirtualBox_QT_MOCHDRS += \
-        src/wizards/registration/UIRegistrationWzd.h
-endif
-
 # Sources containing local definitions of classes that use the Q_OBJECT macro.
 VirtualBox_QT_MOCSRCS = \
@@ -379 +374 @@
         src/runtime/UIMachineLogic.cpp \
         src/runtime/UIMachineMenuBar.cpp
+
+ifeq ($(KBUILD_TARGET),darwin)
+ VirtualBox_QT_MOCHDRS += \
+    src/darwin/UIWindowMenuManager.h
+ VirtualBox_QT_MOCSRCS += \
+    src/darwin/UIWindowMenuManager.cpp
+endif
+
+ifdef VBOX_WITH_REGISTRATION
+ VirtualBox_QT_MOCHDRS += \
+        src/wizards/registration/UIRegistrationWzd.h
+endif
 
 ifdef VBOX_WITH_XPCOM
@@ -529 +536 @@
         src/runtime/UIFrameBufferQuartz2D.cpp \
         src/darwin/UIAbstractDockIconPreview.cpp \
+        src/darwin/UIWindowMenuManager.cpp \
         src/darwin/UICocoaDockIconPreview.mm
 

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

@@ -45 +45 @@
 #include "UIVirtualBoxEventHandler.h"
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
+#ifdef Q_WS_MAC
+# include "UIWindowMenuManager.h"
+#endif /* Q_WS_MAC */
 
 class AddVDMUrlsEvent: public QEvent
@@ -381 +385 @@
 VBoxMediaManagerDlg::~VBoxMediaManagerDlg()
 {
+#ifdef Q_WS_MAC
+    if (!mDoSelect)
+    {
+        UIWindowMenuManager::instance()->removeWindow(this);
+        UIWindowMenuManager::instance()->destroyMenu(this);
+    }
+#endif /* Q_WS_MAC */
     delete mToolBar;
 }
@@ -496 +507 @@
     /* Applying language settings */
     retranslateUi();
+
+#ifdef Q_WS_MAC
+    if (!mDoSelect)
+    {
+        menuBar()->addMenu(UIWindowMenuManager::instance()->createMenu(this));
+        UIWindowMenuManager::instance()->addWindow(this);
+    }
+#endif /* Q_WS_MAC */
 
     mSetupMode = false;

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

@@ -45 +45 @@
 #ifdef Q_WS_MAC
 # include "VBoxUtils.h"
+# include "UIWindowMenuManager.h"
 #endif
 
@@ -281 +282 @@
     mVMMenu->addAction(mVmShowLogsAction);
 
+#ifdef Q_WS_MAC
+    menuBar()->addMenu(UIWindowMenuManager::instance(this)->createMenu(this));
+#endif /* Q_WS_MAC */
+
     mVMCtxtMenu = new QMenu(this);
     mVMCtxtMenu->addAction(mVmConfigAction);
@@ -445 +450 @@
     /* bring the VM list to the focus */
     mVMListView->setFocus();
+
+#ifdef Q_WS_MAC
+    UIWindowMenuManager::instance()->addWindow(this);
+#endif /* Q_WS_MAC */
 }
 
@@ -461 +470 @@
             .arg(mNormalGeo.width()).arg(mNormalGeo.height());
 #ifdef Q_WS_MAC
+        UIWindowMenuManager::destroy();
         ::darwinUnregisterForUnifiedToolbarContextMenuEvents(this);
         if (::darwinIsWindowMaximized(this))