Fuzzy text search, part 4: Search palettes & plugins

src/palette/internal/palettemodel.cpp

@@ -1109,44 +1109,3 @@ bool FilterPaletteTreeModel::filterAcceptsRow(int sourceRow, const QModelIndex&
     }
     return cellFilter->accept(*cell);
 }
-
-//---------------------------------------------------------
-//   PaletteCellFilterProxyModel::PaletteCellFilterProxyModel
-//---------------------------------------------------------
-
-PaletteCellFilterProxyModel::PaletteCellFilterProxyModel(QObject* parent)
-    : QSortFilterProxyModel(parent)
-{
-    setFilterRole(Qt::ToolTipRole);   // palette cells have no data for DisplayRole
-}
-
-//---------------------------------------------------------
-//   PaletteCellFilterProxyModel::filterAcceptsRow
-//---------------------------------------------------------
-
-bool PaletteCellFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
-{
-    const QAbstractItemModel* model = sourceModel();
-    const QModelIndex rowIndex = model->index(sourceRow, 0, sourceParent);
-    const int rowCount = model->rowCount(rowIndex);
-
-    if (rowCount == 0) {
-        if (QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent)) {
-            return true;
-        }
-        // accept row if its parent is accepted by filter: necessary to be able to search by palette name
-        if (sourceParent.isValid()
-            && QSortFilterProxyModel::filterAcceptsRow(sourceParent.row(), sourceParent.parent())) {
-            return true;
-        }
-        return false;
-    }
-
-    for (int i = 0; i < rowCount; ++i) {
-        if (filterAcceptsRow(i, rowIndex)) {
-            return true;
-        }
-    }
-
-    return false;
-}

src/palette/internal/palettemodel.h

@@ -225,19 +225,6 @@ private slots:
 public:
     FilterPaletteTreeModel(PaletteCellFilter* filter, PaletteTreeModel* model, QObject* parent = nullptr);
 };
-
-//---------------------------------------------------------
-//   PaletteCellFilterProxyModel
-//---------------------------------------------------------
-
-class PaletteCellFilterProxyModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-public:
-    PaletteCellFilterProxyModel(QObject* parent = nullptr);
-
-    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
-};
 }
 
 #endif

src/palette/internal/paletteprovider.cpp

@@ -29,20 +29,24 @@
 #include <QMimeData>
 #include <QStandardPaths>
 
+#include "global/translation.h"
+#include "global/io/path.h"
+#include "global/types/uri.h"
+
+#include "uicomponents/qml/Muse/UiComponents/fuzzyfilter.h"
+#include "uicomponents/qml/Muse/UiComponents/fuzzyscoresorter.h"
+#include "uicomponents/qml/Muse/UiComponents/sortfilterproxymodel.h"
+
 #include "engraving/dom/mscore.h"
 
 #include "notation/inotation.h"
 #include "notation/inotationinteraction.h" // IWYU pragma: keep
 
 #include "palettecreator.h"
 
-#include "io/path.h"
-
-#include "translation.h"
-#include "types/uri.h"
-
 #include "app_config.h"
 
+using namespace Qt::StringLiterals;
 using namespace muse;
 using namespace mu::palette;
 using namespace mu::engraving;
@@ -607,8 +611,25 @@ void PaletteProvider::init()
 
     m_masterPaletteModel = new PaletteTreeModel(PaletteCreator(iocContext()).newMasterPaletteTree(), iocContext(), this);
 
-    m_searchFilterModel = new PaletteCellFilterProxyModel(this);
-    m_searchFilterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+    {
+        m_fuzzyFilter = new uicomponents::FuzzyFilter(this);
+        m_fuzzyFilter->setRoleName(u"toolTip"_s);
+
+        auto* sorter = new uicomponents::FuzzyScoreSorter(this);
+        sorter->setFuzzyFilter(m_fuzzyFilter);
+        sorter->setEnabled(true);
+
+        auto* searchFilterModel = new uicomponents::SortFilterProxyModel(this);
+        QQmlListProperty<uicomponents::Filter> filters = searchFilterModel->filters();
+        filters.append(&filters, m_fuzzyFilter);
+        QQmlListProperty<uicomponents::Sorter> sorters = searchFilterModel->sorters();
+        sorters.append(&sorters, sorter);
+        searchFilterModel->setRecursiveFilteringEnabled(true);
+        // accept row if its parent is accepted by filter: necessary to be able to search by palette name
+        searchFilterModel->setAutoAcceptChildRows(true);
+
+        m_searchFilterModel = searchFilterModel;
+    }
 
     m_visibilityFilterModel = new QSortFilterProxyModel(this);
     m_visibilityFilterModel->setFilterRole(PaletteTreeModel::VisibleRole);
@@ -637,7 +658,7 @@ void PaletteProvider::setFilter(const QString& filter)
     // speed up the search in certain other scenarios,
     // e.g. when deleting search characters (going from fewer to more search results).
     m_searchFilterModel->setSourceModel(nullptr);
-    m_searchFilterModel->setFilterFixedString(filter);
+    m_fuzzyFilter->setFuzzyPattern(filter);
     if (!filter.isEmpty()) {
         m_searchFilterModel->setSourceModel(m_masterPaletteModel);
     }

src/palette/internal/paletteprovider.h

@@ -34,6 +34,10 @@
 #include "ipaletteprovider.h"
 #include "palettemodel.h"
 
+namespace muse::uicomponents {
+class FuzzyFilter;
+}
+
 namespace mu::palette {
 class AbstractPaletteController;
 class PaletteProvider;
@@ -315,6 +319,7 @@ private slots:
 
     QSortFilterProxyModel* m_visibilityFilterModel = nullptr;
     QSortFilterProxyModel* m_searchFilterModel = nullptr;
+    muse::uicomponents::FuzzyFilter* m_fuzzyFilter = nullptr;
 
     QAbstractItemModel* m_mainPalette = nullptr; // visible userPalette entries
     // PaletteTreeModel* poolPalette; // masterPalette entries not yet added to mainPalette