From 7b0c8046d20e6a9d960dd6720f84fce1ddbcc2ad Mon Sep 17 00:00:00 2001 From: Avery King Date: Thu, 12 Sep 2024 20:10:01 -0700 Subject: [PATCH] EditToolbar: Remove zoom buttons Signed-off-by: Avery King --- src/toolbars/EditToolBar.cpp | 33 --------------------------------- src/toolbars/EditToolBar.h | 9 --------- 2 files changed, 42 deletions(-) diff --git a/src/toolbars/EditToolBar.cpp b/src/toolbars/EditToolBar.cpp index b43ec0dabb..f2bd83edeb 100644 --- a/src/toolbars/EditToolBar.cpp +++ b/src/toolbars/EditToolBar.cpp @@ -160,31 +160,6 @@ void EditToolBar::Populate() #endif // Tooltips match menu entries. - // We previously had longer tooltips which were not more clear. - AddButton(this, bmpZoomIn, bmpZoomIn, bmpZoomInDisabled, ETBZoomInID, - XO("Zoom In")); - AddButton(this, bmpZoomOut, bmpZoomOut, bmpZoomOutDisabled, ETBZoomOutID, - XO("Zoom Out")); - AddButton(this, bmpZoomSel, bmpZoomSel, bmpZoomSelDisabled, ETBZoomSelID, - XO("Zoom to Selection")); - AddButton(this, bmpZoomFit, bmpZoomFit, bmpZoomFitDisabled, ETBZoomFitID, - XO("Fit to Width")); - -#ifdef EXPERIMENTAL_ZOOM_TOGGLE_BUTTON - AddButton(this, bmpZoomToggle, bmpZoomToggle, bmpZoomToggleDisabled, ETBZoomToggleID, - XO("Zoom Toggle")); -#endif - - - - mButtons[ETBZoomInID]->SetEnabled(false); - mButtons[ETBZoomOutID]->SetEnabled(false); -#ifdef EXPERIMENTAL_ZOOM_TOGGLE_BUTTON - mButtons[ETBZoomToggleID]->SetEnabled(false); -#endif - - mButtons[ETBZoomSelID]->SetEnabled(false); - mButtons[ETBZoomFitID]->SetEnabled(false); mButtons[ETBPasteID]->SetEnabled(false); #ifdef OPTION_SYNC_LOCK_BUTTON @@ -232,14 +207,6 @@ static const struct Entry { #ifdef OPTION_SYNC_LOCK_BUTTON { ETBSyncLockID, wxT("SyncLock"), XO("Sync-Lock Tracks") }, #endif - - { ETBZoomInID, wxT("ZoomIn"), XO("Zoom In") }, - { ETBZoomOutID, wxT("ZoomOut"), XO("Zoom Out") }, -#ifdef EXPERIMENTAL_ZOOM_TOGGLE_BUTTON - { ETBZoomToggleID, wxT("ZoomToggle"), XO("Zoom Toggle") }, -#endif - { ETBZoomSelID, wxT("ZoomSel"), XO("Fit selection to width") }, - { ETBZoomFitID, wxT("FitInWindow"), XO("Fit project to width") }, }; diff --git a/src/toolbars/EditToolBar.h b/src/toolbars/EditToolBar.h index 0a12b0c143..5aae420950 100644 --- a/src/toolbars/EditToolBar.h +++ b/src/toolbars/EditToolBar.h @@ -44,15 +44,6 @@ enum { ETBSyncLockID, #endif - ETBZoomInID, - ETBZoomOutID, -#ifdef EXPERIMENTAL_ZOOM_TOGGLE_BUTTON - ETBZoomToggleID, -#endif - - ETBZoomSelID, - ETBZoomFitID, - ETBNumButtons };