Session: Fix issue #67 by improving error handling

[pulseview.git] / pv / globalsettings.hpp

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index 56ca9632e45a3bdcbb757018bd72a177f493791a..f6239a6b3d089f726cea54afd1bffaf3f211b14a 100644 (file)
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_GLOBALSETTINGS_HPP
-#define PULSEVIEW_GLOBALSETTINGS_HPP
+#ifndef PULSEVIEW_PV_GLOBALSETTINGS_HPP
+#define PULSEVIEW_PV_GLOBALSETTINGS_HPP
 
 #include <map>
 
@@ -30,6 +30,8 @@
 #include <QString>
 #include <QVariant>
 
+#include "util.hpp"
+
 using std::map;
 using std::pair;
 using std::vector;
@@ -55,11 +57,13 @@ public:
        static const QString Key_General_Theme;
        static const QString Key_General_Style;
        static const QString Key_General_SaveWithSetup;
+       static const QString Key_General_StartAllSessions;
        static const QString Key_View_ZoomToFitDuringAcq;
        static const QString Key_View_ZoomToFitAfterAcq;
        static const QString Key_View_TriggerIsZeroTime;
        static const QString Key_View_ColoredBG;
        static const QString Key_View_StickyScrolling;
+       static const QString Key_View_AllowVerticalDragging;
        static const QString Key_View_ShowSamplingPoints;
        static const QString Key_View_FillSignalHighAreas;
        static const QString Key_View_FillSignalHighAreaColor;
@@ -68,8 +72,12 @@ public:
        static const QString Key_View_DefaultDivHeight;
        static const QString Key_View_DefaultLogicHeight;
        static const QString Key_View_ShowHoverMarker;
+       static const QString Key_View_KeepRulerItemSelected;
        static const QString Key_View_SnapDistance;
        static const QString Key_View_CursorFillColor;
+       static const QString Key_View_CursorShowInterval;
+       static const QString Key_View_CursorShowFrequency;
+       static const QString Key_View_CursorShowSamples;
        static const QString Key_Dec_InitialStateConfigurable;
        static const QString Key_Dec_ExportFormat;
        static const QString Key_Dec_AlwaysShowAllRows;
@@ -119,13 +127,14 @@ public:
        void undo_tracked_changes();
 
        static void store_gvariant(QSettings &settings, GVariant *v);
-
        static GVariant* restore_gvariant(QSettings &settings);
 
        static void store_variantbase(QSettings &settings, Glib::VariantBase v);
-
        static Glib::VariantBase restore_variantbase(QSettings &settings);
 
+       static void store_timestamp(QSettings &settings, const char *name, const pv::util::Timestamp &ts);
+       static pv::util::Timestamp restore_timestamp(QSettings &settings, const char *name);
+
 private:
        static vector<GlobalSettingsInterface*> callbacks_;
 
@@ -140,4 +149,4 @@ private:
 
 } // namespace pv
 
-#endif // PULSEVIEW_GLOBALSETTINGS_HPP
+#endif // PULSEVIEW_PV_GLOBALSETTINGS_HPP