From 623d0f29bfc399b36ddba17ccaedf73c3760a8fa Mon Sep 17 00:00:00 2001 From: James Crook Date: Mon, 1 May 2017 10:26:49 +0100 Subject: [PATCH] Bug 1639 - Revert fix. The fix was regarded as a workaround, and too draconian. The problem is that Left and Right shortcuts are being captured (somehow) by our CommandManager when navigating in docked toolbars. A full and proper fix rather than not binding these shortcuts would apply them to the toolbar in preference to the CommandManager, and so fix bug 1637, which Bug 1639 has now been marked as a duplicate of. --- src/Menus.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Menus.cpp b/src/Menus.cpp index d26efead2..09d3aa445 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -1343,8 +1343,8 @@ void AudacityProject::CreateMenusAndCommands() c->SetDefaultFlags(AudioIOBusyFlag, AudioIOBusyFlag); c->BeginSubMenu("Scrub"); - c->AddItem(wxT("SeekLeftShort"), _("Short seek left during playback"), FN(OnSeekLeftShort), wxT("Ctrl+Left\tallowDup")); - c->AddItem(wxT("SeekRightShort"), _("Short seek right during playback"), FN(OnSeekRightShort), wxT("Ctrl+Right\tallowDup")); + c->AddItem(wxT("SeekLeftShort"), _("Short seek left during playback"), FN(OnSeekLeftShort), wxT("Left\tallowDup")); + c->AddItem(wxT("SeekRightShort"), _("Short seek right during playback"), FN(OnSeekRightShort), wxT("Right\tallowDup")); c->AddItem(wxT("SeekLeftLong"), _("Long seek left during playback"), FN(OnSeekLeftLong), wxT("Shift+Left\tallowDup")); c->AddItem(wxT("SeekRightLong"), _("Long Seek right during playback"), FN(OnSeekRightLong), wxT("Shift+Right\tallowDup")); c->EndSubMenu(); @@ -1430,8 +1430,8 @@ void AudacityProject::CreateMenusAndCommands() c->SetDefaultFlags(TracksExistFlag, TracksExistFlag ); c->BeginSubMenu("Cursor"); - c->AddItem(wxT("CursorLeft"), _("Cursor Left"), FN(OnCursorLeft), wxT("Ctrl+Left\twantKeyup\tallowDup")); - c->AddItem(wxT("CursorRight"), _("Cursor Right"), FN(OnCursorRight), wxT("Ctrl+Right\twantKeyup\tallowDup")); + c->AddItem(wxT("CursorLeft"), _("Cursor Left"), FN(OnCursorLeft), wxT("Left\twantKeyup\tallowDup")); + c->AddItem(wxT("CursorRight"), _("Cursor Right"), FN(OnCursorRight), wxT("Right\twantKeyup\tallowDup")); c->AddItem(wxT("CursorShortJumpLeft"), _("Cursor Short Jump Left"), FN(OnCursorShortJumpLeft), wxT(",")); c->AddItem(wxT("CursorShortJumpRight"), _("Cursor Short Jump Right"), FN(OnCursorShortJumpRight), wxT(".")); c->AddItem(wxT("CursorLongJumpLeft"), _("Cursor Long Jump Left"), FN(OnCursorLongJumpLeft), wxT("Shift+,"));