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

Timestamp:

Jul 13, 2023 9:11:17 AM (20 months ago)

Author:

vboxsync

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

158385

Message:

FE/Qt: bugref:9080. Using a sort-filter proxy model in host browser.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

• UIVisoHostBrowser.cpp (modified) (12 diffs)
• UIVisoHostBrowser.h (modified) (2 diffs)

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

@@ -31 +31 @@
 #include <QItemDelegate>
 #include <QMimeData>
+#include <QSortFilterProxyModel>
 #include <QTextEdit>
 #include <QTableView>
@@ -41 +42 @@
 /* Other VBox includes: */
 #include <iprt/assert.h>
+
+
+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;
+};
 
 
@@ -161 +193 @@
     , m_pModel(0)
     , m_pTableView(0)
+    , m_pProxyModel(0)
 {
     prepareObjects();
@@ -183 +216 @@
 
     m_pModel = new UIVisoHostBrowserModel(this);
+    AssertReturnVoid(m_pModel);
     m_pModel->setRootPath(QDir::rootPath());
     m_pModel->setReadOnly(true);
     m_pModel->setFilter(QDir::AllEntries | QDir::NoDot | QDir::Hidden | QDir::System);
 
+    m_pProxyModel = new UIHostBrowserProxyModel(this);
+    AssertReturnVoid(m_pProxyModel);
+    m_pProxyModel->setSourceModel(m_pModel);
+
     m_pTableView = new QTableView;
-    if (m_pTableView)
-    {
-        m_pTableView->setContextMenuPolicy(Qt::CustomContextMenu);
-        m_pMainLayout->addWidget(m_pTableView, 2, 0, 8, 4);
-        m_pTableView->setShowGrid(false);
-        m_pTableView->setSelectionBehavior(QAbstractItemView::SelectRows);
-        m_pTableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
-        m_pTableView->setAlternatingRowColors(true);
-        m_pTableView->setTabKeyNavigation(false);
-        m_pTableView->setItemDelegate(new UIHostBrowserDelegate(this));
-        QHeaderView *pVerticalHeader = m_pTableView->verticalHeader();
-        if (pVerticalHeader)
-        {
-            m_pTableView->verticalHeader()->setVisible(false);
-            /* Minimize the row height: */
-            m_pTableView->verticalHeader()->setDefaultSectionSize(m_pTableView->verticalHeader()->minimumSectionSize());
-        }
-        QHeaderView *pHorizontalHeader = m_pTableView->horizontalHeader();
-        if (pHorizontalHeader)
-        {
-            pHorizontalHeader->setHighlightSections(false);
-            pHorizontalHeader->setSectionResizeMode(QHeaderView::Stretch);
-        }
-
-        m_pTableView->setModel(m_pModel);
-
-        /* Hide the "type" column: */
-        m_pTableView->hideColumn(2);
-
-        m_pTableView->setSelectionMode(QAbstractItemView::ExtendedSelection);
-        m_pTableView->setDragDropMode(QAbstractItemView::DragOnly);
-    }
+    AssertReturnVoid(m_pTableView);
+    m_pTableView->setContextMenuPolicy(Qt::CustomContextMenu);
+    m_pMainLayout->addWidget(m_pTableView, 2, 0, 8, 4);
+    m_pTableView->setShowGrid(false);
+    m_pTableView->setSelectionBehavior(QAbstractItemView::SelectRows);
+    m_pTableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    m_pTableView->setAlternatingRowColors(true);
+    m_pTableView->setTabKeyNavigation(false);
+    m_pTableView->setItemDelegate(new UIHostBrowserDelegate(this));
+
+    QHeaderView *pVerticalHeader = m_pTableView->verticalHeader();
+    QHeaderView *pHorizontalHeader = m_pTableView->horizontalHeader();
+    AssertReturnVoid(pVerticalHeader);
+    AssertReturnVoid(pHorizontalHeader);
+
+    m_pTableView->verticalHeader()->setVisible(false);
+    /* Minimize the row height: */
+    m_pTableView->verticalHeader()->setDefaultSectionSize(m_pTableView->verticalHeader()->minimumSectionSize());
+    pHorizontalHeader->setHighlightSections(false);
+    pHorizontalHeader->setSectionResizeMode(QHeaderView::Stretch);
+
+    m_pTableView->setModel(m_pProxyModel);
+
+    /* Hide the "type" column: */
+    m_pTableView->hideColumn(2);
+
+    m_pTableView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    m_pTableView->setDragDropMode(QAbstractItemView::DragOnly);
 
     retranslateUi();
@@ -318 +352 @@
 {
     AssertReturnVoid(m_pModel);
-    QModelIndex homeIndex = m_pModel->index(QDir::homePath());
+    AssertReturnVoid(m_pProxyModel);
+    QModelIndex homeIndex = m_pProxyModel->mapFromSource(m_pModel->index(QDir::homePath()));
     if (homeIndex.isValid())
         setTableRootIndex(homeIndex);
@@ -328 +363 @@
     QDir currentDir = QDir(currentPath());
     currentDir.cdUp();
-    QModelIndex upIndex = m_pModel->index(currentDir.absolutePath());
+    QModelIndex upIndex = m_pProxyModel->mapFromSource(m_pModel->index(currentDir.absolutePath()));
     if (upIndex.isValid())
         setTableRootIndex(upIndex);
@@ -338 +373 @@
         return;
     /* QFileInfo::isDir() returns true if QFileInfo is a folder or a symlink to folder: */
-    QFileInfo fileInfo = m_pModel->fileInfo(index);
+    QFileInfo fileInfo = m_pModel->fileInfo(m_pProxyModel->mapToSource(index));
     if (!fileInfo.isDir())
         return;
@@ -360 +395 @@
         return QString();
     QModelIndex currentTableIndex = m_pTableView->rootIndex();
-    return QDir::fromNativeSeparators(m_pModel->filePath(currentTableIndex));
+    return QDir::fromNativeSeparators(m_pModel->filePath(m_pProxyModel->mapToSource(currentTableIndex)));
 }
 
@@ -367 +402 @@
     if (strPath.isEmpty() || !m_pModel)
         return;
-    QModelIndex index = m_pModel->index(strPath);
+    QModelIndex index = m_pProxyModel->mapFromSource(m_pModel->index(strPath));
     setTableRootIndex(index);
 }
@@ -397 +432 @@
     for (int i = 0; i < selectedIndices.size(); ++i)
     {
-        QString strPath = m_pModel->filePath(selectedIndices[i]);
+        QString strPath = m_pModel->filePath(m_pProxyModel->mapToSource(selectedIndices[i]));
         if (strPath.contains(".."))
             continue;
@@ -411 +446 @@
     m_pTableView->setRootIndex(index);
     m_pTableView->clearSelection();
-    updateNavigationWidgetPath(m_pModel->filePath(index));
+    QString strPath = m_pModel->filePath(m_pProxyModel->mapToSource(index));
+    updateNavigationWidgetPath(strPath);
     if (m_pGoUp)
         m_pGoUp->setEnabled(!isRoot());
@@ -420 +456 @@
     if (!m_pModel)
         return;
-    QModelIndex index = m_pModel->index(strPath);
+    QModelIndex index = m_pProxyModel->mapFromSource(m_pModel->index(strPath));
     if (!index.isValid())
         return;

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

@@ -39 +39 @@
 class QTableView;
 class UIVisoHostBrowserModel;
+class UIHostBrowserProxyModel;
 
 /** A UIVisoBrowserBase extension to view host file system. Uses QFileSystemModel. */
@@ -88 +89 @@
     QModelIndex currentRootIndex() const;
     /** We have two file system models (one for each item view) since we set different filters on each of these models. */
-    UIVisoHostBrowserModel *m_pModel;
-    QTableView             *m_pTableView;
+    UIVisoHostBrowserModel  *m_pModel;
+    QTableView              *m_pTableView;
+    UIHostBrowserProxyModel *m_pProxyModel;
 };