X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.cc;h=2db640681d4b219e9317affde2e85e7df59e9228;hb=01ac1b5362b0f246e5227dc763054917daa43642;hp=931030180cf8ff29be04e3651be120881689f446;hpb=17ace643e4edbec1e5bd7b446d039f8c94beef75;p=ardour.git diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index 931030180c..2db640681d 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -32,28 +32,30 @@ #include // for fontmap resolution control for GnomeCanvas #include // for fontmap resolution control for GnomeCanvas -#include "pbd/gstdio_compat.h" #include #include #include "pbd/convert.h" +#include "pbd/error.h" #include "pbd/failed_constructor.h" -#include "pbd/xml++.h" #include "pbd/file_utils.h" +#include "pbd/gstdio_compat.h" #include "pbd/locale_guard.h" -#include "pbd/error.h" -#include "pbd/stacktrace.h" - -#include "gtkmm2ext/rgb_macros.h" -#include "gtkmm2ext/gtk_ui.h" +#include "pbd/unwind.h" +#include "pbd/xml++.h" #include "ardour/filesystem_paths.h" +#include "ardour/search_paths.h" +#include "ardour/revision.h" #include "ardour/utils.h" +#include "gtkmm2ext/rgb_macros.h" +#include "gtkmm2ext/gtk_ui.h" + #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; @@ -64,6 +66,7 @@ static const char* ui_config_file_name = "ui_config"; static const char* default_ui_config_file_name = "default_ui_config"; static const double hue_width = 18.0; +std::string UIConfiguration::color_file_suffix = X_(".colors"); UIConfiguration& UIConfiguration::instance () @@ -124,7 +127,7 @@ UIConfiguration::parameter_changed (string param) if (param == "ui-rc-file") { load_rc_file (true); } else if (param == "color-file") { - load_color_theme (); + load_color_theme (true); } save_state (); @@ -133,6 +136,7 @@ UIConfiguration::parameter_changed (string param) void UIConfiguration::reset_gtk_theme () { + LocaleGuard lg; stringstream ss; ss << "gtk_color_scheme = \"" << hex; @@ -154,18 +158,6 @@ UIConfiguration::reset_gtk_theme () void UIConfiguration::reset_dpi () -{ - long val = get_font_scale(); - set_pango_fontsize (); - /* Xft rendering */ - - gtk_settings_set_long_property (gtk_settings_get_default(), - "gtk-xft-dpi", val, "ardour"); - DPIReset(); //Emit Signal -} - -void -UIConfiguration::set_pango_fontsize () { long val = get_font_scale(); @@ -178,6 +170,12 @@ UIConfiguration::set_pango_fontsize () /* Cairo rendering, in case there is any */ pango_cairo_font_map_set_resolution ((PangoCairoFontMap*) pango_cairo_font_map_get_default(), val/1024); + + /* Xft rendering */ + + gtk_settings_set_long_property (gtk_settings_get_default(), + "gtk-xft-dpi", val, "ardour"); + DPIReset(); //Emit Signal } float @@ -214,7 +212,7 @@ UIConfiguration::pre_gui_init () UIConfiguration* UIConfiguration::post_gui_init () { - load_color_theme (); + load_color_theme (true); return this; } @@ -248,59 +246,108 @@ UIConfiguration::load_defaults () if (ret == 0) { /* reload color theme */ load_color_theme (false); - ColorsChanged (); /* EMIT SIGNAL */ } return ret; } +std::string +UIConfiguration::color_file_name (bool use_my, bool with_version) const +{ + string basename; + + if (use_my) { + basename += "my-"; + } + + //this is the overall theme file, e.g. "dark" plus "-downcase(PROGRAM_NAME)" + basename += color_file.get(); + + std::string rev (revision); + std::size_t pos = rev.find_first_of("-"); + + if (with_version && pos != string::npos && pos > 0) { + basename += "-"; + basename += rev.substr (0, pos); // COLORFILE_VERSION - program major.minor + } + + basename += color_file_suffix; + return basename; +} + +int +UIConfiguration::load_color_file (string const & path) +{ + XMLTree tree; + + info << string_compose (_("Loading color file %1"), path) << endmsg; + + if (!tree.read (path.c_str())) { + error << string_compose(_("cannot read color file \"%1\""), path) << endmsg; + return -1; + } + + if (set_state (*tree.root(), Stateful::loading_state_version)) { + error << string_compose(_("color file \"%1\" not loaded successfully."), path) << endmsg; + return -1; + } + + return 0; +} + int UIConfiguration::load_color_theme (bool allow_own) { std::string cfile; - string basename; bool found = false; + /* ColorsChanged() will trigger a parameter_changed () which + * in turn calls save_state() + */ + PBD::Unwinder uw (block_save, block_save + 1); - if (allow_own) { - basename = "my-"; - basename += color_file.get(); - basename += ".colors"; + if (find_file (theme_search_path(), color_file_name (false, true), cfile)) { + found = true; + } - if (find_file (ardour_config_search_path(), basename, cfile)) { + if (!found) { + if (find_file (theme_search_path(), color_file_name (false, false), cfile)) { found = true; } } if (!found) { - basename = color_file.get(); - basename += ".colors"; - - if (find_file (ardour_config_search_path(), basename, cfile)) { - found = true; - } + warning << string_compose (_("Color file for %1 not found along %2"), color_file.get(), theme_search_path().to_string()) << endmsg; + return -1; } - if (found) { + (void) load_color_file (cfile); - XMLTree tree; + if (allow_own) { - info << string_compose (_("Loading color file %1"), cfile) << endmsg; + found = false; - if (!tree.read (cfile.c_str())) { - error << string_compose(_("cannot read color file \"%1\""), cfile) << endmsg; - return -1; + PBD::Searchpath sp (user_config_directory()); + + /* user's own color files never have the program name in them */ + + if (find_file (sp, color_file_name (true, true), cfile)) { + found = true; } - if (set_state (*tree.root(), Stateful::loading_state_version)) { - error << string_compose(_("color file \"%1\" not loaded successfully."), cfile) << endmsg; - return -1; + if (!found) { + if (find_file (sp, color_file_name (true, false), cfile)) { + found = true; + } + } + + if (found) { + (void) load_color_file (cfile); } - ColorsChanged (); - } else { - warning << string_compose (_("Color file %1 not found"), basename) << endmsg; } + ColorsChanged (); + return 0; } @@ -308,7 +355,7 @@ int UIConfiguration::store_color_theme () { XMLNode* root; - LocaleGuard lg (X_("C")); + LocaleGuard lg; root = new XMLNode("Ardour"); @@ -342,7 +389,7 @@ UIConfiguration::store_color_theme () root->add_child_nocopy (*parent); XMLTree tree; - std::string colorfile = Glib::build_filename (user_config_directory(), (string ("my-") + color_file.get() + ".colors")); + std::string colorfile = Glib::build_filename (user_config_directory(), color_file_name (true, true));; tree.set_root (root); @@ -357,6 +404,7 @@ UIConfiguration::store_color_theme () int UIConfiguration::load_state () { + LocaleGuard lg; // a single guard for all 3 configs bool found = false; std::string rcfile; @@ -407,6 +455,9 @@ UIConfiguration::load_state () int UIConfiguration::save_state() { + if (block_save != 0) { + return -1; + } if (_dirty) { std::string rcfile = Glib::build_filename (user_config_directory(), ui_config_file_name); @@ -443,7 +494,7 @@ XMLNode& UIConfiguration::get_state () { XMLNode* root; - LocaleGuard lg (X_("C")); + LocaleGuard lg; root = new XMLNode("Ardour"); @@ -461,7 +512,7 @@ XMLNode& UIConfiguration::get_variables (std::string which_node) { XMLNode* node; - LocaleGuard lg (X_("C")); + LocaleGuard lg; node = new XMLNode (which_node); @@ -480,6 +531,7 @@ UIConfiguration::get_variables (std::string which_node) int UIConfiguration::set_state (const XMLNode& root, int /*version*/) { + LocaleGuard lg; /* this can load a generic UI configuration file or a colors file */ if (root.name() != "Ardour") { @@ -531,8 +583,6 @@ UIConfiguration::load_color_aliases (XMLNode const & node) XMLProperty const *name; XMLProperty const *alias; - color_aliases.clear (); - for (niter = nlist.begin(); niter != nlist.end(); ++niter) { XMLNode const * child = *niter; if (child->name() != X_("ColorAlias")) { @@ -542,7 +592,7 @@ UIConfiguration::load_color_aliases (XMLNode const & node) alias = child->property (X_("alias")); if (name && alias) { - color_aliases.insert (make_pair (name->value(), alias->value())); + color_aliases[name->value()] = alias->value(); } } } @@ -555,7 +605,9 @@ UIConfiguration::load_colors (XMLNode const & node) XMLProperty const *name; XMLProperty const *color; - colors.clear (); + /* don't clear colors, so that we can load > 1 color file and have + the subsequent ones overwrite the later ones. + */ for (niter = nlist.begin(); niter != nlist.end(); ++niter) { XMLNode const * child = *niter; @@ -568,7 +620,8 @@ UIConfiguration::load_colors (XMLNode const & node) if (name && color) { ArdourCanvas::Color c; c = strtoul (color->value().c_str(), 0, 16); - colors.insert (make_pair (name->value(), c)); + /* insert or replace color name definition */ + colors[name->value()] = c; } } } @@ -576,14 +629,12 @@ UIConfiguration::load_colors (XMLNode const & node) void UIConfiguration::load_modifiers (XMLNode const & node) { - PBD::LocaleGuard lg ("C"); + PBD::LocaleGuard lg; XMLNodeList const nlist = node.children(); XMLNodeConstIterator niter; XMLProperty const *name; XMLProperty const *mod; - modifiers.clear (); - for (niter = nlist.begin(); niter != nlist.end(); ++niter) { XMLNode const * child = *niter; if (child->name() != X_("Modifier")) { @@ -595,7 +646,7 @@ UIConfiguration::load_modifiers (XMLNode const & node) if (name && mod) { SVAModifier svam (mod->value()); - modifiers.insert (make_pair (name->value(), svam)); + modifiers[name->value()] = svam; } } } @@ -740,5 +791,3 @@ UIConfiguration::load_rc_file (bool themechange, bool allow_own) Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path, themechange); } - -