reorder ARDOUR_UI action registration and adding tabbables to the main window, to...

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 3578f6f0d54a9a7e63b5b37878febec905014c40..467ca264cb9e702879d573e9d66ef290cc1dbd83 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -65,8 +65,6 @@ using namespace Gtkmm2ext;
 void
 ARDOUR_UI::we_have_dependents ()
 {
-       install_actions ();
-
        /* 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.
@@ -76,6 +74,7 @@ ARDOUR_UI::we_have_dependents ()
                error << _("Global keybindings are missing") << endmsg;
        }
 
+       install_actions ();
        ProcessorBox::register_actions ();
 
        /* Global, editor, mixer, processor box actions are defined now. Link
@@ -274,17 +273,17 @@ ARDOUR_UI::setup_windows ()
                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 */
 
        rc_option_editor->add_to_notebook (_tabs, _("Preferences"));
        mixer->add_to_notebook (_tabs, _("Mixer"));
        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);
 
        main_vpacker.pack_start (top_packer, false, false);