Only show user-presets in favorite sidebar

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 0918e69538b386fe8c485ca96997ea579bdec310..f15c1bed2467cf6b1948cf56f43226526a513ebe 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -60,13 +60,28 @@ namespace ARDOUR {
 }
 
 using namespace ARDOUR;
+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_actions ();
-       load_bindings ();
+       /* The monitor section relies on at least 1 action defined by us. Since that
+        * action now exists, give it a chance to use it.
+        */
+       mixer->monitor_section().use_others_actions ();
 
+       /* Create "static" actions that apply to all ProcessorBoxes
+        */
        ProcessorBox::register_actions ();
 
        /* Global, editor, mixer, processor box actions are defined now. Link
@@ -265,29 +280,34 @@ 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);
 
+       ArdourWidgets::ArdourDropShadow *spacer = manage (new (ArdourWidgets::ArdourDropShadow));
+       spacer->set_size_request( -1, 4 );
+       spacer->show();
+
        /* now add the transport sample to the top of main window */
 
+       main_vpacker.pack_start ( *spacer, false, false);
        main_vpacker.pack_start (transport_frame, false, false);
        main_vpacker.pack_start (_tabs, true, true);
 
        LuaInstance::instance()->ActionChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_action_script_btn));
 
-       for (int i = 0; i < 9; ++i) {
+       for (int i = 0; i < MAX_LUA_ACTION_SCRIPTS; ++i) {
                std::string const a = string_compose (X_("script-action-%1"), i + 1);
                Glib::RefPtr<Action> act = ActionManager::get_action(X_("Editor"), a.c_str());
                assert (act);