X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.cc;h=86f03bbd95ad5c4c9ab755c394bddc78f962f17f;hb=bebe2af95ad9999fdca719450dc2c70cfb849076;hp=c6dd70c992f53594ba841a23e29bfb3d7bd3e76d;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index c6dd70c992..86f03bbd95 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Paul Davis + Copyright (C) 1999-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,17 +18,18 @@ */ #include +#include #include /* for snprintf, grrr */ #include #include "pbd/failed_constructor.h" #include "pbd/xml++.h" -#include "pbd/filesystem.h" #include "pbd/file_utils.h" #include "pbd/error.h" -#include "ardour/ardour.h" +#include "gtkmm2ext/rgb_macros.h" + #include "ardour/filesystem_paths.h" #include "ui_config.h" @@ -49,7 +50,7 @@ UIConfiguration::UIConfiguration () #include "canvas_vars.h" #undef UI_CONFIG_VARIABLE #undef CANVAS_VARIABLE - hack(true) + _dirty (false) { load_state(); } @@ -63,7 +64,7 @@ UIConfiguration::load_defaults () { int found = 0; - sys::path default_ui_rc_file; + std::string default_ui_rc_file; std::string rcfile; if (getenv ("ARDOUR_SAE")) { @@ -71,84 +72,85 @@ UIConfiguration::load_defaults () } else { rcfile = "ardour3_ui_default.conf"; } - if ( !find_file_in_search_path (ardour_search_path() + system_config_search_path(), - rcfile, default_ui_rc_file) ) - { + + if (find_file_in_search_path (ardour_config_search_path(), rcfile, default_ui_rc_file) ) { XMLTree tree; found = 1; - string rcfile = default_ui_rc_file.to_string(); + string rcfile = default_ui_rc_file; + + info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl; - cerr << string_compose (_("loading default ui configuration file %1"), rcfile) << endl; - if (!tree.read (rcfile.c_str())) { - error << string_compose(_("Ardour: cannot read default ui configuration file \"%1\""), rcfile) << endmsg; + error << string_compose(_("cannot read default ui configuration file \"%1\""), rcfile) << endmsg; return -1; } - if (set_state (*tree.root())) { - error << string_compose(_("Ardour: default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; + if (set_state (*tree.root(), Stateful::loading_state_version)) { + error << string_compose(_("default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; return -1; } + + _dirty = false; } + return found; } - + int UIConfiguration::load_state () { bool found = false; - - sys::path default_ui_rc_file; - - if ( find_file_in_search_path (ardour_search_path() + system_config_search_path(), - "ardour3_ui_default.conf", default_ui_rc_file) ) - { + + std::string default_ui_rc_file; + + if ( find_file_in_search_path (ardour_config_search_path(), "ardour3_ui_default.conf", default_ui_rc_file)) { XMLTree tree; found = true; - string rcfile = default_ui_rc_file.to_string(); + string rcfile = default_ui_rc_file; + + info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl; - cerr << string_compose (_("loading default ui configuration file %1"), rcfile) << endl; - if (!tree.read (rcfile.c_str())) { - error << string_compose(_("Ardour: cannot read default ui configuration file \"%1\""), rcfile) << endmsg; + error << string_compose(_("cannot read default ui configuration file \"%1\""), rcfile) << endmsg; return -1; } - if (set_state (*tree.root())) { - error << string_compose(_("Ardour: default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; + if (set_state (*tree.root(), Stateful::loading_state_version)) { + error << string_compose(_("default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; return -1; } } - sys::path user_ui_rc_file; + std::string user_ui_rc_file; - if (find_file_in_search_path (ardour_search_path() + user_config_directory(), - "ardour3_ui.conf", user_ui_rc_file)) - { + if (find_file_in_search_path (ardour_config_search_path(), "ardour3_ui.conf", user_ui_rc_file)) { XMLTree tree; found = true; - - string rcfile = user_ui_rc_file.to_string(); - cerr << string_compose (_("loading user ui configuration file %1"), rcfile) << endl; + string rcfile = user_ui_rc_file; + + info << string_compose (_("Loading user ui configuration file %1"), rcfile) << endmsg; if (!tree.read (rcfile)) { - error << string_compose(_("Ardour: cannot read ui configuration file \"%1\""), rcfile) << endmsg; + error << string_compose(_("cannot read ui configuration file \"%1\""), rcfile) << endmsg; return -1; } - if (set_state (*tree.root())) { - error << string_compose(_("Ardour: user ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; + if (set_state (*tree.root(), Stateful::loading_state_version)) { + error << string_compose(_("user ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; return -1; } + + _dirty = false; } if (!found) - error << "Ardour: could not find any ui configuration file, canvas will look broken." << endmsg; + error << _("could not find any ui configuration file, canvas will look broken.") << endmsg; pack_canvasvars(); + return 0; } @@ -157,18 +159,8 @@ UIConfiguration::save_state() { XMLTree tree; - try { - sys::create_directories (user_config_directory ()); - } - catch (const sys::filesystem_error& ex) { - error << "Could not create user configuration directory" << endmsg; - return -1; - } - - sys::path rcfile_path(user_config_directory()); - - rcfile_path /= "ardour3_ui.conf"; - const string rcfile = rcfile_path.to_string(); + std::string rcfile(user_config_directory()); + rcfile = Glib::build_filename (rcfile, "ardour3_ui.conf"); // this test seems bogus? if (rcfile.length()) { @@ -179,6 +171,8 @@ UIConfiguration::save_state() } } + _dirty = false; + return 0; } @@ -189,14 +183,14 @@ UIConfiguration::get_state () LocaleGuard lg (X_("POSIX")); root = new XMLNode("Ardour"); - + root->add_child_nocopy (get_variables ("UI")); root->add_child_nocopy (get_variables ("Canvas")); - + if (_extra_xml) { root->add_child_copy (*_extra_xml); } - + return *root; } @@ -221,12 +215,14 @@ UIConfiguration::get_variables (std::string which_node) } int -UIConfiguration::set_state (const XMLNode& root) +UIConfiguration::set_state (const XMLNode& root, int /*version*/) { if (root.name() != "Ardour") { return -1; } + Stateful::save_extra_xml (root); + XMLNodeList nlist = root.children(); XMLNodeConstIterator niter; XMLNode *node; @@ -234,14 +230,13 @@ UIConfiguration::set_state (const XMLNode& root) for (niter = nlist.begin(); niter != nlist.end(); ++niter) { node = *niter; + if (node->name() == "Canvas" || node->name() == "UI") { set_variables (*node); - } else if (node->name() == "Extra") { - _extra_xml = new XMLNode (*node); - } } + return 0; } @@ -268,9 +263,32 @@ void UIConfiguration::pack_canvasvars () { #undef CANVAS_VARIABLE -#define CANVAS_VARIABLE(var,name) canvas_colors.push_back(&var); +#define CANVAS_VARIABLE(var,name) canvas_colors.insert (std::pair* >(name,&var)); #include "canvas_vars.h" #undef CANVAS_VARIABLE } +uint32_t +UIConfiguration::color_by_name (const std::string& name) +{ + map* >::iterator i = canvas_colors.find (name); + + if (i != canvas_colors.end()) { + return i->second->get(); + } + // cerr << string_compose (_("Color %1 not found"), name) << endl; + return RGBA_TO_UINT (random()%256,random()%256,random()%256,0xff); +} + +void +UIConfiguration::set_dirty () +{ + _dirty = true; +} + +bool +UIConfiguration::dirty () const +{ + return _dirty; +}