diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2016-12-19 14:08:23 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2016-12-19 14:08:23 -0600 |
| commit | 386a1ed96e7725505cfff0391f4d84fef0f3bb8c (patch) | |
| tree | 72fc36d496b7e416a824bc363477865099b80e39 | |
| parent | 3e214eb4ea41aea9ef031682ee2f4ed76f7f686f (diff) | |
Separate is an Editor action (like Delete), not a Region action.
| -rw-r--r-- | gtk2_ardour/ardour.keys.in | 2 | ||||
| -rw-r--r-- | gtk2_ardour/ardour.menus.in | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/editor_selection.cc | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour.keys.in b/gtk2_ardour/ardour.keys.in index b6dcfbf6d0..532d66d291 100644 --- a/gtk2_ardour/ardour.keys.in +++ b/gtk2_ardour/ardour.keys.in @@ -187,7 +187,7 @@ This mode provides many different operations on both regions and control points, @aep|Region/align-regions-sync|<@TERTIARY@>a|align sync points @aep|Region/align-regions-start|<@PRIMARY@><@SECONDARY@>a|align start(s) @aep|Region/align-regions-start-relative|<@PRIMARY@><@TERTIARY@>a|align start(s) relative -@rop|Region/split-region|s|split +@rop|Editor/split-region|s|split @sess|Common/Save|<@PRIMARY@>s|save session @sess|Main/SnapshotStay|<@PRIMARY@><@TERTIARY@>s|snapshot session @edit|Editor/track-solo-toggle|<@SECONDARY@>s|toggle track solo status diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 4325749e38..0a8dca0dd3 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -318,7 +318,6 @@ <menuitem action='combine-regions'/> <menuitem action='uncombine-regions'/> <menuitem action='pitch-shift-region'/> - <menuitem action='split-region'/> <menuitem action='split-region-at-transients'/> <menuitem action='split-multichannel-region'/> <menuitem action='close-region-gaps'/> diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 759cd7ce20..bcdee8a74b 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -371,6 +371,8 @@ Editor::register_actions () 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)); @@ -1998,7 +2000,6 @@ Editor::register_region_actions () 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)); diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index f2681b58e2..a25ef458c9 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1251,7 +1251,6 @@ Editor::sensitize_the_right_region_actions () _region_actions->get_action("set-region-sync-position")->set_sensitive (false); _region_actions->get_action("trim-front")->set_sensitive (false); _region_actions->get_action("trim-back")->set_sensitive (false); - _region_actions->get_action("split-region")->set_sensitive (false); _region_actions->get_action("place-transient")->set_sensitive (false); } |