X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fglobalsettings.hpp;h=c6b4cfc5891e617a4d44985f240268bf2a2fa1a0;hb=ffc00fdd5946593ad2a587078fd4ee9ba0a507ec;hp=930bb5bbfcceee55f7fdea1cf9cab54831208901;hpb=1cc1c8dec120ed6d98071f939ea435d85ee853bf;p=pulseview.git

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index 930bb5b..c6b4cfc 100644
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -23,6 +23,8 @@
 #include <functional>
 #include <map>
 
+#include <glib.h>
+
 #include <QSettings>
 #include <QString>
 #include <QVariant>
@@ -38,16 +40,29 @@ class GlobalSettings : public QSettings
 	Q_OBJECT
 
 public:
-	static const QString Key_View_AlwaysZoomToFit;
+	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);
 
@@ -71,6 +86,10 @@ public:
 	 */
 	void undo_tracked_changes();
 
+	static void store_gvariant(QSettings &settings, GVariant *v);
+
+	static GVariant* restore_gvariant(QSettings &settings);
+
 private:
 	static multimap< QString, function<void(QVariant)> > callbacks_;