X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=bcf32df76ec4937a52b8b3e569b5129eb997e25a;hb=db843aa8f7135deb6e22a92cff9237b7326a40aa;hp=efe854af4efea9c916153a419b86a47d197992bb;hpb=9d307c60d7fc2dee27bca6eaadd1e68bf7ab0cbf;p=pulseview.git

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index efe854af..bcf32df7 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -84,7 +84,7 @@ public:
 };
 
 Settings::Settings(DeviceManager &device_manager, QWidget *parent) :
-	QDialog(parent, nullptr),
+	QDialog(parent),
 	device_manager_(device_manager)
 {
 	resize(600, 400);
@@ -220,7 +220,7 @@ QWidget *Settings::get_general_settings_form(QWidget *parent) const
 	QComboBox *language_cb = new QComboBox();
 	Application* a = qobject_cast<Application*>(QApplication::instance());
 
-	QString current_language = settings.value(GlobalSettings::Key_General_Language).toString();
+	QString current_language = settings.value(GlobalSettings::Key_General_Language, "en").toString();
 	for (const QString& language : a->get_languages()) {
 		const QLocale locale = QLocale(language);
 		const QString desc = locale.languageToString(locale.language());
@@ -261,7 +261,7 @@ QWidget *Settings::get_general_settings_form(QWidget *parent) const
 	if (current_style.isEmpty())
 		style_cb->setCurrentIndex(0);
 	else
-		style_cb->setCurrentIndex(style_cb->findText(current_style, nullptr));
+		style_cb->setCurrentIndex(style_cb->findText(current_style));
 
 	connect(style_cb, SIGNAL(currentIndexChanged(int)),
 		this, SLOT(on_general_style_changed(int)));
@@ -276,6 +276,11 @@ QWidget *Settings::get_general_settings_form(QWidget *parent) const
 		SLOT(on_general_save_with_setup_changed(int)));
 	general_layout->addRow(tr("Save session &setup along with .sr file"), cb);
 
+	cb = create_checkbox(GlobalSettings::Key_General_StartAllSessions,
+		SLOT(on_general_start_all_sessions_changed(int)));
+	general_layout->addRow(tr("Start acquisition for all open sessions when clicking 'Run'"), cb);
+
+
 	return form;
 }
 
@@ -308,19 +313,23 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 
 	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);
+	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);
 
+	cb = create_checkbox(GlobalSettings::Key_View_AllowVerticalDragging,
+		SLOT(on_view_allowVerticalDragging_changed(int)));
+	trace_view_layout->addRow(tr("Allow &vertical dragging in the view area"), 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_FillSignalHighAreas,
 		SLOT(on_view_fillSignalHighAreas_changed(int)));
-	trace_view_layout->addRow(tr("Fill high areas of logic signals"), cb);
+	trace_view_layout->addRow(tr("Fill &high areas of logic signals"), cb);
 
 	ColorButton* high_fill_cb = new ColorButton(parent);
 	high_fill_cb->set_color(QColor::fromRgba(
@@ -679,6 +688,12 @@ void Settings::on_general_save_with_setup_changed(int state)
 	settings.setValue(GlobalSettings::Key_General_SaveWithSetup, state ? true : false);
 }
 
+void Settings::on_general_start_all_sessions_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_General_StartAllSessions, state ? true : false);
+}
+
 void Settings::on_view_zoomToFitDuringAcq_changed(int state)
 {
 	GlobalSettings settings;
@@ -709,6 +724,12 @@ void Settings::on_view_stickyScrolling_changed(int state)
 	settings.setValue(GlobalSettings::Key_View_StickyScrolling, state ? true : false);
 }
 
+void Settings::on_view_allowVerticalDragging_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_AllowVerticalDragging, state ? true : false);
+}
+
 void Settings::on_view_showSamplingPoints_changed(int state)
 {
 	GlobalSettings settings;