main window: Prefer the user specified device in new sessions

[pulseview.git] / pv / globalsettings.cpp

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 2e29a1717c2092d4d643137d8930646e64f3999a..ee9741030c1098ee8d6c5352dfef6feccfa5fbdf 100644 (file)
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -19,15 +19,22 @@
 
 #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_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()
@@ -35,8 +42,15 @@ GlobalSettings::GlobalSettings() :
        beginGroup("Settings");
 }
 
+void GlobalSettings::set_defaults_where_needed()
+{
+       // Enable coloured trace backgrounds by default
+       if (!contains(Key_View_ColouredBG))
+               setValue(Key_View_ColouredBG, true);
+}
+
 void GlobalSettings::register_change_handler(const QString key,
-       std::function<void(QVariant)> cb)
+       function<void(QVariant)> cb)
 {
        callbacks_.emplace(key, cb);
 }