OSC: no op, white space cleanup

[ardour.git] / gtk2_ardour / ardour_ui_ed.cc

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index dceb61e73bb858f0c5196bef9c0a54391918287e..737400c7afb93b9a5f269095e7e09e6e0b18c4ce 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -114,6 +114,12 @@ ARDOUR_UI::escape ()
        Escape (); /* EMIT SIGNAL */
 }
 
+void
+ARDOUR_UI::close_current_dialog ()
+{
+       Keyboard::close_current_dialog ();
+}
+
 void
 ARDOUR_UI::install_actions ()
 {
@@ -122,6 +128,11 @@ ARDOUR_UI::install_actions ()
        Glib::RefPtr<Action> act;
 
        global_actions.register_action (main_actions, X_("Escape"), _("Escape"), sigc::mem_fun (*this, &ARDOUR_UI::escape));
+       /* This is hard-wired into the Keyboard code as "Primary-w". Maybe it
+          doesn't need to be. This action makes it possible to do this from a
+          control surface.
+       */
+       global_actions.register_action (main_actions, X_("close-current-dialog"), _("Close Current Dialog"), sigc::mem_fun (*this, &ARDOUR_UI::close_current_dialog));
 
        /* menus + submenus that need action items */
 
@@ -156,9 +167,10 @@ ARDOUR_UI::install_actions ()
        act = global_actions.register_action (main_actions, X_("Close"), _("Close"),  sigc::mem_fun(*this, &ARDOUR_UI::close_session));
        ActionManager::session_sensitive_actions.push_back (act);
 
-       act = global_actions.register_action (main_actions, X_("AddTrackBus"), _("Add Track or Bus..."), sigc::mem_fun(*this, &ARDOUR_UI::add_route));
+       act = global_actions.register_action (main_actions, X_("AddTrackBus"), _("Add Track, Bus or VCA..."), sigc::mem_fun(*this, &ARDOUR_UI::add_route));
        ActionManager::session_sensitive_actions.push_back (act);
        ActionManager::write_sensitive_actions.push_back (act);
+       ActionManager::rec_sensitive_actions.push_back (act);
 
        act = global_actions.register_action (main_actions, X_("duplicate-routes"), _("Duplicate Tracks/Busses..."),
                                              sigc::mem_fun(*this, &ARDOUR_UI::start_duplicate_routes));
@@ -207,6 +219,9 @@ ARDOUR_UI::install_actions ()
        act = global_actions.register_action (main_actions, X_("SaveAs"), _("Save As..."), sigc::mem_fun(*this, &ARDOUR_UI::save_session_as));
        ActionManager::session_sensitive_actions.push_back (act);
 
+       act = global_actions.register_action (main_actions, X_("Archive"), _("Archive..."), sigc::mem_fun(*this, &ARDOUR_UI::archive_session));
+       ActionManager::session_sensitive_actions.push_back (act);
+
        act = global_actions.register_action (main_actions, X_("Rename"), _("Rename..."), sigc::mem_fun(*this, &ARDOUR_UI::rename_session));
        ActionManager::session_sensitive_actions.push_back (act);
        ActionManager::write_sensitive_actions.push_back (act);