X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyeditor.cc;h=88c4682c558c46664f414193bf9bc282b7d76ec8;hb=40e2a6b16b47acf1f19a31f5e6d1cd463c45e1b6;hp=f54cc4f739ed1fd0a4b36fb5b0cbc8242a8f5295;hpb=7703f0a76a82ec3fe21609c396ebf2f950803bf9;p=ardour.git

diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index f54cc4f739..88c4682c55 100644
--- 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"
 
@@ -49,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);
@@ -65,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 ();
@@ -173,7 +198,7 @@ KeyEditor::on_key_release_event (GdkEventKey* ev)
 		}
 
 		cerr << "real lkeyval: " << ev->keyval << endl;
-		possibly_translate_keyval_to_make_legal_accelerator (ev->keyval);
+                Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (ev->keyval);
 		cerr << "using keyval = " << ev->keyval << endl;
 
 
@@ -200,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;
@@ -249,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;