Changeset 87101 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 17, 2020 2:30:07 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510. Adding a tool bar action to jump to Resources pane from machine Performance Monitor in the manager UI.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (3 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• manager/UIToolPaneMachine.cpp (modified) (1 diff)
• manager/UIToolPaneMachine.h (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)
• manager/UIVirtualBoxManagerWidget.h (modified) (1 diff)
• monitor/performance/UIPerformanceMonitor.cpp (modified) (1 diff)
• monitor/performance/UIPerformanceMonitor.h (modified) (1 diff)

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

@@ -2264 +2264 @@
 };
 
+/** Simple action extension, used as 'To Resources' action class. */
+class UIActionMenuSelectorPerformanceToResources : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorPerformanceToResources(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/resources_monitor_24px.png", ":/resource_monitor_16px.png",
+                         ":/resource_monitor_disabled_24px.png", ":/resource_monitor_disabled_16px.png")
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("ToResources");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "&To Resurces..."));
+        setShortcutScope(QApplication::translate("UIActionPool", "Performance Monitor"));
+        setStatusTip(QApplication::translate("UIActionPool", "Navigate to the resources widget"));
+        setToolTip(  QApplication::translate("UIActionPool", "Navigate to Resources Widget")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
 
 /*********************************************************************************************************************************
@@ -2509 +2544 @@
     m_pool[UIActionIndex_M_Performance] = new UIActionMenuSelectorPerformance(this);
     m_pool[UIActionIndex_M_Performance_S_Export] = new UIActionMenuSelectorPerformancePerformExport(this);
+    m_pool[UIActionIndex_M_Performance_S_ToResources] = new UIActionMenuSelectorPerformanceToResources(this);
 
     /* Create 'File Manager' actions: */
@@ -2939 +2975 @@
     /* 'Export' action: */
     pMenu->addAction(action(UIActionIndex_M_Performance_S_Export));
+    pMenu->addAction(action(UIActionIndex_M_Performance_S_ToResources));
 
     /* Mark menu as valid: */

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

@@ -101 +101 @@
     UIActionIndex_M_Performance,
     UIActionIndex_M_Performance_S_Export,
+    UIActionIndex_M_Performance_S_ToResources,
 
     /* File Manager actions: */

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

@@ -208 +208 @@
                 m_pLayout->setCurrentWidget(m_pPanePerformanceMonitor);
 
+                connect(m_pPanePerformanceMonitor, &UIPerformanceMonitor::sigSwitchToResourcesPane,
+                        this, &UIToolPaneMachine::sigSwitchToResourcesPane);
                 break;
             }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.h

@@ -61 +61 @@
     /** Notifies listeners about current Snapshot pane item change. */
     void sigCurrentSnapshotItemChange();
+
+    /** Notifies listeners about request to switch to Resources pane. */
+    void sigSwitchToResourcesPane();
 
 public:

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

@@ -508 +508 @@
 }
 
+void UIVirtualBoxManagerWidget::sltSwitchToResourcesPane()
+{
+    AssertPtrReturnVoid(m_pPaneTools);
+    m_pPaneToolsGlobal->setActive(true);
+    switchToGlobalTool(UIToolType_Resources);
+    m_pPaneTools->setToolsType(UIToolType_Resources);
+}
+
 void UIVirtualBoxManagerWidget::prepare()
 {
@@ -618 +626 @@
                             connect(m_pPaneToolsMachine, &UIToolPaneMachine::sigCurrentSnapshotItemChange,
                                     this, &UIVirtualBoxManagerWidget::sigCurrentSnapshotItemChange);
+                            connect(m_pPaneToolsMachine, &UIToolPaneMachine::sigSwitchToResourcesPane,
+                                    this, &UIVirtualBoxManagerWidget::sltSwitchToResourcesPane);
 
                             /* Add into stack: */
@@ -901 +911 @@
                 {
                     m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Performance_S_Export));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Performance_S_ToResources));
                     m_pToolBar->addSeparator();
                     m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.h

@@ -271 +271 @@
         /** Handles signal requesting switch to Performance pane of machine with @a uMachineId. */
         void sltSwitchToMachinePerformancePane(const QUuid &uMachineId);
+        /** Handles signal requesting switch to Resources pane. */
+        void sltSwitchToResourcesPane();
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/monitor/performance/UIPerformanceMonitor.cpp

@@ -1096 +1096 @@
 void UIPerformanceMonitor::prepareActions()
 {
-    QAction *pAction =
+    QAction *pExportAction =
         m_pActionPool->action(UIActionIndex_M_Performance_S_Export);
-    if (pAction)
-        connect(pAction, &QAction::triggered, this, &UIPerformanceMonitor::sltExportMetricsToFile);
+    if (pExportAction)
+        connect(pExportAction, &QAction::triggered, this, &UIPerformanceMonitor::sltExportMetricsToFile);
+
+    QAction *pToResourcesAction =
+        m_pActionPool->action(UIActionIndex_M_Performance_S_ToResources);
+    if (pToResourcesAction)
+        connect(pToResourcesAction, &QAction::triggered, this, &UIPerformanceMonitor::sigSwitchToResourcesPane);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/monitor/performance/UIPerformanceMonitor.h

@@ -111 +111 @@
 {
     Q_OBJECT;
+
+ signals:
+
+    void sigSwitchToResourcesPane();
 
 public: