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

ZoomToggle - Changes from user feedback.

Browse Source 
- Enable ZoomToggle Button by default.
- Set less extreme defaults.
- Repurpose 'Z' shortcut (from Zero Crossings)
This commit is contained in:
James Crook 2018-01-08 12:51:16 +00:00
parent 8a074770e8
commit 21192a7e7b
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Experimental.h
View File

@ -92,7 +92,7 @@
//#define EXPERIMENTAL_THEME_PREFS
// This shows the zoom toggle button on the edit toolbar.
//#define EXPERIMENTAL_ZOOM_TOGGLE_BUTTON
#define EXPERIMENTAL_ZOOM_TOGGLE_BUTTON
//Next line enables Mic monitoring at times when it was previously off.
//More work is needed as after recording or playing it results in an

6
src/Menus.cpp
View File

@ -700,7 +700,7 @@ void AudacityProject::CreateMenusAndCommands()
c->AddSeparator();
c->AddItem(wxT("ZeroCross"), _("At &Zero Crossings"), FN(OnZeroCrossing), wxT("Z"));
c->AddItem(wxT("ZeroCross"), _("At &Zero Crossings"), FN(OnZeroCrossing), wxT(""));
c->EndMenu();
@ -722,7 +722,7 @@ void AudacityProject::CreateMenusAndCommands()
c->AddItem(wxT("ZoomSel"), _("&Zoom to Selection"), FN(OnZoomSel), wxT("Ctrl+E"),
TimeSelectedFlag,
TimeSelectedFlag);
c->AddItem(wxT("ZoomToggle"), _("Zoom &Toggle"), FN(OnZoomToggle), wxT(""),
c->AddItem(wxT("ZoomToggle"), _("Zoom &Toggle"), FN(OnZoomToggle), wxT("Z"),
TracksExistFlag,
TracksExistFlag);
c->EndSubMenu();
@ -6544,7 +6544,7 @@ void AudacityProject::OnZoomToggle(const CommandContext &)
double Zoom1 = GetZoomOfPref(
wxT("/GUI/ZoomPreset1"), WaveTrack::kZoomDefault );
double Zoom2 = GetZoomOfPref(
wxT("/GUI/ZoomPreset2"), WaveTrack::kZoom4To1 );
wxT("/GUI/ZoomPreset2"), WaveTrack::kZoomMinutes );
double Z = mViewInfo.GetZoom();// Current Zoom.
double ChosenZoom = abs(log(Zoom1 / Z)) > abs(log( Z / Zoom2)) ? Zoom1:Zoom2;

4
src/prefs/TracksPrefs.cpp
View File

@ -86,7 +86,7 @@ void TracksPrefs::Populate()
mSampleDisplayChoices.Add(_("Stem plot"));
mSampleDisplayCodes.Add((int) WaveTrack::StemPlot);
mZoomChoices.Add( _("Zoom to Fit") );
mZoomChoices.Add( _("Fit to Width") );
mZoomCodes.Add( WaveTrack::kZoomToFit );
mZoomChoices.Add( _("Zoom to Selection") );
mZoomCodes.Add( WaveTrack::kZoomToSelection );
@ -176,7 +176,7 @@ void TracksPrefs::PopulateOrExchange(ShuttleGui & S)
S.TieChoice(_("Preset 2:"),
wxT("/GUI/ZoomPreset2"),
WaveTrack::kZoom4To1,
WaveTrack::kZoomMinutes,
mZoomChoices,
mZoomCodes);
S.SetSizeHints(mZoomChoices);

9
src/toolbars/EditToolBar.cpp
View File

@ -159,16 +159,17 @@ void EditToolBar::Populate()
_("Zoom In"));
AddButton(bmpZoomOut, bmpZoomOut, bmpZoomOutDisabled, ETBZoomOutID,
_("Zoom Out"));
AddButton(bmpZoomSel, bmpZoomSel, bmpZoomSelDisabled, ETBZoomSelID,
_("Fit selection in window"));
AddButton(bmpZoomFit, bmpZoomFit, bmpZoomFitDisabled, ETBZoomFitID,
_("Fit project in window"));
#ifdef EXPERIMENTAL_ZOOM_TOGGLE_BUTTON
AddButton(bmpZoomToggle, bmpZoomToggle, bmpZoomToggleDisabled, ETBZoomToggleID,
_("Zoom Toggle"));
#endif
AddButton(bmpZoomSel, bmpZoomSel, bmpZoomSelDisabled, ETBZoomSelID,
_("Fit selection in window"));
AddButton(bmpZoomFit, bmpZoomFit, bmpZoomFitDisabled, ETBZoomFitID,
_("Fit project in window"));
mButtons[ETBZoomInID]->SetEnabled(false);
mButtons[ETBZoomOutID]->SetEnabled(false);