Rename "always zoom-to-fit" to "zoom-to-fit during acquisition"

[pulseview.git] / pv / globalsettings.cpp

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index ee9741030c1098ee8d6c5352dfef6feccfa5fbdf..915eaebcc9bee7df37981770f158117b60ffcd42 100644 (file)
--- 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";
@@ -44,9 +45,17 @@ GlobalSettings::GlobalSettings() :
 
 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,