X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=15655a7065cb32363897012f26e7d7305f3db2c1;hb=fe934a93e0dbdab4746091738450f9198a809666;hp=e221e5627c2b337c2dc797151a34947fa77844ee;hpb=8ad61f4071a69445a6917d214b6592878447ddb1;p=pulseview.git

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index e221e56..15655a7 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
@@ -176,6 +187,12 @@ 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>" +
@@ -205,12 +222,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>")
 			.arg(QString::fromUtf8(dec->id),
 				QString::fromUtf8(dec->longname)));
 	}
+	g_slist_free(sl);
 #endif
 
 	s.append("</table>");