X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=915eaebcc9bee7df37981770f158117b60ffcd42;hp=d24822413038c5a63be439c1d1038b53fd49d1e4;hb=e91fb166608133382baa1a90cc022bfa47d649de;hpb=2cca9ebfdc367aa8e4651cf063f0cdea8fccb798;ds=sidebyside

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index d2482241..915eaebc 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -19,14 +19,23 @@
 
 #include "globalsettings.hpp"
 
+using std::function;
+using std::map;
+using std::multimap;
+
 namespace pv {
 
-const QString GlobalSettings::Key_View_AlwaysZoomToFit = "View_AlwaysZoomToFit";
+const QString GlobalSettings::Key_View_ZoomToFitDuringAcq = "View_ZoomToFitDuringAcq";
+const QString GlobalSettings::Key_View_ZoomToFitAfterAcq = "View_ZoomToFitAfterAcq";
 const QString GlobalSettings::Key_View_ColouredBG = "View_ColouredBG";
+const QString GlobalSettings::Key_View_StickyScrolling = "View_StickyScrolling";
+const QString GlobalSettings::Key_View_ShowSamplingPoints = "View_ShowSamplingPoints";
+const QString GlobalSettings::Key_View_ShowAnalogMinorGrid = "View_ShowAnalogMinorGrid";
+const QString GlobalSettings::Key_Dec_InitialStateConfigurable = "Dec_InitialStateConfigurable";
 
-std::multimap< QString, std::function<void(QVariant)> > GlobalSettings::callbacks_;
+multimap< QString, function<void(QVariant)> > GlobalSettings::callbacks_;
 bool GlobalSettings::tracking_ = false;
-std::map<QString, QVariant> GlobalSettings::tracked_changes_;
+map<QString, QVariant> GlobalSettings::tracked_changes_;
 
 GlobalSettings::GlobalSettings() :
 	QSettings()
@@ -34,8 +43,23 @@ GlobalSettings::GlobalSettings() :
 	beginGroup("Settings");
 }
 
+void GlobalSettings::set_defaults_where_needed()
+{
+	// Enable zoom-to-fit after acquisition by default
+	if (!contains(Key_View_ZoomToFitAfterAcq))
+		setValue(Key_View_ZoomToFitAfterAcq, true);
+
+	// Enable coloured trace backgrounds by default
+	if (!contains(Key_View_ColouredBG))
+		setValue(Key_View_ColouredBG, true);
+
+	// Enable showing sampling points by default
+	if (!contains(Key_View_ShowSamplingPoints))
+		setValue(Key_View_ShowSamplingPoints, true);
+}
+
 void GlobalSettings::register_change_handler(const QString key,
-	std::function<void(QVariant)> cb)
+	function<void(QVariant)> cb)
 {
 	callbacks_.emplace(key, cb);
 }