X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.cc;h=7758c6a0524a67be65d2f9fb97f2d2fbee9387dc;hb=e653da32c06c00e2ff481f2fc9d2d2de34b5aba0;hp=f43b4eac33a8de967c716208bde03e1de804cadd;hpb=cb4b6bf8a3dff70c22e63f2f7b01abe225cee9fc;p=ardour.git diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index f43b4eac33..7758c6a052 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -32,30 +32,30 @@ #include // for fontmap resolution control for GnomeCanvas #include // for fontmap resolution control for GnomeCanvas -#include "pbd/gstdio_compat.h" -#include "pbd/unwind.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; @@ -127,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 (); @@ -136,6 +136,7 @@ UIConfiguration::parameter_changed (string param) void UIConfiguration::reset_gtk_theme () { + LocaleGuard lg; stringstream ss; ss << "gtk_color_scheme = \"" << hex; @@ -157,30 +158,24 @@ 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(); /* FT2 rendering - used by GnomeCanvas, sigh */ #ifndef PLATFORM_WINDOWS - pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024); + pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024); // XXX pango_ft2_font_map_new leaks #endif /* 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 @@ -217,7 +212,7 @@ UIConfiguration::pre_gui_init () UIConfiguration* UIConfiguration::post_gui_init () { - load_color_theme (); + load_color_theme (true); return this; } @@ -256,57 +251,110 @@ UIConfiguration::load_defaults () return ret; } +std::string +UIConfiguration::color_file_name (bool use_my, bool with_version) const +{ + string basename; + + if (use_my) { + basename += "my-"; + } + + std::string color_name = color_file.get(); + size_t sep = color_name.find_first_of("-"); + if (sep != string::npos) { + color_name = color_name.substr (0, sep); + } + + basename += color_name; + basename += "-"; + basename += downcase(std::string(PROGRAM_NAME)); + + 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 += color_file_suffix; + if (find_file (theme_search_path(), color_file_name (false, true), cfile)) { + found = true; + } - if (find_file (theme_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 += color_file_suffix; - - if (find_file (theme_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; } @@ -348,7 +396,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() + color_file_suffix)); + std::string colorfile = Glib::build_filename (user_config_directory(), color_file_name (true, true));; tree.set_root (root); @@ -542,8 +590,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")) { @@ -553,7 +599,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(); } } } @@ -566,7 +612,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; @@ -579,7 +627,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; } } } @@ -593,8 +642,6 @@ UIConfiguration::load_modifiers (XMLNode const & node) 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")) { @@ -606,7 +653,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; } } }