Changeset 83608 in vbox

Timestamp:

Apr 7, 2020 12:18:46 PM (5 years ago)

Author:

vboxsync

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

137013

Message:

FE/Qt: bugref:9686. Working on the dialog menu.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (5 diffs)
• globals/UIActionPoolManager.h (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

@@ -2799 +2799 @@
 };
 
+/** Menu action extension, used as 'Resources' menu class. */
+class UIActionMenuVMResourceMonitor : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuVMResourceMonitor(UIActionPool *pParent)
+        : UIActionMenu(pParent)
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("VMResourceMonitorMenu");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "&Resources"));
+    }
+};
+
 /** Toggle action extension, used as 'Toggle Columns' action class. */
-class UIActionMenuSelectorVMResourceManagerToggleColumns : public UIActionToggle
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuSelectorVMResourceManagerToggleColumns(UIActionPool *pParent)
+class UIActionMenuSelectorVMResourceMonitorToggleColumns : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorVMResourceMonitorToggleColumns(UIActionPool *pParent)
         : UIActionToggle(pParent)
     {
@@ -2979 +3006 @@
 
     /* VM resource Monitor actions: */
-    m_pool[UIActionIndexST_M_VMResourceMonitor_T_Columns] = new UIActionMenuSelectorVMResourceManagerToggleColumns(this);
+    m_pool[UIActionIndexST_M_VMResourceMonitor] = new UIActionMenuVMResourceMonitor(this);
+    m_pool[UIActionIndexST_M_VMResourceMonitor_T_Columns] = new UIActionMenuSelectorVMResourceMonitorToggleColumns(this);
 
     /* 'Group' action groups: */
@@ -3010 +3038 @@
     m_menuUpdateHandlers[UIActionIndexST_M_CloudWindow].ptfm =           &UIActionPoolManager::updateMenuCloudWindow;
     m_menuUpdateHandlers[UIActionIndexST_M_Cloud].ptfm =                 &UIActionPoolManager::updateMenuCloud;
+    m_menuUpdateHandlers[UIActionIndexST_M_VMResourceMonitor].ptfm =     &UIActionPoolManager::updateMenuVMResourceMonitor;
     m_menuUpdateHandlers[UIActionIndexST_M_Snapshot].ptfm =              &UIActionPoolManager::updateMenuSnapshot;
 
@@ -3084 +3113 @@
     updateMenuCloudWindow();
     updateMenuCloud();
+
+    /* 'VM Resource Monitor' menu: */
+    addMenu(m_mainMenus, action(UIActionIndexST_M_VMResourceMonitor));
+    updateMenuVMResourceMonitor();
 
     /* 'Snapshot' menu: */
@@ -3557 +3590 @@
     /* 'Help' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Help)) || fSeparator;
+}
+
+void UIActionPoolManager::updateMenuVMResourceMonitor()
+{
+    /* Update corresponding menu: */
+    updateMenuVMResourceMonitorWrapper(action(UIActionIndexST_M_VMResourceMonitor)->menu());
+
+    /* Mark menu as valid: */
+    m_invalidations.remove(UIActionIndexST_M_VMResourceMonitor);
+}
+
+void UIActionPoolManager::updateMenuVMResourceMonitorWrapper(UIMenu *pMenu)
+{
+    /* Clear contents: */
+    pMenu->clear();
+
+    addAction(pMenu, action(UIActionIndexST_M_VMResourceMonitor_T_Columns));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h

@@ -165 +165 @@
 
     /* VM resource Monitor actions: */
+    UIActionIndexST_M_VMResourceMonitor,
     UIActionIndexST_M_VMResourceMonitor_T_Columns,
 
@@ -237 +238 @@
     void updateMenuCloudWrapper(UIMenu *pMenu);
 
+   /** Updates 'VM Resource Monitor' menu. */
+    void updateMenuVMResourceMonitor();
+    /** Updates 'VM Resource Monitor' @a pMenu. */
+    void updateMenuVMResourceMonitorWrapper(UIMenu *pMenu);
+
     /** Updates 'Snapshot' menu. */
     void updateMenuSnapshot();

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -1688 +1688 @@
     actionPool()->action(UIActionIndexST_M_Cloud)->setVisible(fCloudMenuShown);
 
+    /* Determine whether Resources menu should be visible: */
+    const bool fResourcesMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_VMResourceMonitor;
+    actionPool()->action(UIActionIndexST_M_VMResourceMonitor)->setVisible(fResourcesMenuShown);
+
     /* Determine whether Snapshots menu should be visible: */
     const bool fSnapshotMenuShown = (fMachineMenuShown || fGroupMenuShown) &&