use new action map API instead of ActionManager::get_action
[ardour.git] / gtk2_ardour / editor_actions.cc
index da1a9159aac55d58ca5f1279eaae658e64691ee6..befe85934d45d295116986cf50ce588d8e8ee7b2 100644 (file)
 #include "canvas/canvas.h"
 #include "canvas/pixbuf.h"
 
+#include "LuaBridge/LuaBridge.h"
+
 #include "actions.h"
 #include "ardour_ui.h"
 #include "editing.h"
 #include "editor.h"
 #include "gui_thread.h"
+#include "luainstance.h"
+#include "main_clock.h"
 #include "time_axis_view.h"
 #include "ui_config.h"
 #include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "audio_time_axis.h"
 #include "editor_group_tabs.h"
 #include "editor_routes.h"
@@ -59,6 +63,24 @@ using Gtkmm2ext::Bindings;
 
 /* Convenience functions to slightly reduce verbosity below */
 
+
+RefPtr<Action>
+Editor::register_region_action (RefPtr<ActionGroup> group, RegionActionTarget tgt, char const * name, char const * label, sigc::slot<void> slot)
+{
+       RefPtr<Action> act = myactions.register_action (group, name, label, slot);
+       ActionManager::session_sensitive_actions.push_back (act);
+       region_action_map.insert (make_pair<string,RegionAction> (name, RegionAction (act,tgt)));
+       return act;
+}
+
+void
+Editor::register_toggle_region_action (RefPtr<ActionGroup> group, RegionActionTarget tgt, char const * name, char const * label, sigc::slot<void> slot)
+{
+       RefPtr<Action> act = myactions.register_toggle_action (group, name, label, slot);
+       ActionManager::session_sensitive_actions.push_back (act);
+       region_action_map.insert (make_pair<string,RegionAction> (name, RegionAction (act,tgt)));
+}
+
 RefPtr<Action>
 Editor::reg_sens (RefPtr<ActionGroup> group, char const * name, char const * label, sigc::slot<void> slot)
 {
@@ -141,20 +163,21 @@ Editor::register_actions ()
        myactions.register_action (editor_menu_actions, X_("SyncMenu"), _("Sync"));
        myactions.register_action (editor_menu_actions, X_("TempoMenu"), _("Tempo"));
        myactions.register_action (editor_menu_actions, X_("Timecode"), _("Timecode fps"));
-       myactions.register_action (editor_menu_actions, X_("TrackHeightMenu"), _("Height"));
+
+       act = myactions.register_action (editor_menu_actions, X_("TrackHeightMenu"), _("Height"));
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
+
        myactions.register_action (editor_menu_actions, X_("TrackMenu"), _("Track"));
        myactions.register_action (editor_menu_actions, X_("Tools"), _("Tools"));
        myactions.register_action (editor_menu_actions, X_("View"), _("View"));
        myactions.register_action (editor_menu_actions, X_("ZoomFocus"), _("Zoom Focus"));
        myactions.register_action (editor_menu_actions, X_("ZoomMenu"), _("Zoom"));
-       myactions.register_action (editor_menu_actions, X_("ActionScripts"), _("Scripted Actions"));
+       myactions.register_action (editor_menu_actions, X_("LuaScripts"), _("Lua Scripts"));
 
        register_region_actions ();
 
        /* add named actions for the editor */
 
-       myactions.register_action (editor_actions, "escape", _("Break drag or deselect all"), sigc::mem_fun (*this, &Editor::escape));
-
        /* We don't bother registering "unlock" because it would be insensitive
           when required. Editor::unlock() must be invoked directly.
        */
@@ -163,8 +186,8 @@ Editor::register_actions ()
        toggle_reg_sens (editor_actions, "show-editor-mixer", _("Show Editor Mixer"), sigc::mem_fun (*this, &Editor::editor_mixer_button_toggled));
        toggle_reg_sens (editor_actions, "show-editor-list", _("Show Editor List"), sigc::mem_fun (*this, &Editor::editor_list_button_toggled));
 
-       reg_sens (editor_actions, "playhead-to-next-region-boundary", _("Playhead to Next Region Boundary"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_boundary), true ));
-       reg_sens (editor_actions, "playhead-to-next-region-boundary-noselection", _("Playhead to Next Region Boundary (No Track Selection)"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_boundary), false ));
+       reg_sens (editor_actions, "playhead-to-next-region-boundary", _("Playhead to Next Region Boundary"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_boundary), true));
+       reg_sens (editor_actions, "playhead-to-next-region-boundary-noselection", _("Playhead to Next Region Boundary (No Track Selection)"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_boundary), false));
        reg_sens (editor_actions, "playhead-to-previous-region-boundary", _("Playhead to Previous Region Boundary"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_boundary), true));
        reg_sens (editor_actions, "playhead-to-previous-region-boundary-noselection", _("Playhead to Previous Region Boundary (No Track Selection)"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_boundary), false));
 
@@ -196,14 +219,14 @@ Editor::register_actions ()
        reg_sens (editor_actions, "playhead-to-range-end", _("Playhead to Range End"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_selection_end), playhead_cursor));
 
        reg_sens (editor_actions, "select-all-objects", _("Select All Objects"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_objects), Selection::Set));
-       reg_sens (editor_actions, "select-all-tracks", _("Select All Tracks"), sigc::mem_fun(*this, &Editor::select_all_tracks));
-       reg_sens (editor_actions, "deselect-all", _("Deselect All"), sigc::mem_fun(*this, &Editor::deselect_all));
-       reg_sens (editor_actions, "invert-selection", _("Invert Selection"), sigc::mem_fun(*this, &Editor::invert_selection));
 
        reg_sens (editor_actions, "select-loop-range", _("Set Range to Loop Range"), sigc::mem_fun(*this, &Editor::set_selection_from_loop));
        reg_sens (editor_actions, "select-punch-range", _("Set Range to Punch Range"), sigc::mem_fun(*this, &Editor::set_selection_from_punch));
        reg_sens (editor_actions, "select-from-regions", _("Set Range to Selected Regions"), sigc::mem_fun(*this, &Editor::set_selection_from_region));
 
+       reg_sens (editor_actions, "edit-current-tempo", _("Edit Current Tempo"), sigc::mem_fun(*this, &Editor::edit_current_tempo));
+       reg_sens (editor_actions, "edit-current-meter", _("Edit Current Meter"), sigc::mem_fun(*this, &Editor::edit_current_meter));
+
        reg_sens (editor_actions, "select-all-after-edit-cursor", _("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true, false));
        reg_sens (editor_actions, "alternate-select-all-after-edit-cursor", _("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true, false));
        reg_sens (editor_actions, "select-all-before-edit-cursor", _("Select All Before Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), false, false));
@@ -217,17 +240,20 @@ Editor::register_actions ()
        reg_sens (editor_actions, "select-all-in-punch-range", _("Select All in Punch Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_punch));
        reg_sens (editor_actions, "select-all-in-loop-range", _("Select All in Loop Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_loop));
 
-       reg_sens (editor_actions, "select-next-route", _("Select Next Track or Bus"), sigc::mem_fun(*this, &Editor::select_next_route));
-       reg_sens (editor_actions, "select-prev-route", _("Select Previous Track or Bus"), sigc::mem_fun(*this, &Editor::select_prev_route));
+       reg_sens (editor_actions, "select-next-route", _("Select Next Track or Bus"), sigc::bind (sigc::mem_fun(*this, &Editor::select_next_stripable), true));
+       reg_sens (editor_actions, "select-prev-route", _("Select Previous Track or Bus"), sigc::bind (sigc::mem_fun(*this, &Editor::select_prev_stripable), true));
+
+       reg_sens (editor_actions, "select-next-stripable", _("Select Next Strip"), sigc::bind (sigc::mem_fun(*this, &Editor::select_next_stripable), false));
+       reg_sens (editor_actions, "select-prev-stripable", _("Select Previous Strip"), sigc::bind (sigc::mem_fun(*this, &Editor::select_prev_stripable), false));
 
        act = reg_sens (editor_actions, "track-record-enable-toggle", _("Toggle Record Enable"), sigc::mem_fun(*this, &Editor::toggle_record_enable));
        ActionManager::track_selection_sensitive_actions.push_back (act);
        act = reg_sens (editor_actions, "track-solo-toggle", _("Toggle Solo"), sigc::mem_fun(*this, &Editor::toggle_solo));
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
        act = reg_sens (editor_actions, "track-mute-toggle", _("Toggle Mute"), sigc::mem_fun(*this, &Editor::toggle_mute));
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
        act = reg_sens (editor_actions, "track-solo-isolate-toggle", _("Toggle Solo Isolate"), sigc::mem_fun(*this, &Editor::toggle_solo_isolate));
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
 
        for (int i = 1; i <= 12; ++i) {
                string const a = string_compose (X_("save-visual-state-%1"), i);
@@ -247,33 +273,12 @@ Editor::register_actions ()
                reg_sens (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::goto_nth_marker), i - 1));
        }
 
-
-       reg_sens (editor_actions, "jump-forward-to-mark", _("Jump to Next Mark"), sigc::mem_fun(*this, &Editor::jump_forward_to_mark));
-       reg_sens (editor_actions, "alternate-jump-forward-to-mark", _("Jump to Next Mark"), sigc::mem_fun(*this, &Editor::jump_forward_to_mark));
-       reg_sens (editor_actions, "jump-backward-to-mark", _("Jump to Previous Mark"), sigc::mem_fun(*this, &Editor::jump_backward_to_mark));
-       reg_sens (editor_actions, "alternate-jump-backward-to-mark", _("Jump to Previous Mark"), sigc::mem_fun(*this, &Editor::jump_backward_to_mark));
-
-       reg_sens (editor_actions, "set-session-start-from-playhead", _("Set Session Start from Playhead"), sigc::mem_fun(*this, &Editor::set_session_start_from_playhead));
-       reg_sens (editor_actions, "set-session-end-from-playhead", _("Set Session End from Playhead"), sigc::mem_fun(*this, &Editor::set_session_end_from_playhead));
-
-       reg_sens (editor_actions, "add-location-from-playhead", _("Add Mark from Playhead"), sigc::mem_fun(*this, &Editor::add_location_from_playhead_cursor));
-       reg_sens (editor_actions, "alternate-add-location-from-playhead", _("Add Mark from Playhead"), sigc::mem_fun(*this, &Editor::add_location_from_playhead_cursor));
-
-       reg_sens (editor_actions, "remove-location-from-playhead", _("Remove Mark at Playhead"), sigc::mem_fun(*this, &Editor::remove_location_at_playhead_cursor));
-       reg_sens (editor_actions, "alternate-remove-location-from-playhead", _("Remove Mark at Playhead"), sigc::mem_fun(*this, &Editor::remove_location_at_playhead_cursor));
-
-       reg_sens (editor_actions, "nudge-next-forward", _("Nudge Next Later"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_forward), true, false));
-       reg_sens (editor_actions, "nudge-next-backward", _("Nudge Next Earlier"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_backward), true, false));
-
-       reg_sens (editor_actions, "nudge-playhead-forward", _("Nudge Playhead Forward"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_forward), false, true));
-       reg_sens (editor_actions, "nudge-playhead-backward", _("Nudge Playhead Backward"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_backward), false, true));
-       reg_sens (editor_actions, "playhead-forward-to-grid", _("Playhead to Next Grid"), sigc::mem_fun(*this, &Editor::playhead_forward_to_grid));
-       reg_sens (editor_actions, "playhead-backward-to-grid", _("Playhead to Previous Grid"), sigc::mem_fun(*this, &Editor::playhead_backward_to_grid));
-
        reg_sens (editor_actions, "temporal-zoom-out", _("Zoom Out"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), true));
        reg_sens (editor_actions, "temporal-zoom-in", _("Zoom In"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false));
        reg_sens (editor_actions, "zoom-to-session", _("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session));
-       reg_sens (editor_actions, "zoom-to-selection", _("Zoom to Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), false));
+       reg_sens (editor_actions, "zoom-to-extents", _("Zoom to Extents"), sigc::mem_fun(*this, &Editor::temporal_zoom_extents));
+       reg_sens (editor_actions, "zoom-to-selection", _("Zoom to Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Both));
+       reg_sens (editor_actions, "zoom-to-selection-horiz", _("Zoom to Selection (Horizontal)"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Horizontal));
        reg_sens (editor_actions, "toggle-zoom", _("Toggle Zoom State"), sigc::mem_fun(*this, &Editor::swap_visual_state));
 
        reg_sens (editor_actions, "expand-tracks", _("Expand Track Height"), sigc::bind (sigc::mem_fun (*this, &Editor::tav_zoom_step), false));
@@ -296,14 +301,15 @@ Editor::register_actions ()
        reg_sens (editor_actions, "zoom_10_min", _("Zoom to 10 min"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 10 * 60 * 1000));
 
        act = reg_sens (editor_actions, "move-selected-tracks-up", _("Move Selected Tracks Up"), sigc::bind (sigc::mem_fun(*_routes, &EditorRoutes::move_selected_tracks), true));
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
        act = reg_sens (editor_actions, "move-selected-tracks-down", _("Move Selected Tracks Down"), sigc::bind (sigc::mem_fun(*_routes, &EditorRoutes::move_selected_tracks), false));
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
 
        act = reg_sens (editor_actions, "scroll-tracks-up", _("Scroll Tracks Up"), sigc::mem_fun(*this, &Editor::scroll_tracks_up));
        act = reg_sens (editor_actions, "scroll-tracks-down", _("Scroll Tracks Down"), sigc::mem_fun(*this, &Editor::scroll_tracks_down));
-       act = reg_sens (editor_actions, "step-tracks-up", _("Step Tracks Up"), sigc::mem_fun(*this, &Editor::scroll_tracks_up_line));
-       act = reg_sens (editor_actions, "step-tracks-down", _("Step Tracks Down"), sigc::mem_fun(*this, &Editor::scroll_tracks_down_line));
+       act = reg_sens (editor_actions, "step-tracks-up", _("Step Tracks Up"), sigc::hide_return (sigc::bind (sigc::mem_fun(*this, &Editor::scroll_up_one_track), true)));
+       act = reg_sens (editor_actions, "step-tracks-down", _("Step Tracks Down"), sigc::hide_return (sigc::bind (sigc::mem_fun(*this, &Editor::scroll_down_one_track), true)));
+       act = reg_sens (editor_actions, "select-topmost", _("Select Topmost Track"), (sigc::mem_fun(*this, &Editor::select_topmost_track)));
 
        reg_sens (editor_actions, "scroll-backward", _("Scroll Backward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_backward), 0.8f));
        reg_sens (editor_actions, "scroll-forward", _("Scroll Forward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_forward), 0.8f));
@@ -331,8 +337,13 @@ Editor::register_actions ()
 
        reg_sens (editor_actions, "set-playhead", _("Playhead to Mouse"), sigc::mem_fun(*this, &Editor::set_playhead_cursor));
        reg_sens (editor_actions, "set-edit-point", _("Active Marker to Mouse"), sigc::mem_fun(*this, &Editor::set_edit_point));
+       reg_sens (editor_actions, "set-auto-punch-range", _("Set Auto Punch In/Out from Playhead"), sigc::mem_fun(*this, &Editor::set_auto_punch_range));
 
-       reg_sens (editor_actions, "duplicate-range", _("Duplicate Range"), sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_range), false));
+       reg_sens (editor_actions, "duplicate", _("Duplicate"), sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_range), false));
+
+       /* Open the dialogue to duplicate selected regions multiple times */
+       reg_sens (editor_actions, "multi-duplicate", _("Multi-Duplicate..."),
+                 sigc::bind (sigc::mem_fun (*this, &Editor::duplicate_range), true));
 
        undo_action = reg_sens (editor_actions, "undo", S_("Command|Undo"), sigc::bind (sigc::mem_fun(*this, &Editor::undo), 1U));
 
@@ -350,24 +361,24 @@ Editor::register_actions ()
        ActionManager::mouse_edit_point_requires_canvas_actions.push_back (act);
 
        act = reg_sens (editor_actions, "separate-from-punch", _("Separate Using Punch Range"), sigc::mem_fun(*this, &Editor::separate_region_from_punch));
-       ActionManager::mouse_edit_point_requires_canvas_actions.push_back (act);
-
        act = reg_sens (editor_actions, "separate-from-loop", _("Separate Using Loop Range"), sigc::mem_fun(*this, &Editor::separate_region_from_loop));
-       ActionManager::mouse_edit_point_requires_canvas_actions.push_back (act);
 
        act = reg_sens (editor_actions, "editor-crop", _("Crop"), sigc::mem_fun(*this, &Editor::crop_region_to_selection));
-       ActionManager::mouse_edit_point_requires_canvas_actions.push_back (act);
+       ActionManager::time_selection_sensitive_actions.push_back (act);
 
        reg_sens (editor_actions, "editor-cut", _("Cut"), sigc::mem_fun(*this, &Editor::cut));
        reg_sens (editor_actions, "editor-delete", _("Delete"), sigc::mem_fun(*this, &Editor::delete_));
        reg_sens (editor_actions, "alternate-editor-delete", _("Delete"), sigc::mem_fun(*this, &Editor::delete_));
 
+       reg_sens (editor_actions, "split-region", _("Split/Separate"), sigc::mem_fun (*this, &Editor::split_region));
+
        reg_sens (editor_actions, "editor-copy", _("Copy"), sigc::mem_fun(*this, &Editor::copy));
        reg_sens (editor_actions, "editor-paste", _("Paste"), sigc::mem_fun(*this, &Editor::keyboard_paste));
 
        reg_sens (editor_actions, "editor-fade-range", _("Fade Range Selection"), sigc::mem_fun(*this, &Editor::fade_range));
 
-       reg_sens (editor_actions, "set-tempo-from-edit-range", _("Set Tempo from Edit Range = Bar"), sigc::mem_fun(*this, &Editor::use_range_as_bar));
+       act = myactions.register_action (editor_actions, "set-tempo-from-edit-range", _("Set Tempo from Edit Range = Bar"), sigc::mem_fun(*this, &Editor::use_range_as_bar));
+       ActionManager::time_selection_sensitive_actions.push_back (act);
 
        toggle_reg_sens (editor_actions, "toggle-log-window", _("Log"),
                        sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::toggle_errors));
@@ -379,21 +390,6 @@ Editor::register_actions ()
 
        reg_sens (editor_actions, "crop", _("Crop"), sigc::mem_fun(*this, &Editor::crop_region_to_selection));
 
-       reg_sens (editor_actions, "start-range-from-playhead", _("Start Range from Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_begin), EDIT_IGNORE_MOUSE ));
-       reg_sens (editor_actions, "finish-range-from-playhead", _("Finish Range from Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_finish), false, EDIT_IGNORE_MOUSE ));
-
-       reg_sens (editor_actions, "start-range", _("Start Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_begin), EDIT_IGNORE_NONE));
-       reg_sens (editor_actions, "finish-range", _("Finish Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_finish), false, EDIT_IGNORE_NONE));
-
-       reg_sens (editor_actions, "start-punch-range", _("Start Punch Range"), sigc::mem_fun(*this, &Editor::set_punch_start_from_edit_point));
-       reg_sens (editor_actions, "finish-punch-range", _("Finish Punch Range"), sigc::mem_fun(*this, &Editor::set_punch_end_from_edit_point));
-
-       reg_sens (editor_actions, "start-loop-range", _("Start Loop Range"), sigc::mem_fun(*this, &Editor::set_loop_start_from_edit_point));
-       reg_sens (editor_actions, "finish-loop-range", _("Finish Loop Range"), sigc::mem_fun(*this, &Editor::set_loop_end_from_edit_point));
-
-       reg_sens (editor_actions, "alt-start-range", _("Start Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_begin), EDIT_IGNORE_NONE));
-       reg_sens (editor_actions, "alt-finish-range", _("Finish Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_finish), false, EDIT_IGNORE_NONE));
-
 //     reg_sens (editor_actions, "finish-add-range", _("Finish Add Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_finish), true));
 
        reg_sens (
@@ -437,29 +433,28 @@ Editor::register_actions ()
 
 
        act = reg_sens (editor_actions, "toggle-track-active", _("Toggle Active"), (sigc::mem_fun(*this, &Editor::toggle_tracks_active)));
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::route_selection_sensitive_actions.push_back (act);
        act = reg_sens (editor_actions, "remove-track", _("Remove"), (sigc::mem_fun(*this, &Editor::remove_tracks)));
-       /* not selection sensitive? */
-
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
 
        act = reg_sens (editor_actions, "fit-selection", _("Fit Selection (Vertical)"), sigc::mem_fun(*this, &Editor::fit_selection));
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
 
        act = reg_sens (editor_actions, "track-height-largest", _("Largest"), sigc::bind (
                                sigc::mem_fun(*this, &Editor::set_track_height), HeightLargest));
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
        act = reg_sens (editor_actions, "track-height-larger", _("Larger"), sigc::bind (
                                sigc::mem_fun(*this, &Editor::set_track_height), HeightLarger));
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
        act = reg_sens (editor_actions, "track-height-large", _("Large"), sigc::bind (
                                sigc::mem_fun(*this, &Editor::set_track_height), HeightLarge));
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
        act = reg_sens (editor_actions, "track-height-normal", _("Normal"), sigc::bind (
                                sigc::mem_fun(*this, &Editor::set_track_height), HeightNormal));
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
        act = reg_sens (editor_actions, "track-height-small", _("Small"), sigc::bind (
                                sigc::mem_fun(*this, &Editor::set_track_height), HeightSmall));
-       ActionManager::track_selection_sensitive_actions.push_back (act);
+       ActionManager::stripable_selection_sensitive_actions.push_back (act);
 
        toggle_reg_sens (editor_actions, "sound-midi-notes", _("Sound Selected MIDI Notes"), sigc::mem_fun (*this, &Editor::toggle_sound_midi_notes));
 
@@ -475,12 +470,12 @@ Editor::register_actions ()
 
        myactions.register_action (editor_actions, X_("cycle-zoom-focus"), _("Next Zoom Focus"), sigc::mem_fun (*this, &Editor::cycle_zoom_focus));
 
-       act = reg_sens (editor_actions, "manage-action-scripts", _("Manage"),
-                               sigc::mem_fun(*this, &Editor::manage_action_scripts));
-       for (int i = 1; i <= 9; ++i) {
+       for (int i = 1; i <= MAX_LUA_ACTION_SCRIPTS; ++i) {
                string const a = string_compose (X_("script-action-%1"), i);
                string const n = string_compose (_("Unset #%1"), i);
-               reg_sens (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::trigger_script), i - 1));
+               act = myactions.register_action (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::trigger_script), i - 1));
+               act->set_tooltip (_("no action bound"));
+               act->set_sensitive (false);
        }
 
        Glib::RefPtr<ActionGroup> mouse_mode_actions = myactions.create_action_group (X_("MouseMode"));
@@ -494,38 +489,38 @@ Editor::register_actions ()
 
        act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-object", _("Object Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject));
        mouse_move_button.set_related_action (act);
-       mouse_move_button.set_icon (Gtkmm2ext::ArdourIcon::ToolGrab);
+       mouse_move_button.set_icon (ArdourWidgets::ArdourIcon::ToolGrab);
        mouse_move_button.set_name ("mouse mode button");
 
        act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-range", _("Range Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
        mouse_select_button.set_related_action (act);
-       mouse_select_button.set_icon (Gtkmm2ext::ArdourIcon::ToolRange);
+       mouse_select_button.set_icon (ArdourWidgets::ArdourIcon::ToolRange);
        mouse_select_button.set_name ("mouse mode button");
 
        act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-draw", _("Note Drawing Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseDraw));
        mouse_draw_button.set_related_action (act);
-       mouse_draw_button.set_icon (Gtkmm2ext::ArdourIcon::ToolDraw);
+       mouse_draw_button.set_icon (ArdourWidgets::ArdourIcon::ToolDraw);
        mouse_draw_button.set_name ("mouse mode button");
 
        act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-audition", _("Audition Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
        mouse_audition_button.set_related_action (act);
-       mouse_audition_button.set_icon (Gtkmm2ext::ArdourIcon::ToolAudition);
+       mouse_audition_button.set_icon (ArdourWidgets::ArdourIcon::ToolAudition);
        mouse_audition_button.set_name ("mouse mode button");
 
        act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Time FX Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));
        mouse_timefx_button.set_related_action (act);
-       mouse_timefx_button.set_icon (Gtkmm2ext::ArdourIcon::ToolStretch);
+       mouse_timefx_button.set_icon (ArdourWidgets::ArdourIcon::ToolStretch);
        mouse_timefx_button.set_name ("mouse mode button");
 
        act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-content", _("Content Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseContent));
        mouse_content_button.set_related_action (act);
-       mouse_content_button.set_icon (Gtkmm2ext::ArdourIcon::ToolContent);
+       mouse_content_button.set_icon (ArdourWidgets::ArdourIcon::ToolContent);
        mouse_content_button.set_name ("mouse mode button");
 
        if(!Profile->get_mixbus()) {
                act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut));
                mouse_cut_button.set_related_action (act);
-               mouse_cut_button.set_icon (Gtkmm2ext::ArdourIcon::ToolCut);
+               mouse_cut_button.set_icon (ArdourWidgets::ArdourIcon::ToolCut);
                mouse_cut_button.set_name ("mouse mode button");
        }
 
@@ -545,55 +540,48 @@ Editor::register_actions ()
        myactions.register_action (editor_actions, "set-edit-lock", S_("EditMode|Lock"), sigc::bind (sigc::mem_fun (*this, &Editor::set_edit_mode), Lock));
        myactions.register_action (editor_actions, "cycle-edit-mode", _("Cycle Edit Mode"), sigc::mem_fun (*this, &Editor::cycle_edit_mode));
 
-       myactions.register_action (editor_actions, X_("SnapTo"), _("Snap to"));
-       myactions.register_action (editor_actions, X_("SnapMode"), _("Snap Mode"));
+       myactions.register_action (editor_actions, X_("GridChoice"), _("Snap & Grid"));
 
        RadioAction::Group snap_mode_group;
-       myactions.register_radio_action (editor_actions, snap_mode_group, X_("snap-off"), _("No Grid"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_mode_chosen), Editing::SnapOff)));
-       myactions.register_radio_action (editor_actions, snap_mode_group, X_("snap-normal"), _("Grid"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_mode_chosen), Editing::SnapNormal)));
-       myactions.register_radio_action (editor_actions, snap_mode_group, X_("snap-magnetic"), _("Magnetic"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_mode_chosen), Editing::SnapMagnetic)));
+       /* deprecated */  myactions.register_radio_action (editor_actions, snap_mode_group, X_("snap-off"), _("No Grid"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_mode_chosen), Editing::SnapOff)));
+       /* deprecated */  myactions.register_radio_action (editor_actions, snap_mode_group, X_("snap-normal"), _("Grid"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_mode_chosen), Editing::SnapNormal)));  //deprecated
+       /* deprecated */  myactions.register_radio_action (editor_actions, snap_mode_group, X_("snap-magnetic"), _("Magnetic"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_mode_chosen), Editing::SnapMagnetic)));
+
+       snap_mode_button.set_text (_("Snap"));
+       snap_mode_button.set_name ("mouse mode button");
+       snap_mode_button.signal_button_press_event().connect (sigc::mem_fun (*this, &Editor::snap_mode_button_clicked), false);
 
-       myactions.register_action (editor_actions, X_("cycle-snap-mode"), _("Next Snap Mode"), sigc::mem_fun (*this, &Editor::cycle_snap_mode));
-       myactions.register_action (editor_actions, X_("next-snap-choice"), _("Next Snap Choice"), sigc::mem_fun (*this, &Editor::next_snap_choice));
-       myactions.register_action (editor_actions, X_("next-snap-choice-music-only"), _("Next Musical Snap Choice"), sigc::mem_fun (*this, &Editor::next_snap_choice_music_only));
-       myactions.register_action (editor_actions, X_("prev-snap-choice"), _("Previous Snap Choice"), sigc::mem_fun (*this, &Editor::prev_snap_choice));
-       myactions.register_action (editor_actions, X_("prev-snap-choice-music-only"), _("Previous Musical Snap Choice"), sigc::mem_fun (*this, &Editor::prev_snap_choice_music_only));
+       myactions.register_action (editor_actions, X_("cycle-snap-mode"), _("Toggle Snap"), sigc::mem_fun (*this, &Editor::cycle_snap_mode));
+       myactions.register_action (editor_actions, X_("next-grid-choice"), _("Next Quantize Grid Choice"), sigc::mem_fun (*this, &Editor::next_grid_choice));
+       myactions.register_action (editor_actions, X_("prev-grid-choice"), _("Previous Quantize Grid Choice"), sigc::mem_fun (*this, &Editor::prev_grid_choice));
 
        Glib::RefPtr<ActionGroup> snap_actions = myactions.create_action_group (X_("Snap"));
-       RadioAction::Group snap_choice_group;
-
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-cd-frame"), _("Snap to CD Frame"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToCDFrame)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-timecode-frame"), _("Snap to Timecode Frame"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToTimecodeFrame)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-timecode-seconds"), _("Snap to Timecode Seconds"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToTimecodeSeconds)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-timecode-minutes"), _("Snap to Timecode Minutes"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToTimecodeMinutes)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-seconds"), _("Snap to Seconds"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToSeconds)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-minutes"), _("Snap to Minutes"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToMinutes)));
-
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-onetwentyeighths"), _("Snap to One Twenty Eighths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv128)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-sixtyfourths"), _("Snap to Sixty Fourths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv64)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-thirtyseconds"), _("Snap to Thirty Seconds"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv32)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-twentyeighths"), _("Snap to Twenty Eighths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv28)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-twentyfourths"), _("Snap to Twenty Fourths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv24)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-twentieths"), _("Snap to Twentieths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv20)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-asixteenthbeat"), _("Snap to Sixteenths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv16)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-fourteenths"), _("Snap to Fourteenths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv14)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-twelfths"), _("Snap to Twelfths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv12)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-tenths"), _("Snap to Tenths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv10)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-eighths"), _("Snap to Eighths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv8)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-sevenths"), _("Snap to Sevenths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv7)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-sixths"), _("Snap to Sixths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv6)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-fifths"), _("Snap to Fifths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv5)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-quarters"), _("Snap to Quarters"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv4)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-thirds"), _("Snap to Thirds"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv3)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-halves"), _("Snap to Halves"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv2)));
-
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-beat"), _("Snap to Beat"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeat)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-bar"), _("Snap to Bar"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBar)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-mark"), _("Snap to Mark"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToMark)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-region-start"), _("Snap to Region Start"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToRegionStart)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-region-end"), _("Snap to Region End"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToRegionEnd)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-region-sync"), _("Snap to Region Sync"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToRegionSync)));
-       myactions.register_radio_action (snap_actions, snap_choice_group, X_("snap-to-region-boundary"), _("Snap to Region Boundary"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToRegionBoundary)));
+       RadioAction::Group grid_choice_group;
+
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-thirtyseconds"),  grid_type_strings[(int)GridTypeBeatDiv32].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv32)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-twentyeighths"),  grid_type_strings[(int)GridTypeBeatDiv28].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv28)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-twentyfourths"),  grid_type_strings[(int)GridTypeBeatDiv24].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv24)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-twentieths"),     grid_type_strings[(int)GridTypeBeatDiv20].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv20)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-asixteenthbeat"), grid_type_strings[(int)GridTypeBeatDiv16].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv16)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-fourteenths"),    grid_type_strings[(int)GridTypeBeatDiv14].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv14)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-twelfths"),       grid_type_strings[(int)GridTypeBeatDiv12].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv12)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-tenths"),         grid_type_strings[(int)GridTypeBeatDiv10].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv10)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-eighths"),        grid_type_strings[(int)GridTypeBeatDiv8].c_str(),  (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv8)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-sevenths"),       grid_type_strings[(int)GridTypeBeatDiv7].c_str(),  (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv7)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-sixths"),         grid_type_strings[(int)GridTypeBeatDiv6].c_str(),  (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv6)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-fifths"),         grid_type_strings[(int)GridTypeBeatDiv5].c_str(),  (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv5)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-quarters"),       grid_type_strings[(int)GridTypeBeatDiv4].c_str(),  (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv4)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-thirds"),         grid_type_strings[(int)GridTypeBeatDiv3].c_str(),  (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv3)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-halves"),         grid_type_strings[(int)GridTypeBeatDiv2].c_str(),  (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv2)));
+
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-timecode"),       grid_type_strings[(int)GridTypeTimecode].c_str(),      (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeTimecode)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-minsec"),         grid_type_strings[(int)GridTypeMinSec].c_str(),    (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeMinSec)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-cdframe"),        grid_type_strings[(int)GridTypeCDFrame].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeCDFrame)));
+
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-beat"),           grid_type_strings[(int)GridTypeBeat].c_str(),      (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeat)));
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-bar"),            grid_type_strings[(int)GridTypeBar].c_str(),       (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBar)));
+
+       myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-none"),           grid_type_strings[(int)GridTypeNone].c_str(),      (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeNone)));
 
        myactions.register_toggle_action (editor_actions, X_("show-marker-lines"), _("Show Marker Lines"), sigc::mem_fun (*this, &Editor::toggle_marker_lines));
 
@@ -618,7 +606,7 @@ Editor::register_actions ()
 
        xjadeo_ontop_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-ontop"), _("Always on Top"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 1)));
        xjadeo_timecode_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-timecode"), _("Timecode"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 2)));
-       xjadeo_frame_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-frame"), _("Frame number"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 3)));
+       xjadeo_sample_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-frame"), _("Frame number"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 3)));
        xjadeo_osdbg_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-osdbg"), _("Timecode Background"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 4)));
        xjadeo_fullscreen_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-fullscreen"), _("Fullscreen"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 5)));
        xjadeo_letterbox_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-letterbox"), _("Letterbox"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 6)));
@@ -646,7 +634,7 @@ Editor::register_actions ()
                ruler_range_action->set_active (true);
                ruler_loop_punch_action->set_active (true);
                ruler_loop_punch_action->set_active (true);
-               ruler_bbt_action->set_active (false);
+               ruler_bbt_action->set_active (true);
                ruler_cd_marker_action->set_active (true);
                ruler_timecode_action->set_active (true);
                ruler_minsec_action->set_active (false);
@@ -659,8 +647,8 @@ Editor::register_actions ()
        xjadeo_ontop_action->set_sensitive (false);
        xjadeo_timecode_action->set_active (false);
        xjadeo_timecode_action->set_sensitive (false);
-       xjadeo_frame_action->set_active (false);
-       xjadeo_frame_action->set_sensitive (false);
+       xjadeo_sample_action->set_active (false);
+       xjadeo_sample_action->set_sensitive (false);
        xjadeo_osdbg_action->set_active (false);
        xjadeo_osdbg_action->set_sensitive (false);
        xjadeo_fullscreen_action->set_active (false);
@@ -726,9 +714,6 @@ Editor::register_actions ()
 
        /* the next two are duplicate items with different names for use in two different contexts */
 
-       act = reg_sens (editor_actions, X_("addExistingAudioFiles"), _("Import"), sigc::mem_fun (*this, &Editor::external_audio_dialog));
-       ActionManager::write_sensitive_actions.push_back (act);
-
        act = reg_sens (editor_actions, X_("addExternalAudioToRegionList"), _("Import to Region List..."), sigc::bind (sigc::mem_fun(*this, &Editor::add_external_audio_action), ImportAsRegion));
        ActionManager::write_sensitive_actions.push_back (act);
 
@@ -743,10 +728,67 @@ Editor::register_actions ()
 
        myactions.register_toggle_action (editor_actions, X_("ToggleGroupTabs"), _("Show Group Tabs"), sigc::mem_fun (*this, &Editor::set_group_tabs));
 
-       myactions.register_toggle_action (editor_actions, X_("ToggleMeasureVisibility"), _("Show Measure Lines"), sigc::mem_fun (*this, &Editor::toggle_measure_visibility));
-
        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));
+                                  sigc::bind (sigc::mem_fun (*this, &Editor::toggle_midi_input_active), false));
+
+
+       /* MIDI stuff */
+       reg_sens (editor_actions, "quantize", _("Quantize"), sigc::mem_fun (*this, &Editor::quantize_region));
+
+}
+
+static void _lua_print (std::string s) {
+#ifndef NDEBUG
+       std::cout << "LuaInstance: " << s << "\n";
+#endif
+       PBD::info << "LuaInstance: " << s << endmsg;
+}
+
+void
+Editor::trigger_script_by_name (const std::string script_name)
+{
+       string script_path;
+       ARDOUR::LuaScriptList scr = LuaScripting::instance ().scripts(LuaScriptInfo::EditorAction);
+       for (ARDOUR::LuaScriptList::const_iterator s = scr.begin(); s != scr.end(); ++s) {
+
+               if ((*s)->name == script_name) {
+                       script_path = (*s)->path;
+
+                       if (!Glib::file_test (script_path, Glib::FILE_TEST_EXISTS | Glib::FILE_TEST_IS_REGULAR)) {
+#ifndef NDEBUG
+                               cerr << "Lua Script action: path to " << script_path << " does not appear to be valid" << endl;
+#endif
+                               return;
+                       }
+
+                       LuaState lua;
+                       lua.Print.connect (&_lua_print);
+                       lua.sandbox (false);
+                       lua_State* L = lua.getState();
+                       LuaInstance::register_classes (L);
+                       LuaBindings::set_session (L, _session);
+                       luabridge::push <PublicEditor *> (L, &PublicEditor::instance());
+                       lua_setglobal (L, "Editor");
+                       lua.do_command ("function ardour () end");
+                       lua.do_file (script_path);
+                       luabridge::LuaRef args (luabridge::newTable (L));
+
+                       try {
+                               luabridge::LuaRef fn = luabridge::getGlobal (L, "factory");
+                               if (fn.isFunction()) {
+                                       fn (args)();
+                               }
+                       } catch (luabridge::LuaException const& e) {
+                               cerr << "LuaException:" << e.what () << endl;
+                       } catch (...) {
+                               cerr << "Lua script failed: " << script_path << endl;
+                       }
+                       return;
+               }
+       }
+#ifndef NDEBUG
+       cerr << "Lua script was not found: " << script_name << endl;
+#endif
 }
 
 void
@@ -876,7 +918,7 @@ Editor::toggle_xjadeo_proc (int state)
        bool onoff = xjadeo_proc_action->get_active();
        xjadeo_ontop_action->set_sensitive(onoff);
        xjadeo_timecode_action->set_sensitive(onoff);
-       xjadeo_frame_action->set_sensitive(onoff);
+       xjadeo_sample_action->set_sensitive(onoff);
        xjadeo_osdbg_action->set_sensitive(onoff);
        xjadeo_fullscreen_action->set_sensitive(onoff);
        xjadeo_letterbox_action->set_sensitive(onoff);
@@ -905,7 +947,7 @@ Editor::toggle_xjadeo_viewoption (int what, int state)
                        action = xjadeo_timecode_action;
                        break;
                case 3:
-                       action = xjadeo_frame_action;
+                       action = xjadeo_sample_action;
                        break;
                case 4:
                        action = xjadeo_osdbg_action;
@@ -947,7 +989,7 @@ Editor::set_xjadeo_viewoption (int what)
                        action = xjadeo_timecode_action;
                        break;
                case 3:
-                       action = xjadeo_frame_action;
+                       action = xjadeo_sample_action;
                        break;
                case 4:
                        action = xjadeo_osdbg_action;
@@ -972,111 +1014,88 @@ Editor::set_xjadeo_viewoption (int what)
 }
 
 void
-Editor::toggle_measure_visibility ()
+Editor::edit_current_meter ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleMeasureVisibility"));
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               set_show_measures (tact->get_active());
-       }
+       ARDOUR::MeterSection* ms = const_cast<ARDOUR::MeterSection*>(&_session->tempo_map().meter_section_at_sample (ARDOUR_UI::instance()->primary_clock->absolute_time()));
+       edit_meter_section (ms);
+}
+
+void
+Editor::edit_current_tempo ()
+{
+       ARDOUR::TempoSection* ts = const_cast<ARDOUR::TempoSection*>(&_session->tempo_map().tempo_section_at_sample (ARDOUR_UI::instance()->primary_clock->absolute_time()));
+       edit_tempo_section (ts);
 }
 
 RefPtr<RadioAction>
-Editor::snap_type_action (SnapType type)
+Editor::grid_type_action (GridType type)
 {
        const char* action = 0;
        RefPtr<Action> act;
 
        switch (type) {
-       case Editing::SnapToCDFrame:
-               action = "snap-to-cd-frame";
-               break;
-       case Editing::SnapToTimecodeFrame:
-               action = "snap-to-timecode-frame";
-               break;
-       case Editing::SnapToTimecodeSeconds:
-               action = "snap-to-timecode-seconds";
-               break;
-       case Editing::SnapToTimecodeMinutes:
-               action = "snap-to-timecode-minutes";
-               break;
-       case Editing::SnapToSeconds:
-               action = "snap-to-seconds";
-               break;
-       case Editing::SnapToMinutes:
-               action = "snap-to-minutes";
+       case Editing::GridTypeBeatDiv32:
+               action = "grid-type-thirtyseconds";
                break;
-       case Editing::SnapToBeatDiv128:
-               action = "snap-to-onetwentyeighths";
+       case Editing::GridTypeBeatDiv28:
+               action = "grid-type-twentyeighths";
                break;
-       case Editing::SnapToBeatDiv64:
-               action = "snap-to-sixtyfourths";
+       case Editing::GridTypeBeatDiv24:
+               action = "grid-type-twentyfourths";
                break;
-       case Editing::SnapToBeatDiv32:
-               action = "snap-to-thirtyseconds";
+       case Editing::GridTypeBeatDiv20:
+               action = "grid-type-twentieths";
                break;
-       case Editing::SnapToBeatDiv28:
-               action = "snap-to-twentyeighths";
+       case Editing::GridTypeBeatDiv16:
+               action = "grid-type-asixteenthbeat";
                break;
-       case Editing::SnapToBeatDiv24:
-               action = "snap-to-twentyfourths";
+       case Editing::GridTypeBeatDiv14:
+               action = "grid-type-fourteenths";
                break;
-       case Editing::SnapToBeatDiv20:
-               action = "snap-to-twentieths";
+       case Editing::GridTypeBeatDiv12:
+               action = "grid-type-twelfths";
                break;
-       case Editing::SnapToBeatDiv16:
-               action = "snap-to-asixteenthbeat";
+       case Editing::GridTypeBeatDiv10:
+               action = "grid-type-tenths";
                break;
-       case Editing::SnapToBeatDiv14:
-               action = "snap-to-fourteenths";
+       case Editing::GridTypeBeatDiv8:
+               action = "grid-type-eighths";
                break;
-       case Editing::SnapToBeatDiv12:
-               action = "snap-to-twelfths";
+       case Editing::GridTypeBeatDiv7:
+               action = "grid-type-sevenths";
                break;
-       case Editing::SnapToBeatDiv10:
-               action = "snap-to-tenths";
+       case Editing::GridTypeBeatDiv6:
+               action = "grid-type-sixths";
                break;
-       case Editing::SnapToBeatDiv8:
-               action = "snap-to-eighths";
+       case Editing::GridTypeBeatDiv5:
+               action = "grid-type-fifths";
                break;
-       case Editing::SnapToBeatDiv7:
-               action = "snap-to-sevenths";
+       case Editing::GridTypeBeatDiv4:
+               action = "grid-type-quarters";
                break;
-       case Editing::SnapToBeatDiv6:
-               action = "snap-to-sixths";
+       case Editing::GridTypeBeatDiv3:
+               action = "grid-type-thirds";
                break;
-       case Editing::SnapToBeatDiv5:
-               action = "snap-to-fifths";
+       case Editing::GridTypeBeatDiv2:
+               action = "grid-type-halves";
                break;
-       case Editing::SnapToBeatDiv4:
-               action = "snap-to-quarters";
+       case Editing::GridTypeBeat:
+               action = "grid-type-beat";
                break;
-       case Editing::SnapToBeatDiv3:
-               action = "snap-to-thirds";
+       case Editing::GridTypeBar:
+               action = "grid-type-bar";
                break;
-       case Editing::SnapToBeatDiv2:
-               action = "snap-to-halves";
+       case Editing::GridTypeNone:
+               action = "grid-type-none";
                break;
-       case Editing::SnapToBeat:
-               action = "snap-to-beat";
+       case Editing::GridTypeTimecode:
+               action = "grid-type-timecode";
                break;
-       case Editing::SnapToBar:
-               action = "snap-to-bar";
+       case Editing::GridTypeCDFrame:
+               action = "grid-type-cdframe";
                break;
-       case Editing::SnapToMark:
-               action = "snap-to-mark";
-               break;
-       case Editing::SnapToRegionStart:
-               action = "snap-to-region-start";
-               break;
-       case Editing::SnapToRegionEnd:
-               action = "snap-to-region-end";
-               break;
-       case Editing::SnapToRegionSync:
-               action = "snap-to-region-sync";
-               break;
-       case Editing::SnapToRegionBoundary:
-               action = "snap-to-region-boundary";
+       case Editing::GridTypeMinSec:
+               action = "grid-type-minsec";
                break;
        default:
                fatal << string_compose (_("programming error: %1: %2"), "Editor: impossible snap-to type", (int) type) << endmsg;
@@ -1090,371 +1109,113 @@ Editor::snap_type_action (SnapType type)
                return ract;
 
        } else  {
-               error << string_compose (_("programming error: %1"), "Editor::snap_type_chosen could not find action to match type.") << endmsg;
+               error << string_compose (_("programming error: %1"), "Editor::grid_type_chosen could not find action to match type.") << endmsg;
                return RefPtr<RadioAction>();
        }
 }
 
 void
-Editor::next_snap_choice ()
-{
-       switch (_snap_type) {
-       case Editing::SnapToCDFrame:
-               set_snap_to (Editing::SnapToTimecodeFrame);
-               break;
-       case Editing::SnapToTimecodeFrame:
-               set_snap_to (Editing::SnapToTimecodeSeconds);
-               break;
-       case Editing::SnapToTimecodeSeconds:
-               set_snap_to (Editing::SnapToTimecodeMinutes);
-               break;
-       case Editing::SnapToTimecodeMinutes:
-               set_snap_to (Editing::SnapToSeconds);
-               break;
-       case Editing::SnapToSeconds:
-               set_snap_to (Editing::SnapToMinutes);
-               break;
-       case Editing::SnapToMinutes:
-               set_snap_to (Editing::SnapToBeatDiv128);
-               break;
-       case Editing::SnapToBeatDiv128:
-               set_snap_to (Editing::SnapToBeatDiv64);
-               break;
-       case Editing::SnapToBeatDiv64:
-               set_snap_to (Editing::SnapToBeatDiv32);
-               break;
-       case Editing::SnapToBeatDiv32:
-               set_snap_to (Editing::SnapToBeatDiv28);
-               break;
-       case Editing::SnapToBeatDiv28:
-               set_snap_to (Editing::SnapToBeatDiv24);
-               break;
-       case Editing::SnapToBeatDiv24:
-               set_snap_to (Editing::SnapToBeatDiv20);
-               break;
-       case Editing::SnapToBeatDiv20:
-               set_snap_to (Editing::SnapToBeatDiv16);
-               break;
-       case Editing::SnapToBeatDiv16:
-               set_snap_to (Editing::SnapToBeatDiv14);
-               break;
-       case Editing::SnapToBeatDiv14:
-               set_snap_to (Editing::SnapToBeatDiv12);
-               break;
-       case Editing::SnapToBeatDiv12:
-               set_snap_to (Editing::SnapToBeatDiv10);
-               break;
-       case Editing::SnapToBeatDiv10:
-               set_snap_to (Editing::SnapToBeatDiv8);
-               break;
-       case Editing::SnapToBeatDiv8:
-               set_snap_to (Editing::SnapToBeatDiv7);
-               break;
-       case Editing::SnapToBeatDiv7:
-               set_snap_to (Editing::SnapToBeatDiv6);
-               break;
-       case Editing::SnapToBeatDiv6:
-               set_snap_to (Editing::SnapToBeatDiv5);
-               break;
-       case Editing::SnapToBeatDiv5:
-               set_snap_to (Editing::SnapToBeatDiv4);
-               break;
-       case Editing::SnapToBeatDiv4:
-               set_snap_to (Editing::SnapToBeatDiv3);
-               break;
-       case Editing::SnapToBeatDiv3:
-               set_snap_to (Editing::SnapToBeatDiv2);
-               break;
-       case Editing::SnapToBeatDiv2:
-               set_snap_to (Editing::SnapToBeat);
-               break;
-       case Editing::SnapToBeat:
-               set_snap_to (Editing::SnapToBar);
-               break;
-       case Editing::SnapToBar:
-               set_snap_to (Editing::SnapToMark);
-               break;
-       case Editing::SnapToMark:
-               set_snap_to (Editing::SnapToRegionStart);
-               break;
-       case Editing::SnapToRegionStart:
-               set_snap_to (Editing::SnapToRegionEnd);
-               break;
-       case Editing::SnapToRegionEnd:
-               set_snap_to (Editing::SnapToRegionSync);
-               break;
-       case Editing::SnapToRegionSync:
-               set_snap_to (Editing::SnapToRegionBoundary);
-               break;
-       case Editing::SnapToRegionBoundary:
-               set_snap_to (Editing::SnapToCDFrame);
-               break;
-       }
-}
-
-void
-Editor::prev_snap_choice ()
-{
-       switch (_snap_type) {
-       case Editing::SnapToCDFrame:
-               set_snap_to (Editing::SnapToRegionBoundary);
-               break;
-       case Editing::SnapToTimecodeFrame:
-               set_snap_to (Editing::SnapToCDFrame);
-               break;
-       case Editing::SnapToTimecodeSeconds:
-               set_snap_to (Editing::SnapToTimecodeFrame);
-               break;
-       case Editing::SnapToTimecodeMinutes:
-               set_snap_to (Editing::SnapToTimecodeSeconds);
-               break;
-       case Editing::SnapToSeconds:
-               set_snap_to (Editing::SnapToTimecodeMinutes);
-               break;
-       case Editing::SnapToMinutes:
-               set_snap_to (Editing::SnapToSeconds);
-               break;
-       case Editing::SnapToBeatDiv128:
-               set_snap_to (Editing::SnapToMinutes);
-               break;
-       case Editing::SnapToBeatDiv64:
-               set_snap_to (Editing::SnapToBeatDiv128);
-               break;
-       case Editing::SnapToBeatDiv32:
-               set_snap_to (Editing::SnapToBeatDiv64);
-               break;
-       case Editing::SnapToBeatDiv28:
-               set_snap_to (Editing::SnapToBeatDiv32);
-               break;
-       case Editing::SnapToBeatDiv24:
-               set_snap_to (Editing::SnapToBeatDiv28);
-               break;
-       case Editing::SnapToBeatDiv20:
-               set_snap_to (Editing::SnapToBeatDiv24);
-               break;
-       case Editing::SnapToBeatDiv16:
-               set_snap_to (Editing::SnapToBeatDiv20);
-               break;
-       case Editing::SnapToBeatDiv14:
-               set_snap_to (Editing::SnapToBeatDiv16);
-               break;
-       case Editing::SnapToBeatDiv12:
-               set_snap_to (Editing::SnapToBeatDiv14);
-               break;
-       case Editing::SnapToBeatDiv10:
-               set_snap_to (Editing::SnapToBeatDiv12);
-               break;
-       case Editing::SnapToBeatDiv8:
-               set_snap_to (Editing::SnapToBeatDiv10);
-               break;
-       case Editing::SnapToBeatDiv7:
-               set_snap_to (Editing::SnapToBeatDiv8);
-               break;
-       case Editing::SnapToBeatDiv6:
-               set_snap_to (Editing::SnapToBeatDiv7);
-               break;
-       case Editing::SnapToBeatDiv5:
-               set_snap_to (Editing::SnapToBeatDiv6);
-               break;
-       case Editing::SnapToBeatDiv4:
-               set_snap_to (Editing::SnapToBeatDiv5);
-               break;
-       case Editing::SnapToBeatDiv3:
-               set_snap_to (Editing::SnapToBeatDiv4);
-               break;
-       case Editing::SnapToBeatDiv2:
-               set_snap_to (Editing::SnapToBeatDiv3);
-               break;
-       case Editing::SnapToBeat:
-               set_snap_to (Editing::SnapToBeatDiv2);
-               break;
-       case Editing::SnapToBar:
-               set_snap_to (Editing::SnapToBeat);
-               break;
-       case Editing::SnapToMark:
-               set_snap_to (Editing::SnapToBar);
-               break;
-       case Editing::SnapToRegionStart:
-               set_snap_to (Editing::SnapToMark);
-               break;
-       case Editing::SnapToRegionEnd:
-               set_snap_to (Editing::SnapToRegionStart);
-               break;
-       case Editing::SnapToRegionSync:
-               set_snap_to (Editing::SnapToRegionEnd);
-               break;
-       case Editing::SnapToRegionBoundary:
-               set_snap_to (Editing::SnapToRegionSync);
-               break;
-       }
-}
-
-void
-Editor::next_snap_choice_music_only ()
+Editor::next_grid_choice ()
 {
-       switch (_snap_type) {
-       case Editing::SnapToMark:
-       case Editing::SnapToRegionStart:
-       case Editing::SnapToRegionEnd:
-       case Editing::SnapToRegionSync:
-       case Editing::SnapToRegionBoundary:
-       case Editing::SnapToCDFrame:
-       case Editing::SnapToTimecodeFrame:
-       case Editing::SnapToTimecodeSeconds:
-       case Editing::SnapToTimecodeMinutes:
-       case Editing::SnapToSeconds:
-       case Editing::SnapToMinutes:
-               set_snap_to (Editing::SnapToBeatDiv128);
-               break;
-       case Editing::SnapToBeatDiv128:
-               set_snap_to (Editing::SnapToBeatDiv64);
-               break;
-       case Editing::SnapToBeatDiv64:
-               set_snap_to (Editing::SnapToBeatDiv32);
-               break;
-       case Editing::SnapToBeatDiv32:
-               set_snap_to (Editing::SnapToBeatDiv28);
-               break;
-       case Editing::SnapToBeatDiv28:
-               set_snap_to (Editing::SnapToBeatDiv24);
-               break;
-       case Editing::SnapToBeatDiv24:
-               set_snap_to (Editing::SnapToBeatDiv20);
-               break;
-       case Editing::SnapToBeatDiv20:
-               set_snap_to (Editing::SnapToBeatDiv16);
-               break;
-       case Editing::SnapToBeatDiv16:
-               set_snap_to (Editing::SnapToBeatDiv14);
-               break;
-       case Editing::SnapToBeatDiv14:
-               set_snap_to (Editing::SnapToBeatDiv12);
-               break;
-       case Editing::SnapToBeatDiv12:
-               set_snap_to (Editing::SnapToBeatDiv10);
-               break;
-       case Editing::SnapToBeatDiv10:
-               set_snap_to (Editing::SnapToBeatDiv8);
-               break;
-       case Editing::SnapToBeatDiv8:
-               set_snap_to (Editing::SnapToBeatDiv7);
-               break;
-       case Editing::SnapToBeatDiv7:
-               set_snap_to (Editing::SnapToBeatDiv6);
-               break;
-       case Editing::SnapToBeatDiv6:
-               set_snap_to (Editing::SnapToBeatDiv5);
-               break;
-       case Editing::SnapToBeatDiv5:
-               set_snap_to (Editing::SnapToBeatDiv4);
-               break;
-       case Editing::SnapToBeatDiv4:
-               set_snap_to (Editing::SnapToBeatDiv3);
-               break;
-       case Editing::SnapToBeatDiv3:
-               set_snap_to (Editing::SnapToBeatDiv2);
-               break;
-       case Editing::SnapToBeatDiv2:
-               set_snap_to (Editing::SnapToBeat);
-               break;
-       case Editing::SnapToBeat:
-               set_snap_to (Editing::SnapToBar);
-               break;
-       case Editing::SnapToBar:
-               set_snap_to (Editing::SnapToBeatDiv128);
-               break;
+       switch (_grid_type) {
+       case Editing::GridTypeBeatDiv32:
+               set_grid_to (Editing::GridTypeNone);
+               break;
+       case Editing::GridTypeBeatDiv16:
+               set_grid_to (Editing::GridTypeBeatDiv32);
+               break;
+       case Editing::GridTypeBeatDiv8:
+               set_grid_to (Editing::GridTypeBeatDiv16);
+               break;
+       case Editing::GridTypeBeatDiv4:
+               set_grid_to (Editing::GridTypeBeatDiv8);
+               break;
+       case Editing::GridTypeBeatDiv2:
+               set_grid_to (Editing::GridTypeBeatDiv4);
+               break;
+       case Editing::GridTypeBeat:
+               set_grid_to (Editing::GridTypeBeatDiv2);
+               break;
+       case Editing::GridTypeBar:
+               set_grid_to (Editing::GridTypeBeat);
+               break;
+       case Editing::GridTypeNone:
+               set_grid_to (Editing::GridTypeBar);
+               break;
+       case Editing::GridTypeBeatDiv3:
+       case Editing::GridTypeBeatDiv6:
+       case Editing::GridTypeBeatDiv12:
+       case Editing::GridTypeBeatDiv24:
+       case Editing::GridTypeBeatDiv5:
+       case Editing::GridTypeBeatDiv10:
+       case Editing::GridTypeBeatDiv20:
+       case Editing::GridTypeBeatDiv7:
+       case Editing::GridTypeBeatDiv14:
+       case Editing::GridTypeBeatDiv28:
+       case Editing::GridTypeTimecode:
+       case Editing::GridTypeMinSec:
+       case Editing::GridTypeCDFrame:
+               break;  //do nothing
        }
 }
 
 void
-Editor::prev_snap_choice_music_only ()
+Editor::prev_grid_choice ()
 {
-       switch (_snap_type) {
-       case Editing::SnapToMark:
-       case Editing::SnapToRegionStart:
-       case Editing::SnapToRegionEnd:
-       case Editing::SnapToRegionSync:
-       case Editing::SnapToRegionBoundary:
-       case Editing::SnapToCDFrame:
-       case Editing::SnapToTimecodeFrame:
-       case Editing::SnapToTimecodeSeconds:
-       case Editing::SnapToTimecodeMinutes:
-       case Editing::SnapToSeconds:
-       case Editing::SnapToMinutes:
-               set_snap_to (Editing::SnapToBar);
-               break;
-       case Editing::SnapToBeatDiv128:
-               set_snap_to (Editing::SnapToBeat);
-               break;
-       case Editing::SnapToBeatDiv64:
-               set_snap_to (Editing::SnapToBeatDiv128);
-               break;
-       case Editing::SnapToBeatDiv32:
-               set_snap_to (Editing::SnapToBeatDiv64);
-               break;
-       case Editing::SnapToBeatDiv28:
-               set_snap_to (Editing::SnapToBeatDiv32);
-               break;
-       case Editing::SnapToBeatDiv24:
-               set_snap_to (Editing::SnapToBeatDiv28);
-               break;
-       case Editing::SnapToBeatDiv20:
-               set_snap_to (Editing::SnapToBeatDiv24);
-               break;
-       case Editing::SnapToBeatDiv16:
-               set_snap_to (Editing::SnapToBeatDiv20);
-               break;
-       case Editing::SnapToBeatDiv14:
-               set_snap_to (Editing::SnapToBeatDiv16);
-               break;
-       case Editing::SnapToBeatDiv12:
-               set_snap_to (Editing::SnapToBeatDiv14);
-               break;
-       case Editing::SnapToBeatDiv10:
-               set_snap_to (Editing::SnapToBeatDiv12);
-               break;
-       case Editing::SnapToBeatDiv8:
-               set_snap_to (Editing::SnapToBeatDiv10);
-               break;
-       case Editing::SnapToBeatDiv7:
-               set_snap_to (Editing::SnapToBeatDiv8);
-               break;
-       case Editing::SnapToBeatDiv6:
-               set_snap_to (Editing::SnapToBeatDiv7);
-               break;
-       case Editing::SnapToBeatDiv5:
-               set_snap_to (Editing::SnapToBeatDiv6);
-               break;
-       case Editing::SnapToBeatDiv4:
-               set_snap_to (Editing::SnapToBeatDiv5);
-               break;
-       case Editing::SnapToBeatDiv3:
-               set_snap_to (Editing::SnapToBeatDiv4);
-               break;
-       case Editing::SnapToBeatDiv2:
-               set_snap_to (Editing::SnapToBeatDiv3);
-               break;
-       case Editing::SnapToBeat:
-               set_snap_to (Editing::SnapToBeatDiv2);
-               break;
-       case Editing::SnapToBar:
-               set_snap_to (Editing::SnapToBeat);
-               break;
+       switch (_grid_type) {
+       case Editing::GridTypeBeatDiv32:
+               set_grid_to (Editing::GridTypeBeatDiv16);
+               break;
+       case Editing::GridTypeBeatDiv16:
+               set_grid_to (Editing::GridTypeBeatDiv8);
+               break;
+       case Editing::GridTypeBeatDiv8:
+               set_grid_to (Editing::GridTypeBeatDiv4);
+               break;
+       case Editing::GridTypeBeatDiv4:
+               set_grid_to (Editing::GridTypeBeatDiv2);
+               break;
+       case Editing::GridTypeBeatDiv2:
+               set_grid_to (Editing::GridTypeBeat);
+               break;
+       case Editing::GridTypeBeat:
+               set_grid_to (Editing::GridTypeBar);
+               break;
+       case Editing::GridTypeBar:
+               set_grid_to (Editing::GridTypeNone);
+               break;
+       case Editing::GridTypeNone:
+               set_grid_to (Editing::GridTypeBeatDiv32);
+               break;
+       case Editing::GridTypeBeatDiv3:
+       case Editing::GridTypeBeatDiv6:
+       case Editing::GridTypeBeatDiv12:
+       case Editing::GridTypeBeatDiv24:
+       case Editing::GridTypeBeatDiv5:
+       case Editing::GridTypeBeatDiv10:
+       case Editing::GridTypeBeatDiv20:
+       case Editing::GridTypeBeatDiv7:
+       case Editing::GridTypeBeatDiv14:
+       case Editing::GridTypeBeatDiv28:
+       case Editing::GridTypeTimecode:
+       case Editing::GridTypeMinSec:
+       case Editing::GridTypeCDFrame:
+               break;  //do nothing
        }
 }
 
 void
-Editor::snap_type_chosen (SnapType type)
+Editor::grid_type_chosen (GridType type)
 {
        /* this is driven by a toggle on a radio group, and so is invoked twice,
           once for the item that became inactive and once for the one that became
           active.
        */
 
-       RefPtr<RadioAction> ract = snap_type_action (type);
+       RefPtr<RadioAction> ract = grid_type_action (type);
 
        if (ract && ract->get_active()) {
-               set_snap_to (type);
+               set_grid_to (type);
        }
 }
 
@@ -1496,8 +1257,6 @@ Editor::cycle_snap_mode ()
 {
        switch (_snap_mode) {
        case SnapOff:
-               set_snap_mode (SnapNormal);
-               break;
        case SnapNormal:
                set_snap_mode (SnapMagnetic);
                break;
@@ -1515,6 +1274,10 @@ Editor::snap_mode_chosen (SnapMode mode)
           active.
        */
 
+       if (mode == SnapNormal) {
+               mode = SnapMagnetic;
+       }
+
        RefPtr<RadioAction> ract = snap_mode_action (mode);
 
        if (ract && ract->get_active()) {
@@ -1689,7 +1452,7 @@ Editor::parameter_changed (std::string p)
                        _group_tabs->hide ();
                }
 
-                reset_controls_layout_width ();
+               reset_controls_layout_width ();
 
                Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleGroupTabs"));
                if (act) {
@@ -1712,19 +1475,6 @@ Editor::parameter_changed (std::string p)
                }
        } else if (p == "show-region-gain") {
                set_gain_envelope_visibility ();
-       } else if (p == "remote-model") {
-               if (_routes) {
-                       _routes->reset_remote_control_ids ();
-               }
-       } else if (p == "use-tooltips") {
-
-               /* this doesn't really belong here but it has to go somewhere */
-
-               if (UIConfiguration::instance().get_use_tooltips()) {
-                       Gtkmm2ext::enable_tooltips ();
-               } else {
-                       Gtkmm2ext::disable_tooltips ();
-               }
        } else if (p == "skip-playback") {
                Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-skip-playback"));
 
@@ -1738,43 +1488,6 @@ Editor::parameter_changed (std::string p)
        }
 }
 
-void
-Editor::reset_focus (Gtk::Widget* w)
-{
-       /* this resets focus to the first focusable parent of the given widget,
-        * or, if there is no focusable parent, cancels focus in the toplevel
-        * window that the given widget is packed into (if there is one).
-        */
-
-       if (!w) {
-               return;
-       }
-
-       Gtk::Widget* top = w->get_toplevel();
-
-       if (!top || !top->is_toplevel()) {
-               return;
-       }
-
-       w = w->get_parent ();
-
-       while (w) {
-               if (w->get_can_focus ()) {
-                       Window* win = dynamic_cast<Window*> (top);
-                       win->set_focus (*w);
-                       return;
-               }
-               w = w->get_parent ();
-       }
-
-       /* no focusable parent found, cancel focus in top level window.
-          C++ API cannot be used for this. Thanks, references.
-        */
-
-       gtk_window_set_focus (GTK_WINDOW(top->gobj()), 0);
-
-}
-
 void
 Editor::reset_canvas_action_sensitivity (bool onoff)
 {
@@ -1796,273 +1509,188 @@ Editor::register_region_actions ()
        /* PART 1: actions that operate on the selection, and for which the edit point type and location is irrelevant */
 
        /* Remove selected regions */
-       reg_sens (_region_actions, "remove-region", _("Remove"), sigc::mem_fun (*this, &Editor::remove_selected_regions));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "remove-region", _("Remove"), sigc::mem_fun (*this, &Editor::remove_selected_regions));
 
        /* Offer dialogue box to rename the first selected region */
-       reg_sens (_region_actions, "rename-region", _("Rename..."), sigc::mem_fun (*this, &Editor::rename_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "rename-region", _("Rename..."), sigc::mem_fun (*this, &Editor::rename_region));
 
        /* Raise all selected regions by 1 layer */
-       reg_sens (_region_actions, "raise-region", _("Raise"), sigc::mem_fun (*this, &Editor::raise_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "raise-region", _("Raise"), sigc::mem_fun (*this, &Editor::raise_region));
 
        /* Raise all selected regions to the top */
-       reg_sens (_region_actions, "raise-region-to-top", _("Raise to Top"), sigc::mem_fun (*this, &Editor::raise_region_to_top));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "raise-region-to-top", _("Raise to Top"), sigc::mem_fun (*this, &Editor::raise_region_to_top));
 
        /* Lower all selected regions by 1 layer */
-       reg_sens (_region_actions, "lower-region", _("Lower"), sigc::mem_fun (*this, &Editor::lower_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "lower-region", _("Lower"), sigc::mem_fun (*this, &Editor::lower_region));
 
        /* Lower all selected regions to the bottom */
-       reg_sens (_region_actions, "lower-region-to-bottom", _("Lower to Bottom"), sigc::mem_fun (*this, &Editor::lower_region_to_bottom));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "lower-region-to-bottom", _("Lower to Bottom"), sigc::mem_fun (*this, &Editor::lower_region_to_bottom));
 
        /* Move selected regions to their original (`natural') position */
-       reg_sens (_region_actions, "naturalize-region", _("Move to Original Position"), sigc::mem_fun (*this, &Editor::naturalize_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "naturalize-region", _("Move to Original Position"), sigc::mem_fun (*this, &Editor::naturalize_region));
 
        /* Toggle `locked' status of selected regions */
-       toggle_reg_sens (_region_actions, "toggle-region-lock", _("Lock"), sigc::mem_fun(*this, &Editor::toggle_region_lock));
-
-       toggle_reg_sens (_region_actions, "toggle-region-video-lock", _("Lock to Video"), sigc::mem_fun(*this, &Editor::toggle_region_video_lock));
-
-       toggle_reg_sens (
-               _region_actions,
-               "toggle-region-lock-style",
-               _("Glue to Bars and Beats"),
-               sigc::mem_fun (*this, &Editor::toggle_region_lock_style)
-               );
+       register_toggle_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "toggle-region-lock", _("Lock"), sigc::mem_fun(*this, &Editor::toggle_region_lock));
+       register_toggle_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "toggle-region-video-lock", _("Lock to Video"), sigc::mem_fun(*this, &Editor::toggle_region_video_lock));
+       register_toggle_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "toggle-region-lock-style", _("Glue to Bars and Beats"), sigc::mem_fun (*this, &Editor::toggle_region_lock_style));
 
        /* Remove sync points from selected regions */
-       reg_sens (_region_actions, "remove-region-sync", _("Remove Sync"), sigc::mem_fun(*this, &Editor::remove_region_sync));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "remove-region-sync", _("Remove Sync"), sigc::mem_fun(*this, &Editor::remove_region_sync));
 
        /* Mute or unmute selected regions */
-       toggle_reg_sens (_region_actions, "toggle-region-mute", _("Mute"), sigc::mem_fun(*this, &Editor::toggle_region_mute));
+       register_toggle_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "toggle-region-mute", _("Mute"), sigc::mem_fun(*this, &Editor::toggle_region_mute));
 
        /* Open the normalize dialogue to operate on the selected regions */
-       reg_sens (_region_actions, "normalize-region", _("Normalize..."), sigc::mem_fun(*this, &Editor::normalize_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "normalize-region", _("Normalize..."), sigc::mem_fun(*this, &Editor::normalize_region));
 
        /* Reverse selected regions */
-       reg_sens (_region_actions, "reverse-region", _("Reverse"), sigc::mem_fun (*this, &Editor::reverse_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "reverse-region", _("Reverse"), sigc::mem_fun (*this, &Editor::reverse_region));
 
        /* Split selected multi-channel regions into mono regions */
-       reg_sens (_region_actions, "split-multichannel-region", _("Make Mono Regions"), sigc::mem_fun (*this, &Editor::split_multichannel_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "split-multichannel-region", _("Make Mono Regions"), sigc::mem_fun (*this, &Editor::split_multichannel_region));
 
        /* Boost selected region gain */
-       reg_sens (_region_actions, "boost-region-gain", _("Boost Gain"), sigc::bind (sigc::mem_fun(*this, &Editor::adjust_region_gain), true));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "boost-region-gain", _("Boost Gain"), sigc::bind (sigc::mem_fun(*this, &Editor::adjust_region_gain), true));
 
        /* Cut selected region gain */
-       reg_sens (_region_actions, "cut-region-gain", _("Cut Gain"), sigc::bind (sigc::mem_fun(*this, &Editor::adjust_region_gain), false));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "cut-region-gain", _("Cut Gain"), sigc::bind (sigc::mem_fun(*this, &Editor::adjust_region_gain), false));
+
+       /* Reset selected region gain */
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "reset-region-gain", _("Reset Gain"), sigc::mem_fun(*this, &Editor::reset_region_gain));
 
        /* Open the pitch shift dialogue for any selected audio regions */
-       reg_sens (_region_actions, "pitch-shift-region", _("Pitch Shift..."), sigc::mem_fun (*this, &Editor::pitch_shift_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "pitch-shift-region", _("Pitch Shift..."), sigc::mem_fun (*this, &Editor::pitch_shift_region));
 
        /* Open the transpose dialogue for any selected MIDI regions */
-       reg_sens (_region_actions, "transpose-region", _("Transpose..."), sigc::mem_fun (*this, &Editor::transpose_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "transpose-region", _("Transpose..."), sigc::mem_fun (*this, &Editor::transpose_region));
 
        /* Toggle selected region opacity */
-       toggle_reg_sens (_region_actions, "toggle-opaque-region", _("Opaque"), sigc::mem_fun (*this, &Editor::toggle_opaque_region));
+       register_toggle_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "toggle-opaque-region", _("Opaque"), sigc::mem_fun (*this, &Editor::toggle_opaque_region));
 
        /* Toggle active status of selected regions' fade in */
-       toggle_reg_sens (
-               _region_actions, "toggle-region-fade-in", _("Fade In"), sigc::bind (sigc::mem_fun (*this, &Editor::toggle_region_fades), 1)
-               );
+       register_toggle_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "toggle-region-fade-in", _("Fade In"), sigc::bind (sigc::mem_fun (*this, &Editor::toggle_region_fades), 1));
 
        /* Toggle active status of selected regions' fade out */
-       toggle_reg_sens (
-               _region_actions, "toggle-region-fade-out", _("Fade Out"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_region_fades), -1)
-               );
+       register_toggle_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "toggle-region-fade-out", _("Fade Out"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_region_fades), -1));
 
        /* Toggle active status of selected regions' fade in and out */
-       toggle_reg_sens (
-               _region_actions, "toggle-region-fades", _("Fades"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_region_fades), 0)
-               );
+       register_toggle_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "toggle-region-fades", _("Fades"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_region_fades), 0));
 
        /* Duplicate selected regions */
-       reg_sens (_region_actions, "duplicate-region", _("Duplicate"), sigc::bind (sigc::mem_fun (*this, &Editor::duplicate_range), false));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "duplicate-region", _("Duplicate"), sigc::bind (sigc::mem_fun (*this, &Editor::duplicate_regions), 1));
 
        /* Open the dialogue to duplicate selected regions multiple times */
-       reg_sens (
-               _region_actions,
-               "multi-duplicate-region",
-               _("Multi-Duplicate..."),
-               sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_range), true)
-               );
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "multi-duplicate-region", _("Multi-Duplicate..."), sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_range), true));
 
        /* Fill tracks with selected regions */
-       reg_sens (_region_actions, "region-fill-track", _("Fill Track"), sigc::mem_fun (*this, &Editor::region_fill_track));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "region-fill-track", _("Fill Track"), sigc::mem_fun (*this, &Editor::region_fill_track));
 
        /* Set up the loop range from the selected regions */
-       reg_sens (
-               _region_actions, "set-loop-from-region", _("Set Loop Range"), sigc::bind (sigc::mem_fun (*this, &Editor::set_loop_from_region), false)
-               );
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "set-loop-from-region", _("Set Loop Range"), sigc::bind (sigc::mem_fun (*this, &Editor::set_loop_from_region), false));
 
        /* Set up the loop range from the selected regions, and start playback of it */
-       reg_sens (_region_actions, "loop-region", _("Loop"), sigc::bind  (sigc::mem_fun(*this, &Editor::set_loop_from_region), true));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "loop-region", _("Loop"), sigc::bind  (sigc::mem_fun(*this, &Editor::set_loop_from_region), true));
 
        /* Set the punch range from the selected regions */
-       reg_sens (_region_actions, "set-punch-from-region", _("Set Punch"), sigc::mem_fun (*this, &Editor::set_punch_from_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "set-punch-from-region", _("Set Punch"), sigc::mem_fun (*this, &Editor::set_punch_from_region));
 
        /* Add a single range marker around all selected regions */
-       reg_sens (
-               _region_actions, "add-range-marker-from-region", _("Add Single Range Marker"), sigc::mem_fun (*this, &Editor::add_location_from_region)
-               );
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "add-range-marker-from-region", _("Add Single Range Marker"), sigc::mem_fun (*this, &Editor::add_location_from_region));
 
        /* Add a range marker around each selected region */
-       reg_sens (
-               _region_actions, "add-range-markers-from-region", _("Add Range Marker Per Region"), sigc::mem_fun (*this, &Editor::add_locations_from_region)
-               );
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "add-range-markers-from-region", _("Add Range Marker Per Region"), sigc::mem_fun (*this, &Editor::add_locations_from_region));
 
        /* Snap selected regions to the grid */
-       reg_sens (_region_actions, "snap-regions-to-grid", _("Snap Position to Grid"), sigc::mem_fun (*this, &Editor::snap_regions_to_grid));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "snap-regions-to-grid", _("Snap Position to Grid"), sigc::mem_fun (*this, &Editor::snap_regions_to_grid));
 
        /* Close gaps in selected regions */
-       reg_sens (_region_actions, "close-region-gaps", _("Close Gaps"), sigc::mem_fun (*this, &Editor::close_region_gaps));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "close-region-gaps", _("Close Gaps"), sigc::mem_fun (*this, &Editor::close_region_gaps));
 
        /* Open the Rhythm Ferret dialogue for the selected regions */
-       reg_sens (_region_actions, "show-rhythm-ferret", _("Rhythm Ferret..."), sigc::mem_fun (*this, &Editor::show_rhythm_ferret));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "show-rhythm-ferret", _("Rhythm Ferret..."), sigc::mem_fun (*this, &Editor::show_rhythm_ferret));
 
        /* Export the first selected region */
-       reg_sens (_region_actions, "export-region", _("Export..."), sigc::mem_fun (*this, &Editor::export_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "export-region", _("Export..."), sigc::mem_fun (*this, &Editor::export_region));
 
        /* Separate under selected regions: XXX not sure what this does */
-       reg_sens (
-               _region_actions,
-               "separate-under-region",
-               _("Separate Under"),
-               sigc::mem_fun (*this, &Editor::separate_under_selected_regions)
-               );
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "separate-under-region", _("Separate Under"), sigc::mem_fun (*this, &Editor::separate_under_selected_regions));
 
-       reg_sens (_region_actions, "set-fade-in-length", _("Set Fade In Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), true));
-       reg_sens (_region_actions, "alternate-set-fade-in-length", _("Set Fade In Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), true));
-       reg_sens (_region_actions, "set-fade-out-length", _("Set Fade Out Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), false));
-       reg_sens (_region_actions, "alternate-set-fade-out-length", _("Set Fade Out Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), false));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "set-fade-in-length", _("Set Fade In Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), true));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "alternate-set-fade-in-length", _("Set Fade In Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), true));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "set-fade-out-length", _("Set Fade Out Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), false));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "alternate-set-fade-out-length", _("Set Fade Out Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), false));
 
-       reg_sens (_region_actions, "set-tempo-from-region", _("Set Tempo from Region = Bar"), sigc::mem_fun (*this, &Editor::set_tempo_from_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "set-tempo-from-region", _("Set Tempo from Region = Bar"), sigc::mem_fun (*this, &Editor::set_tempo_from_region));
 
-       reg_sens (
-               _region_actions,
-               "split-region-at-transients",
-               _("Split at Percussion Onsets"),
-               sigc::mem_fun(*this, &Editor::split_region_at_transients)
-               );
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "split-region-at-transients", _("Split at Percussion Onsets"), sigc::mem_fun(*this, &Editor::split_region_at_transients));
 
        /* Open the list editor dialogue for the selected regions */
-       reg_sens (_region_actions, "show-region-list-editor", _("List Editor..."), sigc::mem_fun (*this, &Editor::show_midi_list_editor));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "show-region-list-editor", _("List Editor..."), sigc::mem_fun (*this, &Editor::show_midi_list_editor));
 
        /* Open the region properties dialogue for the selected regions */
-       reg_sens (_region_actions, "show-region-properties", _("Properties..."), sigc::mem_fun (*this, &Editor::show_region_properties));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "show-region-properties", _("Properties..."), sigc::mem_fun (*this, &Editor::show_region_properties));
 
-       reg_sens (_region_actions, "play-selected-regions", _("Play"), sigc::mem_fun(*this, &Editor::play_selected_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "play-selected-regions", _("Play selected Regions"), sigc::mem_fun(*this, &Editor::play_selected_region));
 
-       reg_sens (_region_actions, "bounce-regions-processed", _("Bounce (with processing)"), (sigc::bind (sigc::mem_fun (*this, &Editor::bounce_region_selection), true)));
-       reg_sens (_region_actions, "bounce-regions-unprocessed", _("Bounce (without processing)"), (sigc::bind (sigc::mem_fun (*this, &Editor::bounce_region_selection), false)));
-       reg_sens (_region_actions, "combine-regions", _("Combine"), sigc::mem_fun (*this, &Editor::combine_regions));
-       reg_sens (_region_actions, "uncombine-regions", _("Uncombine"), sigc::mem_fun (*this, &Editor::uncombine_regions));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "bounce-regions-processed", _("Bounce (with processing)"), (sigc::bind (sigc::mem_fun (*this, &Editor::bounce_region_selection), true)));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "bounce-regions-unprocessed", _("Bounce (without processing)"), (sigc::bind (sigc::mem_fun (*this, &Editor::bounce_region_selection), false)));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "combine-regions", _("Combine"), sigc::mem_fun (*this, &Editor::combine_regions));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "uncombine-regions", _("Uncombine"), sigc::mem_fun (*this, &Editor::uncombine_regions));
 
-       reg_sens (_region_actions, "loudness-analyze-region", _("Loudness Analysis..."), sigc::mem_fun (*this, &Editor::loudness_analyze_region_selection));
-       reg_sens (_region_actions, "spectral-analyze-region", _("Spectral Analysis..."), sigc::mem_fun (*this, &Editor::spectral_analyze_region_selection));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "loudness-analyze-region", _("Loudness Analysis..."), sigc::mem_fun (*this, &Editor::loudness_analyze_region_selection));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "spectral-analyze-region", _("Spectral Analysis..."), sigc::mem_fun (*this, &Editor::spectral_analyze_region_selection));
 
-       reg_sens (_region_actions, "reset-region-gain-envelopes", _("Reset Envelope"), sigc::mem_fun (*this, &Editor::reset_region_gain_envelopes));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "reset-region-gain-envelopes", _("Reset Envelope"), sigc::mem_fun (*this, &Editor::reset_region_gain_envelopes));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "reset-region-scale-amplitude", _("Reset Gain"), sigc::mem_fun (*this, &Editor::reset_region_scale_amplitude));
 
-       reg_sens (_region_actions, "reset-region-scale-amplitude", _("Reset Gain"), sigc::mem_fun (*this, &Editor::reset_region_scale_amplitude));
+       register_toggle_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "toggle-region-gain-envelope-active", _("Envelope Active"), sigc::mem_fun (*this, &Editor::toggle_gain_envelope_active));
 
-       toggle_reg_sens (
-               _region_actions,
-               "toggle-region-gain-envelope-active",
-               _("Envelope Active"),
-               sigc::mem_fun (*this, &Editor::toggle_gain_envelope_active)
-               );
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "quantize-region", _("Quantize..."), sigc::mem_fun (*this, &Editor::quantize_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "legatize-region", _("Legatize"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), false));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "transform-region", _("Transform..."), sigc::mem_fun (*this, &Editor::transform_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "remove-overlap", _("Remove Overlap"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), true));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "insert-patch-change", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), false));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "insert-patch-change-context", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), true));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "fork-region", _("Unlink from other copies"), sigc::mem_fun (*this, &Editor::fork_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "strip-region-silence", _("Strip Silence..."), sigc::mem_fun (*this, &Editor::strip_region_silence));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "set-selection-from-region", _("Set Range Selection"), sigc::mem_fun (*this, &Editor::set_selection_from_region));
 
-       reg_sens (_region_actions, "quantize-region", _("Quantize..."), sigc::mem_fun (*this, &Editor::quantize_region));
-       reg_sens (_region_actions, "legatize-region", _("Legatize"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), false));
-       reg_sens (_region_actions, "transform-region", _("Transform..."), sigc::mem_fun (*this, &Editor::transform_region));
-       reg_sens (_region_actions, "remove-overlap", _("Remove Overlap"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), true));
-       reg_sens (_region_actions, "insert-patch-change", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), false));
-       reg_sens (_region_actions, "insert-patch-change-context", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), true));
-       reg_sens (_region_actions, "fork-region", _("Unlink from other copies"), sigc::mem_fun (*this, &Editor::fork_region));
-       reg_sens (_region_actions, "strip-region-silence", _("Strip Silence..."), sigc::mem_fun (*this, &Editor::strip_region_silence));
-       reg_sens (_region_actions, "set-selection-from-region", _("Set Range Selection"), sigc::mem_fun (*this, &Editor::set_selection_from_region));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "nudge-forward", _("Nudge Later"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_forward), false, false));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "alternate-nudge-forward", _("Nudge Later"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_forward), false, false));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "nudge-backward", _("Nudge Earlier"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_backward), false, false));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "alternate-nudge-backward", _("Nudge Earlier"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_backward), false, false));
 
-       reg_sens (_region_actions, "nudge-forward", _("Nudge Later"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_forward), false, false));
-       reg_sens (_region_actions, "alternate-nudge-forward", _("Nudge Later"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_forward), false, false));
-       reg_sens (_region_actions, "nudge-backward", _("Nudge Earlier"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_backward), false, false));
-       reg_sens (_region_actions, "alternate-nudge-backward", _("Nudge Earlier"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_backward), false, false));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "sequence-regions", _("Sequence Regions"), sigc::mem_fun (*this, &Editor::sequence_regions));
 
-       reg_sens (_region_actions, "sequence-regions", _("Sequence Regions"), sigc::mem_fun (*this, &Editor::sequence_regions));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "nudge-forward-by-capture-offset", _("Nudge Later by Capture Offset"), sigc::mem_fun (*this, &Editor::nudge_forward_capture_offset));
 
-       reg_sens (
-               _region_actions,
-               "nudge-forward-by-capture-offset",
-               _("Nudge Later by Capture Offset"),
-               sigc::mem_fun (*this, &Editor::nudge_forward_capture_offset)
-               );
-
-       reg_sens (
-               _region_actions,
-               "nudge-backward-by-capture-offset",
-               _("Nudge Earlier by Capture Offset"),
-               sigc::mem_fun (*this, &Editor::nudge_backward_capture_offset)
-               );
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "nudge-backward-by-capture-offset", _("Nudge Earlier by Capture Offset"), sigc::mem_fun (*this, &Editor::nudge_backward_capture_offset));
 
-       reg_sens (_region_actions, "trim-region-to-loop", _("Trim to Loop"), sigc::mem_fun (*this, &Editor::trim_region_to_loop));
-       reg_sens (_region_actions, "trim-region-to-punch", _("Trim to Punch"), sigc::mem_fun (*this, &Editor::trim_region_to_punch));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "trim-region-to-loop", _("Trim to Loop"), sigc::mem_fun (*this, &Editor::trim_region_to_loop));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "trim-region-to-punch", _("Trim to Punch"), sigc::mem_fun (*this, &Editor::trim_region_to_punch));
 
-       reg_sens (_region_actions, "trim-to-previous-region", _("Trim to Previous"), sigc::mem_fun(*this, &Editor::trim_region_to_previous_region_end));
-       reg_sens (_region_actions, "trim-to-next-region", _("Trim to Next"), sigc::mem_fun(*this, &Editor::trim_region_to_next_region_start));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "trim-to-previous-region", _("Trim to Previous"), sigc::mem_fun(*this, &Editor::trim_region_to_previous_region_end));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "trim-to-next-region", _("Trim to Next"), sigc::mem_fun(*this, &Editor::trim_region_to_next_region_start));
 
        /* PART 2: actions that are not related to the selection, but for which the edit point type and location is important */
 
-       reg_sens (
-               _region_actions,
-               "insert-region-from-region-list",
-               _("Insert Region from Region List"),
-               sigc::bind (sigc::mem_fun (*this, &Editor::insert_region_list_selection), 1)
-               );
+       register_region_action (_region_actions, RegionActionTarget (ListSelection), "insert-region-from-region-list", _("Insert Region from Region List"), sigc::bind (sigc::mem_fun (*this, &Editor::insert_region_list_selection), 1));
 
        /* PART 3: actions that operate on the selection and also require the edit point location */
 
-       reg_sens (_region_actions, "set-region-sync-position", _("Set Sync Position"), sigc::mem_fun (*this, &Editor::set_region_sync_position));
-       reg_sens (_region_actions, "place-transient", _("Place Transient"), sigc::mem_fun (*this, &Editor::place_transient));
-       reg_sens (_region_actions, "split-region", _("Split/Separate"), sigc::mem_fun (*this, &Editor::split_region));
-       reg_sens (_region_actions, "trim-front", _("Trim Start at Edit Point"), sigc::mem_fun (*this, &Editor::trim_region_front));
-       reg_sens (_region_actions, "trim-back", _("Trim End at Edit Point"), sigc::mem_fun (*this, &Editor::trim_region_back));
-
-       reg_sens (
-               _region_actions,
-               "align-regions-start",
-               _("Align Start"),
-               sigc::bind (sigc::mem_fun(*this, &Editor::align_regions), ARDOUR::Start)
-               );
-
-       reg_sens (
-               _region_actions,
-               "align-regions-start-relative",
-               _("Align Start Relative"),
-               sigc::bind (sigc::mem_fun (*this, &Editor::align_regions_relative), ARDOUR::Start)
-               );
-
-       reg_sens (_region_actions, "align-regions-end", _("Align End"), sigc::bind (sigc::mem_fun (*this, &Editor::align_regions), ARDOUR::End));
-
-       reg_sens (
-               _region_actions,
-               "align-regions-end-relative",
-               _("Align End Relative"),
-               sigc::bind (sigc::mem_fun(*this, &Editor::align_regions_relative), ARDOUR::End)
-               );
-
-       reg_sens (
-               _region_actions,
-               "align-regions-sync",
-               _("Align Sync"),
-               sigc::bind (sigc::mem_fun(*this, &Editor::align_regions), ARDOUR::SyncPoint)
-               );
-
-       reg_sens (
-               _region_actions,
-               "align-regions-sync-relative",
-               _("Align Sync Relative"),
-               sigc::bind (sigc::mem_fun (*this, &Editor::align_regions_relative), ARDOUR::SyncPoint)
-               );
-
-       reg_sens (_region_actions, "choose-top-region", _("Choose Top..."), sigc::bind (sigc::mem_fun (*this, &Editor::change_region_layering_order), false));
-       reg_sens (_region_actions, "choose-top-region-context-menu", _("Choose Top..."), sigc::bind (sigc::mem_fun (*this, &Editor::change_region_layering_order), true));
-
-       _all_region_actions_sensitized = true;
-
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "set-region-sync-position", _("Set Sync Position"), sigc::mem_fun (*this, &Editor::set_region_sync_position));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "place-transient", _("Place Transient"), sigc::mem_fun (*this, &Editor::place_transient));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "trim-front", _("Trim Start at Edit Point"), sigc::mem_fun (*this, &Editor::trim_region_front));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "trim-back", _("Trim End at Edit Point"), sigc::mem_fun (*this, &Editor::trim_region_back));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "align-regions-start", _("Align Start"), sigc::bind (sigc::mem_fun(*this, &Editor::align_regions), ARDOUR::Start));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "align-regions-start-relative", _("Align Start Relative"), sigc::bind (sigc::mem_fun (*this, &Editor::align_regions_relative), ARDOUR::Start));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "align-regions-end", _("Align End"), sigc::bind (sigc::mem_fun (*this, &Editor::align_regions), ARDOUR::End));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "align-regions-end-relative", _("Align End Relative"), sigc::bind (sigc::mem_fun(*this, &Editor::align_regions_relative), ARDOUR::End));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "align-regions-sync", _("Align Sync"), sigc::bind (sigc::mem_fun(*this, &Editor::align_regions), ARDOUR::SyncPoint));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "align-regions-sync-relative", _("Align Sync Relative"), sigc::bind (sigc::mem_fun (*this, &Editor::align_regions_relative), ARDOUR::SyncPoint));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "choose-top-region", _("Choose Top..."), sigc::bind (sigc::mem_fun (*this, &Editor::change_region_layering_order), false));
+       register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EditPointRegions), "choose-top-region-context-menu", _("Choose Top..."), sigc::bind (sigc::mem_fun (*this, &Editor::change_region_layering_order), true));
+
+       /* desensitize them all by default. region selection will change this */
+       sensitize_all_region_actions (false);
 }