Changeset 85548 in vbox for trunk

Timestamp:

Jul 30, 2020 9:36:35 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686, bugref:9510. Some fixes

File:

• trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp (modified) (4 diffs)

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

@@ -1302 +1302 @@
     updateColumnsMenu();
 
-    if (m_pShowPerformanceMonitorAction)
-        m_pShowPerformanceMonitorAction->setText(tr("Show Performance Monitor"));
     if (m_pModel)
         m_pModel->setColumnCaptions(m_columnTitles);
@@ -1313 +1311 @@
 void UIResourceMonitorWidget::showEvent(QShowEvent *pEvent)
 {
-    QAction *pSwitchAction = m_pActionPool->action(UIActionIndexST_M_VMResourceMonitor_S_SwitchToMachinePerformance);
-    if (pSwitchAction && m_pTableView)
-        pSwitchAction->setEnabled(m_pTableView->hasSelection());
+    if (m_pShowPerformanceMonitorAction && m_pTableView)
+        m_pShowPerformanceMonitorAction->setEnabled(m_pTableView->hasSelection());
 
     QIWithRetranslateUI<QWidget>::showEvent(pEvent);
@@ -1417 +1414 @@
 {
     updateColumnsMenu();
-    m_pShowPerformanceMonitorAction = new QAction(this);
-    connect(m_pShowPerformanceMonitorAction, &QAction::triggered, this, &UIResourceMonitorWidget::sltHandleShowPerformanceMonitor);
-    QAction *pSwitchAction = m_pActionPool->action(UIActionIndexST_M_VMResourceMonitor_S_SwitchToMachinePerformance);
-    if (pSwitchAction)
-        connect(pSwitchAction, &QAction::triggered, this, &UIResourceMonitorWidget::sltHandleShowPerformanceMonitor);
+    m_pShowPerformanceMonitorAction =
+        m_pActionPool->action(UIActionIndexST_M_VMResourceMonitor_S_SwitchToMachinePerformance);
+
+    if (m_pShowPerformanceMonitorAction)
+        connect(m_pShowPerformanceMonitorAction, &QAction::triggered, this, &UIResourceMonitorWidget::sltHandleShowPerformanceMonitor);
 }
 
@@ -1517 +1514 @@
 {
     Q_UNUSED(deselected);
-    QAction *pSwitchAction = m_pActionPool->action(UIActionIndexST_M_VMResourceMonitor_S_SwitchToMachinePerformance);
-    if (pSwitchAction)
-        pSwitchAction->setEnabled(!selected.isEmpty());
+    if (m_pShowPerformanceMonitorAction)
+        m_pShowPerformanceMonitorAction->setEnabled(!selected.isEmpty());
 }