From 2a691b5dc64762782c631fbd01a0e5007efd7560 Mon Sep 17 00:00:00 2001 From: James Crook Date: Wed, 27 Mar 2019 16:21:50 +0000 Subject: [PATCH] Bug 2084 - Enh: Auto-select behaviour changed from previous version and not documented. --- src/Menus.cpp | 8 +++++--- src/Project.cpp | 2 +- src/prefs/TracksBehaviorsPrefs.cpp | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Menus.cpp b/src/Menus.cpp index 6b6eab655..3e3b317a1 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -810,9 +810,11 @@ bool MenuManager::TryToMakeActionAllowed if( (MissingFlags & ~( TimeSelectedFlag | WaveTracksSelectedFlag)) ) return false; - // This was 'OnSelectAll'. Changing it to DoSelectSomething means if - // selecting all tracks is enough, we just do that. - SelectActions::DoSelectSomething(project); + // This was 'DoSelectSomething()'. + // This made autoselect more confusing. + // When autoselect triggers, it might not select all audio in all tracks. + // So changed to DoSelectAll. + SelectActions::DoSelectAll(project); flags = GetMenuManager(project).GetUpdateFlags(project); bAllowed = ((flags & mask) == (flagsRqd & mask)); return bAllowed; diff --git a/src/Project.cpp b/src/Project.cpp index 3acc5709f..a8e5df5a9 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -5727,7 +5727,7 @@ void AudacityProject::SelectAllIfNone() auto flags = GetMenuManager(*this).GetUpdateFlags(*this); if(!(flags & TracksSelectedFlag) || (mViewInfo.selectedRegion.isPoint())) - SelectActions::DoSelectSomething(*this); + SelectActions::DoSelectAll(*this); } // Stop playing or recording, if paused. diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp index 1ecd91053..6954b7689 100644 --- a/src/prefs/TracksBehaviorsPrefs.cpp +++ b/src/prefs/TracksBehaviorsPrefs.cpp @@ -64,7 +64,7 @@ void TracksBehaviorsPrefs::PopulateOrExchange(ShuttleGui & S) S.StartStatic(_("Behaviors")); { - S.TieCheckBox(_("A&uto-select, if selection required"), + S.TieCheckBox(_("&Select all audio, if selection required"), wxT("/GUI/SelectAllOnNone"), false); /* i18n-hint: Cut-lines are lines that can expand to show the cut audio.*/