smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

move location of menus file loading and call ActionManager::enable_accelerators() to get all actions setup for binding options

Browse source
This commit is contained in:
Paul Davis 2014-07-04 07:49:26 -04:00
parent 08b1a9d520
commit b64634e32e
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View file

@ -492,8 +492,6 @@ ARDOUR_UI::post_engine ()
_tooltips.enable(); _tooltips.enable();
ActionManager::load_menus (ARDOUR_COMMAND_LINE::menus_file);
if (setup_windows ()) { if (setup_windows ()) {
throw failed_constructor (); throw failed_constructor ();
} }

6
gtk2_ardour/ardour_ui_dependents.cc
View file

@ -31,6 +31,7 @@
#include "ardour/session.h" #include "ardour/session.h"
#include "actions.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "public_editor.h" #include "public_editor.h"
#include "mixer_ui.h" #include "mixer_ui.h"
@ -59,6 +60,11 @@ ARDOUR_UI::we_have_dependents ()
editor->setup_tooltips (); editor->setup_tooltips ();
editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks)); 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 (); editor->track_mixer_selection ();
mixer->track_editor_selection (); mixer->track_editor_selection ();
} }