From 4059ecc0df2a46eb28abd73cffa67bdaf8eb0703 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 4 Jul 2014 10:50:48 -0400 Subject: [PATCH] move location of menus file loading and call ActionManager::enable_accelerators() to get all actions setup for binding options --- gtk2_ardour/ardour_ui.cc | 2 -- gtk2_ardour/ardour_ui_dependents.cc | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 3a82b457f4..4af3a47fa1 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -509,8 +509,6 @@ ARDOUR_UI::post_engine () _tooltips.enable(); - ActionManager::load_menus (ARDOUR_COMMAND_LINE::menus_file); - if (setup_windows ()) { throw failed_constructor (); } diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index fbfc8c7afd..bb0f375942 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -31,6 +31,7 @@ #include "ardour/session.h" +#include "actions.h" #include "ardour_ui.h" #include "public_editor.h" #include "mixer_ui.h" @@ -59,6 +60,11 @@ ARDOUR_UI::we_have_dependents () editor->setup_tooltips (); editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks)); + /* all actions are defined */ + + ActionManager::enable_accelerators (); + ActionManager::load_menus (ARDOUR_COMMAND_LINE::menus_file); + editor->track_mixer_selection (); mixer->track_editor_selection (); }