feat: Search commandpage [8/9]

src/widgets/helper/EditableModelView.cpp

@@ -150,6 +150,62 @@ void EditableModelView::addRegexHelpLink()
     this->addCustomButton(regexHelpLabel);
 }
 
+bool EditableModelView::filterSearchResults(const QString &query,
+                                            std::span<const int> columnSelect)
+{
+    bool searchFoundSomething = false;
+    auto rowAmount = this->model_->rowCount();
+
+    // make sure to show the page even if the table is empty,
+    // but only if we aren't search something
+    if (rowAmount == 0 && query.isEmpty())
+    {
+        return true;
+    }
+
+    for (int i = 0; i < rowAmount; i++)
+    {
+        tableView_->hideRow(i);
+    }
+    for (int j : columnSelect)
+    {
+        for (int i = 0; i < rowAmount; i++)
+        {
+            QModelIndex idx = model_->index(i, j);
+            QVariant a = model_->data(idx);
+            if (a.toString().contains(query, Qt::CaseInsensitive))
+            {
+                tableView_->showRow(i);
+                searchFoundSomething = true;
+            }
+        }
+    }
+    return searchFoundSomething;
+}
+
+void EditableModelView::filterSearchResultsHotkey(
+    const QKeySequence &keySequenceQuery)
+{
+    auto rowAmount = this->model_->rowCount();
+    for (int i = 0; i < rowAmount; i++)
+    {
+        tableView_->hideRow(i);
+    }
+    for (int i = 0; i < rowAmount; i++)
+    {
+        QModelIndex idx = model_->index(i, 1);
+        QVariant a = model_->data(idx);
+        auto seq = qvariant_cast<QKeySequence>(a);
+
+        // todo: Make this fuzzy match, right now only exact matches happen
+        // so ctrl+f won't match ctrl+shift+f shortcuts
+        if (keySequenceQuery.matches(seq) != QKeySequence::NoMatch)
+        {
+            tableView_->showRow(i);
+        }
+    }
+}
+
 void EditableModelView::moveRow(int dir)
 {
     auto selected = this->getTableView()->selectionModel()->selectedRows(0);

src/widgets/helper/EditableModelView.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <pajlada/signals/signal.hpp>
+#include <QKeySequence>
 #include <QWidget>
 
 class QAbstractTableModel;
@@ -25,6 +26,10 @@ class EditableModelView : public QWidget
     void addCustomButton(QWidget *widget);
     void addRegexHelpLink();
 
+    bool filterSearchResults(const QString &query,
+                             std::span<const int> columnSelect);
+    void filterSearchResultsHotkey(const QKeySequence &keySequenceQuery);
+
 private:
     QTableView *tableView_{};
     QAbstractTableModel *model_{};

src/widgets/settingspages/CommandPage.cpp

@@ -87,10 +87,12 @@ CommandPage::CommandPage()
     LayoutCreator<CommandPage> layoutCreator(this);
     auto layout = layoutCreator.setLayoutType<QVBoxLayout>();
 
-    auto *view = layout
-                     .emplace<EditableModelView>(
-                         getApp()->getCommands()->createModel(nullptr))
-                     .getElement();
+    EditableModelView *view =
+        layout
+            .emplace<EditableModelView>(
+                getApp()->getCommands()->createModel(nullptr))
+            .getElement();
+    this->view_ = view;
 
     view->setTitles({"Trigger", "Command", "Show In\nMessage Menu"});
     view->getTableView()->horizontalHeader()->setSectionResizeMode(
@@ -137,32 +139,39 @@ CommandPage::CommandPage()
 
     // NOTE: These signals mean that the duplicate check happens in the middle of a row being moved, where he index can be wrong.
     // This should be reconsidered, or potentially changed in the signalvectormodel. Or maybe we rely on a SignalVectorModel signal instead
-    QObject::connect(view->getModel(), &QAbstractItemModel::rowsInserted, this,
-                     [view, duplicateWarning]() {
-                         checkCommandDuplicates(view, duplicateWarning);
+    QObject::connect(view_->getModel(), &QAbstractItemModel::rowsInserted, this,
+                     [this, duplicateWarning]() {
+                         checkCommandDuplicates(view_, duplicateWarning);
                      });
 
-    QObject::connect(view->getModel(), &QAbstractItemModel::rowsRemoved, this,
-                     [view, duplicateWarning]() {
-                         checkCommandDuplicates(view, duplicateWarning);
+    QObject::connect(view_->getModel(), &QAbstractItemModel::rowsRemoved, this,
+                     [this, duplicateWarning]() {
+                         checkCommandDuplicates(view_, duplicateWarning);
                      });
 
-    QObject::connect(view->getModel(), &QAbstractItemModel::dataChanged, this,
-                     [view, duplicateWarning](const QModelIndex &topLeft,
+    QObject::connect(view_->getModel(), &QAbstractItemModel::dataChanged, this,
+                     [this, duplicateWarning](const QModelIndex &topLeft,
                                               const QModelIndex &bottomRight,
                                               const QVector<int> &roles) {
                          (void)topLeft;
                          (void)bottomRight;
                          if (roles.contains(Qt::EditRole))
                          {
-                             checkCommandDuplicates(view, duplicateWarning);
+                             checkCommandDuplicates(view_, duplicateWarning);
                          }
                      });
 
-    checkCommandDuplicates(view, duplicateWarning);
+    checkCommandDuplicates(view_, duplicateWarning);
 
     // ---- end of layout
     this->commandsEditTimer_.setSingleShot(true);
 }
 
+bool CommandPage::filterElements(const QString &query)
+{
+    std::array fields{0, 1};
+
+    return this->view_->filterSearchResults(query, fields);
+}
+
 }  // namespace chatterino

src/widgets/settingspages/CommandPage.hpp

@@ -6,13 +6,17 @@
 
 namespace chatterino {
 
+class EditableModelView;
+
 class CommandPage : public SettingsPage
 {
 public:
     CommandPage();
+    bool filterElements(const QString &query) override;
 
 private:
     QTimer commandsEditTimer_;
+    EditableModelView *view_;
 };
 
 }  // namespace chatterino