Changeset 85493 in vbox for trunk

Timestamp:

Jul 28, 2020 5:56:08 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686, bugref:9510. Adding the context menu to navigate to machine performance pane from 'Resources' widget

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIToolPaneGlobal.cpp (modified) (1 diff)
• manager/UIToolPaneGlobal.h (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)
• manager/UIVirtualBoxManagerWidget.h (modified) (1 diff)
• monitor/performance/UIPerformanceMonitor.cpp (modified) (1 diff)
• monitor/resource/UIResourceMonitor.cpp (modified) (12 diffs)
• monitor/resource/UIResourceMonitor.h (modified) (4 diffs)

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

@@ -199 +199 @@
                     m_pLayout->addWidget(m_pPaneResourceMonitor);
                     m_pLayout->setCurrentWidget(m_pPaneResourceMonitor);
+                    connect(m_pPaneResourceMonitor, &UIResourceMonitorWidget::sigSwitchMachinePerformancePane,
+                            this, &UIToolPaneGlobal::sigSwitchMachinePerformancePane);
                 }
 

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

@@ -51 +51 @@
     /** Notifies listeners about Cloud Profile Manager change. */
     void sigCloudProfileManagerChange();
+    void sigSwitchMachinePerformancePane(const QUuid &machineUid);
 
 public:

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

@@ -28 +28 @@
 #include "UIExtraDataManager.h"
 #include "UIChooser.h"
+#include "UICommon.h"
 #include "UIVirtualBoxManager.h"
 #include "UIVirtualBoxManagerWidget.h"
@@ -459 +460 @@
 }
 
+void UIVirtualBoxManagerWidget::sltSwitchMachinePerformancePane(const QUuid &machineUid)
+{
+    if (!m_pPaneToolsMachine)
+        return;
+    CVirtualBox comVBox = uiCommon().virtualBox();
+
+    CMachine comMachine = comVBox.FindMachine(machineUid.toString());
+    if (comMachine.isNull())
+        return;
+    m_pPaneToolsMachine->setActive(true);
+    m_pPaneToolsGlobal->setActive(false);
+    m_pPaneToolsMachine->setMachine(comMachine);
+    switchToMachineTool(UIToolType_Performance);
+}
+
 void UIVirtualBoxManagerWidget::prepare()
 {
@@ -556 +572 @@
                             connect(m_pPaneToolsGlobal, &UIToolPaneGlobal::sigCloudProfileManagerChange,
                                     this, &UIVirtualBoxManagerWidget::sigCloudProfileManagerChange);
+                            connect(m_pPaneToolsGlobal, &UIToolPaneGlobal::sigSwitchMachinePerformancePane,
+                                    this, &UIVirtualBoxManagerWidget::sltSwitchMachinePerformancePane);
 
                             /* Add into stack: */

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

@@ -248 +248 @@
         void sltHandleToolMenuRequested(UIToolClass enmClass, const QPoint &position);
 
-        /** Handles signal abour Tools-pane index change. */
+        /** Handles signal about Tools-pane index change. */
         void sltHandleToolsPaneIndexChange();
+
+        /** Handles signal requesting performance pane switch. */
+        void sltSwitchMachinePerformancePane(const QUuid &machineUid);
     /** @} */
 

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

@@ -560 +560 @@
         font.setPixelSize(iFontSize);
         --iFontSize;
-    }while(QFontMetrics(font).width(m_strGAWarning) >= m_lineChartRect.width());
+    }while(QFontMetrics(font).width(m_strGAWarning) >= 0.8 * m_lineChartRect.width());
     font.setBold(true);
     painter.setFont(font);

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp

@@ -184 +184 @@
     void setMinimumColumnWidths(const QMap<int, int>& widths);
     void updateColumVisibility();
+    int selectedItemIndex() const;
 
 protected:
@@ -248 +249 @@
     void setupPerformanceCollector();
 };
+
+Q_DECLARE_METATYPE(UIResourceMonitorItem);
 
 
@@ -289 +292 @@
     void setShouldUpdate(bool fShouldUpdate);
     const QMap<int, int> dataLengths() const;
+    QUuid itemUid(int iIndex);
 
 private slots:
@@ -667 +671 @@
 }
 
+int UIVMResourceMonitorTableView::selectedItemIndex() const
+{
+    UIResourceMonitorProxyModel *pModel = qobject_cast<UIResourceMonitorProxyModel*>(model());
+    if (!pModel)
+        return -1;
+
+    QItemSelectionModel *pSelectionModel =  selectionModel();
+    if (!pSelectionModel)
+        return -1;
+    QModelIndexList selectedItemIndices = pSelectionModel->selectedRows();
+    if (selectedItemIndices.isEmpty())
+        return -1;
+
+    /* just use the the 1st index: */
+    QModelIndex modelIndex = pModel->mapToSource(selectedItemIndices[0]);
+
+    if (!modelIndex.isValid())
+        return -1;
+    return modelIndex.row();
+}
+
 void UIVMResourceMonitorTableView::resizeEvent(QResizeEvent *pEvent)
 {
@@ -860 +885 @@
 {
     return m_columnDataMaxLength;
+}
+
+QUuid UIResourceMonitorModel::itemUid(int iIndex)
+{
+    if (iIndex >= m_itemList.size())
+        return QUuid();
+    return m_itemList[iIndex].m_VMuid;
 }
 
@@ -1198 +1230 @@
     , m_pColumnVisibilityToggleMenu(0)
     , m_pHostStatsWidget(0)
+    , m_pShowPerformanceMonitorAction(0)
     , m_fIsCurrentTool(true)
     , m_iSortIndicatorWidth(0)
@@ -1247 +1280 @@
     m_columnTitles[VMResourceMonitorColumn_DiskIOWriteTotal] = UIResourceMonitorWidget::tr("Disk Write Total");
     m_columnTitles[VMResourceMonitorColumn_VMExits] = UIResourceMonitorWidget::tr("VM Exits");
+    if (m_pShowPerformanceMonitorAction)
+        m_pShowPerformanceMonitorAction->setText(tr("Show Performance Monitor"));
     if (m_pModel)
         m_pModel->setColumnCaptions(m_columnTitles);
     computeMinimumColumnWidths();
-}
-
-void UIResourceMonitorWidget::resizeEvent(QResizeEvent *pEvent)
-{
-    QIWithRetranslateUI<QWidget>::resizeEvent(pEvent);
-}
-
-void UIResourceMonitorWidget::showEvent(QShowEvent *pEvent)
-{
-    QIWithRetranslateUI<QWidget>::showEvent(pEvent);
-}
-
-void UIResourceMonitorWidget::paintEvent(QPaintEvent *pEvent)
-{
-    QIWithRetranslateUI<QWidget>::paintEvent(pEvent);
 }
 
@@ -1282 +1302 @@
     prepareWidgets();
     loadSettings();
+    prepareActions();
     retranslateUi();
-    prepareActions();
     updateModelColumVisibilityCache();
 }
@@ -1318 +1338 @@
         m_pTableView->setModel(m_pProxyModel);
         m_pTableView->setItemDelegate(new UIVMResourceMonitorDelegate);
-        m_pTableView->setSelectionMode(QAbstractItemView::NoSelection);
+        m_pTableView->setSelectionMode(QAbstractItemView::SingleSelection);
+        m_pTableView->setSelectionBehavior(QAbstractItemView::SelectRows);
         m_pTableView->setShowGrid(false);
+        m_pTableView->setContextMenuPolicy(Qt::CustomContextMenu);
         m_pTableView->horizontalHeader()->setHighlightSections(false);
         m_pTableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
@@ -1329 +1351 @@
         m_pTableView->setSortingEnabled(true);
         m_pTableView->sortByColumn(0, Qt::AscendingOrder);
-        connect(m_pModel, &UIResourceMonitorModel::sigDataUpdate, this, &UIResourceMonitorWidget::sltHandleDataUpdate);
-        connect(m_pModel, &UIResourceMonitorModel::sigHostStatsUpdate, this, &UIResourceMonitorWidget::sltHandleHostStatsUpdate);
+        connect(m_pModel, &UIResourceMonitorModel::sigDataUpdate,
+                this, &UIResourceMonitorWidget::sltHandleDataUpdate);
+        connect(m_pModel, &UIResourceMonitorModel::sigHostStatsUpdate,
+                this, &UIResourceMonitorWidget::sltHandleHostStatsUpdate);
+        connect(m_pTableView, &UIVMResourceMonitorTableView::customContextMenuRequested,
+                this, &UIResourceMonitorWidget::sltHandleTableContextMenuRequest);
+
         updateModelColumVisibilityCache();
     }
@@ -1353 +1380 @@
         connect(pAction, &QAction::toggled, this, &UIResourceMonitorWidget::sltHandleColumnAction);
     }
-    return;
+    m_pShowPerformanceMonitorAction = new QAction(this);
+     connect(m_pShowPerformanceMonitorAction, &QAction::triggered, this, &UIResourceMonitorWidget::sltHandleShowPerformanceMonitor);
 }
 
@@ -1434 +1462 @@
 }
 
+void UIResourceMonitorWidget::sltHandleTableContextMenuRequest(const QPoint &pos)
+{
+    if (!m_pTableView)
+        return;
+
+    QMenu menu;
+    if (m_pShowPerformanceMonitorAction)
+        menu.addAction(m_pShowPerformanceMonitorAction);
+
+    menu.exec(m_pTableView->mapToGlobal(pos));
+}
+
+void UIResourceMonitorWidget::sltHandleShowPerformanceMonitor()
+{
+    if (!m_pTableView || !m_pModel)
+        return;
+    QUuid machineId = m_pModel->itemUid(m_pTableView->selectedItemIndex());
+    if (machineId.isNull())
+        return;
+    emit sigSwitchMachinePerformancePane(machineId);
+}
+
 void UIResourceMonitorWidget::setColumnVisible(int iColumnId, bool fVisible)
 {

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.h

@@ -49 +49 @@
     Q_OBJECT;
 
+signals:
+
+    void sigSwitchMachinePerformancePane(const QUuid &machineId);
+
 public:
 
@@ -69 +73 @@
       * @{ */
         virtual void retranslateUi() /* override */;
-        virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
-        virtual void showEvent(QShowEvent *pEvent) /* override */;
-        virtual void paintEvent(QPaintEvent *pEvent) /* override */;
     /** @} */
 
@@ -80 +81 @@
     void sltHandleColumnAction(bool fChecked);
     void sltHandleHostStatsUpdate(const UIVMResourceMonitorHostStats &stats);
+    void sltHandleTableContextMenuRequest(const QPoint &pos);
+    void sltHandleShowPerformanceMonitor();
 
 private:
@@ -119 +122 @@
         QMap<int, bool>                     m_columnVisible;
         UIVMResourceMonitorHostStatsWidget *m_pHostStatsWidget;
+        QAction                            *m_pShowPerformanceMonitorAction;
     /** @} */
     /** Indicates if this widget's host tool is current tool. */