X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.hpp;h=a65a723c0c0e85f4704fa38bb712a8e68276c0ba;hp=9cf2978b68369751c76c9e53dc9ec0d6586ded04;hb=8962d7b3b640b5f07f26a4b4ebee839c4880b69d;hpb=90ee1ed9a90bc0651f86ee4af07e0958572f86da

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index 9cf2978b..a65a723c 100644
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -20,36 +20,59 @@
 #ifndef PULSEVIEW_GLOBALSETTINGS_HPP
 #define PULSEVIEW_GLOBALSETTINGS_HPP
 
-#include <functional>
 #include <map>
 
 #include <glib.h>
+#include <glibmm/variant.h>
 
+#include <QPalette>
 #include <QSettings>
 #include <QString>
 #include <QVariant>
 
-using std::function;
 using std::map;
-using std::multimap;
+using std::pair;
+using std::vector;
 
 namespace pv {
 
+extern const vector< pair<QString, QString> > Themes;
+
+
+class GlobalSettingsInterface
+{
+public:
+	virtual void on_setting_changed(const QString &key, const QVariant &value) = 0;
+};
+
+
 class GlobalSettings : public QSettings
 {
 	Q_OBJECT
 
 public:
+	static const QString Key_General_Theme;
+	static const QString Key_General_Style;
+	static const QString Key_General_SaveWithSetup;
 	static const QString Key_View_ZoomToFitDuringAcq;
 	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_FillSignalHighAreas;
+	static const QString Key_View_FillSignalHighAreaColor;
 	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_View_CursorFillColor;
 	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,
@@ -60,10 +83,16 @@ public:
 public:
 	GlobalSettings();
 
+	void save_internal_defaults();
 	void set_defaults_where_needed();
+	void set_bright_theme_default_colors();
+	void set_dark_theme_default_colors();
+
+	bool current_theme_is_dark();
+	void apply_theme();
 
-	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);
 
@@ -89,11 +118,20 @@ 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 multimap< QString, function<void(QVariant)> > callbacks_;
+	static vector<GlobalSettingsInterface*> callbacks_;
 
 	static bool tracking_;
 	static map<QString, QVariant> tracked_changes_;
+
+	static QString default_style_;
+	static QPalette default_palette_;
+
+	bool is_dark_theme_;
 };
 
 } // namespace pv