X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=12c6f0cfede13f370f4d4ae8a880c81465e49f68;hp=b07a63696fb4b11d3c6c69cbf8b5beb79d7da60d;hb=HEAD;hpb=c583ea05e31967f78870ebbe19f6794e51f512c6

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index b07a6369..55b7e826 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());
@@ -231,8 +231,13 @@ QWidget *Settings::get_general_settings_form(QWidget *parent) const
 			language_cb->setCurrentIndex(index);
 		}
 	}
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	connect(language_cb, SIGNAL(currentTextChanged(const QString&)),
+		this, SLOT(on_general_language_changed(const QString&)));
+#else
 	connect(language_cb, SIGNAL(currentIndexChanged(const QString&)),
 		this, SLOT(on_general_language_changed(const QString&)));
+#endif
 	general_layout->addRow(tr("User interface language"), language_cb);
 
 	// Theme combobox
@@ -261,7 +266,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)));
@@ -313,19 +318,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(
@@ -342,6 +351,10 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 		SLOT(on_view_showHoverMarker_changed(int)));
 	trace_view_layout->addRow(tr("Highlight mouse cursor using a vertical marker line"), cb);
 
+	cb = create_checkbox(GlobalSettings::Key_View_KeepRulerItemSelected,
+		SLOT(on_view_keepRulerItemSelected_changed(int)));
+	trace_view_layout->addRow(tr("Keep active item on ruler selected when editing popup is closed"), cb);
+
 	QSpinBox *snap_distance_sb = new QSpinBox();
 	snap_distance_sb->setRange(0, 1000);
 	snap_distance_sb->setSuffix(tr(" pixels"));
@@ -720,6 +733,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;
@@ -750,6 +769,12 @@ void Settings::on_view_showHoverMarker_changed(int state)
 	settings.setValue(GlobalSettings::Key_View_ShowHoverMarker, state ? true : false);
 }
 
+void Settings::on_view_keepRulerItemSelected_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_KeepRulerItemSelected, state ? true : false);
+}
+
 void Settings::on_view_snapDistance_changed(int value)
 {
 	GlobalSettings settings;