projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inputfile: Increase chunk size from 16KB to 4MB.
[pulseview.git]
/
pv
/
globalsettings.hpp
diff --git
a/pv/globalsettings.hpp
b/pv/globalsettings.hpp
index b2b3626ed05febc0e7c7b51c9491a75aa826a496..b7f7af06de2d8ec5efbb7e15205187ff9090928c 100644
(file)
--- a/
pv/globalsettings.hpp
+++ b/
pv/globalsettings.hpp
@@
-20,39
+20,58
@@
#ifndef PULSEVIEW_GLOBALSETTINGS_HPP
#define PULSEVIEW_GLOBALSETTINGS_HPP
#ifndef PULSEVIEW_GLOBALSETTINGS_HPP
#define PULSEVIEW_GLOBALSETTINGS_HPP
-#include <functional>
#include <map>
#include <map>
+#include <glib.h>
+
#include <QSettings>
#include <QString>
#include <QVariant>
#include <QSettings>
#include <QString>
#include <QVariant>
-using std::function;
using std::map;
using std::map;
-using std::
multimap
;
+using std::
vector
;
namespace pv {
namespace pv {
+class GlobalSettingsInterface
+{
+public:
+ virtual void on_setting_changed(const QString &key, const QVariant &value) = 0;
+};
+
+
class GlobalSettings : public QSettings
{
Q_OBJECT
public:
class GlobalSettings : public QSettings
{
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_ZoomToFitAfterAcq;
- static const QString Key_View_ColouredBG;
+ static const QString Key_View_TriggerIsZeroTime;
+ 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_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_Dec_InitialStateConfigurable;
static const QString Key_Dec_InitialStateConfigurable;
+ static const QString Key_Log_BufferSize;
+ static const QString Key_Log_NotifyOfStacktrace;
+
+ enum ConvThrDispMode {
+ ConvThrDispMode_None = 0,
+ ConvThrDispMode_Background,
+ ConvThrDispMode_Dots
+ };
public:
GlobalSettings();
void set_defaults_where_needed();
public:
GlobalSettings();
void set_defaults_where_needed();
- static void
register_change_handler(const QString key,
-
function<void(QVariant)>
cb);
+ static void
add_change_handler(GlobalSettingsInterface *cb);
+
static void remove_change_handler(GlobalSettingsInterface *
cb);
void setValue(const QString& key, const QVariant& value);
void setValue(const QString& key, const QVariant& value);
@@
-74,8
+93,12
@@
public:
*/
void undo_tracked_changes();
*/
void undo_tracked_changes();
+ static void store_gvariant(QSettings &settings, GVariant *v);
+
+ static GVariant* restore_gvariant(QSettings &settings);
+
private:
private:
- static
multimap< QString, function<void(QVariant)>
> callbacks_;
+ static
vector<GlobalSettingsInterface*
> callbacks_;
static bool tracking_;
static map<QString, QVariant> tracked_changes_;
static bool tracking_;
static map<QString, QVariant> tracked_changes_;