#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace PBD;
if (param == "ui-rc-file") {
load_rc_file (true);
} else if (param == "color-file") {
- load_color_theme ();
+ load_color_theme (true);
}
save_state ();
void
UIConfiguration::reset_gtk_theme ()
{
+ LocaleGuard lg;
stringstream ss;
ss << "gtk_color_scheme = \"" << hex;
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();
/* 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
UIConfiguration*
UIConfiguration::post_gui_init ()
{
- load_color_theme ();
+ load_color_theme (true);
return this;
}
}
std::string
-UIConfiguration::color_file_name (bool use_my, bool with_program_name, bool with_version) const
+UIConfiguration::color_file_name (bool use_my, bool with_version) const
{
string basename;
basename += "my-";
}
- basename += color_file.get(); //this is the overall theme file, e.g. "dark"
-
- if (with_program_name) {
- basename += '-';
- basename += downcase (PROGRAM_NAME);
- }
+ //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("-");
}
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)
{
* in turn calls save_state()
*/
PBD::Unwinder<uint32_t> uw (block_save, block_save + 1);
- const bool running_from_source = ARDOUR_UI_UTILS::running_from_source_tree ();
-
- if (allow_own) {
-
- PBD::Searchpath sp (user_config_directory());
-
- if (find_file (sp, color_file_name (true, running_from_source, true), cfile)) {
- found = true;
- }
-
- if (!found) {
- if (find_file (sp, color_file_name (true, running_from_source, false), cfile)) {
- found = true;
- }
- }
+ if (find_file (theme_search_path(), color_file_name (false, true), cfile)) {
+ found = true;
}
if (!found) {
- if (find_file (theme_search_path(), color_file_name (false, running_from_source, true), cfile)) {
+ if (find_file (theme_search_path(), color_file_name (false, false), cfile)) {
found = true;
}
-
- if (!found) {
- if (find_file (theme_search_path(), color_file_name (false, running_from_source, false), cfile)) {
- found = true;
- }
- }
}
if (!found) {
return -1;
}
+ (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());
- if (set_state (*tree.root(), Stateful::loading_state_version)) {
- error << string_compose(_("color file \"%1\" not loaded successfully."), cfile) << endmsg;
- return -1;
+ /* 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 (!found) {
+ if (find_file (sp, color_file_name (true, false), cfile)) {
+ found = true;
+ }
}
+ if (found) {
+ (void) load_color_file (cfile);
+ }
+
+ }
+
ColorsChanged ();
return 0;
root->add_child_nocopy (*parent);
XMLTree tree;
- std::string colorfile = Glib::build_filename (user_config_directory(), color_file_name (true, false, true));;
+ std::string colorfile = Glib::build_filename (user_config_directory(), color_file_name (true, true));;
tree.set_root (root);
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")) {
alias = child->property (X_("alias"));
if (name && alias) {
- color_aliases.insert (make_pair (name->value(), alias->value()));
+ color_aliases[name->value()] = alias->value();
}
}
}
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;
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;
}
}
}
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")) {
if (name && mod) {
SVAModifier svam (mod->value());
- modifiers.insert (make_pair (name->value(), svam));
+ modifiers[name->value()] = svam;
}
}
}
projects / ardour.git / blobdiff