From a7d19f8fe58f8a343916ce2f768a822d7bc98e76 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Wed, 30 Nov 2016 19:34:47 +1000 Subject: Rename Duplicate Range action to Duplicate and assign existing Alt+d key binding This will work the same as the existing binding with a Region Selection and will also duplicate ranges in range selection mode. Also add multi-duplicate editor action and use that for the default multi-duplicate action, which will work the same in Object Selection/Grab Mode but also supports Multi Duplicate of Range Selections....well it would if that functionality worked correctly. The duplicate and duplicate-multi region actions still have to exist to be used in the Region menu as they should only be sensitive if there is a Region selection which would not be the case if the editor actions were used. Resolves: #7153 --- gtk2_ardour/ardour.keys.in | 4 ++-- gtk2_ardour/editor_actions.cc | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/ardour.keys.in b/gtk2_ardour/ardour.keys.in index f4312e5012..b6dcfbf6d0 100644 --- a/gtk2_ardour/ardour.keys.in +++ b/gtk2_ardour/ardour.keys.in @@ -192,8 +192,8 @@ This mode provides many different operations on both regions and control points, @sess|Main/SnapshotStay|<@PRIMARY@><@TERTIARY@>s|snapshot session @edit|Editor/track-solo-toggle|<@SECONDARY@>s|toggle track solo status @mmode|MouseMode/set-mouse-mode-draw|d|note-draw mode -@rop|Region/duplicate-region|<@SECONDARY@>d|duplicate region (once) -@rop|Region/multi-duplicate-region|<@TERTIARY@>d|duplicate region (multi) +@edit|Editor/duplicate|<@SECONDARY@>d|duplicate (once) +@edit|Editor/multi-duplicate|<@TERTIARY@>d|duplicate (multi) @select|Editor/select-all-in-punch-range|<@PRIMARY@>d|select all in punch range @vis|Editor/fit-selection|f|fit selection vertically @edit|Editor/toggle-follow-playhead|<@PRIMARY@>f|toggle playhead tracking diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index e9448858b4..c9f63c02ba 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -332,7 +332,11 @@ Editor::register_actions () 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)); -- cgit v1.2.3