diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-18 11:50:21 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-18 11:50:38 -0400 |
| commit | 56c4b3c9b05ec22a89ba594061ba4ec4cb7c5da1 (patch) | |
| tree | a71554f0096297cfc1e726dd115877e50de3c6ea /gtk2_ardour/ui_config.h | |
| parent | 8c944c08eacf8372fc714c9c00257ec13a263ae8 (diff) | |
turn back towards color theme files ALWAYS including the program name. also load both default and user colors (if present)
Diffstat (limited to 'gtk2_ardour/ui_config.h')
| -rw-r--r-- | gtk2_ardour/ui_config.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h index ddfd2f9ecd..559c86a148 100644 --- a/gtk2_ardour/ui_config.h +++ b/gtk2_ardour/ui_config.h @@ -53,14 +53,14 @@ private: 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_program_name, bool with_version) const; + 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; @@ -137,11 +137,12 @@ 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; |