X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=ef916f1a57c842c9d34475eb4d7760b077c4dc63;hp=a3738b73e0920da9163e129d53d63b7f8c4330ac;hb=e91fb166608133382baa1a90cc022bfa47d649de;hpb=87a97d8aa169936ec2dcd229df88b8c5b4a1411c

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index a3738b73..ef916f1a 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -17,8 +17,12 @@
  * 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>
 #include <QDialogButtonBox>
 #include <QFormLayout>
 #include <QGroupBox>
@@ -40,6 +44,8 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
+using std::shared_ptr;
+
 namespace pv {
 namespace dialogs {
 
@@ -55,11 +61,12 @@ Settings::Settings(DeviceManager &device_manager, QWidget *parent) :
 	page_list->setViewMode(QListView::IconMode);
 	page_list->setIconSize(QSize(icon_size, icon_size));
 	page_list->setMovement(QListView::Static);
-	page_list->setMaximumWidth(icon_size + icon_size/2);
+	page_list->setMaximumWidth(icon_size + (icon_size / 2));
 	page_list->setSpacing(12);
 
 	pages = new QStackedWidget;
 	create_pages();
+	page_list->setCurrentIndex(page_list->model()->index(0, 0));
 
 	QHBoxLayout *tab_layout = new QHBoxLayout;
 	tab_layout->addWidget(page_list);
@@ -88,11 +95,22 @@ void Settings::create_pages()
 	pages->addWidget(get_view_settings_form(pages));
 
 	QListWidgetItem *viewButton = new QListWidgetItem(page_list);
-	viewButton->setIcon(QIcon(":/icons/sigrok-logo-notext.svg"));
+	viewButton->setIcon(QIcon(":/icons/settings-views.svg"));
 	viewButton->setText(tr("Views"));
 	viewButton->setTextAlignment(Qt::AlignHCenter);
 	viewButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
+#ifdef ENABLE_DECODE
+	// Decoder page
+	pages->addWidget(get_decoder_settings_form(pages));
+
+	QListWidgetItem *decoderButton = new QListWidgetItem(page_list);
+	decoderButton->setIcon(QIcon(":/icons/add-decoder.svg"));
+	decoderButton->setText(tr("Decoders"));
+	decoderButton->setTextAlignment(Qt::AlignHCenter);
+	decoderButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+#endif
+
 	// About page
 	pages->addWidget(get_about_page(pages));
 
@@ -103,10 +121,20 @@ void Settings::create_pages()
 	aboutButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 }
 
-QWidget *Settings::get_view_settings_form(QWidget *parent) const
+QCheckBox *Settings::create_checkbox(const QString& key, const char* slot) const
 {
 	GlobalSettings settings;
 
+	QCheckBox *cb = new QCheckBox();
+	cb->setChecked(settings.value(key).toBool());
+	connect(cb, SIGNAL(stateChanged(int)), this, slot);
+	return cb;
+}
+
+QWidget *Settings::get_view_settings_form(QWidget *parent) const
+{
+	QCheckBox *cb;
+
 	QWidget *form = new QWidget(parent);
 	QVBoxLayout *form_layout = new QVBoxLayout(form);
 
@@ -117,24 +145,69 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 	QFormLayout *trace_view_layout = new QFormLayout();
 	trace_view_group->setLayout(trace_view_layout);
 
-	QCheckBox *coloured_bg_cb = new QCheckBox();
-	coloured_bg_cb->setChecked(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
-	connect(coloured_bg_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_colouredBG_changed(int)));
-	trace_view_layout->addRow(tr("Use coloured trace &background"), coloured_bg_cb);
+	cb = create_checkbox(GlobalSettings::Key_View_ColouredBG,
+		SLOT(on_view_colouredBG_changed(int)));
+	trace_view_layout->addRow(tr("Use coloured trace &background"), cb);
 
-	QCheckBox *always_zoom_to_fit_cb = new QCheckBox();
-	always_zoom_to_fit_cb->setChecked(settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool());
-	connect(always_zoom_to_fit_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_alwaysZoomToFit_changed(int)));
-	trace_view_layout->addRow(tr("Constantly perform &zoom-to-fit during capture"), always_zoom_to_fit_cb);
+	cb = create_checkbox(GlobalSettings::Key_View_ZoomToFitDuringAcq,
+		SLOT(on_view_zoomToFitDuringAcq_changed(int)));
+	trace_view_layout->addRow(tr("Constantly perform &zoom-to-fit during acquisition"), cb);
 
-	QCheckBox *sticky_scrolling_cb = new QCheckBox();
-	sticky_scrolling_cb->setChecked(settings.value(GlobalSettings::Key_View_StickyScrolling).toBool());
-	connect(sticky_scrolling_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_stickyScrolling_changed(int)));
-	trace_view_layout->addRow(tr("Always keep &newest samples at the right edge during capture"), sticky_scrolling_cb);
+	cb = create_checkbox(GlobalSettings::Key_View_ZoomToFitAfterAcq,
+		SLOT(on_view_zoomToFitAfterAcq_changed(int)));
+	trace_view_layout->addRow(tr("Perform a zoom-to-&fit when acquisition stops"), cb);
+
+	cb = create_checkbox(GlobalSettings::Key_View_StickyScrolling,
+		SLOT(on_view_stickyScrolling_changed(int)));
+	trace_view_layout->addRow(tr("Always keep &newest samples at the right edge during capture"), cb);
+
+	cb = create_checkbox(GlobalSettings::Key_View_ShowSamplingPoints,
+		SLOT(on_view_showSamplingPoints_changed(int)));
+	trace_view_layout->addRow(tr("Show data &sampling points"), cb);
+
+	cb = create_checkbox(GlobalSettings::Key_View_ShowAnalogMinorGrid,
+		SLOT(on_view_showAnalogMinorGrid_changed(int)));
+	trace_view_layout->addRow(tr("Show analog minor grid in addition to vdiv grid"), cb);
 
 	return form;
 }
 
+QWidget *Settings::get_decoder_settings_form(QWidget *parent) const
+{
+#ifdef ENABLE_DECODE
+	QCheckBox *cb;
+
+	QWidget *form = new QWidget(parent);
+	QVBoxLayout *form_layout = new QVBoxLayout(form);
+
+	// Decoder settings
+	QGroupBox *decoder_group = new QGroupBox(tr("Decoders"));
+	form_layout->addWidget(decoder_group);
+
+	QFormLayout *decoder_layout = new QFormLayout();
+	decoder_group->setLayout(decoder_layout);
+
+	cb = create_checkbox(GlobalSettings::Key_Dec_InitialStateConfigurable,
+		SLOT(on_dec_initialStateConfigurable_changed(int)));
+	decoder_layout->addRow(tr("Allow configuration of &initial signal state"), cb);
+
+	return form;
+#else
+	(void)parent;
+#endif
+}
+
+#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
@@ -142,7 +215,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 #endif
 
 	QLabel *icon = new QLabel();
-	icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/sigrok-logo-notext.svg")));
+	icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/pulseview.svg")));
 
 	/* Setup the version field */
 	QLabel *version_info = new QLabel();
@@ -153,49 +226,115 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 		QApplication::organizationDomain()));
 	version_info->setOpenExternalLinks(true);
 
-	std::shared_ptr<sigrok::Context> context = device_manager_.context();
+	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 */
+	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</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) {
+		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);
+
+	char *host = sr_buildinfo_host_get();
+	s.append(QString("<tr><td><i>- Host</i></td><td>%1</td></tr>")
+		.arg(QString(host)));
+	g_free(host);
+
+	char *scpi_backends = sr_buildinfo_scpi_backends_get();
+	s.append(QString("<tr><td><i>- SCPI backends</i></td><td>%1</td></tr>")
+		.arg(QString(scpi_backends)));
+	g_free(scpi_backends);
+
+#ifdef ENABLE_DECODE
+	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>");
+		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())));
 	}
 
+	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
-		tr("Supported input formats:") +
-		"</b></td></tr>");
+		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())));
 	}
 
+	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
-		tr("Supported output formats:") +
-		"</b></td></tr>");
+		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())));
 	}
 
 #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>");
-	for (const GSList *l = srd_decoder_list(); l; l = l->next) {
+		tr("Supported protocol decoders:") + "</b></td></tr>");
+	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>");
@@ -241,10 +380,16 @@ void Settings::on_page_changed(QListWidgetItem *current, QListWidgetItem *previo
 	pages->setCurrentIndex(page_list->row(current));
 }
 
-void Settings::on_view_alwaysZoomToFit_changed(int state)
+void Settings::on_view_zoomToFitDuringAcq_changed(int state)
 {
 	GlobalSettings settings;
-	settings.setValue(GlobalSettings::Key_View_AlwaysZoomToFit, state ? true : false);
+	settings.setValue(GlobalSettings::Key_View_ZoomToFitDuringAcq, state ? true : false);
+}
+
+void Settings::on_view_zoomToFitAfterAcq_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_ZoomToFitAfterAcq, state ? true : false);
 }
 
 void Settings::on_view_colouredBG_changed(int state)
@@ -259,6 +404,23 @@ void Settings::on_view_stickyScrolling_changed(int state)
 	settings.setValue(GlobalSettings::Key_View_StickyScrolling, state ? true : false);
 }
 
+void Settings::on_view_showSamplingPoints_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, state ? true : false);
+}
+
+void Settings::on_view_showAnalogMinorGrid_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, state ? true : false);
+}
+
+void Settings::on_dec_initialStateConfigurable_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_Dec_InitialStateConfigurable, state ? true : false);
+}
 
 } // namespace dialogs
 } // namespace pv