Changeset 104969 in vbox

Timestamp:

Jun 20, 2024 8:45:02 AM (3 months ago)

Author:

vboxsync

Message:

FE/Qt. bugref:10659. Polishing. part 1.

Location:

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

Files:

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

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

@@ -58 +58 @@
 
 /*********************************************************************************************************************************
-*   Class UIActivityOverviewAccessibleRowLocal definition.                                                                       *
+*   UIActivityOverviewAccessibleRow definition.                                                                       *
+*********************************************************************************************************************************/
+
+class UIActivityOverviewAccessibleRow : public QITableViewRow
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIActivityOverviewAccessibleRow(QITableView *pTableView, const QUuid &uMachineId,
+                                    const QString &strMachineName);
+
+    const QUuid &machineId() const;
+
+    virtual void setMachineState(int iState) = 0;
+    virtual bool isRunning() const = 0;
+    virtual bool isCloudVM() const = 0;
+
+    virtual ~UIActivityOverviewAccessibleRow();
+    virtual int childCount() const RT_OVERRIDE RT_FINAL;
+
+    virtual QITableViewCell *childItem(int iIndex) const RT_OVERRIDE RT_FINAL;
+    int columnLength(int iColumnIndex) const;
+    QString cellText(int iColumn) const;
+    virtual QString machineStateString() const = 0;
+
+protected:
+    void updateCellText(int /*VMActivityOverviewColumn*/ iColumnIndex, const QString &strText);
+    QUuid m_uMachineId;
+    /* Key is VMActivityOverviewColumn enum item. */
+    QMap<int, UIActivityOverviewAccessibleCell*> m_cells;
+
+    QString m_strMachineName;
+    quint64  m_uTotalRAM;
+private:
+
+    void initCells();
+};
+
+/*********************************************************************************************************************************
+* UIActivityOverviewAccessibleRowLocal definition.                                                                       *
 *********************************************************************************************************************************/
 
@@ -105 +146 @@
 
 /*********************************************************************************************************************************
-*   Class UIActivityOverviewAccessibleRowCloud definition.                                                                       *
+* UIActivityOverviewAccessibleRowCloud definition.                                                                       *
 *********************************************************************************************************************************/
 
@@ -143 +184 @@
 
 /*********************************************************************************************************************************
-*   Class UIActivityOverviewAccessibleRowLocal implementation.                                                                   *
+* UIActivityOverviewAccessibleRowLocal implementation.                                                                   *
 *********************************************************************************************************************************/
 
@@ -298 +339 @@
 
 /*********************************************************************************************************************************
-*   Class UIActivityOverviewAccessibleRowCloud implementation.                                                                   *
+*   UIActivityOverviewAccessibleRowCloud implementation.                                                                   *
 *********************************************************************************************************************************/
 
@@ -1004 +1045 @@
 }
 
+bool UIActivityOverviewAccessibleProxyModel::lessThan(const QModelIndex &sourceLeftIndex, const QModelIndex &sourceRightIndex) const
+{
+    UIActivityOverviewAccessibleModel *pModel = qobject_cast<UIActivityOverviewAccessibleModel*>(sourceModel());
+    if (pModel)
+    {
+        /* Keep running vm always on top of the list: */
+        bool fLeftRunning = pModel->isVMRunning(sourceLeftIndex.row());
+        bool fRightRunning = pModel->isVMRunning(sourceRightIndex.row());
+        if (fLeftRunning && !fRightRunning)
+        {
+            if (sortOrder() == Qt::AscendingOrder)
+                return true;
+            else
+                return false;
+        }
+        if (!fLeftRunning && fRightRunning)
+        {
+            if (sortOrder() == Qt::AscendingOrder)
+                return false;
+            else
+                return true;
+        }
+    }
+    return QSortFilterProxyModel::lessThan(sourceLeftIndex, sourceRightIndex);
+}
+
 
 

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

@@ -117 +117 @@
 protected:
 
-    // virtual bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const RT_OVERRIDE;
-    bool filterAcceptsRow(int iSourceRow, const QModelIndex &sourceParent) const RT_OVERRIDE RT_FINAL;
+    virtual bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const RT_OVERRIDE;
+    virtual bool filterAcceptsRow(int iSourceRow, const QModelIndex &sourceParent) const RT_OVERRIDE RT_FINAL;
 
 private:
@@ -146 +146 @@
 };
 
-class UIActivityOverviewAccessibleRow : public QITableViewRow
-{
-
-    Q_OBJECT;
-
-public:
-
-    UIActivityOverviewAccessibleRow(QITableView *pTableView, const QUuid &uMachineId,
-                                    const QString &strMachineName);
-
-    const QUuid &machineId() const;
-
-    virtual void setMachineState(int iState) = 0;
-    virtual bool isRunning() const = 0;
-    virtual bool isCloudVM() const = 0;
-
-    virtual ~UIActivityOverviewAccessibleRow();
-    virtual int childCount() const RT_OVERRIDE RT_FINAL;
-
-    virtual QITableViewCell *childItem(int iIndex) const RT_OVERRIDE RT_FINAL;
-    int columnLength(int iColumnIndex) const;
-    QString cellText(int iColumn) const;
-    virtual QString machineStateString() const = 0;
-
-protected:
-    void updateCellText(int /*VMActivityOverviewColumn*/ iColumnIndex, const QString &strText);
-    QUuid m_uMachineId;
-    /* Key is VMActivityOverviewColumn enum item. */
-    QMap<int, UIActivityOverviewAccessibleCell*> m_cells;
-
-    QString m_strMachineName;
-    quint64  m_uTotalRAM;
-private:
-
-    void initCells();
-
-
-};