X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fglobalsettings.hpp;h=e41c2ea9ed6a8b8d88b537f7bbae33bcc07f418d;hb=e23d7aa0d9980c3c269cbddb4cfbb32350d7425c;hp=56ca9632e45a3bdcbb757018bd72a177f493791a;hpb=0466001be51e779b23aaebec1cc9361305c07be9;p=pulseview.git diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp index 56ca9632..e41c2ea9 100644 --- a/pv/globalsettings.hpp +++ b/pv/globalsettings.hpp @@ -17,8 +17,8 @@ * along with this program; if not, see . */ -#ifndef PULSEVIEW_GLOBALSETTINGS_HPP -#define PULSEVIEW_GLOBALSETTINGS_HPP +#ifndef PULSEVIEW_PV_GLOBALSETTINGS_HPP +#define PULSEVIEW_PV_GLOBALSETTINGS_HPP #include @@ -30,6 +30,8 @@ #include #include +#include "util.hpp" + using std::map; using std::pair; using std::vector; @@ -70,6 +72,9 @@ public: static const QString Key_View_ShowHoverMarker; 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 +124,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 callbacks_; @@ -140,4 +146,4 @@ private: } // namespace pv -#endif // PULSEVIEW_GLOBALSETTINGS_HPP +#endif // PULSEVIEW_PV_GLOBALSETTINGS_HPP