use syntactic sugar

[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 307eac5451b8b03625fd7bd828b8a0f70c1d1916..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
@@ -132,7 +147,7 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 gint
 ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
 {
-#ifdef TOP_MENUBAR
+#ifdef __APPLE__
        /* just hide the window, and return - the top menu stays up */
        editor->hide ();
        return TRUE;
@@ -265,49 +280,34 @@ ARDOUR_UI::setup_windows ()
                return -1;
        }
 
-       /* 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 ();
 
-#ifdef TOP_MENUBAR
-       EventBox* status_bar_event_box = manage (new EventBox);
-
-       status_bar_event_box->add (status_bar_label);
-       status_bar_event_box->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-       status_bar_label.set_size_request (300, -1);
-
-       status_bar_label.show ();
-       status_bar_event_box->show ();
+       /* order of addition affects order seen in initial window display */
 
-       status_bar_event_box->signal_button_press_event().connect (mem_fun (*this, &ARDOUR_UI::status_bar_button_press));
+       rc_option_editor->add_to_notebook (_tabs, _("Preferences"));
+       mixer->add_to_notebook (_tabs, _("Mixer"));
+       editor->add_to_notebook (_tabs, _("Editor"));
 
-       status_bar_hpacker.pack_start (*status_bar_event_box, true, true, 6);
-       status_bar_hpacker.pack_start (menu_bar_base, false, false, 2);
-#else
        top_packer.pack_start (menu_bar_base, false, false);
-#endif
 
        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 (transport_sample, false, false);
+       main_vpacker.pack_start ( *spacer, false, false);
+       main_vpacker.pack_start (transport_frame, false, false);
        main_vpacker.pack_start (_tabs, true, true);
 
-#ifdef TOP_MENUBAR
-       main_vpacker.pack_start (status_bar_hpacker, false, false);
-#endif
-
        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);
@@ -336,7 +336,7 @@ ARDOUR_UI::setup_windows ()
         */
 
        _main_window.add (main_vpacker);
-       transport_sample.show_all ();
+       transport_frame.show_all ();
 
        const XMLNode* mnode = main_window_settings ();