reorder ARDOUR_UI action registration and adding tabbables to the main window, to avoid action-not-found in tabbable_state_change()
This commit is contained in:
parent
154f9825ff
commit
5b513828bd
|
@ -65,8 +65,6 @@ using namespace Gtkmm2ext;
|
||||||
void
|
void
|
||||||
ARDOUR_UI::we_have_dependents ()
|
ARDOUR_UI::we_have_dependents ()
|
||||||
{
|
{
|
||||||
install_actions ();
|
|
||||||
|
|
||||||
/* other windows and related key-event-handling contexts have already
|
/* other windows and related key-event-handling contexts have already
|
||||||
* called Bindings::get_bindings() to setup their list of keybindings.
|
* called Bindings::get_bindings() to setup their list of keybindings.
|
||||||
* Do that here for the global bindings.
|
* Do that here for the global bindings.
|
||||||
|
@ -76,6 +74,7 @@ ARDOUR_UI::we_have_dependents ()
|
||||||
error << _("Global keybindings are missing") << endmsg;
|
error << _("Global keybindings are missing") << endmsg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
install_actions ();
|
||||||
ProcessorBox::register_actions ();
|
ProcessorBox::register_actions ();
|
||||||
|
|
||||||
/* Global, editor, mixer, processor box actions are defined now. Link
|
/* Global, editor, mixer, processor box actions are defined now. Link
|
||||||
|
@ -274,17 +273,17 @@ ARDOUR_UI::setup_windows ()
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
time_info_box = new TimeInfoBox ("ToolbarTimeInfo", false);
|
||||||
|
/* all other dialogs are created conditionally */
|
||||||
|
|
||||||
|
we_have_dependents ();
|
||||||
|
|
||||||
/* order of addition affects order seen in initial window display */
|
/* order of addition affects order seen in initial window display */
|
||||||
|
|
||||||
rc_option_editor->add_to_notebook (_tabs, _("Preferences"));
|
rc_option_editor->add_to_notebook (_tabs, _("Preferences"));
|
||||||
mixer->add_to_notebook (_tabs, _("Mixer"));
|
mixer->add_to_notebook (_tabs, _("Mixer"));
|
||||||
editor->add_to_notebook (_tabs, _("Editor"));
|
editor->add_to_notebook (_tabs, _("Editor"));
|
||||||
|
|
||||||
time_info_box = new TimeInfoBox ("ToolbarTimeInfo", false);
|
|
||||||
/* all other dialogs are created conditionally */
|
|
||||||
|
|
||||||
we_have_dependents ();
|
|
||||||
|
|
||||||
top_packer.pack_start (menu_bar_base, false, false);
|
top_packer.pack_start (menu_bar_base, false, false);
|
||||||
|
|
||||||
main_vpacker.pack_start (top_packer, false, false);
|
main_vpacker.pack_start (top_packer, false, false);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user