X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.h;h=ddfd2f9ecd3f25defe8319f3706faafbe81397b6;hb=786cb746d0ce387a6194555e6757ec64c937690b;hp=55e21045e78ddac67a2e8b84f0a63478b3c9318e;hpb=83326a06ca695878d91636200679a46fd10310e4;p=ardour.git

diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index 55e21045e7..ddfd2f9ecd 100644
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -27,9 +27,11 @@
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 
+#include "ardour/types.h" // required for opeators used in pbd/configuration_variable.h
+
 #include "pbd/stateful.h"
 #include "pbd/xml++.h"
-#include "ardour/configuration_variable.h"
+#include "pbd/configuration_variable.h"
 
 #include "canvas/colors.h"
 
@@ -37,23 +39,29 @@
 
 class UIConfiguration : public PBD::Stateful
 {
-    public:
+private:
 	UIConfiguration();
 	~UIConfiguration();
 
-	static UIConfiguration* instance() { return _instance; }
+    public:
+	static UIConfiguration& instance();
+
+	static std::string color_file_suffix;
 
 	void load_rc_file (bool themechange, bool allow_own = true);
 
 	int load_state ();
 	int save_state ();
 	int load_defaults ();
+	int load_color_theme (bool allow_own=true);
 
 	int set_state (const XMLNode&, int version);
 	XMLNode& get_state (void);
 	XMLNode& get_variables (std::string);
 	void set_variables (const XMLNode&);
 
+	std::string  color_file_name (bool use_my, bool with_program_name, bool with_version) const;
+
 	typedef std::map<std::string,ArdourCanvas::Color> Colors;
 	typedef std::map<std::string,std::string> ColorAliases;
 	typedef std::map<std::string,ArdourCanvas::SVAModifier> Modifiers;
@@ -64,19 +72,41 @@ class UIConfiguration : public PBD::Stateful
 
 	void set_alias (std::string const & name, std::string const & alias);
 	void set_color (const std::string& name, ArdourCanvas::Color);
-	
+	void set_modifier (std::string const &, ArdourCanvas::SVAModifier svam);
+
 	std::string color_as_alias (ArdourCanvas::Color c);
 	ArdourCanvas::Color quantized (ArdourCanvas::Color) const;
 
 	ArdourCanvas::Color color (const std::string&, bool* failed = 0) const;
+	ArdourCanvas::Color color_mod (std::string const & color, std::string const & modifier) const;
+	ArdourCanvas::Color color_mod (const ArdourCanvas::Color& color, std::string const & modifier) const;
 	ArdourCanvas::HSV  color_hsv (const std::string&) const;
-	ArdourCanvas::SVAModifier modifier (const std::string&);
-		
-        sigc::signal<void,std::string> ParameterChanged;
+	ArdourCanvas::SVAModifier modifier (const std::string&) const;
+
+	sigc::signal<void>  ColorsChanged;
+
+	void reset_dpi ();
+	void set_pango_fontsize ();
+
+	float get_ui_scale ();
+
+	sigc::signal<void>  DPIReset;
+
+	sigc::signal<void,std::string> ParameterChanged;
 	void map_parameters (boost::function<void (std::string)>&);
 
 	void parameter_changed (std::string);
-	
+
+	/** called before initializing any part of the GUI. Sets up
+	 *  any runtime environment required to make the GUI work
+	 *  in specific ways.
+	 */
+	int pre_gui_init ();
+
+	/** called after the GUI toolkit has been initialized.
+	 */
+	UIConfiguration* post_gui_init ();
+
 #undef UI_CONFIG_VARIABLE
 #define UI_CONFIG_VARIABLE(Type,var,name,value) \
 	Type get_##var () const { return var.get(); } \
@@ -93,11 +123,11 @@ class UIConfiguration : public PBD::Stateful
 	/* declare variables */
 
 #undef  UI_CONFIG_VARIABLE
-#define UI_CONFIG_VARIABLE(Type,var,name,value) ARDOUR::ConfigVariable<Type> var;
+#define UI_CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
 #include "ui_config_vars.h"
 #undef UI_CONFIG_VARIABLE
 
-#define CANVAS_FONT_VARIABLE(var,name) ARDOUR::ConfigVariable<std::string> var;
+#define CANVAS_FONT_VARIABLE(var,name) PBD::ConfigVariable<std::string> var;
 #include "canvas_vars.h"
 #undef CANVAS_FONT_VARIABLE
 
@@ -105,8 +135,7 @@ class UIConfiguration : public PBD::Stateful
 	bool _dirty;
 	bool aliases_modified;
 	bool colors_modified;
-	
-	static UIConfiguration* _instance;
+	bool modifiers_modified;
 
 	int store_color_theme ();
 	void load_color_aliases (XMLNode const &);
@@ -114,10 +143,8 @@ class UIConfiguration : public PBD::Stateful
 	void load_modifiers (XMLNode const &);
 	void reset_gtk_theme ();
 	void colors_changed ();
-	int load_color_theme (bool allow_own=true);
 
 	uint32_t block_save;
 };
 
 #endif /* __ardour_ui_configuration_h__ */
-