#include <pango/pangoft2.h> // for fontmap resolution control for GnomeCanvas
#include <pango/pangocairo.h> // for fontmap resolution control for GnomeCanvas
-#include "pbd/gstdio_compat.h"
-#include "pbd/unwind.h"
#include <glibmm/miscutils.h>
#include <gtkmm/settings.h>
#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;
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 ()
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;
UIConfiguration*
UIConfiguration::post_gui_init ()
{
- load_color_theme ();
+ load_color_theme (true);
return this;
}
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<uint32_t> 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;
}
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);
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;
}
}
}
Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path, themechange);
}
-
-