X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsubwindows%2Fdecoder_selector%2Fsubwindow.cpp;h=94ed6f4b6da970e02a3191ba2a87dc7d951bd054;hb=24d69d27584c7adec70bc0d6db764a3db04fce3c;hp=948c5ae81b7b8b7cbc155f653eaae986ed305837;hpb=66ab3d702150a3122c5ec3bfcd7f4da930732383;p=pulseview.git

diff --git a/pv/subwindows/decoder_selector/subwindow.cpp b/pv/subwindows/decoder_selector/subwindow.cpp
index 948c5ae8..94ed6f4b 100644
--- a/pv/subwindows/decoder_selector/subwindow.cpp
+++ b/pv/subwindows/decoder_selector/subwindow.cpp
@@ -32,14 +32,23 @@
 #include "pv/session.hpp"
 #include "pv/subwindows/decoder_selector/subwindow.hpp"
 
+#include <libsigrokdecode/libsigrokdecode.h>
+#include "subwindow.hpp"  // Required only for lupdate since above include isn't recognized
+
+#define DECODERS_HAVE_TAGS \
+	((SRD_PACKAGE_VERSION_MAJOR > 0) || \
+	 (SRD_PACKAGE_VERSION_MAJOR == 0) && (SRD_PACKAGE_VERSION_MINOR > 5))
+
 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;
 
 
@@ -100,7 +109,9 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
 	filter->setClearButtonEnabled(true);
 	filter->addAction(filter_icon, QLineEdit::LeadingPosition);
 
+
 	sort_filter_model_->setSourceModel(model_);
+	sort_filter_model_->setSortCaseSensitivity(Qt::CaseInsensitive);
 	sort_filter_model_->setFilterCaseSensitivity(Qt::CaseInsensitive);
 	sort_filter_model_->setFilterKeyColumn(-1);
 
@@ -117,6 +128,11 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
 
 	tree_view_->setIndentation(10);
 
+#if (!DECODERS_HAVE_TAGS)
+	tree_view_->expandAll();
+	tree_view_->setItemsExpandable(false);
+#endif
+
 	QScrollArea* info_label_body_container = new QScrollArea();
 	info_label_body_container->setWidget(info_label_body_);
 	info_label_body_container->setWidgetResizable(true);
@@ -132,7 +148,7 @@ 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);
@@ -169,7 +185,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;
 }
@@ -207,34 +223,47 @@ vector<const srd_decoder*> SubWindow::get_decoders_providing(const char* output)
 
 void SubWindow::on_item_changed(const QModelIndex& index)
 {
-	if (!index.isValid())
-		return;
+	QString decoder_name, id, longname, desc, doc, tags;
 
-	QModelIndex id_index = index.model()->index(index.row(), 2, index.parent());
-	QString decoder_name = index.model()->data(id_index, Qt::DisplayRole).toString();
+	// If the parent isn't valid, a category title was clicked
+	if (index.isValid() && index.parent().isValid()) {
+		QModelIndex id_index = index.model()->index(index.row(), 2, index.parent());
+		decoder_name = index.model()->data(id_index, Qt::DisplayRole).toString();
 
-	if (decoder_name.isEmpty())
-		return;
+		if (decoder_name.isEmpty())
+			return;
 
-	const srd_decoder* d = srd_decoder_get_by_id(decoder_name.toUtf8());
+		const srd_decoder* d = srd_decoder_get_by_id(decoder_name.toUtf8());
 
-	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)).trimmed();
+		id = QString::fromUtf8(d->id);
+		longname = QString::fromUtf8(d->longname);
+		desc = QString::fromUtf8(d->desc);
+		doc = QString::fromUtf8(srd_decoder_doc_get(d)).trimmed();
 
-	QString tags;
-	for (GSList* li = (GSList*)d->tags; li; li = li->next) {
-		QString s = (li == (GSList*)d->tags) ?
-			tr((char*)li->data) :
-			QString(tr(", %1")).arg(tr((char*)li->data));
-		tags.append(s);
-	}
+#if DECODERS_HAVE_TAGS
+		for (GSList* li = (GSList*)d->tags; li; li = li->next) {
+			QString s = (li == (GSList*)d->tags) ?
+				tr((char*)li->data) :
+				QString(tr(", %1")).arg(tr((char*)li->data));
+			tags.append(s);
+		}
+#endif
+	} else
+		doc = QString(tr(initial_notice));
+
+	if (!id.isEmpty())
+		info_label_header_->setText(
+			QString("<span style='font-size:large'><b>%1 (%2)</b></span><br><i>%3</i>")
+			.arg(longname, id, desc));
+	else
+		info_label_header_->clear();
 
-	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));
+
+	if (!tags.isEmpty())
+		info_label_footer_->setText(tr("<p align='right'>Tags: %1</p>").arg(tags));
+	else
+		info_label_footer_->clear();
 }
 
 void SubWindow::on_item_activated(const QModelIndex& index)