Changeset 100565 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 13, 2023 1:32:04 PM (20 months ago)

Author:

vboxsync

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

158391

Message:

FE/Qt: bugref:9080. Reimplementing QSortFilterProxyModel::lessThan(...) to make sure up directory is listed always on top (in the host browser).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoHostBrowser.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoHostBrowser.cpp

@@ -44 +44 @@
 
 
-class SHARED_LIBRARY_STUFF UIHostBrowserProxyModel : public QSortFilterProxyModel
-{
-
-    Q_OBJECT;
-
-public:
-
-    UIHostBrowserProxyModel(QObject *pParent = 0)
-        : QSortFilterProxyModel(pParent)
-    {
-    }
-
-    // void setListDirectoriesOnTop(bool fListDirectoriesOnTop);
-    // bool listDirectoriesOnTop() const;
-
-    // void setShowHiddenObjects(bool fShowHiddenObjects);
-    // bool showHiddenObjects() const;
-
-protected:
-
-    // virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const RT_OVERRIDE;
-    // /** Currently filters out hidden objects if options is set to "not showing them". */
-    // virtual bool filterAcceptsRow(int iSourceRow, const QModelIndex &sourceParent) const RT_OVERRIDE;
-
-private:
-
-    // bool m_fListDirectoriesOnTop;
-    // bool m_fShowHiddenObjects;
-};
-
 
 /*********************************************************************************************************************************
@@ -115 +85 @@
 private:
 
+};
+
+/*********************************************************************************************************************************
+*   UIHostBrowserProxyModel definition.                                                                                   *
+*********************************************************************************************************************************/
+
+class SHARED_LIBRARY_STUFF UIHostBrowserProxyModel : public QSortFilterProxyModel
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIHostBrowserProxyModel(QObject *pParent = 0)
+        : QSortFilterProxyModel(pParent)
+    {
+    }
+
+protected:
+
+    virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const RT_OVERRIDE;
+
+private:
 };
 
@@ -185 +178 @@
 }
 
+
+/*********************************************************************************************************************************
+*   UIHostBrowserProxyModel implementation.                                                                                      *
+*********************************************************************************************************************************/
+
+bool UIHostBrowserProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+{
+    UIVisoHostBrowserModel *pModel = qobject_cast<UIVisoHostBrowserModel*>(sourceModel());
+    AssertReturn(pModel, true);
+
+    if (pModel->filePath(left).contains(".."))
+        return (sortOrder() == Qt::AscendingOrder);
+
+    if (pModel->filePath(right).contains(".."))
+        return (sortOrder() == Qt::DescendingOrder);
+
+    QFileInfo leftInfo(pModel->fileInfo(left));
+    QFileInfo rightInfo(pModel->fileInfo(right));
+
+    if (leftInfo.isDir() && !rightInfo.isDir())
+        return (sortOrder() == Qt::AscendingOrder);
+
+    if (!leftInfo.isDir() && rightInfo.isDir())
+        return (sortOrder() == Qt::DescendingOrder);
+
+    return QSortFilterProxyModel::lessThan(left, right);
+}
+
+
 /*********************************************************************************************************************************
 *   UIVisoHostBrowser implementation.                                                                                   *
@@ -224 +246 @@
     AssertReturnVoid(m_pProxyModel);
     m_pProxyModel->setSourceModel(m_pModel);
+    m_pProxyModel->setDynamicSortFilter(true);
+
 
     m_pTableView = new QTableView;
@@ -248 +272 @@
 
     m_pTableView->setModel(m_pProxyModel);
+    m_pTableView->setSortingEnabled(true);
+    m_pTableView->sortByColumn(0, Qt::AscendingOrder);
 
     /* Hide the "type" column: */
@@ -377 +403 @@
         return;
     if (QString::compare(fileInfo.fileName(), "..") == 0)
-        setTableRootIndex(m_pModel->parent(m_pTableView->rootIndex()));
+        setTableRootIndex(m_pProxyModel->parent(m_pTableView->rootIndex()));
     else
         setTableRootIndex(index);
@@ -442 +468 @@
 void UIVisoHostBrowser::setTableRootIndex(QModelIndex index /* = QModelIndex */)
 {
-    if (!m_pTableView || !m_pModel)
-        return;
+    AssertReturnVoid(m_pTableView);
+    AssertReturnVoid(m_pModel);
+    AssertReturnVoid(m_pProxyModel);
+
     m_pTableView->setRootIndex(index);
     m_pTableView->clearSelection();
@@ -450 +478 @@
     if (m_pGoUp)
         m_pGoUp->setEnabled(!isRoot());
+
+    m_pTableView->sortByColumn(m_pProxyModel->sortColumn(), m_pProxyModel->sortOrder());
 }