X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=f2f9e2692a753624b2750a5771405a7bce038660;hb=7df44935d55572baa53fce9ce4e8e3258b2d5ecb;hp=e8e102c2c36d3a0c75858bae555c3e6479593571;hpb=6579ca9227e50f8a3acd1a5d5364752864d2e7fd;p=pulseview.git

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index e8e102c2..f2f9e269 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -17,7 +17,10 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include <glib.h>
+#include <boost/version.hpp>
 
 #include <QApplication>
 #include <QCheckBox>
@@ -190,10 +193,18 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 	/* Library info */
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Libraries and features:") + "</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()));
+	s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+		.arg(QString("glibmm"), PV_GLIBMM_VERSION));
+	s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+		.arg(QString("Boost"), BOOST_LIB_VERSION));
+
+	s.append(QString("<tr><td><i>%1</i></td><td>%2/%3 (rt: %4/%5)</td></tr>")
+		.arg(QString("libsigrok"), SR_PACKAGE_VERSION_STRING,
+		SR_LIB_VERSION_STRING, sr_package_version_string_get(),
+		sr_lib_version_string_get()));
 
 	GSList *l_orig = sr_buildinfo_libs_get();
 	for (GSList *l = l_orig; l; l = l->next) {
@@ -217,11 +228,30 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 	g_free(scpi_backends);
 
 #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()));
+	s.append(QString("<tr><td><i>%1</i></td><td>%2/%3 (rt: %4/%5)</td></tr>")
+		.arg(QString("libsigrokdecode"), SRD_PACKAGE_VERSION_STRING,
+		SRD_LIB_VERSION_STRING, srd_package_version_string_get(),
+		srd_lib_version_string_get()));
+
+	l_orig = srd_buildinfo_libs_get();
+	for (GSList *l = l_orig; l; l = l->next) {
+		GSList *m = (GSList *)l->data;
+		const char *lib = (const char *)m->data;
+		const char *version = (const char *)m->next->data;
+		s.append(QString("<tr><td><i>- %1</i></td><td>%2</td></tr>")
+			.arg(QString(lib), QString(version)));
+		g_slist_free_full(m, g_free);
+	}
+	g_slist_free(l_orig);
+
+	host = srd_buildinfo_host_get();
+	s.append(QString("<tr><td><i>- Host</i></td><td>%1</td></tr>")
+		.arg(QString(host)));
+	g_free(host);
 #endif
 
 	/* Set up the supported field */
+	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported hardware drivers:") + "</b></td></tr>");
 	for (auto entry : context->drivers()) {
@@ -230,6 +260,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 				QString::fromUtf8(entry.second->long_name().c_str())));
 	}
 
+	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported input formats:") + "</b></td></tr>");
 	for (auto entry : context->input_formats()) {
@@ -238,6 +269,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 				QString::fromUtf8(entry.second->description().c_str())));
 	}
 
+	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported output formats:") + "</b></td></tr>");
 	for (auto entry : context->output_formats()) {
@@ -247,6 +279,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 	}
 
 #ifdef ENABLE_DECODE
+	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported protocol decoders:") + "</b></td></tr>");
 	GSList *sl = g_slist_copy((GSList *)srd_decoder_list());