Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-22 07:10:06 +02:00
Code Issues Releases Wiki Activity

Put the scrub bar enabling item back in the menu, topmost, before a separator

Browse Source
This commit is contained in:
Paul Licameli 2016-05-02 10:37:53 -04:00
parent 1b8aab426e
commit 378634a189
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/widgets/Ruler.cpp
View File

@ -1774,6 +1774,9 @@ BEGIN_EVENT_TABLE(AdornedRulerPanel, wxPanel)
EVT_MENU(OnAutoScrollID, AdornedRulerPanel::OnAutoScroll) EVT_MENU(OnAutoScrollID, AdornedRulerPanel::OnAutoScroll)
EVT_MENU(OnLockPlayRegionID, AdornedRulerPanel::OnLockPlayRegion) EVT_MENU(OnLockPlayRegionID, AdornedRulerPanel::OnLockPlayRegion)
// Scrub bar menu commands
EVT_MENU(OnShowHideScrubbingID, AdornedRulerPanel::OnToggleScrubbing)
END_EVENT_TABLE() END_EVENT_TABLE()
AdornedRulerPanel::AdornedRulerPanel(AudacityProject* parent, AdornedRulerPanel::AdornedRulerPanel(AudacityProject* parent,
@ -2606,7 +2609,7 @@ void AdornedRulerPanel::UpdateStatusBarAndTooltips(StatusChoice choice)
RegenerateTooltips(); RegenerateTooltips();
} }
void AdornedRulerPanel::OnToggleScrubbing() void AdornedRulerPanel::OnToggleScrubbing(wxCommandEvent&)
{ {
mShowScrubbing = !mShowScrubbing; mShowScrubbing = !mShowScrubbing;
WriteScrubEnabledPref(mShowScrubbing); WriteScrubEnabledPref(mShowScrubbing);
@ -2686,6 +2689,15 @@ void AdornedRulerPanel::ShowScrubMenu(const wxPoint & pos)
auto cleanup = finally([this]{ PopEventHandler(); }); auto cleanup = finally([this]{ PopEventHandler(); });
wxMenu rulerMenu; wxMenu rulerMenu;
auto label = wxGetTranslation(
AdornedRulerPanel::PushbuttonLabels
[static_cast<int>(StatusChoice::ScrubBarButton)].label);
rulerMenu.AppendCheckItem(OnShowHideScrubbingID, _("Scrub Bar"));
if(GetButtonState(StatusChoice::ScrubBarButton))
rulerMenu.FindItem(OnShowHideScrubbingID)->Check();
rulerMenu.AppendSeparator();
mProject->GetScrubber().PopulateMenu(rulerMenu); mProject->GetScrubber().PopulateMenu(rulerMenu);
PopupMenu(&rulerMenu, pos); PopupMenu(&rulerMenu, pos);
} }
@ -2890,15 +2902,12 @@ bool AdornedRulerPanel::GetButtonState( StatusChoice button ) const
void AdornedRulerPanel::ToggleButtonState( StatusChoice button ) void AdornedRulerPanel::ToggleButtonState( StatusChoice button )
{ {
wxCommandEvent dummy;
switch(button) { switch(button) {
case StatusChoice::QuickPlayButton: { case StatusChoice::QuickPlayButton:
wxCommandEvent dummy; return OnToggleQuickPlay(dummy);
OnToggleQuickPlay(dummy);
}
break;
case StatusChoice::ScrubBarButton: case StatusChoice::ScrubBarButton:
OnToggleScrubbing(); return OnToggleScrubbing(dummy);
break;
default: default:
wxASSERT(false); wxASSERT(false);
} }

2
src/widgets/Ruler.h
View File

@ -453,7 +453,7 @@ private:
void OnAutoScroll(wxCommandEvent &evt); void OnAutoScroll(wxCommandEvent &evt);
void OnLockPlayRegion(wxCommandEvent &evt); void OnLockPlayRegion(wxCommandEvent &evt);
void OnToggleScrubbing(); void OnToggleScrubbing(wxCommandEvent&);
bool mPlayRegionDragsSelection; bool mPlayRegionDragsSelection;
bool mTimelineToolTip; bool mTimelineToolTip;