#include <boost/function.hpp>
#include <boost/bind.hpp>
+#include "ardour/types.h" // required for opeators used in pbd/configuration_variable.h
+#include "ardour/types_convert.h"
+
#include "pbd/stateful.h"
#include "pbd/xml++.h"
-#include "ardour/configuration_variable.h"
+#include "pbd/configuration_variable.h"
-#include "canvas/colors.h"
+#include "gtkmm2ext/colors.h"
+#include "widgets/ui_config.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 T>
-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
+class UIConfiguration : public ArdourWidgets::UIConfigurationBase
{
- 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;
-};
-
+private:
UIConfiguration();
~UIConfiguration();
- static UIConfiguration* instance() { return _instance; }
+public:
+ static UIConfiguration& instance();
- std::map<std::string,ColorVariable<ArdourCanvas::Color> *> configurable_colors;
+ static std::string color_file_suffix;
- 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 ();
+ int load_color_theme (bool allow_own);
- 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<std::string,RelativeHSV> RelativeColors;
+ std::string color_file_name (bool use_my, bool with_version) const;
+
+ typedef std::map<std::string,Gtkmm2ext::Color> Colors;
typedef std::map<std::string,std::string> ColorAliases;
+ typedef std::map<std::string,Gtkmm2ext::SVAModifier> Modifiers;
- RelativeColors relative_colors;
- ColorAliases color_aliases;
+ Colors colors;
+ ColorAliases color_aliases;
+ Modifiers modifiers;
void set_alias (std::string const & name, std::string const & alias);
-
- 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::HSV color_hsv (const std::string&) const;
-
- sigc::signal<void,std::string> ParameterChanged;
+ void set_color (const std::string& name, Gtkmm2ext::Color);
+ void set_modifier (std::string const &, Gtkmm2ext::SVAModifier svam);
+
+ std::string color_as_alias (Gtkmm2ext::Color c);
+ Gtkmm2ext::Color quantized (Gtkmm2ext::Color) const;
+
+ Gtkmm2ext::Color color (const std::string&, bool* failed = 0) const;
+ Gtkmm2ext::Color color_mod (std::string const & color, std::string const & modifier) const;
+ Gtkmm2ext::Color color_mod (const Gtkmm2ext::Color& color, std::string const & modifier) const;
+ Gtkmm2ext::HSV color_hsv (const std::string&) const;
+ Gtkmm2ext::SVAModifier modifier (const std::string&) const;
+
+ static std::string color_to_hex_string (Gtkmm2ext::Color c);
+ static std::string color_to_hex_string_no_alpha (Gtkmm2ext::Color c);
+
+ void reset_dpi ();
+ float get_ui_scale ();
+
+ sigc::signal<void,std::string> ParameterChanged;
void map_parameters (boost::function<void (std::string)>&);
void parameter_changed (std::string);
-
+
+ /** called before initializing any part of the GUI. Sets up
+ * any runtime environment required to make the GUI work
+ * in specific ways.
+ */
+ int pre_gui_init ();
+
+ /** 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(); } \
#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:
+private:
/* declare variables */
#undef UI_CONFIG_VARIABLE
-#define UI_CONFIG_VARIABLE(Type,var,name,value) ARDOUR::ConfigVariable<Type> var;
+#define UI_CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
#include "ui_config_vars.h"
#undef UI_CONFIG_VARIABLE
-#define CANVAS_FONT_VARIABLE(var,name) ARDOUR::ConfigVariable<std::string> var;
+#define CANVAS_FONT_VARIABLE(var,name) PBD::ConfigVariable<std::string> 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<ArdourCanvas::Color> var;
-#include "base_colors.h"
-#undef CANVAS_BASE_COLOR
-
XMLNode& state ();
bool _dirty;
bool aliases_modified;
- bool derived_modified;
-
- static UIConfiguration* _instance;
+ bool colors_modified;
+ bool modifiers_modified;
+ 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 ();
-
- XMLNode _saved_state_node;
- int _saved_state_version;
-};
-std::ostream& operator<< (std::ostream& o, const UIConfiguration::RelativeHSV& rhsv);
+ uint32_t block_save;
+};
#endif /* __ardour_ui_configuration_h__ */
-
projects / ardour.git / blobdiff