X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsubwindows%2Fdecoder_selector%2Fsubwindow.cpp;h=719d2efa1456142ac940936ec80560e671ad2a6e;hp=375e749e789b9860af5988f07422a42c404d5ea9;hb=b229a1b72d6f675e0fcf14aa83285e5c3ca122be;hpb=a6fab02455b3d9910fe1bcc51ab644f224ee52e1 diff --git a/pv/subwindows/decoder_selector/subwindow.cpp b/pv/subwindows/decoder_selector/subwindow.cpp index 375e749e..719d2efa 100644 --- a/pv/subwindows/decoder_selector/subwindow.cpp +++ b/pv/subwindows/decoder_selector/subwindow.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -36,6 +37,24 @@ namespace subwindows { namespace decoder_selector { +bool QCustomSortFilterProxyModel::filterAcceptsRow(int source_row, + const QModelIndex& source_parent) const +{ + // Search model recursively + + if (QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent)) + return true; + + const QModelIndex index = sourceModel()->index(source_row, 0, source_parent); + + for (int i = 0; i < sourceModel()->rowCount(index); i++) + if (filterAcceptsRow(i, index)) + return true; + + return false; +} + + void QCustomTreeView::currentChanged(const QModelIndex& current, const QModelIndex& previous) { @@ -53,17 +72,30 @@ SubWindow::SubWindow(Session& session, QWidget* parent) : info_label_body_(new QLabel()), info_label_footer_(new QLabel()), model_(new DecoderCollectionModel()), - sort_filter_model_(new QSortFilterProxyModel()) + sort_filter_model_(new QCustomSortFilterProxyModel()) { QVBoxLayout* root_layout = new QVBoxLayout(this); root_layout->setContentsMargins(0, 0, 0, 0); root_layout->addWidget(splitter_); + QWidget* upper_container = new QWidget(); + QVBoxLayout* upper_layout = new QVBoxLayout(upper_container); + upper_layout->setContentsMargins(0, 5, 0, 0); + QLineEdit* filter = new QLineEdit(); + upper_layout->addWidget(filter); + upper_layout->addWidget(tree_view_); + splitter_->setOrientation(Qt::Vertical); - splitter_->addWidget(tree_view_); + splitter_->addWidget(upper_container); splitter_->addWidget(info_box_); + const QIcon filter_icon(QIcon::fromTheme("search", + QIcon(":/icons/search.svg"))); + filter->setClearButtonEnabled(true); + filter->addAction(filter_icon, QLineEdit::LeadingPosition); + sort_filter_model_->setSourceModel(model_); + sort_filter_model_->setFilterCaseSensitivity(Qt::CaseInsensitive); tree_view_->setModel(sort_filter_model_); tree_view_->setRootIsDecorated(true); @@ -81,6 +113,9 @@ SubWindow::SubWindow(Session& session, QWidget* parent) : info_label_body_->setWordWrap(true); info_label_body_->setText(tr("Select a decoder to see its description here.")); + connect(filter, SIGNAL(textChanged(const QString&)), + this, SLOT(on_filter_changed(const QString&))); + connect(tree_view_, SIGNAL(currentChanged(const QModelIndex&)), this, SLOT(on_item_changed(const QModelIndex&))); connect(tree_view_, SIGNAL(activated(const QModelIndex&)), @@ -256,6 +291,11 @@ void SubWindow::on_item_activated(const QModelIndex& index) new_decoders_selected(decoders); } +void SubWindow::on_filter_changed(const QString& text) +{ + sort_filter_model_->setFilterFixedString(text); +} + } // namespace decoder_selector } // namespace subwindows } // namespace pv