X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=38017f3b14569444c8f1ab45b5d32624bac67e69;hb=ffad6cd6856a0e0de36cad164d9d09e06c0ec52a;hp=10b344a4aa4bb156e6f52163cf5c7085c7a60866;hpb=e887fe9e6ede73b9fe9ace9c6bfd4f6a096eb3b2;p=pulseview.git

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 10b344a4..38017f3b 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -52,11 +52,13 @@ const QString GlobalSettings::Key_General_Language = "General_Language";
 const QString GlobalSettings::Key_General_Theme = "General_Theme";
 const QString GlobalSettings::Key_General_Style = "General_Style";
 const QString GlobalSettings::Key_General_SaveWithSetup = "General_SaveWithSetup";
+const QString GlobalSettings::Key_General_StartAllSessions = "General_StartAllSessions";
 const QString GlobalSettings::Key_View_ZoomToFitDuringAcq = "View_ZoomToFitDuringAcq";
 const QString GlobalSettings::Key_View_ZoomToFitAfterAcq = "View_ZoomToFitAfterAcq";
 const QString GlobalSettings::Key_View_TriggerIsZeroTime = "View_TriggerIsZeroTime";
 const QString GlobalSettings::Key_View_ColoredBG = "View_ColoredBG";
 const QString GlobalSettings::Key_View_StickyScrolling = "View_StickyScrolling";
+const QString GlobalSettings::Key_View_AllowVerticalDragging = "View_AllowVerticalDragging";
 const QString GlobalSettings::Key_View_ShowSamplingPoints = "View_ShowSamplingPoints";
 const QString GlobalSettings::Key_View_FillSignalHighAreas = "View_FillSignalHighAreas";
 const QString GlobalSettings::Key_View_FillSignalHighAreaColor = "View_FillSignalHighAreaColor";
@@ -102,10 +104,11 @@ void GlobalSettings::set_defaults_where_needed()
 {
 	if (!contains(Key_General_Language)) {
 		// Determine and set default UI language
-		QString language = QLocale().uiLanguages().first();  // May return e.g. en-Latn-US
+		QString language = QLocale().uiLanguages().first();  // May return e.g. en-Latn-US  // clazy:exclude=detaching-temporary
 		language = language.split("-").first();
 
 		setValue(Key_General_Language, language);
+		apply_language();
 	}
 
 	// Use no theme by default
@@ -122,6 +125,10 @@ void GlobalSettings::set_defaults_where_needed()
 	if (!contains(Key_View_ZoomToFitAfterAcq))
 		setValue(Key_View_ZoomToFitAfterAcq, true);
 
+	// Allow vertical dragging by default
+	if (!contains(Key_View_AllowVerticalDragging))
+		setValue(Key_View_AllowVerticalDragging, true);
+
 	// Enable colored trace backgrounds by default
 	if (!contains(Key_View_ColoredBG))
 		setValue(Key_View_ColoredBG, true);
@@ -335,8 +342,11 @@ GVariant* GlobalSettings::restore_gvariant(QSettings &settings)
 
 	QByteArray data = settings.value("value").toByteArray();
 
-	gpointer var_data = g_memdup((gconstpointer)data.constData(),
-		(guint)data.size());
+#if GLIB_CHECK_VERSION(2, 67, 3)  // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538
+	gpointer var_data = g_memdup2((gconstpointer)data.constData(), (gsize)data.size());
+#else
+	gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size());
+#endif
 
 	GVariant *value = g_variant_new_from_data(var_type, var_data,
 		data.size(), false, g_free, var_data);
@@ -361,8 +371,11 @@ Glib::VariantBase GlobalSettings::restore_variantbase(QSettings &settings)
 
 	QByteArray data = settings.value("value").toByteArray();
 
-	gpointer var_data = g_memdup((gconstpointer)data.constData(),
-		(guint)data.size());
+#if GLIB_CHECK_VERSION(2, 67, 3)  // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538
+	gpointer var_data = g_memdup2((gconstpointer)data.constData(), (gsize)data.size());
+#else
+	gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size());
+#endif
 
 	GVariant *value = g_variant_new_from_data(var_type, var_data,
 		data.size(), false, g_free, var_data);