Changeset 104972 in vbox

Timestamp:

Jun 20, 2024 9:21:03 AM (3 months ago)

Author:

vboxsync

Message:

FE/Qt. bugref:10659. some more polishing

Location:

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview

Files:

• UIVMActivityOverviewModelView.cpp (modified) (11 diffs)
• UIVMActivityOverviewModelView.h (modified) (5 diffs)

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

@@ -116 +116 @@
     QString m_strMachineName;
     quint64  m_uTotalRAM;
+
 private:
 
@@ -148 +149 @@
 private:
 
-
-
     KMachineState    m_enmMachineState;
     CMachineDebugger m_comDebugger;
     CSession         m_comSession;
     CGuest           m_comGuest;
-
-
     quint64  m_uFreeRAM;
-
     quint64  m_uNetworkDownTotal;
     quint64  m_uNetworkUpTotal;
-
     quint64          m_uVMExitTotal;
     quint64          m_uDiskWriteTotal;
     quint64          m_uDiskReadTotal;
-
 };
 
@@ -176 +170 @@
 {
     Q_OBJECT;
+
 public:
+
     UIVMActivityOverviewRowCloud(QITableView *pTableView, const QUuid &uMachineId,
                                          const QString &strMachineName, CCloudMachine &comCloudMachine);
@@ -185 +181 @@
     virtual void setMachineState(int iState) RT_OVERRIDE RT_FINAL;
 
-
-protected:
-
 private slots:
 
@@ -205 +198 @@
 };
 
+
+/*********************************************************************************************************************************
+*   UIVMActivityOverviewCell implementation.                                                                             *
+*********************************************************************************************************************************/
+
+UIVMActivityOverviewCell::UIVMActivityOverviewCell(QITableViewRow *pRow, int iColumnIndex)
+    :QITableViewCell(pRow)
+    , m_iColumnIndex(iColumnIndex)
+{
+}
+
+QString UIVMActivityOverviewCell::text() const
+{
+    return m_strText;
+}
+
+int UIVMActivityOverviewCell::columnLength(int /*iColumnIndex*/) const
+{
+    return 0;
+    //return m_columnData.value(iColumnIndex, QString()).length();
+}
+
+void UIVMActivityOverviewCell::setText(const QString &strText)
+{
+    m_strText = strText;
+}
+
+/*********************************************************************************************************************************
+*   UIVMActivityOverviewRow implementation.                                                                              *
+*********************************************************************************************************************************/
+
+UIVMActivityOverviewRow::UIVMActivityOverviewRow(QITableView *pTableView, const QUuid &uMachineId,
+                                                                 const QString &strMachineName)
+    : QITableViewRow(pTableView)
+    , m_uMachineId(uMachineId)
+    , m_strMachineName(strMachineName)
+    , m_uTotalRAM(0)
+{
+    initCells();
+}
+
+int UIVMActivityOverviewRow::childCount() const
+{
+    return m_cells.size();
+}
+
+QITableViewCell *UIVMActivityOverviewRow::childItem(int iIndex) const
+{
+    return m_cells.value(iIndex, 0);
+}
+
+QString UIVMActivityOverviewRow::cellText(int iColumn) const
+{
+    if (!m_cells.contains(iColumn))
+        return QString();
+    if (!m_cells[iColumn])
+        return QString();
+    return m_cells[iColumn]->text();
+}
+
+int UIVMActivityOverviewRow::columnLength(int iColumnIndex) const
+{
+    UIVMActivityOverviewCell *pCell = m_cells.value(iColumnIndex, 0);
+    if (!pCell)
+        return 0;
+    return pCell->text().length();
+}
+
+UIVMActivityOverviewRow::~UIVMActivityOverviewRow()
+{
+    qDeleteAll(m_cells);
+}
+
+void UIVMActivityOverviewRow::initCells()
+{
+    for (int i = (int) VMActivityOverviewColumn_Name; i < (int) VMActivityOverviewColumn_Max; ++i)
+        m_cells[i] = new UIVMActivityOverviewCell(this, i);
+    m_cells[VMActivityOverviewColumn_Name]->setText(m_strMachineName);
+}
+
+const QUuid &UIVMActivityOverviewRow::machineId() const
+{
+    return m_uMachineId;
+}
+
+void UIVMActivityOverviewRow::updateCellText(int /*VMActivityOverviewColumn*/ enmColumnIndex, const QString &strText)
+{
+    if (m_cells.value(enmColumnIndex, 0))
+        m_cells[enmColumnIndex]->setText(strText);
+}
 
 /*********************************************************************************************************************************
@@ -223 +306 @@
     if (m_enmMachineState == KMachineState_Running)
         resetDebugger();
-
 }
 
@@ -292 +374 @@
     updateCellText(VMActivityOverviewColumn_VMExits, QString("%1/%2").arg(UITranslator::addMetricSuffixToNumber(uVMExitRate)).
                    arg(UITranslator::addMetricSuffixToNumber(m_uVMExitTotal)));
-
-
 }
 
@@ -359 +439 @@
     return gpConverter->toString(m_enmMachineState);
 }
-
 
 /*********************************************************************************************************************************
@@ -623 +702 @@
     }
 }
-
 
 /*********************************************************************************************************************************
@@ -1019 +1097 @@
 }
 
-
 /*********************************************************************************************************************************
 *   UIVMActivityOverviewProxyModel implementation.                                                                       *
 *********************************************************************************************************************************/
+
 UIVMActivityOverviewProxyModel::UIVMActivityOverviewProxyModel(QObject *pParent /* = 0 */)
     :  QSortFilterProxyModel(pParent)
@@ -1095 +1173 @@
 
 
-
-/*********************************************************************************************************************************
-*   UIVMActivityOverviewRow implementation.                                                                              *
-*********************************************************************************************************************************/
-
-UIVMActivityOverviewRow::UIVMActivityOverviewRow(QITableView *pTableView, const QUuid &uMachineId,
-                                                                 const QString &strMachineName)
-    : QITableViewRow(pTableView)
-    , m_uMachineId(uMachineId)
-    , m_strMachineName(strMachineName)
-    , m_uTotalRAM(0)
-{
-    initCells();
-}
-
-int UIVMActivityOverviewRow::childCount() const
-{
-    return m_cells.size();
-}
-
-QITableViewCell *UIVMActivityOverviewRow::childItem(int iIndex) const
-{
-    return m_cells.value(iIndex, 0);
-}
-
-QString UIVMActivityOverviewRow::cellText(int iColumn) const
-{
-    if (!m_cells.contains(iColumn))
-        return QString();
-    if (!m_cells[iColumn])
-        return QString();
-    return m_cells[iColumn]->text();
-}
-
-int UIVMActivityOverviewRow::columnLength(int iColumnIndex) const
-{
-    UIVMActivityOverviewCell *pCell = m_cells.value(iColumnIndex, 0);
-    if (!pCell)
-        return 0;
-    return pCell->text().length();
-}
-
-UIVMActivityOverviewRow::~UIVMActivityOverviewRow()
-{
-    qDeleteAll(m_cells);
-}
-
-void UIVMActivityOverviewRow::initCells()
-{
-    for (int i = (int) VMActivityOverviewColumn_Name; i < (int) VMActivityOverviewColumn_Max; ++i)
-        m_cells[i] = new UIVMActivityOverviewCell(this, i);
-    m_cells[VMActivityOverviewColumn_Name]->setText(m_strMachineName);
-}
-
-const QUuid &UIVMActivityOverviewRow::machineId() const
-{
-    return m_uMachineId;
-}
-
-void UIVMActivityOverviewRow::updateCellText(int /*VMActivityOverviewColumn*/ enmColumnIndex, const QString &strText)
-{
-    if (m_cells.value(enmColumnIndex, 0))
-        m_cells[enmColumnIndex]->setText(strText);
-}
-
-
-/*********************************************************************************************************************************
-*   UIVMActivityOverviewCell implementation.                                                                             *
-*********************************************************************************************************************************/
-
-UIVMActivityOverviewCell::UIVMActivityOverviewCell(QITableViewRow *pRow, int iColumnIndex)
-    :QITableViewCell(pRow)
-    , m_iColumnIndex(iColumnIndex)
-{
-}
-
-QString UIVMActivityOverviewCell::text() const
-{
-    return m_strText;
-}
-
-int UIVMActivityOverviewCell::columnLength(int /*iColumnIndex*/) const
-{
-    return 0;
-    //return m_columnData.value(iColumnIndex, QString()).length();
-}
-
-void UIVMActivityOverviewCell::setText(const QString &strText)
-{
-    m_strText = strText;
-}
-
 #include "UIVMActivityOverviewModelView.moc"

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

@@ -52 +52 @@
 class UIVirtualMachineItemCloud;
 
-/*********************************************************************************************************************************
-*   Class UIVMActivityOverviewHostStats definition.                                                                              *
-*********************************************************************************************************************************/
 /** A simple container to store host related performance values. */
 class UIVMActivityOverviewHostStats
@@ -93 +90 @@
     virtual void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) RT_OVERRIDE;
     virtual void mousePressEvent(QMouseEvent *pEvent) RT_OVERRIDE;
-
     /** Resizes all the columns in response to resizeEvent. Columns cannot be narrower than m_minimumColumnWidths values. */
     void resizeHeaders();
     /** Value is in pixels. Columns cannot be narrower than this width. */
     QMap<int, int> m_minimumColumnWidths;
-
 };
-
-
 
 class UIVMActivityOverviewProxyModel : public QSortFilterProxyModel
@@ -124 +117 @@
     bool m_fShowNotRunningVMs;
     bool m_fShowCloudVMs;
-
 };
 
@@ -171 +163 @@
     void getHostRAMStats();
     QVector<UIVMActivityOverviewRow*> m_rows;
-    QITableView *m_pTableView;
+    QITableView       *m_pTableView;
     QMap<int, QString> m_columnTitles;
-    QMap<int, bool> m_columnVisible;
-    QTimer *m_pLocalVMUpdateTimer;
+    QMap<int, bool>    m_columnVisible;
+    QTimer            *m_pLocalVMUpdateTimer;
     /** Maximum length of string length of data displayed in column. Updated in UIVMActivityOverviewModel::data(..). */
     mutable QMap<int, int> m_columnDataMaxLength;
@@ -180 +172 @@
     /** @name The following are used during UIPerformanceCollector::QueryMetricsData(..)
      * @{ */
-       QVector<QString> m_nameList;
+       QVector<QString>  m_nameList;
        QVector<CUnknown> m_objectList;
     /** @} */