Changeset 88173 in vbox

Timestamp:

Mar 18, 2021 8:11:08 AM (4 years ago)

Author:

vboxsync

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

143324

Message:

FE/Qt: bugref:9510. Some refactoring

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/overview/UIVMActivityOverviewWidget.cpp (modified) (8 diffs)
• activity/overview/UIVMActivityOverviewWidget.h (modified) (2 diffs)
• converter/UIConverterBackendGlobal.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• globals/UIActionPool.cpp (modified) (1 diff)
• globals/UIActionPoolManager.cpp (modified) (6 diffs)
• globals/UIActionPoolManager.h (modified) (1 diff)
• manager/UIToolPaneGlobal.cpp (modified) (1 diff)
• manager/UIToolPaneGlobal.h (modified) (1 diff)

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

@@ -277 +277 @@
     UIActivityOverviewProxyModel(QObject *parent = 0);
     void dataUpdate();
-    void setNonRunningVMVisibility(bool fShow);
+    void setNotRunningVMVisibility(bool fShow);
 
 protected:
@@ -286 +286 @@
 private:
 
-    bool m_fShowNonRunningVMs;
+    bool m_fShowNotRunningVMs;
 };
 
@@ -876 +876 @@
 }
 
-void UIActivityOverviewProxyModel::setNonRunningVMVisibility(bool fShow)
-{
-    m_fShowNonRunningVMs = fShow;
+void UIActivityOverviewProxyModel::setNotRunningVMVisibility(bool fShow)
+{
+    m_fShowNotRunningVMs = fShow;
     invalidateFilter();
 }
@@ -912 +912 @@
 {
     Q_UNUSED(sourceParent);
-    if (m_fShowNonRunningVMs)
+    if (m_fShowNotRunningVMs)
         return true;
     UIActivityOverviewModel *pModel = qobject_cast<UIActivityOverviewModel*>(sourceModel());
@@ -1362 +1362 @@
     , m_fIsCurrentTool(true)
     , m_iSortIndicatorWidth(0)
-    , m_fShowNonRunningVMs(false)
+    , m_fShowNotRunningVMs(false)
 {
     prepare();
@@ -1476 +1476 @@
         layout()->addWidget(m_pTableView);
         m_pProxyModel->setSourceModel(m_pModel);
-        m_pProxyModel->setNonRunningVMVisibility(m_fShowNonRunningVMs);
+        m_pProxyModel->setNotRunningVMVisibility(m_fShowNotRunningVMs);
         m_pTableView->setModel(m_pProxyModel);
         m_pTableView->setItemDelegate(new UIVMActivityOverviewDelegate);
@@ -1623 +1623 @@
         menu.addAction(m_pVMActivityMonitorAction);
     QAction *pHideNotRunningAction =
-        menu.addAction(UIVMActivityOverviewWidget::tr("List non-running virtual machines"));
+        menu.addAction(UIVMActivityOverviewWidget::tr("List all virtual machines"));
     pHideNotRunningAction->setCheckable(true);
-    pHideNotRunningAction->setChecked(m_fShowNonRunningVMs);
+    pHideNotRunningAction->setChecked(m_fShowNotRunningVMs);
     connect(pHideNotRunningAction, &QAction::triggered,
-            this, &UIVMActivityOverviewWidget::sltNonRunningVMVisibility);
+            this, &UIVMActivityOverviewWidget::sltNotRunningVMVisibility);
     menu.exec(m_pTableView->mapToGlobal(pos));
 }
@@ -1661 +1661 @@
 }
 
-void UIVMActivityOverviewWidget::sltNonRunningVMVisibility(bool fShow)
-{
-    m_fShowNonRunningVMs = fShow;
+void UIVMActivityOverviewWidget::sltNotRunningVMVisibility(bool fShow)
+{
+    m_fShowNotRunningVMs = fShow;
     if (m_pProxyModel)
-        m_pProxyModel->setNonRunningVMVisibility(m_fShowNonRunningVMs);
+        m_pProxyModel->setNotRunningVMVisibility(m_fShowNotRunningVMs);
 }
 

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

@@ -86 +86 @@
     void sltHandleShowVMActivityMonitor();
     void sltHandleTableSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
-    void sltNonRunningVMVisibility(bool fShow);
+    void sltNotRunningVMVisibility(bool fShow);
 
 private:
@@ -132 +132 @@
     bool    m_fIsCurrentTool;
     int     m_iSortIndicatorWidth;
-    bool    m_fShowNonRunningVMs;
+    bool    m_fShowNotRunningVMs;
 };
 

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

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

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

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

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

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

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

@@ -2293 +2293 @@
         setName(QApplication::translate("UIActionPool", "&Activity Overview..."));
         setShortcutScope(QApplication::translate("UIActionPool", "Activity Monitor"));
-        setStatusTip(QApplication::translate("UIActionPool", "Navigate to the vm activity overview widget"));
-        setToolTip(  QApplication::translate("UIActionPool", "Navigate to the VM Activity Overview Widget")
+        setStatusTip(QApplication::translate("UIActionPool", "Navigate to the vm activity overview"));
+        setToolTip(  QApplication::translate("UIActionPool", "Navigate to the VM Activity Overview")
                    + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
     }

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

@@ -354 +354 @@
 };
 
-/** Simple action extension, used as 'Show VM Activity Overview Widget' action class. */
+/** Simple action extension, used as 'Show VM Activity Overview' action class. */
 class UIActionToggleManagerToolsGlobalShowVMActivityOverview : public UIActionToggle
 {
@@ -382 +382 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "&VM Activity Overview Widget"));
-        setStatusTip(QApplication::translate("UIActionPool", "Open the VM Activity Overview Widget"));
+        setName(QApplication::translate("UIActionPool", "&VM Activity Overview"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open the VM Activity Overview"));
     }
 };
@@ -3439 +3439 @@
     {
         setName(QApplication::translate("UIActionPool", "Columns"));
-        setShortcutScope(QApplication::translate("UIActionPool", "VM Activity Overview Widget"));
+        setShortcutScope(QApplication::translate("UIActionPool", "VM Activity Overview"));
         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", "VM Activity Overview Widget"));
+        setShortcutScope(QApplication::translate("UIActionPool", "VM Activity Overview"));
         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 Activity Overview Widget actions: */
+    /* VM Activity Overview actions: */
     m_pool[UIActionIndexMN_M_VMActivityOverview] = new UIActionMenuVMActivityOverview(this);
     m_pool[UIActionIndexMN_M_VMActivityOverview_M_Columns] = new UIActionMenuManagerVMActivityOverviewColumns(this);
@@ -3787 +3787 @@
     updateMenuCloudWindow();
     updateMenuCloud();
-    /* 'VM Activity Overview Widget' menu: */
+    /* 'VM Activity Overview' 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 VM Activity Overview Widget actions: */
+    /* VM VM Activity Overview actions: */
     UIActionIndexMN_M_VMActivityOverview,
     UIActionIndexMN_M_VMActivityOverview_M_Columns,

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

@@ -205 +205 @@
             case UIToolType_VMActivityOverview:
             {
-                /* Create VM Activity Overview Widget: */
+                /* Create VM Activity Overview: */
                 m_pPaneVMActivityOverview = new UIVMActivityOverviewWidget(EmbedTo_Stack, m_pActionPool, false /* show toolbar */);
                 AssertPtrReturnVoid(m_pPaneVMActivityOverview);

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

@@ -103 +103 @@
     /** Holds the Cloud Profile Manager instance. */
     UICloudProfileManagerWidget  *m_pPaneCloud;
-    /** Holds the VM Activity Overview Widget instance. */
+    /** Holds the VM Activity Overview instance. */
     UIVMActivityOverviewWidget   *m_pPaneVMActivityOverview;