X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.h;h=c9f950d94790bfc39bd6181723c33c02ccb51a6e;hb=736038556fa41607d54a57fd3339d4fd1782bddf;hp=bcfb1092e6aff74133ff429317b3dd7d3ba5517f;hpb=624a86c39d0a22439c797d88c6defe28e55ab806;p=ardour.git diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h index bcfb1092e6..c9f950d947 100644 --- a/gtk2_ardour/ui_config.h +++ b/gtk2_ardour/ui_config.h @@ -29,111 +29,52 @@ #include "pbd/stateful.h" #include "pbd/xml++.h" -#include "ardour/configuration_variable.h" +#include "pbd/configuration_variable.h" #include "canvas/colors.h" #include "utils.h" -/* This is very similar to ARDOUR::ConfigVariable but expects numeric values to - * be in hexadecimal. This is because it is intended for use with color - * specifications which are easier to scan for issues in "rrggbbaa" format than - * as decimals. - */ -template -class ColorVariable : public ARDOUR::ConfigVariableBase -{ - public: - ColorVariable (std::string str) : ARDOUR::ConfigVariableBase (str) {} - ColorVariable (std::string str, T val) : ARDOUR::ConfigVariableBase (str), value (val) {} - - bool set (T val) { - if (val == value) { - return false; - } - value = val; - return true; - } - - T get() const { - return value; - } - - std::string get_as_string () const { - std::stringstream ss; - ss << std::hex; - ss.fill('0'); - ss.width(8); - ss << value; - return ss.str (); - } - - void set_from_string (std::string const & s) { - std::stringstream ss; - ss << std::hex; - ss << s; - ss >> value; - } - - protected: - T get_for_save() { return value; } - T value; -}; - class UIConfiguration : public PBD::Stateful { public: - struct RelativeHSV { - RelativeHSV (const std::string& b, const ArdourCanvas::HSV& mod) - : base_color (b) - , modifier (mod) - , quantized_hue (-1.0) {} - std::string base_color; - ArdourCanvas::HSV modifier; - double quantized_hue; - - ArdourCanvas::HSV get() const; -}; - UIConfiguration(); ~UIConfiguration(); static UIConfiguration* instance() { return _instance; } - bool dirty () const; - void set_dirty (); + void load_rc_file (bool themechange, bool allow_own = true); int load_state (); int save_state (); int load_defaults (); - static void load_rc_file (std::string const &, bool themechange); - int set_state (const XMLNode&, int version); XMLNode& get_state (void); XMLNode& get_variables (std::string); void set_variables (const XMLNode&); - typedef std::map RelativeColors; + typedef std::map Colors; typedef std::map ColorAliases; - typedef std::map *> BaseColors; + typedef std::map Modifiers; - BaseColors base_colors; - RelativeColors relative_colors; + Colors colors; ColorAliases color_aliases; + Modifiers modifiers; 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); - void reset_relative (const std::string& name, const RelativeHSV& new_value); - - RelativeHSV color_as_relative_hsv (ArdourCanvas::Color c); std::string color_as_alias (ArdourCanvas::Color c); ArdourCanvas::Color quantized (ArdourCanvas::Color) const; - ArdourCanvas::Color base_color_by_name (const std::string&) const; - ArdourCanvas::Color color (const std::string&) 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&) const; + sigc::signal ParameterChanged; void map_parameters (boost::function&); @@ -151,55 +92,36 @@ class UIConfiguration : public PBD::Stateful #include "canvas_vars.h" #undef CANVAS_FONT_VARIABLE -#undef CANVAS_BASE_COLOR -#define CANVAS_BASE_COLOR(var,name,val) \ - ArdourCanvas::Color get_##var() const { return var.get(); } \ - bool set_##var (ArdourCanvas::Color v) { bool ret = var.set (v); if (ret) { ParameterChanged (name); } return ret; } \ - bool set_##var(const ArdourCanvas::HSV& v) const { return set_##var (v.color()); } -#include "base_colors.h" -#undef CANVAS_BASE_COLOR - -#undef COLOR_ALIAS -#define COLOR_ALIAS(var,name,alias) ArdourCanvas::Color get_##var() const { return color (name); } -#include "color_aliases.h" -#undef COLOR_ALIAS - private: /* declare variables */ #undef UI_CONFIG_VARIABLE -#define UI_CONFIG_VARIABLE(Type,var,name,value) ARDOUR::ConfigVariable var; +#define UI_CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable var; #include "ui_config_vars.h" #undef UI_CONFIG_VARIABLE -#define CANVAS_FONT_VARIABLE(var,name) ARDOUR::ConfigVariable var; +#define CANVAS_FONT_VARIABLE(var,name) PBD::ConfigVariable var; #include "canvas_vars.h" #undef CANVAS_FONT_VARIABLE - /* declare base color variables (these are modifiable by the user) */ - -#undef CANVAS_BASE_COLOR -#define CANVAS_BASE_COLOR(var,name,val) ColorVariable var; -#include "base_colors.h" -#undef CANVAS_BASE_COLOR - XMLNode& state (); bool _dirty; bool aliases_modified; - bool derived_modified; + bool colors_modified; + bool modifiers_modified; static UIConfiguration* _instance; + int store_color_theme (); void load_color_aliases (XMLNode const &); - void load_relative_colors (XMLNode const &); + void load_colors (XMLNode const &); + void load_modifiers (XMLNode const &); void reset_gtk_theme (); void colors_changed (); - - XMLNode _saved_state_node; - int _saved_state_version; -}; + int load_color_theme (bool allow_own=true); -std::ostream& operator<< (std::ostream& o, const UIConfiguration::RelativeHSV& rhsv); + uint32_t block_save; +}; #endif /* __ardour_ui_configuration_h__ */