X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fglobalsettings.hpp;h=ea43491c35b1a2b63d3656cbf375a8940113df5b;hb=d0c0573b3ee694827a747727f862c5f91736ca05;hp=317805a72f3ddc1ff5fb4fb5828048ebdaa6bdfd;hpb=daa54986010a11879da11e30aafd3a2739ab7a15;p=pulseview.git

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index 317805a..ea43491 100644
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -20,7 +20,6 @@
 #ifndef PULSEVIEW_GLOBALSETTINGS_HPP
 #define PULSEVIEW_GLOBALSETTINGS_HPP
 
-#include <functional>
 #include <map>
 
 #include <glib.h>
@@ -31,10 +30,17 @@
 
 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,20 +48,29 @@ class GlobalSettings : public QSettings
 public:
 	static const QString Key_View_ZoomToFitDuringAcq;
 	static const QString Key_View_ZoomToFitAfterAcq;
+	static const QString Key_View_TriggerIsZeroTime;
 	static const QString Key_View_ColouredBG;
 	static const QString Key_View_StickyScrolling;
 	static const QString Key_View_ShowSamplingPoints;
 	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_Dec_InitialStateConfigurable;
 
+	enum ConvThrDispMode {
+		ConvThrDispMode_None = 0,
+		ConvThrDispMode_Background,
+		ConvThrDispMode_Dots
+	};
+
 public:
 	GlobalSettings();
 
 	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);
 
@@ -82,7 +97,7 @@ public:
 	static GVariant* restore_gvariant(QSettings &settings);
 
 private:
-	static multimap< QString, function<void(QVariant)> > callbacks_;
+	static vector<GlobalSettingsInterface*> callbacks_;
 
 	static bool tracking_;
 	static map<QString, QVariant> tracked_changes_;