Changeset 69935 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 5, 2017 12:58:22 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8939 Fixing MacOS doc menu update issue

Location:

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

Files:

• UIMachineLogic.cpp (modified) (5 diffs)
• UIMachineLogic.h (modified) (3 diffs)
• UISession.cpp (modified) (1 diff)

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

@@ -840 +840 @@
     , m_pDockSettingsMenuSeparator(0)
     , m_DockIconPreviewMonitor(0)
+    , m_pDockSettingMenuAction(0)
 #endif /* VBOX_WS_MAC */
     , m_pHostLedsState(NULL)
@@ -1214 +1215 @@
 {
     QMenu *pDockMenu = actionPool()->action(UIActionIndexRT_M_Dock)->menu();
-
+    /* Clear the menu to get rid of any previously added actions and separators: */
+    pDockMenu->clear();
+    
     /* Add all the 'Machine' menu entries to the 'Dock' menu: */
     QList<QAction*> actions = actionPool()->action(UIActionIndexRT_M_Machine)->menu()->actions();
+    m_dockMachineMenuActions.clear();
     for (int i=0; i < actions.size(); ++i)
     {
@@ -1230 +1234 @@
         if (qobject_cast<UIActionMenu*>(pAction))
             continue;
+        if (!pAction->isAllowed())
+            continue;
         pDockMenu->addAction(actions.at(i));
-    }
-    pDockMenu->addSeparator();
+        m_dockMachineMenuActions.push_back(actions.at(i));
+    }
+    if (!m_dockMachineMenuActions.empty())
+    {
+        m_dockMachineMenuActions.push_back(pDockMenu->addSeparator());
+    }
 
     QMenu *pDockSettingsMenu = actionPool()->action(UIActionIndexRT_M_Dock_M_DockSettings)->menu();
+    /* Clear the menu to get rid of any previously added actions and separators: */
+    pDockSettingsMenu->clear();
     QActionGroup *pDockPreviewModeGroup = new QActionGroup(this);
     QAction *pDockDisablePreview = actionPool()->action(UIActionIndexRT_M_Dock_M_DockSettings_T_DisableMonitor);
@@ -1289 +1301 @@
     }
 
-    pDockMenu->addMenu(pDockSettingsMenu);
+    m_pDockSettingMenuAction = pDockMenu->addMenu(pDockSettingsMenu);
 
     /* Add it to the dock: */
@@ -1317 +1329 @@
 {
     QMenu *pDockSettingsMenu = actionPool()->action(UIActionIndexRT_M_Dock_M_DockSettings)->menu();
+    AssertReturnVoid(pDockSettingsMenu);
+
+    QMenu *pDockMenu = actionPool()->action(UIActionIndexRT_M_Dock)->menu();
+    AssertReturnVoid(pDockMenu);
+
+    /* Clean previous machine menu actions: */
+    for (int i=0; i < m_dockMachineMenuActions.size(); ++i)
+    {
+        pDockMenu->removeAction(m_dockMachineMenuActions.at(i));
+        if (m_dockMachineMenuActions.at(i)->isSeparator())
+            delete m_dockMachineMenuActions[i];
+    }
+    m_dockMachineMenuActions.clear();
+
+    /* Determine the list of actions to be inserted: */
+    QList<QAction*> actions = actionPool()->action(UIActionIndexRT_M_Machine)->menu()->actions();
+    QList<QAction*> allowedActions;
+    for (int i=0; i < actions.size(); ++i)
+    {
+        /* Check if we really have correct action: */
+        UIAction *pAction = qobject_cast<UIAction*>(actions.at(i));
+        /* Skip incorrect actions: */
+        if (!pAction)
+            continue;
+        /* Skip actions which have 'role' (to prevent consuming): */
+        if (pAction->menuRole() != QAction::NoRole)
+            continue;
+        /* Skip actions which have menu (to prevent consuming): */
+        if (qobject_cast<UIActionMenu*>(pAction))
+            continue;
+        if (!pAction->isAllowed())
+            continue;
+        allowedActions.push_back(actions.at(i));
+    }
+
+    if (!allowedActions.empty())
+    {
+        QAction *separator = new QAction(pDockMenu);
+        separator->setSeparator(true);
+        allowedActions.push_back(separator);
+        pDockMenu->insertActions(m_pDockSettingMenuAction, allowedActions);
+        m_dockMachineMenuActions = allowedActions;
+    }
+
     /* Clean the previous preview actions: */
     if (m_pDockPreviewSelectMonitorGroup)

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

@@ -138 +138 @@
     void updateDockIconSize(int screenId, int width, int height);
     UIMachineView* dockPreviewView() const;
+    virtual void updateDock();
 #endif /* VBOX_WS_MAC */
 
@@ -225 +226 @@
 #ifdef VBOX_WS_MAC
     virtual void prepareDock();
-    virtual void updateDock();
 #endif /* VBOX_WS_MAC */
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -409 +409 @@
     QAction *m_pDockSettingsMenuSeparator;
     int m_DockIconPreviewMonitor;
+    QAction *m_pDockSettingMenuAction;
+    /* Keep a list of machine menu actions that we add to dock menu: */
+    QList<QAction*> m_dockMachineMenuActions;
 #endif /* VBOX_WS_MAC */
 

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

@@ -1473 +1473 @@
             pMenuUI->setConsumed(true);
     }
+    /* Update the dock menu as well: */
+    if(machineLogic())
+        machineLogic()->updateDock();
 }
 #endif /* VBOX_WS_MAC */