X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fsubwindows%2Fdecoder_selector%2Fsubwindow.cpp;h=719d2efa1456142ac940936ec80560e671ad2a6e;hb=b229a1b72d6f675e0fcf14aa83285e5c3ca122be;hp=781e494fbc85d5196bcb823cd63098db6d123df9;hpb=c2b80ad9a17caef1089848134b2354c544ea1dc3;p=pulseview.git

diff --git a/pv/subwindows/decoder_selector/subwindow.cpp b/pv/subwindows/decoder_selector/subwindow.cpp
index 781e494..719d2ef 100644
--- a/pv/subwindows/decoder_selector/subwindow.cpp
+++ b/pv/subwindows/decoder_selector/subwindow.cpp
@@ -22,6 +22,7 @@
 #include <QDebug>
 #include <QInputDialog>
 #include <QLabel>
+#include <QLineEdit>
 #include <QPushButton>
 #include <QVBoxLayout>
 
@@ -36,26 +37,70 @@ 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)
+{
+	QTreeView::currentChanged(current, previous);
+	currentChanged(current);
+}
+
+
 SubWindow::SubWindow(Session& session, QWidget* parent) :
 	SubWindowBase(session, parent),
 	splitter_(new QSplitter()),
-	tree_view_(new QTreeView()),
+	tree_view_(new QCustomTreeView()),
 	info_box_(new QWidget()),
 	info_label_header_(new QLabel()),
 	info_label_body_(new QLabel()),
 	info_label_footer_(new QLabel()),
-	model_(new DecoderCollectionModel())
+	model_(new DecoderCollectionModel()),
+	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_);
 
-	tree_view_->setModel(model_);
+	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);
+	tree_view_->setSortingEnabled(true);
+	tree_view_->sortByColumn(0, Qt::AscendingOrder);
 
 	// Hide the columns that hold the detailed item information
 	tree_view_->hideColumn(2);  // ID
@@ -68,10 +113,13 @@ 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(tree_view_, SIGNAL(clicked(const QModelIndex&)),
-		this, SLOT(on_item_clicked(const QModelIndex&)));
-	connect(tree_view_, SIGNAL(doubleClicked(const QModelIndex&)),
-		this, SLOT(on_item_double_clicked(const QModelIndex&)));
+	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&)),
+		this, SLOT(on_item_activated(const QModelIndex&)));
 
 	connect(this, SIGNAL(new_decoders_selected(vector<const srd_decoder*>)),
 		&session, SLOT(on_new_decoders_selected(vector<const srd_decoder*>)));
@@ -141,7 +189,7 @@ vector<const srd_decoder*> SubWindow::decoders_providing(const char* output) con
 	return ret_val;
 }
 
-void SubWindow::on_item_clicked(const QModelIndex& index)
+void SubWindow::on_item_changed(const QModelIndex& index)
 {
 	if (!index.isValid())
 		return;
@@ -175,7 +223,7 @@ void SubWindow::on_item_clicked(const QModelIndex& index)
 	info_label_footer_->setText(tr("<p align='right'>Tags: %1</p>").arg(tags));
 }
 
-void SubWindow::on_item_double_clicked(const QModelIndex& index)
+void SubWindow::on_item_activated(const QModelIndex& index)
 {
 	if (!index.isValid())
 		return;
@@ -243,6 +291,11 @@ void SubWindow::on_item_double_clicked(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