X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=32b1c207677979f32b285426bf5b9da9b395726a;hb=6c34883054aac5036d09a30424021de5182b8944;hp=214ac9cf26e862aefd4208a4da84d685709d2655;hpb=e6d42eec32b61b6831b7926a9d6a5cd03d1f3430;p=pulseview.git

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 214ac9c..32b1c20 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -40,6 +40,8 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
+using std::shared_ptr;
+
 namespace pv {
 namespace dialogs {
 
@@ -55,7 +57,7 @@ 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;
@@ -133,6 +135,16 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 	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);
 
+	QCheckBox *show_sampling_points_cb = new QCheckBox();
+	show_sampling_points_cb->setChecked(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
+	connect(show_sampling_points_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_showSamplingPoints_changed(int)));
+	trace_view_layout->addRow(tr("Show data &sampling points"), show_sampling_points_cb);
+
+	QCheckBox *show_analog_minor_grid_cb = new QCheckBox();
+	show_analog_minor_grid_cb->setChecked(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool());
+	connect(show_analog_minor_grid_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_showAnalogMinorGrid_changed(int)));
+	trace_view_layout->addRow(tr("Show analog minor grid in addition to vdiv grid"), show_analog_minor_grid_cb);
+
 	return form;
 }
 
@@ -154,15 +166,26 @@ 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("<table>");
 
+	/* Library info */
+	s.append("<tr><td colspan=\"2\"><b>" +
+		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>");
+		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>")
 			.arg(QString::fromUtf8(entry.first.c_str()),
@@ -170,8 +193,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 	}
 
 	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>")
 			.arg(QString::fromUtf8(entry.first.c_str()),
@@ -179,8 +201,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 	}
 
 	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>")
 			.arg(QString::fromUtf8(entry.first.c_str()),
@@ -189,8 +210,7 @@ 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>");
+		tr("Supported protocol decoders:") + "</b></td></tr>");
 	for (const GSList *l = srd_decoder_list(); l; l = l->next) {
 		dec = (struct srd_decoder *)l->data;
 		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
@@ -260,6 +280,17 @@ 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);
+}
 
 } // namespace dialogs
 } // namespace pv