Changeset 52472 in vbox

Timestamp:

Aug 22, 2014 12:45:51 PM (11 years ago)

Author:

vboxsync

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

95687

Message:

FE/Qt: 7462: Mac OS X: Runtime UI: Session: Menu-bar: Listen for configuration changes at runtime.

Location:

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

Files:

• UISession.cpp (modified) (3 diffs)
• UISession.h (modified) (2 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (4 diffs)
• normal/UIMachineWindowNormal.h (modified) (2 diffs)

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

@@ -663 +663 @@
 }
 
+#ifdef RT_OS_DARWIN
+void UISession::sltHandleMenuBarConfigurationChange()
+{
+    /* Update Mac OS X menu-bar: */
+    updateMenu();
+}
+#endif /* RT_OS_DARWIN */
+
 void UISession::sltMousePointerShapeChange(bool fVisible, bool fAlpha, QPoint hotCorner, QSize size, QVector<uint8_t> shape)
 {
@@ -1070 +1078 @@
     AssertPtrReturnVoid(m_pMenuBar);
     {
-        /* Prepare menu-bar: */
-        foreach (QMenu *pMenu, actionPool()->menus())
-            m_pMenuBar->addMenu(pMenu);
+        /* Configure Mac OS X menu-bar: */
+        connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange()),
+                this, SLOT(sltHandleMenuBarConfigurationChange()));
+        /* Update Mac OS X menu-bar: */
+        updateMenu();
     }
 #endif /* Q_WS_MAC */
@@ -1263 +1273 @@
     UIActionPool::destroy(m_pActionPool);
 }
+
+#ifdef Q_WS_MAC
+void UISession::updateMenu()
+{
+    /* Rebuild Mac OS X menu-bar: */
+    m_pMenuBar->clear();
+    foreach (QMenu *pMenu, actionPool()->menus())
+        m_pMenuBar->addMenu(pMenu);
+}
+#endif /* Q_WS_MAC */
 
 WId UISession::winId() const

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

@@ -279 +279 @@
     void sltCloseRuntimeUI();
 
+#ifdef RT_OS_DARWIN
+    /** Mac OS X: Handles menu-bar configuration-change. */
+    void sltHandleMenuBarConfigurationChange();
+#endif /* RT_OS_DARWIN */
+
     /* Console events slots */
     void sltMousePointerShapeChange(bool fVisible, bool fAlpha, QPoint hotCorner, QSize size, QVector<uint8_t> shape);
@@ -322 +327 @@
     void cleanupConnections();
     void cleanupActions();
+
+#ifdef Q_WS_MAC
+    /** Mac OS X: Updates menu-bar content. */
+    void updateMenu();
+#endif /* Q_WS_MAC */
 
     /* Common helpers: */

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

@@ -115 +115 @@
 }
 
+#ifndef RT_OS_DARWIN
 void UIMachineWindowNormal::sltHandleMenuBarConfigurationChange()
 {
@@ -120 +121 @@
     updateMenu();
 }
+#endif /* !RT_OS_DARWIN */
 
 void UIMachineWindowNormal::sltHandleStatusBarConfigurationChange()
@@ -508 +510 @@
 }
 
+#ifndef Q_WS_MAC
 void UIMachineWindowNormal::updateMenu()
 {
@@ -515 +518 @@
         menuBar()->addMenu(pMenu);
 }
+#endif /* !Q_WS_MAC */
 
 bool UIMachineWindowNormal::isMaximizedChecked()

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

@@ -59 +59 @@
     void sltCPUExecutionCapChange();
 
+#ifndef RT_OS_DARWIN
     /** Handles menu-bar configuration-change. */
     void sltHandleMenuBarConfigurationChange();
+#endif /* !RT_OS_DARWIN */
 
     /** Handles status-bar configuration-change. */
@@ -98 +100 @@
     void updateAppearanceOf(int aElement);
 
+#ifndef Q_WS_MAC
     /** Updates menu-bar content. */
     void updateMenu();
+#endif /* !Q_WS_MAC */
 
     /* Event handler: */