projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Use pv::data::SignalBase namespace
[pulseview.git]
/
pv
/
globalsettings.hpp
diff --git
a/pv/globalsettings.hpp
b/pv/globalsettings.hpp
index 45247377391267eada5bb5438ce841870022c3ee..7bbff59fa9068d4b2f4650b5ea35b4521ddb1e0f 100644
(file)
--- a/
pv/globalsettings.hpp
+++ b/
pv/globalsettings.hpp
@@
-23,6
+23,8
@@
#include <functional>
#include <map>
#include <functional>
#include <map>
+#include <glib.h>
+
#include <QSettings>
#include <QString>
#include <QVariant>
#include <QSettings>
#include <QString>
#include <QVariant>
@@
-38,14
+40,21
@@
class GlobalSettings : public QSettings
Q_OBJECT
public:
Q_OBJECT
public:
- static const QString Key_View_AlwaysZoomToFit;
+ static const QString Key_View_ZoomToFitDuringAcq;
+ static const QString Key_View_ZoomToFitAfterAcq;
static const QString Key_View_ColouredBG;
static const QString Key_View_StickyScrolling;
static const QString Key_View_ShowSamplingPoints;
static const QString Key_View_ColouredBG;
static const QString Key_View_StickyScrolling;
static const QString Key_View_ShowSamplingPoints;
+ static const QString Key_View_ShowAnalogMinorGrid;
+ static const QString Key_View_DefaultDivHeight;
+ static const QString Key_View_DefaultLogicHeight;
+ static const QString Key_Dec_InitialStateConfigurable;
public:
GlobalSettings();
public:
GlobalSettings();
+ void set_defaults_where_needed();
+
static void register_change_handler(const QString key,
function<void(QVariant)> cb);
static void register_change_handler(const QString key,
function<void(QVariant)> cb);
@@
-69,6
+78,10
@@
public:
*/
void undo_tracked_changes();
*/
void undo_tracked_changes();
+ static void store_gvariant(QSettings &settings, GVariant *v);
+
+ static GVariant* restore_gvariant(QSettings &settings);
+
private:
static multimap< QString, function<void(QVariant)> > callbacks_;
private:
static multimap< QString, function<void(QVariant)> > callbacks_;