Make zoom toggle finer grained

- Upgraders using zoom toggle will need to reselect the zoom levels they want.
audacity · Mar 16, 2018 · 2da227a · 2da227a
1 parent ddb4290
commit 2da227a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/src/Project.cpp b/src/Project.cpp
@@ -5975,6 +5975,24 @@ double AudacityProject::GetZoomOfPreset( int preset ){
       case WaveTrack::kZoomSeconds:
          result = pixelsPerUnit * 1.0;
          break;
+      case WaveTrack::kZoom5ths:
+         result = pixelsPerUnit * 5.0;
+         break;
+      case WaveTrack::kZoom10ths:
+         result = pixelsPerUnit * 10.0;
+         break;
+      case WaveTrack::kZoom20ths:
+         result = pixelsPerUnit * 20.0;
+         break;
+      case WaveTrack::kZoom50ths:
+         result = pixelsPerUnit * 50.0;
+         break;
+      case WaveTrack::kZoom100ths:
+         result = pixelsPerUnit * 100.0;
+         break;
+      case WaveTrack::kZoom500ths:
+         result = pixelsPerUnit * 500.0;
+         break;
       case WaveTrack::kZoomMilliSeconds:
          result = pixelsPerUnit * 1000.0;
          break;

diff --git a/src/WaveTrack.h b/src/WaveTrack.h
@@ -566,6 +566,12 @@ class AUDACITY_DLL_API WaveTrack final : public PlayableTrack {
       kZoomDefault,
       kZoomMinutes,
       kZoomSeconds,
+      kZoom5ths,
+      kZoom10ths,
+      kZoom20ths,
+      kZoom50ths,
+      kZoom100ths,
+      kZoom500ths,
       kZoomMilliSeconds,
       kZoomSamples,
       kZoom4To1,

diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp
@@ -96,6 +96,18 @@ void TracksPrefs::Populate()
    mZoomCodes.push_back( WaveTrack::kZoomMinutes );
    mZoomChoices.Add( _("Seconds") );
    mZoomCodes.push_back( WaveTrack::kZoomSeconds );
+   mZoomChoices.Add( _("5ths of Seconds") );
+   mZoomCodes.push_back( WaveTrack::kZoom5ths );
+   mZoomChoices.Add( _("10ths of Seconds") );
+   mZoomCodes.push_back( WaveTrack::kZoom10ths );
+   mZoomChoices.Add( _("20ths of Seconds") );
+   mZoomCodes.push_back( WaveTrack::kZoom20ths );
+   mZoomChoices.Add( _("50ths of Seconds") );
+   mZoomCodes.push_back( WaveTrack::kZoom50ths );
+   mZoomChoices.Add( _("100ths of Seconds") );
+   mZoomCodes.push_back( WaveTrack::kZoom100ths );
+   mZoomChoices.Add( _("500ths of Seconds") );
+   mZoomCodes.push_back( WaveTrack::kZoom500ths );
    mZoomChoices.Add( _("MilliSeconds") );
    mZoomCodes.push_back( WaveTrack::kZoomMilliSeconds );
    mZoomChoices.Add( _("Samples") );