ardour/livetrax
13
0
Fork 0
Code

ActionManager::get_all_actions() no longer includes <Actions> in the paths it returns, part 3 (GUI)

Browse Source
This commit is contained in:
Paul Davis 2019-03-20 11:15:47 -07:00
parent 94d859e30d
commit 51df70b405
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/ardour_ui.cc
View File

@ -772,8 +772,7 @@ ARDOUR_UI::post_engine ()
vector<string>::iterator l; vector<string>::iterator l;
for (p = paths.begin(), l = labels.begin(); p != paths.end(); ++p, ++l) { for (p = paths.begin(), l = labels.begin(); p != paths.end(); ++p, ++l) {
output << " <tr><th><kbd class=\"osc\">" << (*p).substr (10, string::npos); output << " <tr><th><kbd class=\"osc\">" << *p << "</kbd></th><td>" << *l << "</td></tr>" << endl;
output << "</kbd></th><td>" << *l << "</td></tr>" << endl;
} }
output << " </tbody>\n </table>" << endl; output << " </tbody>\n </table>" << endl;

2
gtk2_ardour/editor.cc
View File

@ -5577,7 +5577,7 @@ Editor::timeaxisview_deleted (TimeAxisView *tv)
* button to inactive (which also unticks the menu option) * button to inactive (which also unticks the menu option)
*/ */
ActionManager::uncheck_toggleaction ("<Actions>/Editor/show-editor-mixer"); ActionManager::uncheck_toggleaction ("Editor/show-editor-mixer");
} }
} }
} }

6
gtk2_ardour/editor_summary.cc
View File

@ -424,6 +424,9 @@ EditorSummary::on_key_press_event (GdkEventKey* key)
{ {
gint x, y; gint x, y;
GtkAccelKey set_playhead_accel; GtkAccelKey set_playhead_accel;
/* XXXX this is really ugly and should be using our own action maps and bindings */
if (gtk_accel_map_lookup_entry ("<Actions>/Editor/set-playhead", &set_playhead_accel)) { if (gtk_accel_map_lookup_entry ("<Actions>/Editor/set-playhead", &set_playhead_accel)) {
if (key->keyval == set_playhead_accel.accel_key && (int) key->state == set_playhead_accel.accel_mods) { if (key->keyval == set_playhead_accel.accel_key && (int) key->state == set_playhead_accel.accel_mods) {
if (_session) { if (_session) {
@ -442,6 +445,9 @@ EditorSummary::on_key_release_event (GdkEventKey* key)
{ {
GtkAccelKey set_playhead_accel; GtkAccelKey set_playhead_accel;
/* XXXX this is really ugly and should be using our own action maps and bindings */
if (gtk_accel_map_lookup_entry ("<Actions>/Editor/set-playhead", &set_playhead_accel)) { if (gtk_accel_map_lookup_entry ("<Actions>/Editor/set-playhead", &set_playhead_accel)) {
if (key->keyval == set_playhead_accel.accel_key && (int) key->state == set_playhead_accel.accel_mods) { if (key->keyval == set_playhead_accel.accel_key && (int) key->state == set_playhead_accel.accel_mods) {
return true; return true;

6
gtk2_ardour/luainstance.cc
View File

@ -477,17 +477,13 @@ lua_actionlist (lua_State *L)
if (parts[1] == _("ProcessorMenu")) if (parts[1] == _("ProcessorMenu"))
continue; continue;
/* strip <Actions>/ from the start */
string path = (*p);
path = path.substr (strlen ("<Actions>/"));
if (!action_tbl[parts[1]].isTable()) { if (!action_tbl[parts[1]].isTable()) {
action_tbl[parts[1]] = luabridge::newTable (L); action_tbl[parts[1]] = luabridge::newTable (L);
} }
assert (action_tbl[parts[1]].isTable()); assert (action_tbl[parts[1]].isTable());
luabridge::LuaRef tbl (action_tbl[parts[1]]); luabridge::LuaRef tbl (action_tbl[parts[1]]);
assert (tbl.isTable()); assert (tbl.isTable());
tbl[*l] = path; tbl[*l] = *p;
} }
luabridge::push (L, action_tbl); luabridge::push (L, action_tbl);