X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsubwindows%2Fdecoder_selector%2Fsubwindow.cpp;h=96da710fb052ca9228214eff5a36a3772efba75f;hp=165b90d8a3e055baebc5fffa44acf9cfb407386b;hb=0e2ba0cc745e763279510d943593abce52a36040;hpb=5da32ad69122ca5583c66ccdbc552ea1ae313566

diff --git a/pv/subwindows/decoder_selector/subwindow.cpp b/pv/subwindows/decoder_selector/subwindow.cpp
index 165b90d8..96da710f 100644
--- a/pv/subwindows/decoder_selector/subwindow.cpp
+++ b/pv/subwindows/decoder_selector/subwindow.cpp
@@ -19,11 +19,14 @@
 
 #include <algorithm>
 
+#include <QApplication>
 #include <QDebug>
+#include <QFontMetrics>
 #include <QInputDialog>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
+#include <QScrollArea>
 #include <QVBoxLayout>
 
 #include "pv/session.hpp"
@@ -36,6 +39,9 @@ namespace pv {
 namespace subwindows {
 namespace decoder_selector {
 
+const QString initial_notice = QApplication::tr("Select a decoder to see its description here.");
+const int min_width_margin = 75;
+
 
 bool QCustomSortFilterProxyModel::filterAcceptsRow(int source_row,
 	const QModelIndex& source_parent) const
@@ -96,6 +102,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);
@@ -110,10 +117,14 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
 
 	tree_view_->setIndentation(10);
 
+	QScrollArea* info_label_body_container = new QScrollArea();
+	info_label_body_container->setWidget(info_label_body_);
+	info_label_body_container->setWidgetResizable(true);
+
 	info_box_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 	QVBoxLayout* info_box_layout = new QVBoxLayout(info_box_);
 	info_box_layout->addWidget(info_label_header_);
-	info_box_layout->addWidget(info_label_body_);
+	info_box_layout->addWidget(info_label_body_container);
 	info_box_layout->addWidget(info_label_footer_);
 	info_box_layout->setAlignment(Qt::AlignTop);
 	Qt::TextInteractionFlags flags = Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard;
@@ -121,7 +132,8 @@ 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(tr("Select a decoder to see its description here."));
+	info_label_body_->setText(initial_notice);
+	info_label_body_->setAlignment(Qt::AlignTop);
 	info_label_footer_->setWordWrap(true);
 	info_label_footer_->setTextInteractionFlags(flags);
 
@@ -135,6 +147,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
@@ -149,6 +164,14 @@ QToolBar* SubWindow::create_toolbar(QWidget *parent) const
 	return toolbar;
 }
 
+int SubWindow::minimum_width() const
+{
+	QFontMetrics m(info_label_body_->font());
+	const int label_width = m.width(initial_notice);
+
+	return label_width + min_width_margin;
+}
+
 vector<const char*> SubWindow::get_decoder_inputs(const srd_decoder* d) const
 {
 	vector<const char*> ret_val;
@@ -170,8 +193,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);
 	}
 
@@ -194,7 +219,7 @@ void SubWindow::on_item_changed(const QModelIndex& index)
 	const QString id = QString::fromUtf8(d->id);
 	const QString longname = QString::fromUtf8(d->longname);
 	const QString desc = QString::fromUtf8(d->desc);
-	const QString doc = QString::fromUtf8(srd_decoder_doc_get(d));
+	const QString doc = QString::fromUtf8(srd_decoder_doc_get(d)).trimmed();
 
 	QString tags;
 	for (GSList* li = (GSList*)d->tags; li; li = li->next) {
@@ -204,7 +229,7 @@ void SubWindow::on_item_changed(const QModelIndex& index)
 		tags.append(s);
 	}
 
-	info_label_header_->setText(QString("<span style='font-size:large;font-weight:bold'>%1 (%2)</span><br>%3")
+	info_label_header_->setText(QString("<span style='font-size:large'><b>%1 (%2)</b></span><br><i>%3</i>")
 		.arg(longname, id, desc));
 	info_label_body_->setText(doc);
 	info_label_footer_->setText(tr("<p align='right'>Tags: %1</p>").arg(tags));
@@ -232,13 +257,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) {
@@ -281,6 +306,9 @@ 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());
 }
 
 } // namespace decoder_selector