From ba585e440d4e93eeb908ac9e2a1ed46871ccdd09 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 17 Apr 2020 10:46:50 -0600 Subject: fix actions names & description for note transport to reflect semitone not tone --- gtk2_ardour/ardour.keys.in | 8 ++++---- gtk2_ardour/editor_actions.cc | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour.keys.in b/gtk2_ardour/ardour.keys.in index 93d200560a..bebd570235 100644 --- a/gtk2_ardour/ardour.keys.in +++ b/gtk2_ardour/ardour.keys.in @@ -435,12 +435,12 @@ This mode provides many different operations on both regions and control points, @notes|Notes/transpose-up-octave|Up|Transpose up (1 octave) @notes|Notes/transpose-down-octave|Down|Transpose down (1 octave) -@notes|Notes/transpose-up-tone|<@SECONDARY@>Up|Transpose up (1 tone) -@notes|Notes/transpose-down-tone|<@SECONDARY@>Down|Transpose down (1 tone) +@notes|Notes/transpose-up-semitone|<@SECONDARY@>Up|Transpose up (1 semitone) +@notes|Notes/transpose-down-semitone|<@SECONDARY@>Down|Transpose down (1 semitone) @notes|Notes/transpose-up-octave-smush|<@TERTIARY@>Up|Transpose up (1 octave) allow mushing @notes|Notes/transpose-down-octave-smush|<@TERTIARY@>Down|Transpose down (1 octave) allow mushing -@notes|Notes/transpose-up-tone-smush|<@TERTIARY@><@SECONDARY@>Up|Transpose up (1 tone) allow mushing -@notes|Notes/transpose-down-tone-smush|<@TERTIARY@><@SECONDARY>Down|Transpose down (1 tone) allow mushing +@notes|Notes/transpose-up-semitone-smush|<@TERTIARY@><@SECONDARY@>Up|Transpose up (1 semitone) allow mushing +@notes|Notes/transpose-down-semitone-smush|<@TERTIARY@><@SECONDARY>Down|Transpose down (1 tone) allow mushing @notes|Notes/increase-velocity|<@PRIMARY@>Up|Increase Note Velocity (+8) @notes|Notes/decrease-velocity|<@PRIMARY@>Down|Increase Note Velocity (+8) diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 8d8f8d24ef..a7199d9a81 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -750,18 +750,18 @@ Editor::register_midi_actions (Bindings* midi_bindings) ActionManager::register_action (_midi_actions, X_("transpose-up-octave"), _("Transpose Up (octave)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_up_octave)); ActionManager::register_action (_midi_actions, X_("transpose-up-octave-smush"), _("Transpose Up (octave, allow mush)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_up_octave_smush)); - ActionManager::register_action (_midi_actions, X_("transpose-up-tone"), _("Transpose Up (tone)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_up_tone)); - ActionManager::register_action (_midi_actions, X_("transpose-up-tone-smush"), _("Transpose Up (tone, allow mush)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_up_octave_smush)); + ActionManager::register_action (_midi_actions, X_("transpose-up-semitone"), _("Transpose Up (semitone)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_up_tone)); + ActionManager::register_action (_midi_actions, X_("transpose-up-semitone-smush"), _("Transpose Up (semitone, allow mush)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_up_octave_smush)); ActionManager::register_action (_midi_actions, X_("transpose-down-octave"), _("Transpose Down (octave)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_down_octave)); ActionManager::register_action (_midi_actions, X_("transpose-down-octave-smush"), _("Transpose Down (octave, allow mush)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_down_octave_smush)); - ActionManager::register_action (_midi_actions, X_("transpose-down-tone"), _("Transpose Down (tone)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_down_tone)); - ActionManager::register_action (_midi_actions, X_("transpose-down-tone-smush"), _("Transpose Down (tone, allow mush)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_down_octave_smush)); + ActionManager::register_action (_midi_actions, X_("transpose-down-semitone"), _("Transpose Down (semitone)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_down_tone)); + ActionManager::register_action (_midi_actions, X_("transpose-down-semitone-smush"), _("Transpose Down (semitone, allow mush)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::transpose_down_octave_smush)); ActionManager::register_action (_midi_actions, X_("nudge-later"), _("Nudge Notes Later (grid)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::nudge_notes_later)); - ActionManager::register_action (_midi_actions, X_("nudge-later-fine"), _("Nudge Notes Later (1/128th)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::nudge_notes_later_fine)); + ActionManager::register_action (_midi_actions, X_("nudge-later-fine"), _("Nudge Notes Later (1/4 grid)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::nudge_notes_later_fine)); ActionManager::register_action (_midi_actions, X_("nudge-earlier"), _("Nudge Notes Earlier (grid)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::nudge_notes_earlier)); - ActionManager::register_action (_midi_actions, X_("nudge-earlier-fine"), _("Nudge Notes Earlier (1/128th)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::nudge_notes_earlier_fine)); + ActionManager::register_action (_midi_actions, X_("nudge-earlier-fine"), _("Nudge Notes Earlier (1/4 grid)"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::nudge_notes_earlier_fine)); ActionManager::register_action (_midi_actions, X_("edit-channels"), _("Edit Note Channels"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::channel_edit)); ActionManager::register_action (_midi_actions, X_("edit-velocities"), _("Edit Note Velocities"), sigc::bind (sigc::mem_fun (*this, &Editor::midi_action), &MidiRegionView::velocity_edit)); -- cgit v1.2.3