X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fglobalsettings.hpp;h=cf1921e89ea52b551f3ca46a85102b04a9dbf502;hb=ff49e70c60ba4ea93c5966dd4d415fcd6f6e19fb;hp=eda3e03a0bfc1bc12b2fe6870bf8ed1c5df8299a;hpb=bcb4c327ee9b8d2172d126429ba017884d079d4c;p=pulseview.git

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index eda3e03a..cf1921e8 100644
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -23,16 +23,24 @@
 #include <map>
 
 #include <glib.h>
+#include <glibmm/variant.h>
 
+#include <QPalette>
 #include <QSettings>
 #include <QString>
 #include <QVariant>
 
+#include "util.hpp"
+
 using std::map;
+using std::pair;
 using std::vector;
 
 namespace pv {
 
+extern const vector< pair<QString, QString> > Themes;
+
+
 class GlobalSettingsInterface
 {
 public:
@@ -45,18 +53,33 @@ class GlobalSettings : public QSettings
 	Q_OBJECT
 
 public:
+	static const QString Key_General_Language;
+	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_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_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_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;
 	static const QString Key_Log_BufferSize;
+	static const QString Key_Log_NotifyOfStacktrace;
 
 	enum ConvThrDispMode {
 		ConvThrDispMode_None = 0,
@@ -67,7 +90,15 @@ public:
 public:
 	GlobalSettings();
 
+	void save_internal_defaults();
 	void set_defaults_where_needed();
+	void set_bright_theme_default_colors();
+	void set_dark_theme_default_colors();
+
+	static bool current_theme_is_dark();
+	void apply_theme();
+
+	void apply_language();
 
 	static void add_change_handler(GlobalSettingsInterface *cb);
 	static void remove_change_handler(GlobalSettingsInterface *cb);
@@ -93,14 +124,24 @@ 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<GlobalSettingsInterface*> callbacks_;
 
 	static bool tracking_;
 	static map<QString, QVariant> tracked_changes_;
+
+	static QString default_style_;
+	static QPalette default_palette_;
+
+	static bool is_dark_theme_;
 };
 
 } // namespace pv