Changeset 101692 in vbox for trunk/src/VBox

Timestamp:

Oct 31, 2023 4:08:48 PM (13 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: Reworking tree-view UISettingsSelector to use QSortFilterProxyModel for automatic sorting routine.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsSelector.cpp (modified) (10 diffs)
• UISettingsSelector.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.cpp

@@ -35 +35 @@
 #include <QLayout>
 #include <QPainter>
+#include <QSortFilterProxyModel>
 #include <QTabWidget>
 #include <QToolButton>
@@ -245 +246 @@
     /** Returns item with certain @a strLink. */
     QModelIndex findItem(const QString &strLink);
-
-    /** Sorts the contents of model by @a iColumn and @a enmOrder. */
-    virtual void sort(int iColumn = 0, Qt::SortOrder enmOrder = Qt::AscendingOrder) RT_OVERRIDE;
 
 private:
@@ -438 +436 @@
 }
 
-void UISelectorDelegate::paint(QPainter *pPainter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+void UISelectorDelegate::paint(QPainter *pPainter, const QStyleOptionViewItem &option, const QModelIndex &proxyIndex) const
 {
     /* Sanity checks: */
     AssertPtrReturnVoid(pPainter);
+    AssertReturnVoid(proxyIndex.isValid());
+
+    /* Acquire model: */
+    const QSortFilterProxyModel *pProxyModel = qobject_cast<const QSortFilterProxyModel*>(proxyIndex.model());
+    AssertPtrReturnVoid(pProxyModel);
+    const UISelectorModel *pModel = qobject_cast<const UISelectorModel*>(pProxyModel->sourceModel());
+    AssertPtrReturnVoid(pModel);
+
+    /* Acquire model index: */
+    const QModelIndex index = pProxyModel->mapToSource(proxyIndex);
     AssertReturnVoid(index.isValid());
-
-    /* Acquire model: */
-    const UISelectorModel *pModel = qobject_cast<const UISelectorModel*>(index.model());
 
     /* Acquire item properties: */
@@ -725 +730 @@
 }
 
-void UISelectorModel::sort(int /* iColumn */, Qt::SortOrder enmOrder)
-{
-    /* Prepare empty list for sorted items: */
-    QList<UISelectorTreeViewItem*> sortedItems;
-
-    /* For each of items: */
-    const int iItemCount = m_pRootItem->childCount();
-    for (int iItemPos = 0; iItemPos < iItemCount; ++iItemPos)
-    {
-        /* Get iterated item/id: */
-        UISelectorTreeViewItem *pItem = m_pRootItem->childItem(iItemPos);
-        const int iID = pItem->id();
-
-        /* Gather suitable position in the list of sorted items: */
-        int iInsertPosition = 0;
-        for (; iInsertPosition < sortedItems.size(); ++iInsertPosition)
-        {
-            /* Get sorted item/id: */
-            UISelectorTreeViewItem *pSortedItem = sortedItems.at(iInsertPosition);
-            const int iSortedID = pSortedItem->id();
-
-            /* Apply sorting rule: */
-            if (   ((enmOrder == Qt::AscendingOrder) && (iID < iSortedID))
-                || ((enmOrder == Qt::DescendingOrder) && (iID > iSortedID)))
-                break;
-        }
-
-        /* Insert iterated item into sorted position: */
-        sortedItems.insert(iInsertPosition, pItem);
-    }
-
-    /* Update corresponding model-indexes: */
-    m_pRootItem->setChildren(sortedItems);
-    beginMoveRows(root(), 0, iItemCount - 1, root(), 0);
-    endMoveRows();
-}
-
 Qt::ItemFlags UISelectorModel::flags(const QModelIndex &specifiedIndex) const
 {
@@ -790 +758 @@
 {
     /* Sanity check: */
-    UISelectorModel *pModel = qobject_cast<UISelectorModel*>(model());
+    QSortFilterProxyModel *pProxyModel = qobject_cast<QSortFilterProxyModel*>(model());
+    AssertPtrReturn(pProxyModel, QITreeView::minimumSizeHint());
+    UISelectorModel *pModel = qobject_cast<UISelectorModel*>(pProxyModel->sourceModel());
     AssertPtrReturn(pModel, QITreeView::minimumSizeHint());
 
@@ -820 +790 @@
 {
     /* Configure tree-view: */
+    setSortingEnabled(true);
+    sortByColumn(0, Qt::AscendingOrder);
     setFrameShape(QFrame::NoFrame);
     viewport()->setAutoFillBackground(false);
@@ -925 +897 @@
     , m_pTreeView(0)
     , m_pModel(0)
+    , m_pModelProxy(0)
 {
     prepare();
@@ -990 +963 @@
 {
     int iID = -1;
-    const QModelIndex index = m_pTreeView->currentIndex();
+    const QModelIndex proxyIndex = m_pTreeView->currentIndex();
+    const QModelIndex index = m_pModelProxy->mapToSource(proxyIndex);
     if (index.isValid())
         iID = m_pModel->data(index, UISelectorModel::R_ItemId).toString().toInt();
@@ -1008 +982 @@
 {
     const QModelIndex index = m_pModel->findItem(iID);
-    if (index.isValid())
-        m_pTreeView->setCurrentIndex(index);
-}
-
-void UISettingsSelectorTreeView::sltHandleCurrentChanged(const QModelIndex &index,
+    const QModelIndex proxyIndex = m_pModelProxy->mapFromSource(index);
+    if (proxyIndex.isValid())
+        m_pTreeView->setCurrentIndex(proxyIndex);
+}
+
+void UISettingsSelectorTreeView::sltHandleCurrentChanged(const QModelIndex &proxyIndex,
                                                          const QModelIndex & /* previousIndex */)
 {
+    const QModelIndex index = m_pModelProxy->mapToSource(proxyIndex);
     if (index.isValid())
     {
@@ -1033 +1009 @@
         if (m_pModel)
         {
-            m_pTreeView->setModel(m_pModel);
-            m_pTreeView->setRootIndex(m_pModel->root());
+            /* Create proxy-model: */
+            m_pModelProxy = new QSortFilterProxyModel(m_pTreeView);
+            if (m_pModelProxy)
+            {
+                /* Configure proxy-model: */
+                m_pModelProxy->setSortRole(UISelectorModel::R_ItemId);
+                m_pModelProxy->setSourceModel(m_pModel);
+                m_pTreeView->setModel(m_pModelProxy);
+            }
+            const QModelIndex proxyIndex = m_pModelProxy->mapFromSource(m_pModel->root());
+            m_pTreeView->setRootIndex(proxyIndex);
         }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.h

@@ -41 +41 @@
 class QAction;
 class QActionGroup;
+class QSortFilterProxyModel;
 class QTabWidget;
 class QTreeWidget;
@@ -184 +185 @@
 
     /** Holds the tree-view instance. */
-    UISelectorTreeView *m_pTreeView;
+    UISelectorTreeView    *m_pTreeView;
     /** Holds the model instance. */
-    UISelectorModel    *m_pModel;
+    UISelectorModel       *m_pModel;
+    /** Holds the proxy-model instance. */
+    QSortFilterProxyModel *m_pModelProxy;
 };