From b196c7de8dff792f8f8ad848e64be4e6c49a292f Mon Sep 17 00:00:00 2001 From: James Crook Date: Sun, 14 May 2017 18:44:53 +0100 Subject: [PATCH] Bug 1541 - Skip to Start/End buttons don't show that they respect SHIFT usage --- src/toolbars/ControlToolBar.cpp | 12 ++++++++++-- src/toolbars/TranscriptionToolBar.cpp | 8 +++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp index 716ac7441..a27db471b 100644 --- a/src/toolbars/ControlToolBar.cpp +++ b/src/toolbars/ControlToolBar.cpp @@ -256,10 +256,18 @@ void ControlToolBar::RegenerateTooltips() commands.push_back(wxT("Stop")); break; case ID_FF_BUTTON: - commands.push_back(wxT("SkipEnd")); + commands.push_back(wxT("CursProjectEnd")); + // With shift + commands.push_back(_("Select to End")); + // For the shortcut tooltip. + commands.push_back(wxT("SelCursorEnd")); break; case ID_REW_BUTTON: - commands.push_back(wxT("SkipStart")); + commands.push_back(wxT("CursProjectStart")); + // With shift + commands.push_back(_("Select to Start")); + // For the shortcut tooltip. + commands.push_back(wxT("SelStartCursor")); break; } ToolBar::SetButtonToolTip(*pCtrl, commands); diff --git a/src/toolbars/TranscriptionToolBar.cpp b/src/toolbars/TranscriptionToolBar.cpp index 5d9d99744..662e35443 100644 --- a/src/toolbars/TranscriptionToolBar.cpp +++ b/src/toolbars/TranscriptionToolBar.cpp @@ -302,8 +302,12 @@ void TranscriptionToolBar::RegenerateTooltips() int tool; wxString commandName; wxString untranslatedLabel; + wxString commandName2; + wxString untranslatedLabel2; } table[] = { - { TTB_PlaySpeed, wxT("PlayAtSpeed"), XO("Play-at-Speed") }, + { TTB_PlaySpeed, wxT("PlayAtSpeed"), XO("Play-at-Speed"), + wxT("PlayAtSpeedLooped"), XO("Looped-Play-at-Speed") + }, }; std::vector commands; @@ -311,6 +315,8 @@ void TranscriptionToolBar::RegenerateTooltips() commands.clear(); commands.push_back(wxGetTranslation(entry.untranslatedLabel)); commands.push_back(entry.commandName); + commands.push_back(wxGetTranslation(entry.untranslatedLabel2)); + commands.push_back(entry.commandName2); ToolBar::SetButtonToolTip(*mButtons[entry.tool], commands); }