Changeset 44954 in vbox

Timestamp:

Mar 7, 2013 1:34:21 PM (12 years ago)

Author:

vboxsync

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

84164

Message:

FE/Qt: Runtime UI: Mac OS multi-screen menu-bar support.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (6 diffs)
• UIMachineLogic.h (modified) (4 diffs)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (2 diffs)
• scale/UIMachineWindowScale.cpp (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (2 diffs)
• seamless/UIMachineWindowSeamless.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -25 +25 @@
 #include <QPainter>
 #include <QTimer>
+#ifdef Q_WS_MAC
+# include <QMenuBar>
+#endif /* Q_WS_MAC */
 
 /* GUI includes: */
@@ -173 +176 @@
 
 #ifdef Q_WS_MAC
+    /* Prepare menu-bar: */
+    prepareMenuBar();
     /* Prepare dock: */
     prepareDock();
@@ -204 +209 @@
     /* Cleanup dock: */
     cleanupDock();
+    /* Cleanup menu-bar: */
+    cleanupMenuBar();
 #endif /* Q_WS_MAC */
 
@@ -467 +474 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 #ifdef Q_WS_MAC
+    , m_pMenuBar(0)
     , m_fIsDockIconEnabled(true)
     , m_pDockIconPreview(0)
@@ -721 +729 @@
 
 #ifdef Q_WS_MAC
+void UIMachineLogic::prepareMenuBar()
+{
+    m_pMenuBar = uisession()->newMenuBar();
+}
+
 void UIMachineLogic::prepareDock()
 {
@@ -833 +846 @@
         m_pDockIconPreview = 0;
     }
+}
+
+void UIMachineLogic::cleanupMenuBar()
+{
+    delete m_pMenuBar;
+    m_pMenuBar = 0;
 }
 #endif /* Q_WS_MAC */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -44 +44 @@
 class CUSBDevice;
 class CVirtualBoxErrorInfo;
+#ifdef Q_WS_MAC
+class QMenuBar;
+#endif /* Q_WS_MAC */
 
 /* Machine logic interface: */
@@ -130 +133 @@
     virtual void prepareMachineWindows() = 0;
 #ifdef Q_WS_MAC
+    virtual void prepareMenuBar();
     virtual void prepareDock();
 #endif /* Q_WS_MAC */
@@ -142 +146 @@
 #ifdef Q_WS_MAC
     virtual void cleanupDock();
+    virtual void cleanupMenuBar();
 #endif /* Q_WS_MAC */
     virtual void cleanupMachineWindows() = 0;
@@ -235 +240 @@
 
 #ifdef Q_WS_MAC
+    QMenuBar *m_pMenuBar;
     bool m_fIsDockIconEnabled;
     UIDockIconPreview *m_pDockIconPreview;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -70 +70 @@
 
     /* Prepare menu: */
-#ifdef Q_WS_MAC
-    setMenuBar(uisession()->newMenuBar());
-#endif /* Q_WS_MAC */
     m_pMainMenu = uisession()->newMenu();
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -198 +198 @@
     UIMachineWindow::prepareMenu();
 
+#ifndef Q_WS_MAC
     /* Prepare menu-bar: */
     setMenuBar(uisession()->newMenuBar());
+#endif /* !Q_WS_MAC */
 }
 
@@ -425 +427 @@
     {
         VBoxGlobalSettings settings = vboxGlobal().settings();
+#ifndef Q_WS_MAC
         menuBar()->setHidden(settings.isFeatureActive("noMenuBar"));
+#endif /* !Q_WS_MAC */
         statusBar()->setHidden(settings.isFeatureActive("noStatusBar"));
         if (statusBar()->isHidden())

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -78 +78 @@
     UIMachineWindow::prepareMenu();
 
-#ifdef Q_WS_MAC
-    setMenuBar(uisession()->newMenuBar());
-#endif /* Q_WS_MAC */
+    /* Prepare menu: */
     m_pMainMenu = uisession()->newMenu();
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -87 +87 @@
 
     /* Prepare menu: */
-#ifdef Q_WS_MAC
-    setMenuBar(uisession()->newMenuBar());
-#endif /* Q_WS_MAC */
     m_pMainMenu = uisession()->newMenu();
 }
@@ -155 +152 @@
 }
 #endif /* !Q_WS_MAC */
-
-#ifdef Q_WS_MAC
-void UIMachineWindowSeamless::loadSettings()
-{
-    /* Call to base-class: */
-    UIMachineWindow::loadSettings();
-
-    /* Load global settings: */
-    {
-        VBoxGlobalSettings settings = vboxGlobal().settings();
-        menuBar()->setHidden(settings.isFeatureActive("noMenuBar"));
-    }
-}
-#endif /* Q_WS_MAC */
 
 #ifndef Q_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.h

@@ -64 +64 @@
     void prepareMiniToolbar();
 #endif /* !Q_WS_MAC */
-#ifdef Q_WS_MAC
-    void loadSettings();
-#endif /* Q_WS_MAC */
 
     /* Cleanup helpers: */
-#ifdef Q_WS_MAC
-    //void saveSettings() {}
-#endif /* Q_WS_MAC */
 #ifndef Q_WS_MAC
     void cleanupMiniToolbar();