X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.hpp;h=4f07955adb35200d9130f654f71894744cfacd54;hp=ea43491c35b1a2b63d3656cbf375a8940113df5b;hb=fb64180193664005567570724d52b685913e15ed;hpb=d0c0573b3ee694827a747727f862c5f91736ca05 diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp index ea43491c..4f07955a 100644 --- a/pv/globalsettings.hpp +++ b/pv/globalsettings.hpp @@ -23,12 +23,12 @@ #include #include +#include #include #include #include -using std::function; using std::map; using std::vector; @@ -49,14 +49,19 @@ public: static const QString Key_View_ZoomToFitDuringAcq; static const QString Key_View_ZoomToFitAfterAcq; static const QString Key_View_TriggerIsZeroTime; - static const QString Key_View_ColouredBG; + static const QString Key_View_ColoredBG; static const QString Key_View_StickyScrolling; static const QString Key_View_ShowSamplingPoints; static const QString Key_View_ShowAnalogMinorGrid; static const QString Key_View_ConversionThresholdDispMode; static const QString Key_View_DefaultDivHeight; static const QString Key_View_DefaultLogicHeight; + static const QString Key_View_ShowHoverMarker; + static const QString Key_View_SnapDistance; static const QString Key_Dec_InitialStateConfigurable; + static const QString Key_Dec_ExportFormat; + static const QString Key_Log_BufferSize; + static const QString Key_Log_NotifyOfStacktrace; enum ConvThrDispMode { ConvThrDispMode_None = 0, @@ -96,6 +101,10 @@ public: static GVariant* restore_gvariant(QSettings &settings); + static void store_variantbase(QSettings &settings, Glib::VariantBase v); + + static Glib::VariantBase restore_variantbase(QSettings &settings); + private: static vector callbacks_;