X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=cd356ae631f70c4f1ec3d83d1ae29fad302a8b4d;hp=8be4265b247e729d00f9bccacd433283d868250f;hb=1325ce422f1b49ab1f693125105b8c373c2965e5;hpb=7ba25e4f0953839d9dd9623ef8d80c57db75364b

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 8be4265b..cd356ae6 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -25,6 +25,7 @@
 #include <QString>
 
 using std::map;
+using std::string;
 using std::vector;
 
 namespace pv {
@@ -32,7 +33,7 @@ namespace pv {
 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_ColouredBG = "View_ColouredBG";
+const QString GlobalSettings::Key_View_ColoredBG = "View_ColoredBG";
 const QString GlobalSettings::Key_View_StickyScrolling = "View_StickyScrolling";
 const QString GlobalSettings::Key_View_ShowSamplingPoints = "View_ShowSamplingPoints";
 const QString GlobalSettings::Key_View_ShowAnalogMinorGrid = "View_ShowAnalogMinorGrid";
@@ -59,9 +60,9 @@ void GlobalSettings::set_defaults_where_needed()
 	if (!contains(Key_View_ZoomToFitAfterAcq))
 		setValue(Key_View_ZoomToFitAfterAcq, true);
 
-	// Enable coloured trace backgrounds by default
-	if (!contains(Key_View_ColouredBG))
-		setValue(Key_View_ColouredBG, true);
+	// Enable colored trace backgrounds by default
+	if (!contains(Key_View_ColoredBG))
+		setValue(Key_View_ColoredBG, true);
 
 	// Enable showing sampling points by default
 	if (!contains(Key_View_ShowSamplingPoints))
@@ -107,6 +108,7 @@ void GlobalSettings::setValue(const QString &key, const QVariant &value)
 
 	QSettings::setValue(key, value);
 
+	// TODO Emulate noquote()
 	qDebug() << "Setting" << key << "changed to" << value;
 
 	// Call all registered callbacks
@@ -168,5 +170,33 @@ GVariant* GlobalSettings::restore_gvariant(QSettings &settings)
 	return value;
 }
 
+void GlobalSettings::store_variantbase(QSettings &settings, Glib::VariantBase v)
+{
+	const QByteArray var_data = QByteArray((const char*)v.get_data(), v.get_size());
+
+	settings.setValue("value", var_data);
+	settings.setValue("type", QString::fromStdString(v.get_type_string()));
+}
+
+Glib::VariantBase GlobalSettings::restore_variantbase(QSettings &settings)
+{
+	QString raw_type = settings.value("type").toString();
+	GVariantType *var_type = g_variant_type_new(raw_type.toUtf8());
+
+	QByteArray data = settings.value("value").toByteArray();
+
+	gpointer var_data = g_memdup((gconstpointer)data.constData(),
+		(guint)data.size());
+
+	GVariant *value = g_variant_new_from_data(var_type, var_data,
+		data.size(), false, g_free, var_data);
+
+	Glib::VariantBase ret_val = Glib::VariantBase(value, true);
+
+	g_variant_type_free(var_type);
+	g_variant_unref(value);
+
+	return ret_val;
+}
 
 } // namespace pv