more changes to Bindings, Keyboard APIs

[ardour.git] / gtk2_ardour / editor_actions.cc

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 3677aa8edc35c727b1cf43c8567be3a92c7f1961..de1ff8b4b8ac6592da2f57449585d822bd85bb65 100644 (file)
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -55,6 +55,8 @@ using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Editing;
 
+using Gtkmm2ext::Bindings;
+
 /* Convenience functions to slightly reduce verbosity below */
 
 RefPtr<Action>
@@ -741,22 +743,14 @@ Editor::register_actions ()
        tact->set_active (true);
 
        myactions.register_action (editor_actions, X_("toggle-midi-input-active"), _("Toggle MIDI Input Active for Editor-Selected Tracks/Busses"), 
-                                  sigc::bind (sigc::mem_fun (*this, &Editor::toggle_midi_input_active), false));
-
-       myactions.install_action_group (rl_actions);
-       myactions.install_action_group (ruler_actions);
-       myactions.install_action_group (zoom_actions);
-       myactions.install_action_group (mouse_mode_actions);
-       myactions.install_action_group (snap_actions);
-       myactions.install_action_group (editor_actions);
-       myactions.install_action_group (editor_menu_actions);
+                                  sigc::bind (sigc::mem_fun (*this, &Editor::toggle_midi_input_active), false));
 }
 
 void
 Editor::load_bindings ()
 {
-        bindings.set_action_map (myactions);
-        bindings.load (X_("editor"));
+       bindings = Bindings::get_bindings (X_("editor"), myactions);
+       global_hpacker.set_data ("ardour-bindings", bindings);
 }
 
 void
@@ -1780,7 +1774,7 @@ Editor::reset_canvas_action_sensitivity (bool onoff)
 void
 Editor::register_region_actions ()
 {
-       _region_actions = ActionGroup::create (X_("Region"));
+       _region_actions = myactions.create_action_group (X_("Region"));
 
        /* PART 1: actions that operate on the selection, and for which the edit point type and location is irrelevant */
 
@@ -2053,5 +2047,4 @@ Editor::register_region_actions ()
 
        _all_region_actions_sensitized = true;
 
-       ActionManager::add_action_group (_region_actions);
 }