X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=915eaebcc9bee7df37981770f158117b60ffcd42;hb=e91fb166608133382baa1a90cc022bfa47d649de;hp=0eff1915d15ed5d151b4d1eb364d40247231c532;hpb=1cc1c8dec120ed6d98071f939ea435d85ee853bf;p=pulseview.git

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 0eff191..915eaeb 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -25,7 +25,8 @@ 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";
@@ -42,6 +43,21 @@ 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,
 	function<void(QVariant)> cb)
 {