Changeset 88089 in vbox

Timestamp:

Mar 11, 2021 1:40:14 PM (4 years ago)

Author:

vboxsync

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

143231

Message:

FE/Qt: bugref:9510. Even more renaming

Location:

trunk

Files:

• doc/manual/en_US/user_Introduction.xml (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp (modified) (6 diffs)
• src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.cpp (modified) (4 diffs)
• src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/monitor/overview/UIVMActivityOverviewWidget.cpp (modified) (2 diffs)

trunk/doc/manual/en_US/user_Introduction.xml

@@ -4814 +4814 @@
       </para>
     </sect2>
-    <sect2 id="resource-monitor">
+    <sect2 id="vm-activity-overview-widget">
 
       <title>Resource Monitor</title>
@@ -4831 +4831 @@
         in the context menu.
       </para>
-      <figure id="fig-resource-monitor">
+      <figure id="fig-vm-activity-overview-widget">
         <title>Resource Monitor</title>
         <mediaobject>

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

@@ -2626 +2626 @@
         default:
             {
-                AssertMsgFailed(("No text for VM Resource Monitor Column=%d", enmVMActivityOverviewColumn));
+                AssertMsgFailed(("No text for VM Activity Overview Widget Column=%d", enmVMActivityOverviewColumn));
                 break;
             }

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

@@ -243 +243 @@
 const char *UIExtraDataDefs::GUI_HelpBrowserBookmarks = "GUI/HelpBrowserBookmarks";
 
-/* VM Resource Monitor: */
+/* VM Activity Overview Widget: */
 const char *UIExtraDataDefs::GUI_VMResourceManager_HiddenColumns = "GUI/VMResourceManagerHiddenColumns";
 

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

@@ -443 +443 @@
     /** @} */
 
-    /** @name Manager UI: VM Resource Monitor Related stuff
+    /** @name Manager UI: VM Activity Overview Related stuff
       * @{ */
         SHARED_LIBRARY_STUFF extern const char *GUI_VMResourceManager_HiddenColumns;

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

@@ -796 +796 @@
     /** @} */
 
-    /** @name Manager UI: VM Resource Monitor
+    /** @name Manager UI: VM Activity Overview Widget
       * @{ */
         void setVMActivityOverviewHiddenColumnList(const QStringList &hiddenColumnList);

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

@@ -354 +354 @@
 };
 
-/** Simple action extension, used as 'Show VM Resource Monitor' action class. */
+/** Simple action extension, used as 'Show VM Activity Overview Widget' action class. */
 class UIActionToggleManagerToolsGlobalShowVMActivityOverview : public UIActionToggle
 {
@@ -382 +382 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "&VM Resource Monitor"));
-        setStatusTip(QApplication::translate("UIActionPool", "Open the VM Resource Monitor"));
+        setName(QApplication::translate("UIActionPool", "&VM Activity Overview Widget"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open the VM Activity Overview Widget"));
     }
 };
@@ -3439 +3439 @@
     {
         setName(QApplication::translate("UIActionPool", "Columns"));
-        setShortcutScope(QApplication::translate("UIActionPool", "Resource Monitor"));
+        setShortcutScope(QApplication::translate("UIActionPool", "VM Activity Overview Widget"));
         setStatusTip(QApplication::translate("UIActionPool", "Show/Hide Columns"));
         setToolTip(  QApplication::translate("UIActionPool", "Show/Hide Columns")
@@ -3474 +3474 @@
     {
         setName(QApplication::translate("UIActionPool", "VM Activity"));
-        setShortcutScope(QApplication::translate("UIActionPool", "Resource Monitor"));
+        setShortcutScope(QApplication::translate("UIActionPool", "VM Activity Overview Widget"));
         setStatusTip(QApplication::translate("UIActionPool", "Switch to selected virtual machine's activity monitor pane"));
         setToolTip(  QApplication::translate("UIActionPool", "Switch to selected virtual machine's activity monitor pane")
@@ -3649 +3649 @@
     m_pool[UIActionIndexMN_M_CloudConsole_T_Details] = new UIActionMenuManagerCloudConsoleToggleProperties(this);
 
-    /* VM resource Monitor actions: */
+    /* VM Activity Overview Widget actions: */
     m_pool[UIActionIndexMN_M_VMActivityOverview] = new UIActionMenuVMActivityOverview(this);
     m_pool[UIActionIndexMN_M_VMActivityOverview_M_Columns] = new UIActionMenuManagerVMActivityOverviewColumns(this);
@@ -3787 +3787 @@
     updateMenuCloudWindow();
     updateMenuCloud();
-    /* 'VM Resource Monitor' menu: */
+    /* 'VM Activity Overview Widget' menu: */
     addMenu(m_mainMenus, action(UIActionIndexMN_M_VMActivityOverview));
     updateMenuVMActivityOverview();

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

@@ -190 +190 @@
     UIActionIndexMN_M_CloudConsole_T_Details,
 
-    /* VM Resource Monitor actions: */
+    /* VM VM Activity Overview Widget actions: */
     UIActionIndexMN_M_VMActivityOverview,
     UIActionIndexMN_M_VMActivityOverview_M_Columns,
@@ -298 +298 @@
     void updateMenuCloudConsoleWrapper(UIMenu *pMenu);
 
-    /** Updates 'VM Resource Monitor' menu. */
+    /** Updates 'VM VM Activity Overview' menu. */
     void updateMenuVMActivityOverview();
-    /** Updates 'VM Resource Monitor' @a pMenu. */
+    /** Updates 'VM VM Activity Overview' @a pMenu. */
     void updateMenuVMActivityOverviewWrapper(UIMenu *pMenu);
 

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

@@ -47 +47 @@
     , m_pPaneNetwork(0)
     , m_pPaneCloud(0)
-    , m_pPaneResourceMonitor(0)
+    , m_pPaneVMActivityOverview(0)
     , m_fActive(false)
 {
@@ -206 +206 @@
             {
                 /* Create VM Resource Monitor: */
-                m_pPaneResourceMonitor = new UIVMActivityOverviewWidget(EmbedTo_Stack, m_pActionPool, false /* show toolbar */);
-                AssertPtrReturnVoid(m_pPaneResourceMonitor);
-                {
-#ifndef VBOX_WS_MAC
-                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
-                    m_pPaneResourceMonitor->setContentsMargins(iMargin, 0, iMargin, 0);
-#endif
-
-                    /* Configure pane: */
-                    m_pPaneResourceMonitor->setProperty("ToolType", QVariant::fromValue(UIToolType_VMActivityOverview));
-                    connect(m_pPaneResourceMonitor, &UIVMActivityOverviewWidget::sigSwitchToMachinePerformancePane,
+                m_pPaneVMActivityOverview = new UIVMActivityOverviewWidget(EmbedTo_Stack, m_pActionPool, false /* show toolbar */);
+                AssertPtrReturnVoid(m_pPaneVMActivityOverview);
+                {
+#ifndef VBOX_WS_MAC
+                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
+                    m_pPaneVMActivityOverview->setContentsMargins(iMargin, 0, iMargin, 0);
+#endif
+
+                    /* Configure pane: */
+                    m_pPaneVMActivityOverview->setProperty("ToolType", QVariant::fromValue(UIToolType_VMActivityOverview));
+                    connect(m_pPaneVMActivityOverview, &UIVMActivityOverviewWidget::sigSwitchToMachinePerformancePane,
                             this, &UIToolPaneGlobal::sigSwitchToMachinePerformancePane);
 
                     /* Add into layout: */
-                    m_pLayout->addWidget(m_pPaneResourceMonitor);
-                    m_pLayout->setCurrentWidget(m_pPaneResourceMonitor);
+                    m_pLayout->addWidget(m_pPaneVMActivityOverview);
+                    m_pLayout->setCurrentWidget(m_pPaneVMActivityOverview);
                 }
 
@@ -288 +288 @@
             break;
         case UIToolType_VMActivityOverview:
-            pCurrentToolWidget = m_pPaneResourceMonitor;
+            pCurrentToolWidget = m_pPaneVMActivityOverview;
             break;
         default:
@@ -319 +319 @@
 {
     /* Determine whether resource monitor is currently active tool: */
-    if (m_pPaneResourceMonitor)
-        m_pPaneResourceMonitor->setIsCurrentTool(m_fActive && currentTool() == UIToolType_VMActivityOverview);
-}
+    if (m_pPaneVMActivityOverview)
+        m_pPaneVMActivityOverview->setIsCurrentTool(m_fActive && currentTool() == UIToolType_VMActivityOverview);
+}

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

@@ -103 +103 @@
     /** Holds the Cloud Profile Manager instance. */
     UICloudProfileManagerWidget  *m_pPaneCloud;
-    /** Holds the VM Resource Monitor instance. */
-    UIVMActivityOverviewWidget   *m_pPaneResourceMonitor;
+    /** Holds the VM Activity Overview Widget instance. */
+    UIVMActivityOverviewWidget   *m_pPaneVMActivityOverview;
 
     /** Holds whether this pane is active. */

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

@@ -1358 +1358 @@
     retranslateUi();
     updateModelColumVisibilityCache();
-    uiCommon().setHelpKeyword(this, "resource-monitor");
+    uiCommon().setHelpKeyword(this, "vm-activity-overview-widget");
 }
 
@@ -1622 +1622 @@
 void UIVMActivityOverviewDialog::retranslateUi()
 {
-    setWindowTitle(UIVMActivityOverviewWidget::tr("VM Resource Monitor"));
+    setWindowTitle(UIVMActivityOverviewWidget::tr("VM Activity Overview"));
 }