X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.h;h=559c86a14837034854e4caa3308710d97c456115;hb=f371ac1beb035716ef2e1def831a61bd4b5020c2;hp=06338aae39f6ee91f13362c59a18ea3ad2238d3e;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index 06338aae39..559c86a148 100644
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -46,18 +46,22 @@ private:
     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 load_color_theme (bool allow_own);
 
 	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_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;
@@ -133,15 +137,15 @@ private:
 	bool colors_modified;
 	bool modifiers_modified;
 
-	int store_color_theme ();
+	int  store_color_theme ();
 	void load_color_aliases (XMLNode const &);
 	void load_colors (XMLNode const &);
 	void load_modifiers (XMLNode const &);
 	void reset_gtk_theme ();
+	int  load_color_file (std::string const &);
 	void colors_changed ();
 
 	uint32_t block_save;
 };
 
 #endif /* __ardour_ui_configuration_h__ */
-