Changeset 85515 in vbox for trunk

Timestamp:

Jul 29, 2020 10:46:40 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686, bugref:9510. Making sure that columns menu of the Resouces widget is retranslated

Location:

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource

Files:

• UIResourceMonitor.cpp (modified) (3 diffs)
• UIResourceMonitor.h (modified) (1 diff)

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

@@ -1280 +1280 @@
     m_columnTitles[VMResourceMonitorColumn_DiskIOWriteTotal] = UIResourceMonitorWidget::tr("Disk Write Total");
     m_columnTitles[VMResourceMonitorColumn_VMExits] = UIResourceMonitorWidget::tr("VM Exits");
+
+    updateColumnsMenu();
+
     if (m_pShowPerformanceMonitorAction)
         m_pShowPerformanceMonitorAction->setText(tr("Show Performance Monitor"));
     if (m_pModel)
         m_pModel->setColumnCaptions(m_columnTitles);
+
+
     computeMinimumColumnWidths();
 }
@@ -1362 +1367 @@
 }
 
-void UIResourceMonitorWidget::prepareActions()
-{
-    if (!m_pActionPool->action(UIActionIndexST_M_VMResourceMonitor_M_Columns))
-        return;
+void UIResourceMonitorWidget::updateColumnsMenu()
+{
     UIMenu *pMenu = m_pActionPool->action(UIActionIndexST_M_VMResourceMonitor_M_Columns)->menu();
     if (!pMenu)
         return;
-
+    pMenu->clear();
     for (int i = 0; i < VMResourceMonitorColumn_Max; ++i)
     {
@@ -1380 +1383 @@
         connect(pAction, &QAction::toggled, this, &UIResourceMonitorWidget::sltHandleColumnAction);
     }
+}
+
+void UIResourceMonitorWidget::prepareActions()
+{
+    updateColumnsMenu();
     m_pShowPerformanceMonitorAction = new QAction(this);
-     connect(m_pShowPerformanceMonitorAction, &QAction::triggered, this, &UIResourceMonitorWidget::sltHandleShowPerformanceMonitor);
+    connect(m_pShowPerformanceMonitorAction, &QAction::triggered, this, &UIResourceMonitorWidget::sltHandleShowPerformanceMonitor);
 }
 

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

@@ -98 +98 @@
         void prepareToolBar();
         void prepareActions();
+        void updateColumnsMenu();
         void loadSettings();
         void loadHiddenColumnList();