From 2304a51b85830753e68450bde1d62686358fff09 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Sun, 20 Feb 2011 17:29:52 +0000
Subject: Use an action's tooltip in the key editor if its label is empty; add
 some tooltips so that Solo / Monitor actions are not blank in the key editor.

git-svn-id: svn://localhost/ardour2/branches/3.0@8909 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/keyeditor.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'gtk2_ardour/keyeditor.cc')

diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index 83481d8172..88c4682c55 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -225,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;
@@ -274,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;
 
-- 
cgit v1.2.3