X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fglobalsettings.hpp;h=6e027d782c97dd3e4a449e72282fa8c2ad55e646;hb=39dce56b0e0b4daba503663e44ee6c86a754ddc2;hp=9cf2978b68369751c76c9e53dc9ec0d6586ded04;hpb=90ee1ed9a90bc0651f86ee4af07e0958572f86da;p=pulseview.git

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index 9cf2978..6e027d7 100644
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -20,21 +20,27 @@
 #ifndef PULSEVIEW_GLOBALSETTINGS_HPP
 #define PULSEVIEW_GLOBALSETTINGS_HPP
 
-#include <functional>
 #include <map>
 
 #include <glib.h>
+#include <glibmm/variant.h>
 
 #include <QSettings>
 #include <QString>
 #include <QVariant>
 
-using std::function;
 using std::map;
-using std::multimap;
+using std::vector;
 
 namespace pv {
 
+class GlobalSettingsInterface
+{
+public:
+	virtual void on_setting_changed(const QString &key, const QVariant &value) = 0;
+};
+
+
 class GlobalSettings : public QSettings
 {
 	Q_OBJECT
@@ -42,14 +48,22 @@ class GlobalSettings : public QSettings
 public:
 	static const QString Key_View_ZoomToFitDuringAcq;
 	static const QString Key_View_ZoomToFitAfterAcq;
-	static const QString Key_View_ColouredBG;
+	static const QString Key_View_TriggerIsZeroTime;
+	static const QString Key_View_ColoredBG;
 	static const QString Key_View_StickyScrolling;
 	static const QString Key_View_ShowSamplingPoints;
+	static const QString Key_View_FillSignalHighAreas;
+	static const QString Key_View_FillSignalHighAreaColor;
 	static const QString Key_View_ShowAnalogMinorGrid;
 	static const QString Key_View_ConversionThresholdDispMode;
 	static const QString Key_View_DefaultDivHeight;
 	static const QString Key_View_DefaultLogicHeight;
+	static const QString Key_View_ShowHoverMarker;
+	static const QString Key_View_SnapDistance;
 	static const QString Key_Dec_InitialStateConfigurable;
+	static const QString Key_Dec_ExportFormat;
+	static const QString Key_Log_BufferSize;
+	static const QString Key_Log_NotifyOfStacktrace;
 
 	enum ConvThrDispMode {
 		ConvThrDispMode_None = 0,
@@ -62,8 +76,8 @@ public:
 
 	void set_defaults_where_needed();
 
-	static void register_change_handler(const QString key,
-		function<void(QVariant)> cb);
+	static void add_change_handler(GlobalSettingsInterface *cb);
+	static void remove_change_handler(GlobalSettingsInterface *cb);
 
 	void setValue(const QString& key, const QVariant& value);
 
@@ -89,8 +103,12 @@ public:
 
 	static GVariant* restore_gvariant(QSettings &settings);
 
+	static void store_variantbase(QSettings &settings, Glib::VariantBase v);
+
+	static Glib::VariantBase restore_variantbase(QSettings &settings);
+
 private:
-	static multimap< QString, function<void(QVariant)> > callbacks_;
+	static vector<GlobalSettingsInterface*> callbacks_;
 
 	static bool tracking_;
 	static map<QString, QVariant> tracked_changes_;