X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.hpp;h=40dc1b3c5e94d0cda96e8078a7f166f45609b254;hp=9581e294ba658518e393f7e5966324e9a92f3433;hb=d9b55cc8ab01e83b392762ed1fa400fdafafb60b;hpb=2cca9ebfdc367aa8e4651cf063f0cdea8fccb798

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index 9581e294..40dc1b3c 100644
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -20,28 +20,60 @@
 #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::map;
+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
 
 public:
-	static const QString Key_View_AlwaysZoomToFit;
-	static const QString Key_View_ColouredBG;
+	static const QString Key_View_ZoomToFitDuringAcq;
+	static const QString Key_View_ZoomToFitAfterAcq;
+	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_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_Dec_InitialStateConfigurable;
+	static const QString Key_Log_BufferSize;
+	static const QString Key_Log_NotifyOfStacktrace;
+
+	enum ConvThrDispMode {
+		ConvThrDispMode_None = 0,
+		ConvThrDispMode_Background,
+		ConvThrDispMode_Dots
+	};
 
 public:
 	GlobalSettings();
 
-	static void register_change_handler(const QString key,
-		std::function<void(QVariant)> cb);
+	void set_defaults_where_needed();
+
+	static void add_change_handler(GlobalSettingsInterface *cb);
+	static void remove_change_handler(GlobalSettingsInterface *cb);
 
 	void setValue(const QString& key, const QVariant& value);
 
@@ -63,11 +95,19 @@ public:
 	 */
 	void undo_tracked_changes();
 
+	static void store_gvariant(QSettings &settings, GVariant *v);
+
+	static GVariant* restore_gvariant(QSettings &settings);
+
+	static void store_variantbase(QSettings &settings, Glib::VariantBase v);
+
+	static Glib::VariantBase restore_variantbase(QSettings &settings);
+
 private:
-	static std::multimap< QString, std::function<void(QVariant)> > callbacks_;
+	static vector<GlobalSettingsInterface*> callbacks_;
 
 	static bool tracking_;
-	static std::map<QString, QVariant> tracked_changes_;
+	static map<QString, QVariant> tracked_changes_;
 };
 
 } // namespace pv