X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=7c40cae5b5157087c99e27cb7fb99bf2d887ab1c;hp=9f20b2694968942a2a0e1da9a38dd920707f4d1a;hb=1ed996b433f3391f54846784d76da4fe6b07500f;hpb=641574bcc118be0b6dc3a65039ab3497f9d7241a

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 9f20b269..7c40cae5 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 {
@@ -39,7 +40,9 @@ const QString GlobalSettings::Key_View_ShowAnalogMinorGrid = "View_ShowAnalogMin
 const QString GlobalSettings::Key_View_ConversionThresholdDispMode = "View_ConversionThresholdDispMode";
 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_Dec_InitialStateConfigurable = "Dec_InitialStateConfigurable";
+const QString GlobalSettings::Key_Dec_ExportFormat = "Dec_ExportFormat";
 const QString GlobalSettings::Key_Log_BufferSize = "Log_BufferSize";
 const QString GlobalSettings::Key_Log_NotifyOfStacktrace = "Log_NotifyOfStacktrace";
 
@@ -75,6 +78,9 @@ void GlobalSettings::set_defaults_where_needed()
 		setValue(Key_View_DefaultLogicHeight,
 		2 * QFontMetrics(QApplication::font()).height());
 
+	if (!contains(Key_Dec_ExportFormat))
+		setValue(Key_Dec_ExportFormat, "%s %d: %c: %1");
+
 	// Default to 500 lines of backlog
 	if (!contains(Key_Log_BufferSize))
 		setValue(Key_Log_BufferSize, 500);
@@ -107,7 +113,8 @@ void GlobalSettings::setValue(const QString &key, const QVariant &value)
 
 	QSettings::setValue(key, value);
 
-	qDebug().noquote() << "Setting" << key << "changed to" << value;
+	// TODO Emulate noquote()
+	qDebug() << "Setting" << key << "changed to" << value;
 
 	// Call all registered callbacks
 	for (GlobalSettingsInterface *cb : callbacks_)
@@ -168,5 +175,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