summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_actions.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-04-17 13:55:41 +0000
committerCarl Hetherington <carl@carlh.net>2011-04-17 13:55:41 +0000
commit80abf7693e63da5fba3426c8a32d7d65d6734a8b (patch)
tree7f7eec6daa54adbef0069a2304a44cadb94a8705 /gtk2_ardour/editor_actions.cc
parent47018e771da7a4e9cb8c15e172259928d15f22a4 (diff)
Remove extend-range-to-{start,end}-of-region and replace with move-range-{start,end}-to-{previous,next}-region boundary after discussions with Chris. Seems to make more sense, and works without the need for a region selection, which is fiddly to adjust when one is in range mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@9360 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_actions.cc')
-rw-r--r--gtk2_ardour/editor_actions.cc31
1 files changed, 28 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 7f3d6db148..e557fe7999 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -315,9 +315,34 @@ Editor::register_actions ()
reg_sens (editor_actions, "finish-range", _("Finish Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_finish), false));
reg_sens (editor_actions, "finish-add-range", _("Finish Add Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_finish), true));
- reg_sens (editor_actions, "extend-range-to-end-of-region", _("Extend Range to End of Region"), sigc::bind (sigc::mem_fun(*this, &Editor::extend_selection_to_end_of_region), false));
- reg_sens (editor_actions, "extend-range-to-start-of-region", _("Extend Range to Start of Region"), sigc::bind (sigc::mem_fun(*this, &Editor::extend_selection_to_start_of_region), false));
-
+ reg_sens (
+ editor_actions,
+ "move-range-start-to-previous-region-boundary",
+ _("Move Range Start to Previous Region Boundary"),
+ sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), false, false)
+ );
+
+ reg_sens (
+ editor_actions,
+ "move-range-start-to-next-region-boundary",
+ _("Move Range Start to Next Region Boundary"),
+ sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), false, true)
+ );
+
+ reg_sens (
+ editor_actions,
+ "move-range-end-to-previous-region-boundary",
+ _("Move Range End to Previous Region Boundary"),
+ sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), true, false)
+ );
+
+ reg_sens (
+ editor_actions,
+ "move-range-end-to-next-region-boundary",
+ _("Move Range End to Next Region Boundary"),
+ sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), true, true)
+ );
+
toggle_reg_sens (editor_actions, "toggle-follow-playhead", _("Follow Playhead"), (sigc::mem_fun(*this, &Editor::toggle_follow_playhead)));
act = reg_sens (editor_actions, "remove-last-capture", _("Remove Last Capture"), (sigc::mem_fun(*this, &Editor::remove_last_capture)));