Changeset 109237 in vbox

Timestamp:

May 13, 2025 10:31:53 AM (6 days ago)

Author:

vboxsync

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

168822

Message:

FE/Qt: bugref:10886. Renaming widgets, and related variables, classes etc. part 2.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/overview/UIVMActivityOverviewWidget.cpp (modified) (1 diff)
• converter/UIConverterBackendGlobal.cpp (modified) (3 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (2 diffs)
• globals/UIActionPool.cpp (modified) (9 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• globals/UIActionPoolManager.cpp (modified) (13 diffs)
• globals/UIActionPoolManager.h (modified) (2 diffs)
• manager/UIGlobalToolsWidget.cpp (modified) (3 diffs)
• manager/UIToolPane.cpp (modified) (10 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (4 diffs)
• manager/UIVirtualBoxWidget.cpp (modified) (2 diffs)
• manager/tools/UIToolsModel.cpp (modified) (3 diffs)
• runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp

@@ -1190 +1190 @@
     updateColumnsMenu();
     m_pVMActivityMonitorAction =
-        m_pActionPool->action(UIActionIndexMN_M_ResourceDashboard_S_SwitchToMachineActivity);
+        m_pActionPool->action(UIActionIndexMN_M_ResourceDashboard_S_SwitchToResourceUtilization);
 
     if (m_pVMActivityMonitorAction)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -1700 +1700 @@
         case UIToolType_Cloud:        strResult = "Cloud"; break;
         case UIToolType_CloudConsole: strResult = "CloudConsole"; break;
-        case UIToolType_Activities:   strResult = "Activities"; break;
+        case UIToolType_ResourceDashboard:   strResult = "Activities"; break;
         case UIToolType_Details:      strResult = "Details"; break;
         case UIToolType_Snapshots:    strResult = "Snapshots"; break;
         case UIToolType_Logs:         strResult = "Logs"; break;
-        case UIToolType_VMActivity:   strResult = "Activity"; break;
+        case UIToolType_ResourceUtilization:   strResult = "Activity"; break;
         case UIToolType_FileManager:  strResult = "FileManager"; break;
         default:
@@ -1733 +1733 @@
         return UIToolType_CloudConsole;
     if (strToolType.compare("Activities", Qt::CaseInsensitive) == 0)
-        return UIToolType_Activities;
+        return UIToolType_ResourceDashboard;
     if (strToolType.compare("Details", Qt::CaseInsensitive) == 0)
         return UIToolType_Details;
@@ -1741 +1741 @@
         return UIToolType_Logs;
     if (strToolType.compare("Activity", Qt::CaseInsensitive) == 0)
-        return UIToolType_VMActivity;
+        return UIToolType_ResourceUtilization;
     if (strToolType.compare("FileManager", Qt::CaseInsensitive) == 0)
         return UIToolType_FileManager;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -297 +297 @@
         case UIToolType_Cloud:
         case UIToolType_CloudConsole:
-        case UIToolType_Activities:
+        case UIToolType_ResourceDashboard:
             return UIToolClass_Global;
         case UIToolType_Error:
@@ -303 +303 @@
         case UIToolType_Snapshots:
         case UIToolType_Logs:
-        case UIToolType_VMActivity:
+        case UIToolType_ResourceUtilization:
         case UIToolType_FileManager:
             return UIToolClass_Machine;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -975 +975 @@
     UIToolType_Cloud,
     UIToolType_CloudConsole,
-    UIToolType_Activities,
+    UIToolType_ResourceDashboard,
     /* Machine types: */
     UIToolType_Error,
@@ -981 +981 @@
     UIToolType_Snapshots,
     UIToolType_Logs,
-    UIToolType_VMActivity,
+    UIToolType_ResourceUtilization,
     UIToolType_FileManager
 };

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

@@ -2999 +2999 @@
 };
 
-/** Menu action extension, used as 'Activity' menu class. */
+/** Menu action extension, used as 'Resource Utilization' menu class. */
 class UIActionMenuSelectorResourceUtilization : public UIActionMenu
 {
@@ -3016 +3016 @@
     virtual void retranslateUi() RT_OVERRIDE
     {
-        setName(QApplication::translate("UIActionPool", "&Activity"));
+        setName(QApplication::translate("UIActionPool", "&Resource"));
     }
 };
@@ -3083 +3083 @@
     {
         setName(QApplication::translate("UIActionPool", "&Resource Dashboard..."));
-        setShortcutScope(QApplication::translate("UIActionPool", "Activity Monitor"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Resource Utilization"));
         setStatusTip(QApplication::translate("UIActionPool", "Navigate to the resource dashboard"));
         setToolTip(  QApplication::translate("UIActionPool", "Navigate to Resource Dashboard")
@@ -3091 +3091 @@
 
 /** Simple action extension, used as 'Toggle Pane Preferences' action class. */
-class UIActionMenuActivityPreferences : public UIActionToggle
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuActivityPreferences(UIActionPool *pParent)
+class UIActionMenuResourceUtilityPreferences : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuResourceUtilityPreferences(UIActionPool *pParent)
         : UIActionToggle(pParent)
     {
@@ -3111 +3111 @@
     virtual QString shortcutExtraDataID() const RT_OVERRIDE
     {
-        return QString("ToggleActivityMonitorPreferences");
+        return QString("ToggleResourceUtilityMonitorPreferences");
     }
 
@@ -3124 +3124 @@
     {
         setName(QApplication::translate("UIActionPool", "&Preferences"));
-        setShortcutScope(QApplication::translate("UIActionPool", "Activity Monitor"));
-        setStatusTip(QApplication::translate("UIActionPool", "Open pane with activity monitor preferences"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Resource Utility"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open pane with resource utility preferences"));
         setToolTip(  QApplication::translate("UIActionPool", "Open Preferences Pane")
                    + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
@@ -3378 +3378 @@
     m_pool[UIActionIndex_M_ResourceUtilization_S_Export] = new UIActionMenuSelectorResourceUtilizationPerformExport(this);
     m_pool[UIActionIndex_M_ResourceUtilization_S_ToResourceDashboard] = new UIActionMenuSelectorResourceUtilizationToResourceDashboard(this);
-    m_pool[UIActionIndex_M_ResourceUtilization_T_Preferences] = new UIActionMenuActivityPreferences(this);
+    m_pool[UIActionIndex_M_ResourceUtilization_T_Preferences] = new UIActionMenuResourceUtilityPreferences(this);
 
     /* Create 'File Manager' actions: */
@@ -3460 +3460 @@
     m_menuUpdateHandlers[UIActionIndex_M_LogWindow].ptf = &UIActionPool::updateMenuLogViewerWindow;
     m_menuUpdateHandlers[UIActionIndex_M_Log].ptf = &UIActionPool::updateMenuLogViewer;
-    m_menuUpdateHandlers[UIActionIndex_M_ResourceUtilization].ptf = &UIActionPool::updateMenuVMActivityMonitor;
+    m_menuUpdateHandlers[UIActionIndex_M_ResourceUtilization].ptf = &UIActionPool::updateMenuResourceUtilization;
     m_menuUpdateHandlers[UIActionIndex_M_FileManager].ptf = &UIActionPool::updateMenuFileManager;
 
@@ -3851 +3851 @@
 }
 
-void UIActionPool::updateMenuVMActivityMonitor()
+void UIActionPool::updateMenuResourceUtilization()
 {
     /* Get corresponding menu: */

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

@@ -628 +628 @@
     /** Updates 'Log Viewer' @a pMenu. */
     void updateMenuLogViewerWrapper(UIMenu *pMenu);
-    /** Updates 'Performance Monitor' menu. */
-    void updateMenuVMActivityMonitor();
+    /** Updates 'Resource Utilization' menu. */
+    void updateMenuResourceUtilization();
     /** Updates 'File Manager' menu. */
     void updateMenuFileManager();

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

@@ -404 +404 @@
         : UIActionToggle(pParent)
     {
-        setProperty("UIToolType", QVariant::fromValue(UIToolType_Activities));
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_ResourceDashboard));
         /// @todo use icons with check-boxes
         setIcon(UIIconPool::iconSetFull(":/resources_monitor_24px.png", ":/resources_monitor_16px.png",
@@ -1905 +1905 @@
         : UIActionToggle(pParent)
     {
-        setProperty("UIToolType", QVariant::fromValue(UIToolType_VMActivity));
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_ResourceUtilization));
         /// @todo use icons with check-boxes
         setIcon(UIIconPool::iconSetFull(":/performance_monitor_32px.png", ":/performance_monitor_16px.png",
@@ -3486 +3486 @@
     virtual void retranslateUi() RT_OVERRIDE
     {
-        setName(QApplication::translate("UIActionPool", "&Resources"));
+        setName(QApplication::translate("UIActionPool", "&Resource"));
     }
 };
@@ -3519 +3519 @@
 };
 
-/** Simple action extension, used as 'Switch to Machine Activity' action class. */
-class UIActionMenuManagerResourceDashboardSwitchToMachineActivity : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuManagerResourceDashboardSwitchToMachineActivity(UIActionPool *pParent)
+/** Simple action extension, used as 'Switch to Resource Utilization' action class. */
+class UIActionMenuManagerResourceDashboardSwitchToResourceUtilization : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuManagerResourceDashboardSwitchToResourceUtilization(UIActionPool *pParent)
         : UIActionSimple(pParent,
                          ":/resources_monitor_jump_to_vm_32px.png",          ":/resources_monitor_jump_to_vm_16px.png",
@@ -3540 +3540 @@
     virtual QString shortcutExtraDataID() const RT_OVERRIDE
     {
-        return QString("ResourceDashboardSwitchToMachineActivity");
+        return QString("ResourceDashboardSwitchToResourceUtilization");
     }
 
@@ -3548 +3548 @@
         setName(QApplication::translate("UIActionPool", "Resource Utilization"));
         setShortcutScope(QApplication::translate("UIActionPool", "Resource Dashboard"));
-        setStatusTip(QApplication::translate("UIActionPool", "View activity for selected virtual machine"));
-        setToolTip(  QApplication::translate("UIActionPool", "View activity for selected virtual machine")
+        setStatusTip(QApplication::translate("UIActionPool", "View resource utilization of the selected virtual machine"));
+        setToolTip(  QApplication::translate("UIActionPool", "View resource utilization of the selected virtual machine")
                    + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
     }
@@ -3616 +3616 @@
     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_Activity] = new UIActionToggleManagerToolsMachineShowResourceUtilization(this);
+    m_pool[UIActionIndexMN_M_Group_M_Tools_T_ResourceUtilization] = new UIActionToggleManagerToolsMachineShowResourceUtilization(this);
     m_pool[UIActionIndexMN_M_Group_M_Tools_T_FileManager] = new UIActionToggleManagerToolsMachineShowFileManager(this);
     m_pool[UIActionIndexMN_M_Group_S_Discard] = new UIActionSimpleManagerCommonPerformDiscard(this);
@@ -3730 +3730 @@
     m_pool[UIActionIndexMN_M_ResourceDashboard] = new UIActionMenuResourceDashboard(this);
     m_pool[UIActionIndexMN_M_ResourceDashboard_M_Columns] = new UIActionMenuManagerResourceDashboardColumns(this);
-    m_pool[UIActionIndexMN_M_ResourceDashboard_S_SwitchToMachineActivity] = new UIActionMenuManagerResourceDashboardSwitchToMachineActivity(this);
+    m_pool[UIActionIndexMN_M_ResourceDashboard_S_SwitchToResourceUtilization] = new UIActionMenuManagerResourceDashboardSwitchToResourceUtilization(this);
 
     /* 'File' action groups: */
@@ -3747 +3747 @@
     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_Activity));
+    m_groupPool[UIActionIndexMN_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Group_M_Tools_T_ResourceUtilization));
     m_groupPool[UIActionIndexMN_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Group_M_Tools_T_FileManager));
 
@@ -3885 +3885 @@
     /* 'Resouce Utilization' menu: */
     addMenu(m_mainMenus, action(UIActionIndex_M_ResourceUtilization));
-    updateMenuVMActivityMonitor();
+    updateMenuResourceUtilization();
 
     /* 'File Manager' menu*/
@@ -3940 +3940 @@
                     << action(UIActionIndexMN_M_Group_M_Tools_T_Snapshots)
                     << action(UIActionIndexMN_M_Group_M_Tools_T_Logs)
-                    << action(UIActionIndexMN_M_Group_M_Tools_T_Activity);
+                    << action(UIActionIndexMN_M_Group_M_Tools_T_ResourceUtilization);
             break;
         }
@@ -4307 +4307 @@
     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_Activity));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_Tools_T_ResourceUtilization));
     if (fExpertMode)
         pMenu->addAction(action(UIActionIndexMN_M_Group_M_Tools_T_FileManager));
@@ -4618 +4618 @@
     pMenu->clear();
     addAction(pMenu, action(UIActionIndexMN_M_ResourceDashboard_M_Columns));
-    addAction(pMenu, action(UIActionIndexMN_M_ResourceDashboard_S_SwitchToMachineActivity));
+    addAction(pMenu, action(UIActionIndexMN_M_ResourceDashboard_S_SwitchToResourceUtilization));
 }
 

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

@@ -95 +95 @@
     UIActionIndexMN_M_Group_M_Tools_T_Snapshots,
     UIActionIndexMN_M_Group_M_Tools_T_Logs,
-    UIActionIndexMN_M_Group_M_Tools_T_Activity,
+    UIActionIndexMN_M_Group_M_Tools_T_ResourceUtilization,
     UIActionIndexMN_M_Group_M_Tools_T_FileManager,
     UIActionIndexMN_M_Group_S_Discard,
@@ -209 +209 @@
     UIActionIndexMN_M_ResourceDashboard,
     UIActionIndexMN_M_ResourceDashboard_M_Columns,
-    UIActionIndexMN_M_ResourceDashboard_S_SwitchToMachineActivity,
+    UIActionIndexMN_M_ResourceDashboard_S_SwitchToResourceUtilization,
 
     /* Maximum index: */

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

@@ -173 +173 @@
     /* If Global Activities tool is currently chosen: */
     AssertPtrReturnVoid(toolPane());
-    if (toolPane()->currentTool() == UIToolType_Activities)
+    if (toolPane()->currentTool() == UIToolType_ResourceDashboard)
     {
         /* Propagate a set of cloud machine items to Management tool-pane: */
@@ -222 +222 @@
         /* Special handling for Activities Global tool,
          * start unconditionally updating all cloud VMs: */
-        if (enmType == UIToolType_Activities)
+        if (enmType == UIToolType_ResourceDashboard)
         {
             chooser()->setKeepCloudNodesUpdated(true);
@@ -239 +239 @@
     chooser()->setCurrentMachine(uMachineId);
     setMenuToolType(UIToolType_Machines);
-    machineToolsWidget()->setMenuToolType(UIToolType_VMActivity);
+    machineToolsWidget()->setMenuToolType(UIToolType_ResourceUtilization);
 }
 
 void UIGlobalToolsWidget::sltSwitchToActivitiesTool()
 {
-    setMenuToolType(UIToolType_Activities);
+    setMenuToolType(UIToolType_ResourceDashboard);
 }
 

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

@@ -241 +241 @@
                 break;
             }
-            case UIToolType_Activities:
+            case UIToolType_ResourceDashboard:
             {
                 /* Create Resource Dashboard: */
@@ -248 +248 @@
                 {
                     /* Configure pane: */
-                    m_pPaneActivities->setProperty("ToolType", QVariant::fromValue(UIToolType_Activities));
+                    m_pPaneActivities->setProperty("ToolType", QVariant::fromValue(UIToolType_ResourceDashboard));
                     connect(m_pPaneActivities, &UIVMActivityOverviewWidget::sigSwitchToMachineActivityPane,
                             this, &UIToolPane::sigSwitchToMachineActivityPane);
@@ -345 +345 @@
                 break;
             }
-            case UIToolType_VMActivity:
+            case UIToolType_ResourceUtilization:
             {
                 /* Create Activity pane: */
@@ -353 +353 @@
                 {
                     /* Configure pane: */
-                    m_pPaneVMActivityMonitor->setProperty("ToolType", QVariant::fromValue(UIToolType_VMActivity));
+                    m_pPaneVMActivityMonitor->setProperty("ToolType", QVariant::fromValue(UIToolType_ResourceUtilization));
                     m_pPaneVMActivityMonitor->setSelectedVMListItems(m_items);
                     connect(m_pPaneVMActivityMonitor, &UIVMActivityToolWidget::sigSwitchToActivityOverviewPane,
@@ -423 +423 @@
             case UIToolType_Network:     m_pPaneNetwork = 0; break;
             case UIToolType_Cloud:       m_pPaneCloud = 0; break;
-            case UIToolType_Activities:  m_pPaneActivities = 0; break;
+            case UIToolType_ResourceDashboard:  m_pPaneActivities = 0; break;
             case UIToolType_Error:       m_pPaneError = 0; break;
             case UIToolType_Details:     m_pPaneDetails = 0; break;
             case UIToolType_Snapshots:   m_pPaneSnapshots = 0; break;
             case UIToolType_Logs:        m_pPaneLogViewer = 0; break;
-            case UIToolType_VMActivity:  m_pPaneVMActivityMonitor = 0; break;
+            case UIToolType_ResourceUtilization:  m_pPaneVMActivityMonitor = 0; break;
             case UIToolType_FileManager: m_pPaneFileManager = 0; break;
             default: break;
@@ -465 +465 @@
             pCurrentToolWidget = m_pPaneCloud;
             break;
-        case UIToolType_Activities:
+        case UIToolType_ResourceDashboard:
             pCurrentToolWidget = m_pPaneActivities;
             break;
@@ -480 +480 @@
             pCurrentToolWidget = m_pPaneLogViewer;
             break;
-        case UIToolType_VMActivity:
+        case UIToolType_ResourceUtilization:
             pCurrentToolWidget = m_pPaneVMActivityMonitor;
             break;
@@ -528 +528 @@
     }
     /* Update performance monitor pane if it is open: */
-    if (isToolOpened(UIToolType_VMActivity))
+    if (isToolOpened(UIToolType_ResourceUtilization))
     {
         AssertPtrReturnVoid(m_pPaneVMActivityMonitor);
@@ -558 +558 @@
 
     /* Update activity overview pane if it is open: */
-    if (isToolOpened(UIToolType_Activities))
+    if (isToolOpened(UIToolType_ResourceDashboard))
     {
         AssertPtrReturnVoid(m_pPaneActivities);
@@ -619 +619 @@
     /* Determine whether resource monitor is currently active tool: */
     if (m_pPaneActivities)
-        m_pPaneActivities->setIsCurrentTool(m_fActive && currentTool() == UIToolType_Activities);
-}
+        m_pPaneActivities->setIsCurrentTool(m_fActive && currentTool() == UIToolType_ResourceDashboard);
+}

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

@@ -3569 +3569 @@
     actionPool()->action(UIActionIndexMN_M_Cloud)->setVisible(fCloudMenuShown);
     /* Determine whether Activities menu should be visible: */
-    const bool fResourcesMenuShown = fGlobalToolShown && m_pWidget->currentGlobalTool() == UIToolType_Activities;
+    const bool fResourcesMenuShown = fGlobalToolShown && m_pWidget->currentGlobalTool() == UIToolType_ResourceDashboard;
     actionPool()->action(UIActionIndexMN_M_ResourceDashboard)->setVisible(fResourcesMenuShown);
 
@@ -3582 +3582 @@
     /* Determine whether Performance menu should be visible: */
     const bool fPerformanceMenuShown = (fMachineMenuShown || fGroupMenuShown) &&
-                                       m_pWidget->currentMachineTool() == UIToolType_VMActivity;
+                                       m_pWidget->currentMachineTool() == UIToolType_ResourceUtilization;
     actionPool()->action(UIActionIndex_M_ResourceUtilization)->setVisible(fPerformanceMenuShown);
     /* Determine whether File Manager menu item should be visible: */
@@ -3755 +3755 @@
                 break;
             }
-            case UIToolType_Activities:
+            case UIToolType_ResourceDashboard:
             {
                 actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_ResourceDashboard)->setChecked(true);
@@ -3784 +3784 @@
                 break;
             }
-            case UIToolType_VMActivity:
+            case UIToolType_ResourceUtilization:
             {
-                actionPool()->action(UIActionIndexMN_M_Group_M_Tools_T_Activity)->setChecked(true);
+                actionPool()->action(UIActionIndexMN_M_Group_M_Tools_T_ResourceUtilization)->setChecked(true);
                 actionPool()->action(UIActionIndexMN_M_Machine_M_Tools_T_ResourceUtilization)->setChecked(true);
                 break;

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

@@ -591 +591 @@
             break;
         }
-        case UIToolType_VMActivity:
+        case UIToolType_ResourceUtilization:
         {
             m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_ResourceUtilization_S_Export));
@@ -673 +673 @@
             break;
         }
-        case UIToolType_Activities:
+        case UIToolType_ResourceDashboard:
         {
             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_ResourceDashboard_M_Columns));
-            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_ResourceDashboard_S_SwitchToMachineActivity));
+            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_ResourceDashboard_S_SwitchToResourceUtilization));
             QToolButton *pButton =
                 qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_ResourceDashboard_M_Columns)));

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -486 +486 @@
             case UIToolType_Network:     pItem->setName(tr("Network")); break;
             case UIToolType_Cloud:       pItem->setName(tr("Cloud")); break;
-            case UIToolType_Activities:  pItem->setName(tr("Resource Dashboard")); break;
+            case UIToolType_ResourceDashboard:  pItem->setName(tr("Resource Dashboard")); break;
             // Machine
             case UIToolType_Details:     pItem->setName(tr("Details")); break;
             case UIToolType_Snapshots:   pItem->setName(tr("Snapshots")); break;
             case UIToolType_Logs:        pItem->setName(tr("Logs")); break;
-            case UIToolType_VMActivity:  pItem->setName(tr("Resource Utilization")); break;
+            case UIToolType_ResourceUtilization:  pItem->setName(tr("Resource Utilization")); break;
             case UIToolType_FileManager: pItem->setName(tr("File Manager")); break;
             default: break;
@@ -567 +567 @@
             m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/resources_monitor_24px.png",
                                                                     ":/resources_monitor_disabled_24px.png"),
-                                       UIToolType_Activities);
+                                       UIToolType_ResourceDashboard);
 
             /* Toggle: */
@@ -596 +596 @@
             m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/performance_monitor_24px.png",
                                                                     ":/performance_monitor_disabled_24px.png"),
-                                       UIToolType_VMActivity);
+                                       UIToolType_ResourceUtilization);
 
             /* File Manager: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -78 +78 @@
     m_pTabWidget->setTabText(Tabs_ConfigurationDetails, tr("Configuration &Details"));
     m_pTabWidget->setTabText(Tabs_RuntimeInformation, tr("&Runtime Information"));
-    m_pTabWidget->setTabText(Tabs_ActivityMonitor, tr("VM &Activity"));
+    m_pTabWidget->setTabText(Tabs_ActivityMonitor, tr("Resource &Utilization"));
     m_pTabWidget->setTabText(3, tr("&Guest Control"));