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

diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index 285bc5366a..ddfd2f9ecd 100644
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -27,6 +27,8 @@
 #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 "pbd/configuration_variable.h"
@@ -37,11 +39,14 @@
 
 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);
 
@@ -55,6 +60,8 @@ class UIConfiguration : public PBD::Stateful
 	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;
@@ -66,7 +73,7 @@ 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;
 
@@ -75,8 +82,17 @@ class UIConfiguration : public PBD::Stateful
 	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&) const;
-		
-        sigc::signal<void,std::string> ParameterChanged;
+
+	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);
@@ -87,10 +103,10 @@ class UIConfiguration : public PBD::Stateful
 	 */
 	int pre_gui_init ();
 
-	/** called after the GUI toolkit has been initialized. 
+	/** 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(); } \
@@ -120,8 +136,6 @@ class UIConfiguration : public PBD::Stateful
 	bool aliases_modified;
 	bool colors_modified;
 	bool modifiers_modified;
-	
-	static UIConfiguration* _instance;
 
 	int store_color_theme ();
 	void load_color_aliases (XMLNode const &);
@@ -134,4 +148,3 @@ class UIConfiguration : public PBD::Stateful
 };
 
 #endif /* __ardour_ui_configuration_h__ */
-