set ARDOUR_SURFACES_PATH for a bundle, just like ARDOUR_PANNER_PATH

[ardour.git] / gtk2_ardour / keyeditor.cc

diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index b909812f107117aaa2292f5f7619b11736b6528c..88c4682c558c46664f414193bf9bc282b7d76ec8 100644 (file)
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -1,3 +1,26 @@
+/*
+    Copyright (C) 2002 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
 #include <map>
 
 #include "ardour/profile.h"
@@ -8,6 +31,8 @@
 #include <gtkmm/accelmap.h>
 #include <gtkmm/uimanager.h>
 
+#include "gtkmm2ext/utils.h"
+
 #include "pbd/strsplit.h"
 #include "pbd/replace_all.h"
 
@@ -25,6 +50,8 @@ using namespace Gtk;
 using namespace Gdk;
 using namespace PBD;
 
+using Gtkmm2ext::Keyboard;
+
 KeyEditor::KeyEditor ()
        : ArdourDialog (_("Key Bindings"), false)
        , unbind_button (_("Remove shortcut"))
@@ -47,7 +74,7 @@ KeyEditor::KeyEditor ()
        view.set_rules_hint (true);
        view.set_name (X_("KeyEditorTree"));
 
-       view.get_selection()->signal_changed().connect (mem_fun (*this, &KeyEditor::action_selected));
+       view.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &KeyEditor::action_selected));
 
        scroller.add (view);
        scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
@@ -63,7 +90,7 @@ KeyEditor::KeyEditor ()
                unbind_box.set_spacing (6);
                unbind_box.pack_start (*hint, false, true);
                unbind_box.pack_start (unbind_button, false, false);
-               unbind_button.signal_clicked().connect (mem_fun (*this, &KeyEditor::unbind));
+               unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind));
 
                get_vbox()->pack_start (unbind_box, false, false);
                unbind_box.show ();
@@ -86,6 +113,8 @@ KeyEditor::unbind ()
 
        unbind_button.set_sensitive (false);
 
+       cerr << "trying to unbind\n";
+
        if (i != model->children().end()) {
                string path = (*i)[columns.path];
 
@@ -168,24 +197,21 @@ KeyEditor::on_key_release_event (GdkEventKey* ev)
                        goto out;
                }
 
-               possibly_translate_keyval_to_make_legal_accelerator (ev->keyval);
+               cerr << "real lkeyval: " << ev->keyval << endl;
+                Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (ev->keyval);
+               cerr << "using keyval = " << ev->keyval << endl;
+
 
                bool result = AccelMap::change_entry (path,
                                                      ev->keyval,
                                                      ModifierType (Keyboard::RelevantModifierKeyMask & ev->state),
                                                      true);
 
+               cerr << "New binding to " << ev->keyval << " worked: " << result << endl;
+
                if (result) {
-                       bool known;
                        AccelKey key;
-
-                       known = ActionManager::lookup_entry (path, key);
-
-                       if (known) {
-                               (*i)[columns.binding] = ActionManager::ui_manager->get_accel_group()->name (key.get_key(), Gdk::ModifierType (key.get_mod()));
-                       } else {
-                               (*i)[columns.binding] = string();
-                       }
+                       (*i)[columns.binding] = ActionManager::get_key_representation (path, key);
                }
        }
 
@@ -199,21 +225,23 @@ KeyEditor::populate ()
 {
        vector<string> paths;
        vector<string> labels;
+       vector<string> tooltips;
        vector<string> keys;
        vector<AccelKey> bindings;
        typedef std::map<string,TreeIter> NodeMap;
        NodeMap nodes;
        NodeMap::iterator r;
 
-       ActionManager::get_all_actions (labels, paths, keys, bindings);
+       ActionManager::get_all_actions (labels, paths, tooltips, keys, bindings);
 
        vector<string>::iterator k;
        vector<string>::iterator p;
+       vector<string>::iterator t;
        vector<string>::iterator l;
 
        model->clear ();
 
-       for (l = labels.begin(), k = keys.begin(), p = paths.begin(); l != labels.end(); ++k, ++p, ++l) {
+       for (l = labels.begin(), k = keys.begin(), p = paths.begin(), t = tooltips.begin(); l != labels.end(); ++k, ++p, ++t, ++l) {
 
                TreeModel::Row row;
                vector<string> parts;
@@ -248,7 +276,11 @@ KeyEditor::populate ()
 
                /* add this action */
 
-               row[columns.action] = (*l);
+               if (l->empty ()) {
+                       row[columns.action] = *t;
+               } else {
+                       row[columns.action] = *l;
+               }
                row[columns.path] = (*p);
                row[columns.bindable] = true;