X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=6821f342757d49008b250694278da507826dbb1e;hp=ca649befad8f318dab49f90e2ef73ad766756625;hb=refs%2Fheads%2Fmaster;hpb=49fee853b3f56ba78810260c71c3c402067f09fe

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index ca649bef..ecca21d5 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";
@@ -65,6 +67,7 @@ const QString GlobalSettings::Key_View_ConversionThresholdDispMode = "View_Conve
 const QString GlobalSettings::Key_View_DefaultDivHeight = "View_DefaultDivHeight";
 const QString GlobalSettings::Key_View_DefaultLogicHeight = "View_DefaultLogicHeight";
 const QString GlobalSettings::Key_View_ShowHoverMarker = "View_ShowHoverMarker";
+const QString GlobalSettings::Key_View_KeepRulerItemSelected = "View_KeepRulerItemSelected";
 const QString GlobalSettings::Key_View_SnapDistance = "View_SnapDistance";
 const QString GlobalSettings::Key_View_CursorFillColor = "View_CursorFillColor";
 const QString GlobalSettings::Key_View_CursorShowFrequency = "View_CursorShowFrequency";
@@ -123,6 +126,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);
@@ -146,6 +153,9 @@ void GlobalSettings::set_defaults_where_needed()
 	if (!contains(Key_View_ShowHoverMarker))
 		setValue(Key_View_ShowHoverMarker, true);
 
+	if (!contains(Key_View_KeepRulerItemSelected))
+		setValue(Key_View_KeepRulerItemSelected, false);
+
 	if (!contains(Key_View_SnapDistance))
 		setValue(Key_View_SnapDistance, 15);
 
@@ -324,7 +334,11 @@ void GlobalSettings::store_gvariant(QSettings &settings, GVariant *v)
 		g_variant_get_size(v));
 
 	settings.setValue("value", var_data);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	settings.setValue("type", (const char *)var_type_str);
+#else
 	settings.setValue("type", var_type_str);
+#endif
 
 	g_free(var_type_str);
 }
@@ -336,8 +350,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);
@@ -362,8 +379,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);