Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-30 15:49:41 +02:00
Code Issues Releases Wiki Activity

Revert "Bug 2366 - Macros: Run does "Select All" ignoring setting in Tracks Behaviors Preferences"

Browse Source 
This reverts commit 1478abf3d02573538e95769a4aa3548c59f4bc19.

Removing until some questions are answered.
This commit is contained in:
Leland Lucius 2021-01-29 06:16:17 -06:00
parent e5ca3cefba
commit 90a1783779
4 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BatchCommands.cpp
View File

@ -549,19 +549,11 @@ bool MacroCommands::ApplyEffectCommand(
AudacityProject *project = &mProject; AudacityProject *project = &mProject;
// IF nothing selected, THEN select everything depending // FIXME: for later versions may want to not select-all in batch mode.
// on preferences setting. // IF nothing selected, THEN select everything
// (most effects require that you have something selected). // (most effects require that you have something selected).
if( plug->GetPluginType() != PluginTypeAudacityCommand ) if( plug->GetPluginType() != PluginTypeAudacityCommand )
{ SelectUtilities::SelectAllIfNone( *project );
if( !SelectUtilities::SelectAllIfNoneAndAllowed( *project ) )
{
AudacityMessageBox(
// i18n-hint: %s will be replaced by the name of an action, such as "Remove Tracks".
XO("\"%s\" requires one or more tracks to be selected.").Format(friendlyCommand));
return false;
}
}
bool res = false; bool res = false;

18
src/SelectUtilities.cpp
View File

@ -90,24 +90,6 @@ void SelectAllIfNone( AudacityProject &project )
DoSelectAllAudio( project ); DoSelectAllAudio( project );
} }
// Select the full time range, if no time range is selected and
// selecting is allowed. Returns "false" selecting not allowed.
bool SelectAllIfNoneAndAllowed( AudacityProject &project )
{
auto allowed = gPrefs->ReadBool(wxT("/GUI/SelectAllOnNone"), false);
auto &viewInfo = ViewInfo::Get( project );
auto flags = MenuManager::Get( project ).GetUpdateFlags();
if((flags & TracksSelectedFlag()).none() ||
viewInfo.selectedRegion.isPoint()) {
if (!allowed) {
return false;
}
DoSelectAllAudio( project );
}
return true;
}
void DoListSelection void DoListSelection
(AudacityProject &project, Track *t, bool shift, bool ctrl, bool modifyState) (AudacityProject &project, Track *t, bool shift, bool ctrl, bool modifyState)
{ {

1
src/SelectUtilities.h
View File

@ -20,7 +20,6 @@ namespace SelectUtilities {
void DoSelectTimeAndTracks( void DoSelectTimeAndTracks(
AudacityProject &project, bool bAllTime, bool bAllTracks); AudacityProject &project, bool bAllTime, bool bAllTracks);
void SelectAllIfNone( AudacityProject &project ); void SelectAllIfNone( AudacityProject &project );
bool SelectAllIfNoneAndAllowed( AudacityProject &project );
void SelectNone( AudacityProject &project ); void SelectNone( AudacityProject &project );
void DoListSelection( void DoListSelection(
AudacityProject &project, Track *t, AudacityProject &project, Track *t,

14
src/commands/ImportExportCommands.cpp
View File

@ -21,7 +21,6 @@
#include "../ProjectFileManager.h" #include "../ProjectFileManager.h"
#include "../ViewInfo.h" #include "../ViewInfo.h"
#include "../export/Export.h" #include "../export/Export.h"
#include "../SelectUtilities.h"
#include "../Shuttle.h" #include "../Shuttle.h"
#include "../ShuttleGui.h" #include "../ShuttleGui.h"
#include "../wxFileNameWrapper.h" #include "../wxFileNameWrapper.h"
@ -48,18 +47,9 @@ void ImportCommand::PopulateOrExchange(ShuttleGui & S)
S.EndMultiColumn(); S.EndMultiColumn();
} }
bool ImportCommand::Apply(const CommandContext & context) bool ImportCommand::Apply(const CommandContext & context){
{ return ProjectFileManager::Get( context.project )
bool wasEmpty = TrackList::Get( context.project ).Any().empty();
bool success = ProjectFileManager::Get( context.project )
.Import(mFileName, false); .Import(mFileName, false);
if (success && wasEmpty)
{
SelectUtilities::SelectAllIfNone( context.project );
}
return success;
} }