ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

get ordering correct of global binding set creation and action registration

Browse Source
This commit is contained in:
Paul Davis 2019-02-16 01:12:07 -07:00
parent 8b64f556d7
commit b0f99312d8
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk2_ardour/ardour_ui.cc
View File

@ -388,6 +388,17 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
keyboard->set_state (*node, Stateful::loading_state_version);
}
/* actions do not need to be defined when we load keybindings. They
* will be lazily discovered. But bindings do need to exist when we
* create windows/tabs with their own binding sets.
*/
keyboard->setup_keybindings ();
if ((global_bindings = Bindings::get_bindings (X_("Global"))) == 0) {
error << _("Global keybindings are missing") << endmsg;
}
install_actions ();
UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed));

16
gtk2_ardour/ardour_ui_dependents.cc
View File

@ -66,15 +66,6 @@ using namespace Gtkmm2ext;
void
ARDOUR_UI::we_have_dependents ()
{
/* other windows and related key-event-handling contexts have already
* called Bindings::get_bindings() to setup their list of keybindings.
* Do that here for the global bindings.
*/
if ((global_bindings = Bindings::get_bindings (X_("Global"))) == 0) {
error << _("Global keybindings are missing") << endmsg;
}
install_dependent_actions ();
/* The monitor section relies on at least 1 action defined by us. Since that
@ -248,13 +239,6 @@ tab_window_root_drop (GtkNotebook* src,
int
ARDOUR_UI::setup_windows ()
{
/* actions do not need to be defined when we load keybindings. They
* will be lazily discovered. But bindings do need to exist when we
* create windows/tabs with their own binding sets.
*/
keyboard->setup_keybindings ();
_tabs.set_show_border(false);
_tabs.signal_switch_page().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_switch));
_tabs.signal_page_added().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_page_added));