Changeset 88242 in vbox for trunk

Timestamp:

Mar 22, 2021 12:20:10 PM (4 years ago)

Author:

vboxsync

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

143442

Message:

FE/Qt: bugref:9510. Renaming action names, classes etc.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/vmactivity/UIVMActivityMonitor.cpp (modified) (1 diff)
• globals/UIActionPool.cpp (modified) (7 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• globals/UIActionPoolManager.cpp (modified) (11 diffs)
• globals/UIActionPoolManager.h (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -1151 +1151 @@
 {
     QAction *pExportAction =
-        m_pActionPool->action(UIActionIndex_M_Performance_S_Export);
+        m_pActionPool->action(UIActionIndex_M_Activity_S_Export);
     if (pExportAction)
         connect(pExportAction, &QAction::triggered, this, &UIVMActivityMonitor::sltExportMetricsToFile);
 
     QAction *pToResourcesAction =
-        m_pActionPool->action(UIActionIndex_M_Performance_S_ToVMActivityOverview);
+        m_pActionPool->action(UIActionIndex_M_Activity_S_ToVMActivityOverview);
     if (pToResourcesAction)
         connect(pToResourcesAction, &QAction::triggered, this, &UIVMActivityMonitor::sigSwitchToResourcesPane);

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

@@ -2202 +2202 @@
 };
 
-/** Menu action extension, used as 'Performance' menu class. */
-class UIActionMenuSelectorPerformance : public UIActionMenu
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuSelectorPerformance(UIActionPool *pParent)
+/** Menu action extension, used as 'Activity' menu class. */
+class UIActionMenuSelectorActivity : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorActivity(UIActionPool *pParent)
         : UIActionMenu(pParent)
     {}
@@ -2225 +2225 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "&Performance"));
+        setName(QApplication::translate("UIActionPool", "&Activity"));
     }
 };
 
 /** Simple action extension, used as 'Perform Export' action class. */
-class UIActionMenuSelectorPerformancePerformExport : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuSelectorPerformancePerformExport(UIActionPool *pParent)
+class UIActionMenuSelectorActivityPerformExport : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorActivityPerformExport(UIActionPool *pParent)
         : UIActionSimple(pParent,
                          ":/performance_monitor_export_32px.png", ":/performance_monitor_export_16px.png",
@@ -2265 +2265 @@
 
 /** Simple action extension, used as 'To VM Activity Oveview' action class. */
-class UIActionMenuSelectorPerformanceToVMActivityOverview : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuSelectorPerformanceToVMActivityOverview(UIActionPool *pParent)
+class UIActionMenuSelectorActivityToVMActivityOverview : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorActivityToVMActivityOverview(UIActionPool *pParent)
         : UIActionSimple(pParent,
                          ":/resources_monitor_24px.png", ":/resource_monitor_16px.png",
@@ -2542 +2542 @@
 
     /* Create 'Performance Monitor' actions: */
-    m_pool[UIActionIndex_M_Performance] = new UIActionMenuSelectorPerformance(this);
-    m_pool[UIActionIndex_M_Performance_S_Export] = new UIActionMenuSelectorPerformancePerformExport(this);
-    m_pool[UIActionIndex_M_Performance_S_ToVMActivityOverview] = new UIActionMenuSelectorPerformanceToVMActivityOverview(this);
+    m_pool[UIActionIndex_M_Activity] = new UIActionMenuSelectorActivity(this);
+    m_pool[UIActionIndex_M_Activity_S_Export] = new UIActionMenuSelectorActivityPerformExport(this);
+    m_pool[UIActionIndex_M_Activity_S_ToVMActivityOverview] = new UIActionMenuSelectorActivityToVMActivityOverview(this);
 
     /* Create 'File Manager' actions: */
@@ -2589 +2589 @@
     m_menuUpdateHandlers[UIActionIndex_M_LogWindow].ptf = &UIActionPool::updateMenuLogViewerWindow;
     m_menuUpdateHandlers[UIActionIndex_M_Log].ptf = &UIActionPool::updateMenuLogViewer;
-    m_menuUpdateHandlers[UIActionIndex_M_Performance].ptf = &UIActionPool::updateMenuVMActivityMonitor;
+    m_menuUpdateHandlers[UIActionIndex_M_Activity].ptf = &UIActionPool::updateMenuVMActivityMonitor;
     m_menuUpdateHandlers[UIActionIndex_M_FileManager].ptf = &UIActionPool::updateMenuFileManager;
 
@@ -2968 +2968 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndex_M_Performance)->menu();
+    UIMenu *pMenu = action(UIActionIndex_M_Activity)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -2974 +2974 @@
 
     /* 'Export' action: */
-    pMenu->addAction(action(UIActionIndex_M_Performance_S_Export));
-    pMenu->addAction(action(UIActionIndex_M_Performance_S_ToVMActivityOverview));
+    pMenu->addAction(action(UIActionIndex_M_Activity_S_Export));
+    pMenu->addAction(action(UIActionIndex_M_Activity_S_ToVMActivityOverview));
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndex_M_Performance);
+    m_invalidations.remove(UIActionIndex_M_Activity);
 }
 

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

@@ -99 +99 @@
 
     /* 'Performance' menu actions: */
-    UIActionIndex_M_Performance,
-    UIActionIndex_M_Performance_S_Export,
-    UIActionIndex_M_Performance_S_ToVMActivityOverview,
+    UIActionIndex_M_Activity,
+    UIActionIndex_M_Activity_S_Export,
+    UIActionIndex_M_Activity_S_ToVMActivityOverview,
 
     /* File Manager actions: */

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

@@ -1872 +1872 @@
 };
 
-/** Simple action extension, used as 'Show Performance Monitor' action class. */
-class UIActionToggleManagerToolsMachineShowPerformance : public UIActionToggle
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionToggleManagerToolsMachineShowPerformance(UIActionPool *pParent)
+/** Simple action extension, used as 'Show VM Activity Monitor' action class. */
+class UIActionToggleManagerToolsMachineShowActivity : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionToggleManagerToolsMachineShowActivity(UIActionPool *pParent)
         : UIActionToggle(pParent)
     {
@@ -1900 +1900 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "&Performance"));
-        setStatusTip(QApplication::translate("UIActionPool", "Open the machine performance pane"));
+        setName(QApplication::translate("UIActionPool", "&Activity"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open the machine activity monitor pane"));
     }
 };
@@ -3541 +3541 @@
     m_pool[UIActionIndexMN_M_Group_M_Tools_T_Snapshots] = new UIActionToggleManagerToolsMachineShowSnapshots(this);
     m_pool[UIActionIndexMN_M_Group_M_Tools_T_Logs] = new UIActionToggleManagerToolsMachineShowLogs(this);
-    m_pool[UIActionIndexMN_M_Group_M_Tools_T_Performance] = new UIActionToggleManagerToolsMachineShowPerformance(this);
+    m_pool[UIActionIndexMN_M_Group_M_Tools_T_Activity] = new UIActionToggleManagerToolsMachineShowActivity(this);
     m_pool[UIActionIndexMN_M_Group_S_Discard] = new UIActionSimpleManagerCommonPerformDiscard(this);
     m_pool[UIActionIndexMN_M_Group_S_ShowLogDialog] = new UIActionSimpleManagerCommonShowMachineLogs(this);
@@ -3586 +3586 @@
     m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Snapshots] = new UIActionToggleManagerToolsMachineShowSnapshots(this);
     m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Logs] = new UIActionToggleManagerToolsMachineShowLogs(this);
-    m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Performance] = new UIActionToggleManagerToolsMachineShowPerformance(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Activity] = new UIActionToggleManagerToolsMachineShowActivity(this);
     m_pool[UIActionIndexMN_M_Machine_S_Discard] = new UIActionSimpleManagerCommonPerformDiscard(this);
     m_pool[UIActionIndexMN_M_Machine_S_ShowLogDialog] = new UIActionSimpleManagerCommonShowMachineLogs(this);
@@ -3668 +3668 @@
     m_groupPool[UIActionIndexMN_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Group_M_Tools_T_Snapshots));
     m_groupPool[UIActionIndexMN_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Group_M_Tools_T_Logs));
-    m_groupPool[UIActionIndexMN_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Group_M_Tools_T_Performance));
+    m_groupPool[UIActionIndexMN_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Group_M_Tools_T_Activity));
 
     /* 'Machine' action groups: */
@@ -3675 +3675 @@
     m_groupPool[UIActionIndexMN_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Machine_M_Tools_T_Snapshots));
     m_groupPool[UIActionIndexMN_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Machine_M_Tools_T_Logs));
-    m_groupPool[UIActionIndexMN_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Machine_M_Tools_T_Performance));
+    m_groupPool[UIActionIndexMN_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Machine_M_Tools_T_Activity));
 
     /* Prepare update-handlers for known menus: */
@@ -3798 +3798 @@
     updateMenuLogViewerWindow();
     updateMenuLogViewer();
-    /* 'Performance' menu: */
-    addMenu(m_mainMenus, action(UIActionIndex_M_Performance));
+    /* 'Activity' menu: */
+    addMenu(m_mainMenus, action(UIActionIndex_M_Activity));
     updateMenuVMActivityMonitor();
 
@@ -3851 +3851 @@
                     << action(UIActionIndexMN_M_Group_M_Tools_T_Snapshots)
                     << action(UIActionIndexMN_M_Group_M_Tools_T_Logs)
-                    << action(UIActionIndexMN_M_Group_M_Tools_T_Performance);
+                    << action(UIActionIndexMN_M_Group_M_Tools_T_Activity);
             break;
         }
@@ -3892 +3892 @@
                     << action(UIActionIndexMN_M_Machine_M_Tools_T_Snapshots)
                     << action(UIActionIndexMN_M_Machine_M_Tools_T_Logs)
-                    << action(UIActionIndexMN_M_Machine_M_Tools_T_Performance);
+                    << action(UIActionIndexMN_M_Machine_M_Tools_T_Activity);
             break;
         }
@@ -4206 +4206 @@
     pMenu->addAction(action(UIActionIndexMN_M_Group_M_Tools_T_Snapshots));
     pMenu->addAction(action(UIActionIndexMN_M_Group_M_Tools_T_Logs));
-    pMenu->addAction(action(UIActionIndexMN_M_Group_M_Tools_T_Performance));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_Tools_T_Activity));
 
     /* Mark menu as valid: */
@@ -4224 +4224 @@
     pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Tools_T_Snapshots));
     pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Tools_T_Logs));
-    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Tools_T_Performance));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Tools_T_Activity));
 
     /* Mark menu as valid: */

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

@@ -83 +83 @@
     UIActionIndexMN_M_Group_M_Tools_T_Snapshots,
     UIActionIndexMN_M_Group_M_Tools_T_Logs,
-    UIActionIndexMN_M_Group_M_Tools_T_Performance,
+    UIActionIndexMN_M_Group_M_Tools_T_Activity,
     UIActionIndexMN_M_Group_S_Discard,
     UIActionIndexMN_M_Group_S_ShowLogDialog,
@@ -127 +127 @@
     UIActionIndexMN_M_Machine_M_Tools_T_Snapshots,
     UIActionIndexMN_M_Machine_M_Tools_T_Logs,
-    UIActionIndexMN_M_Machine_M_Tools_T_Performance,
+    UIActionIndexMN_M_Machine_M_Tools_T_Activity,
     UIActionIndexMN_M_Machine_S_Discard,
     UIActionIndexMN_M_Machine_S_ShowLogDialog,

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

@@ -3125 +3125 @@
     const bool fPerformanceMenuShown = (fMachineMenuShown || fGroupMenuShown) &&
                                        m_pWidget->currentMachineTool() == UIToolType_VMActivity;
-    actionPool()->action(UIActionIndex_M_Performance)->setVisible(fPerformanceMenuShown);
+    actionPool()->action(UIActionIndex_M_Activity)->setVisible(fPerformanceMenuShown);
 
     /* Hide action shortcuts: */
@@ -3299 +3299 @@
             case UIToolType_VMActivity:
             {
-                actionPool()->action(UIActionIndexMN_M_Group_M_Tools_T_Performance)->setChecked(true);
-                actionPool()->action(UIActionIndexMN_M_Machine_M_Tools_T_Performance)->setChecked(true);
+                actionPool()->action(UIActionIndexMN_M_Group_M_Tools_T_Activity)->setChecked(true);
+                actionPool()->action(UIActionIndexMN_M_Machine_M_Tools_T_Activity)->setChecked(true);
                 break;
             }

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

@@ -922 +922 @@
                 case UIToolType_VMActivity:
                 {
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Performance_S_Export));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Performance_S_ToVMActivityOverview));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Activity_S_Export));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Activity_S_ToVMActivityOverview));
                     m_pToolBar->addSeparator();
                     m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));