Provide dialogs to edit pan values numerically, at least for

[ardour.git] / gtk2_ardour / ui_config.cc

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 1ba298c2ec0c9d8d3073ba87f0baa8bdc815a8c1..b17316e2dbf4b68f393e053c8ead706569e6f645 100644 (file)
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -18,6 +18,7 @@
 */
 
 #include <unistd.h>
+#include <cstdlib>
 #include <cstdio> /* for snprintf, grrr */
 
 #include <glibmm/miscutils.h>
@@ -28,7 +29,8 @@
 #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 +51,7 @@ UIConfiguration::UIConfiguration ()
 #include "canvas_vars.h"
 #undef  UI_CONFIG_VARIABLE
 #undef  CANVAS_VARIABLE
-       hack(true)
+       _dirty (false)
 {
        load_state();
 }
@@ -71,26 +73,28 @@ 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();
 
-               cerr << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
+               info << 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(), Stateful::loading_state_version)) {
-                       error << string_compose(_("Ardour: default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+                       error << string_compose(_("default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
                        return -1;
                }
+
+               _dirty = false;
        }
+
        return found;
 }
 
@@ -101,54 +105,53 @@ UIConfiguration::load_state ()
 
        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) )
-       {
+       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();
 
-               cerr << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
+               info << 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(), Stateful::loading_state_version)) {
-                       error << string_compose(_("Ardour: default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+                       error << string_compose(_("default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
                        return -1;
                }
        }
 
        sys::path 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;
+               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(), Stateful::loading_state_version)) {
-                       error << string_compose(_("Ardour: user ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+                       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;
 }
 
@@ -179,6 +182,8 @@ UIConfiguration::save_state()
                }
        }
 
+       _dirty = false;
+
        return 0;
 }
 
@@ -227,6 +232,8 @@ UIConfiguration::set_state (const XMLNode& root, int /*version*/)
                return -1;
        }
 
+       Stateful::save_extra_xml (root);
+
        XMLNodeList nlist = root.children();
        XMLNodeConstIterator niter;
        XMLNode *node;
@@ -234,14 +241,13 @@ UIConfiguration::set_state (const XMLNode& root, int /*version*/)
        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 +274,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<std::string,UIConfigVariable<uint32_t>* >(name,&var));
 #include "canvas_vars.h"
 #undef  CANVAS_VARIABLE
 }
 
+uint32_t
+UIConfiguration::color_by_name (const std::string& name)
+{
+       map<std::string,UIConfigVariable<uint32_t>* >::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;
+}