X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=d18d2d42e5e9df63f77dc3e7dfc016c8d76e7b24;hb=bf84211be02b096646cf28cf9dc7480029e4f439;hp=ef916f1a57c842c9d34475eb4d7760b077c4dc63;hpb=e91fb166608133382baa1a90cc022bfa47d649de;p=pulseview.git

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index ef916f1..d18d2d4 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -23,11 +23,13 @@
 #include <boost/version.hpp>
 
 #include <QApplication>
+#include <QComboBox>
 #include <QDialogButtonBox>
 #include <QFormLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QSpinBox>
 #include <QString>
 #include <QTextBrowser>
 #include <QTextDocument>
@@ -133,6 +135,7 @@ QCheckBox *Settings::create_checkbox(const QString& key, const char* slot) const
 
 QWidget *Settings::get_view_settings_form(QWidget *parent) const
 {
+	GlobalSettings settings;
 	QCheckBox *cb;
 
 	QWidget *form = new QWidget(parent);
@@ -157,6 +160,10 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 		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_TriggerIsZeroTime,
+		SLOT(on_view_triggerIsZero_changed(int)));
+	trace_view_layout->addRow(tr("Show time zero at the trigger"), 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);
@@ -167,7 +174,35 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 
 	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);
+	trace_view_layout->addRow(tr("Show analog minor grid in addition to div grid"), cb);
+
+	QComboBox *thr_disp_mode_cb = new QComboBox();
+	thr_disp_mode_cb->addItem(tr("None"), GlobalSettings::ConvThrDispMode_None);
+	thr_disp_mode_cb->addItem(tr("Background"), GlobalSettings::ConvThrDispMode_Background);
+	thr_disp_mode_cb->addItem(tr("Dots"), GlobalSettings::ConvThrDispMode_Dots);
+	thr_disp_mode_cb->setCurrentIndex(
+		settings.value(GlobalSettings::Key_View_ConversionThresholdDispMode).toInt());
+	connect(thr_disp_mode_cb, SIGNAL(currentIndexChanged(int)),
+		this, SLOT(on_view_conversionThresholdDispMode_changed(int)));
+	trace_view_layout->addRow(tr("Conversion threshold display mode (analog traces only)"), thr_disp_mode_cb);
+
+	QSpinBox *default_div_height_sb = new QSpinBox();
+	default_div_height_sb->setRange(20, 1000);
+	default_div_height_sb->setSuffix(tr(" pixels"));
+	default_div_height_sb->setValue(
+		settings.value(GlobalSettings::Key_View_DefaultDivHeight).toInt());
+	connect(default_div_height_sb, SIGNAL(valueChanged(int)), this,
+		SLOT(on_view_defaultDivHeight_changed(int)));
+	trace_view_layout->addRow(tr("Default analog trace div height"), default_div_height_sb);
+
+	QSpinBox *default_logic_height_sb = new QSpinBox();
+	default_logic_height_sb->setRange(5, 1000);
+	default_logic_height_sb->setSuffix(tr(" pixels"));
+	default_logic_height_sb->setValue(
+		settings.value(GlobalSettings::Key_View_DefaultLogicHeight).toInt());
+	connect(default_logic_height_sb, SIGNAL(valueChanged(int)), this,
+		SLOT(on_view_defaultLogicHeight_changed(int)));
+	trace_view_layout->addRow(tr("Default logic trace height"), default_logic_height_sb);
 
 	return form;
 }
@@ -194,6 +229,7 @@ QWidget *Settings::get_decoder_settings_form(QWidget *parent) const
 	return form;
 #else
 	(void)parent;
+	return nullptr;
 #endif
 }
 
@@ -294,6 +330,28 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 	g_free(host);
 #endif
 
+	s.append("<tr><td colspan=\"2\"></td></tr>");
+	s.append("<tr><td colspan=\"2\"><b>" +
+		tr("Firmware search paths:") + "</b></td></tr>");
+
+	l_orig = sr_resourcepaths_get(SR_RESOURCE_FIRMWARE);
+	for (GSList *l = l_orig; l; l = l->next)
+		s.append(QString("<tr><td colspan=\"2\">%1</td></tr>").arg(
+			QString((char*)l->data)));
+	g_slist_free_full(l_orig, g_free);
+
+#ifdef ENABLE_DECODE
+	s.append("<tr><td colspan=\"2\"></td></tr>");
+	s.append("<tr><td colspan=\"2\"><b>" +
+		tr("Protocol decoder search paths:") + "</b></td></tr>");
+
+	l_orig = srd_searchpaths_get();
+	for (GSList *l = l_orig; l; l = l->next)
+		s.append(QString("<tr><td colspan=\"2\">%1</td></tr>").arg(
+			QString((char*)l->data)));
+	g_slist_free_full(l_orig, g_free);
+#endif
+
 	/* Set up the supported field */
 	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
@@ -392,6 +450,12 @@ void Settings::on_view_zoomToFitAfterAcq_changed(int state)
 	settings.setValue(GlobalSettings::Key_View_ZoomToFitAfterAcq, state ? true : false);
 }
 
+void Settings::on_view_triggerIsZero_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_TriggerIsZeroTime, state ? true : false);
+}
+
 void Settings::on_view_colouredBG_changed(int state)
 {
 	GlobalSettings settings;
@@ -416,6 +480,24 @@ void Settings::on_view_showAnalogMinorGrid_changed(int state)
 	settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, state ? true : false);
 }
 
+void Settings::on_view_conversionThresholdDispMode_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_ConversionThresholdDispMode, state);
+}
+
+void Settings::on_view_defaultDivHeight_changed(int value)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_DefaultDivHeight, value);
+}
+
+void Settings::on_view_defaultLogicHeight_changed(int value)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_DefaultLogicHeight, value);
+}
+
 void Settings::on_dec_initialStateConfigurable_changed(int state)
 {
 	GlobalSettings settings;