Changeset 52471 in vbox

Timestamp:

Aug 22, 2014 12:27:21 PM (11 years ago)

Author:

vboxsync

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

95686

Message:

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

Location:

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

Files:

• UIMachineWindowNormal.cpp (modified) (3 diffs)
• UIMachineWindowNormal.h (modified) (2 diffs)

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

@@ -115 +115 @@
 }
 
+void UIMachineWindowNormal::sltHandleMenuBarConfigurationChange()
+{
+    /* Update menu-bar: */
+    updateMenu();
+}
+
 void UIMachineWindowNormal::sltHandleStatusBarConfigurationChange()
 {
@@ -206 +212 @@
     AssertPtrReturnVoid(menuBar());
     {
-        /* Prepare menu-bar: */
-        foreach (QMenu *pMenu, actionPool()->menus())
-            menuBar()->addMenu(pMenu);
+        /* Post-configure menu-bar: */
+        connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange()),
+                this, SLOT(sltHandleMenuBarConfigurationChange()));
+        /* Update menu-bar: */
+        updateMenu();
     }
 }
@@ -500 +508 @@
 }
 
+void UIMachineWindowNormal::updateMenu()
+{
+    /* Rebuild menu-bar: */
+    menuBar()->clear();
+    foreach (QMenu *pMenu, actionPool()->menus())
+        menuBar()->addMenu(pMenu);
+}
+
 bool UIMachineWindowNormal::isMaximizedChecked()
 {

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

@@ -59 +59 @@
     void sltCPUExecutionCapChange();
 
-    /** Handles status-bar configuration-change: */
+    /** Handles menu-bar configuration-change. */
+    void sltHandleMenuBarConfigurationChange();
+
+    /** Handles status-bar configuration-change. */
     void sltHandleStatusBarConfigurationChange();
-    /** Handles status-bar context-menu-request: */
+    /** Handles status-bar context-menu-request. */
     void sltHandleStatusBarContextMenuRequest(const QPoint &position);
-    /** Handles status-bar indicator context-menu-request: */
+    /** Handles status-bar indicator context-menu-request. */
     void sltHandleIndicatorContextMenuRequest(IndicatorType indicatorType, const QPoint &position);
 
@@ -95 +98 @@
     void updateAppearanceOf(int aElement);
 
+    /** Updates menu-bar content. */
+    void updateMenu();
+
     /* Event handler: */
     bool event(QEvent *pEvent);