diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-02-20 17:29:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-02-20 17:29:52 +0000 |
| commit | 2304a51b85830753e68450bde1d62686358fff09 (patch) | |
| tree | 32f820bd544383010ebf3753352d926d487a7468 /gtk2_ardour/keyeditor.cc | |
| parent | 150734ac619d7d602d47304f1496df71ce0c43ef (diff) | |
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
Diffstat (limited to 'gtk2_ardour/keyeditor.cc')
| -rw-r--r-- | gtk2_ardour/keyeditor.cc | 12 |
1 files changed, 9 insertions, 3 deletions
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; |