X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsubwindows%2Fdecoder_selector%2Fsubwindow.cpp;h=0b49c34aa190af74235473839dec121ce2392651;hp=af6de2d95f295a87827805083b0892f75e4ad533;hb=1fd847fedce2d8b93080ee7cd4d8c86aa916f6d2;hpb=e0cfcb0e4f744a1e28f83b1babb4bc48ef680f79

diff --git a/pv/subwindows/decoder_selector/subwindow.cpp b/pv/subwindows/decoder_selector/subwindow.cpp
index af6de2d9..0b49c34a 100644
--- a/pv/subwindows/decoder_selector/subwindow.cpp
+++ b/pv/subwindows/decoder_selector/subwindow.cpp
@@ -33,13 +33,15 @@
 #include "pv/subwindows/decoder_selector/subwindow.hpp"
 
 using std::reverse;
-using std::shared_ptr;
 
 namespace pv {
 namespace subwindows {
 namespace decoder_selector {
 
-const QString initial_notice = QApplication::tr("Select a decoder to see its description here.");
+const char *initial_notice =
+	QT_TRANSLATE_NOOP("pv::subwindows::decoder_selector::SubWindow",
+		"Select a decoder to see its description here.");  // clazy:exclude=non-pod-global-static
+
 const int min_width_margin = 75;
 
 
@@ -102,6 +104,7 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
 
 	sort_filter_model_->setSourceModel(model_);
 	sort_filter_model_->setFilterCaseSensitivity(Qt::CaseInsensitive);
+	sort_filter_model_->setFilterKeyColumn(-1);
 
 	tree_view_->setModel(sort_filter_model_);
 	tree_view_->setRootIsDecorated(true);
@@ -131,13 +134,15 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
 	info_label_header_->setTextInteractionFlags(flags);
 	info_label_body_->setWordWrap(true);
 	info_label_body_->setTextInteractionFlags(flags);
-	info_label_body_->setText(initial_notice);
+	info_label_body_->setText(QString(tr(initial_notice)));
 	info_label_body_->setAlignment(Qt::AlignTop);
 	info_label_footer_->setWordWrap(true);
 	info_label_footer_->setTextInteractionFlags(flags);
 
 	connect(filter, SIGNAL(textChanged(const QString&)),
 		this, SLOT(on_filter_changed(const QString&)));
+	connect(filter, SIGNAL(returnPressed()),
+		this, SLOT(on_filter_return_pressed()));
 
 	connect(tree_view_, SIGNAL(currentChanged(const QModelIndex&)),
 		this, SLOT(on_item_changed(const QModelIndex&)));
@@ -146,6 +151,9 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
 
 	connect(this, SIGNAL(new_decoders_selected(vector<const srd_decoder*>)),
 		&session, SLOT(on_new_decoders_selected(vector<const srd_decoder*>)));
+
+	// Place the keyboard cursor in the filter QLineEdit initially
+	filter->setFocus();
 }
 
 bool SubWindow::has_toolbar() const
@@ -163,7 +171,7 @@ QToolBar* SubWindow::create_toolbar(QWidget *parent) const
 int SubWindow::minimum_width() const
 {
 	QFontMetrics m(info_label_body_->font());
-	const int label_width = m.width(initial_notice);
+	const int label_width = m.width(QString(tr(initial_notice)));
 
 	return label_width + min_width_margin;
 }
@@ -189,8 +197,10 @@ vector<const srd_decoder*> SubWindow::get_decoders_providing(const char* output)
 		if (!d->outputs)
 			continue;
 
+		const int maxlen = 1024;
+
 		// TODO For now we ignore that d->outputs is actually a list
-		if (strncmp((char*)(d->outputs->data), output, strlen(output)) == 0)
+		if (strncmp((char*)(d->outputs->data), output, maxlen) == 0)
 			ret_val.push_back(d);
 	}
 
@@ -251,13 +261,13 @@ void SubWindow::on_item_activated(const QModelIndex& index)
 		return;
 	}
 
-	if (strncmp(inputs.at(0), "logic", 5) == 0) {
+	if (strcmp(inputs.at(0), "logic") == 0) {
 		new_decoders_selected(decoders);
 		return;
 	}
 
 	// Check if we can automatically fulfill the stacking requirements
-	while (strncmp(inputs.at(0), "logic", 5) != 0) {
+	while (strcmp(inputs.at(0), "logic") != 0) {
 		vector<const srd_decoder*> prov_decoders = get_decoders_providing(inputs.at(0));
 
 		if (prov_decoders.size() == 0) {
@@ -300,6 +310,31 @@ void SubWindow::on_item_activated(const QModelIndex& index)
 void SubWindow::on_filter_changed(const QString& text)
 {
 	sort_filter_model_->setFilterFixedString(text);
+
+	// Expand the "All Decoders" category/tag if the user filtered
+	tree_view_->setExpanded(tree_view_->model()->index(0, 0), !text.isEmpty());
+}
+
+void SubWindow::on_filter_return_pressed()
+{
+	int num_visible_decoders = 0;
+	QModelIndex last_valid_index;
+
+	QModelIndex index = tree_view_->model()->index(0, 0);
+
+	while (index.isValid()) {
+		QModelIndex id_index = index.model()->index(index.row(), 2, index.parent());
+		QString decoder_name = index.model()->data(id_index, Qt::DisplayRole).toString();
+		if (!decoder_name.isEmpty()) {
+			last_valid_index = index;
+			num_visible_decoders++;
+		}
+		index = tree_view_->indexBelow(index);
+	}
+
+	// If only one decoder matches the filter, apply it when the user presses enter
+	if (num_visible_decoders == 1)
+		tree_view_->activated(last_valid_index);
 }
 
 } // namespace decoder_selector