added search in grouping_dialog.cpp

emsec · Oct 12, 2023 · 8a39682 · 8a39682
1 parent 477f500
commit 8a39682
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/plugins/gui/include/gui/grouping_dialog/grouping_dialog.h b/plugins/gui/include/gui/grouping_dialog/grouping_dialog.h
@@ -95,6 +95,8 @@ namespace hal {
         GroupingTableView* mGroupingTableView;
         GroupingTableView* mLastUsed;
 
+        GroupingProxyModel* mProxyModel;
+
         QDialogButtonBox* mButtonBox;
         QTabWidget* mTabWidget;
 

diff --git a/plugins/gui/src/grouping_dialog/grouping_dialog.cpp b/plugins/gui/src/grouping_dialog/grouping_dialog.cpp
@@ -16,6 +16,7 @@ namespace hal {
     GroupingDialog::GroupingDialog(QWidget* parent)
         : QDialog(parent),
           mSearchbar(new Searchbar(this)),
+          mProxyModel(new GroupingProxyModel),
           mGroupingTableView(new GroupingTableView(false, this)),
           mLastUsed(nullptr),
           mTabWidget(new QTabWidget(this)),
@@ -34,7 +35,13 @@ namespace hal {
         connect(butSearch, &QPushButton::pressed, this, &GroupingDialog::handleToggleSearchbar);
         layout->addWidget(butSearch, 0, 1);
 
+        mProxyModel->setSourceModel(mGroupingTableView->model());
+        mProxyModel->setSortRole(Qt::UserRole);
+        mGroupingTableView->setModel(mProxyModel);
+
         mSearchbar->hide();
+        mSearchbar->setColumnNames(mProxyModel->getColumnNames());
+
         layout->addWidget(mSearchbar, 1, 0, 1, 3);
 
         mTabWidget->addTab(mGroupingTableView, "Groupings");
@@ -74,6 +81,7 @@ namespace hal {
         connect(mButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
         connect(mButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
         connect(mGroupingTableView, &GroupingTableView::groupingSelected, this, &GroupingDialog::handleGroupingSelected);
+        connect(mSearchbar, &Searchbar::triggerNewSearch, mProxyModel, &GroupingProxyModel::startSearch);
     }
 
     void GroupingDialog::handleNewGroupingClicked()

diff --git a/plugins/gui/src/searchbar/searchcolumndialog.cpp b/plugins/gui/src/searchbar/searchcolumndialog.cpp
@@ -47,6 +47,13 @@ namespace hal {
                 cbox->setChecked(true);
             mDisableHandler = false;
         }
+        if (sender()==mCheckAllColumns && state == Qt::Unchecked)
+        {
+            mDisableHandler = true;
+            for (QCheckBox* cbox : mCheckColumn)
+                cbox->setChecked(false);
+            mDisableHandler = false;
+        }
         bool allChecked = true;
         bool nullChecked = true;
 
@@ -58,8 +65,8 @@ namespace hal {
                 allChecked = false;
         }
 
-        if (mCheckAllColumns->isChecked() != allChecked)
-            mCheckAllColumns->setChecked(allChecked);
+        /*if (mCheckAllColumns->isChecked() != allChecked)
+            mCheckAllColumns->setChecked(allChecked);*/
 
         mButtonBox->button(QDialogButtonBox::Ok)->setDisabled(nullChecked);
     }