X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=0104b7c9e32f3de4c146c52ab6326e7fb8b68b9d;hp=e221e5627c2b337c2dc797151a34947fa77844ee;hb=d008cab11b7508601e793d47e53a87be9972aed1;hpb=8ad61f4071a69445a6917d214b6592878447ddb1;ds=sidebyside

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index e221e562..0104b7c9 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -148,6 +148,17 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 	return form;
 }
 
+#ifdef ENABLE_DECODE
+static gint sort_pds(gconstpointer a, gconstpointer b)
+{
+	const struct srd_decoder *sda, *sdb;
+
+	sda = (const struct srd_decoder *)a;
+	sdb = (const struct srd_decoder *)b;
+	return strcmp(sda->id, sdb->id);
+}
+#endif
+
 QWidget *Settings::get_about_page(QWidget *parent) const
 {
 #ifdef ENABLE_DECODE
@@ -169,6 +180,9 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 	shared_ptr<sigrok::Context> context = device_manager_.context();
 
 	QString s;
+
+	s.append("<style type=\"text/css\"> tr .id { white-space: pre; padding-right: 5px; } </style>");
+
 	s.append("<table>");
 
 	/* Library info */
@@ -176,12 +190,18 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 		tr("Used libraries:") + "</b></td></tr>");
 	s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
 		.arg(QString("Qt"), qVersion()));
+	s.append(QString("<tr><td><i>%1</i></td><td>%2 (lib version %3)</td></tr>")
+		.arg(QString("libsigrok"), sr_package_version_string_get(), sr_lib_version_string_get()));
+#ifdef ENABLE_DECODE
+	s.append(QString("<tr><td><i>%1</i></td><td>%2 (lib version %3)</td></tr>")
+		.arg(QString("libsigrokdecode"), srd_package_version_string_get(), srd_lib_version_string_get()));
+#endif
 
 	/* Set up the supported field */
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported hardware drivers:") + "</b></td></tr>");
 	for (auto entry : context->drivers()) {
-		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+		s.append(QString("<tr><td class=\"id\"><i>%1</i></td><td>%2</td></tr>")
 			.arg(QString::fromUtf8(entry.first.c_str()),
 				QString::fromUtf8(entry.second->long_name().c_str())));
 	}
@@ -189,7 +209,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported input formats:") + "</b></td></tr>");
 	for (auto entry : context->input_formats()) {
-		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+		s.append(QString("<tr><td class=\"id\"><i>%1</i></td><td>%2</td></tr>")
 			.arg(QString::fromUtf8(entry.first.c_str()),
 				QString::fromUtf8(entry.second->description().c_str())));
 	}
@@ -197,7 +217,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported output formats:") + "</b></td></tr>");
 	for (auto entry : context->output_formats()) {
-		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+		s.append(QString("<tr><td class=\"id\"><i>%1</i></td><td>%2</td></tr>")
 			.arg(QString::fromUtf8(entry.first.c_str()),
 				QString::fromUtf8(entry.second->description().c_str())));
 	}
@@ -205,12 +225,15 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 #ifdef ENABLE_DECODE
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported protocol decoders:") + "</b></td></tr>");
-	for (const GSList *l = srd_decoder_list(); l; l = l->next) {
+	GSList *sl = g_slist_copy((GSList *)srd_decoder_list());
+	sl = g_slist_sort(sl, sort_pds);
+	for (const GSList *l = sl; l; l = l->next) {
 		dec = (struct srd_decoder *)l->data;
-		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+		s.append(QString("<tr><td class=\"id\"><i>%1</i></td><td>%2</td></tr>")
 			.arg(QString::fromUtf8(dec->id),
 				QString::fromUtf8(dec->longname)));
 	}
+	g_slist_free(sl);
 #endif
 
 	s.append("</table>");