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

diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index c869dfb420..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"
@@ -44,6 +46,8 @@ private:
     public:
 	static UIConfiguration& instance();
 
+	static std::string color_file_suffix;
+
 	void load_rc_file (bool themechange, bool allow_own = true);
 
 	int load_state ();
@@ -56,6 +60,8 @@ private:
 	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;
@@ -67,7 +73,7 @@ private:
 	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;
 
@@ -83,7 +89,7 @@ private:
 	void set_pango_fontsize ();
 
 	float get_ui_scale ();
-		
+
 	sigc::signal<void>  DPIReset;
 
 	sigc::signal<void,std::string> ParameterChanged;
@@ -97,10 +103,10 @@ private:
 	 */
 	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(); } \
@@ -130,7 +136,7 @@ private:
 	bool aliases_modified;
 	bool colors_modified;
 	bool modifiers_modified;
-	
+
 	int store_color_theme ();
 	void load_color_aliases (XMLNode const &);
 	void load_colors (XMLNode const &);
@@ -142,4 +148,3 @@ private:
 };
 
 #endif /* __ardour_ui_configuration_h__ */
-