mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-16 08:09:32 +02:00
Bug 240 - Time track selected by itself can't be removed with Tracks>Remove Tracks
This commit is contained in:
parent
9d1b75a5d7
commit
43af7b3265
@ -51,6 +51,13 @@ bool TracksSelectedPred( const AudacityProject &project )
|
|||||||
return !range.empty();
|
return !range.empty();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// This predicate includes time tracks too.
|
||||||
|
bool AnyTracksSelectedPred( const AudacityProject &project )
|
||||||
|
{
|
||||||
|
auto range = TrackList::Get( project ).Selected();
|
||||||
|
return !range.empty();
|
||||||
|
};
|
||||||
|
|
||||||
bool AudioIOBusyPred( const AudacityProject &project )
|
bool AudioIOBusyPred( const AudacityProject &project )
|
||||||
{
|
{
|
||||||
return AudioIOBase::Get()->IsAudioTokenActive(
|
return AudioIOBase::Get()->IsAudioTokenActive(
|
||||||
@ -147,7 +154,15 @@ const ReservedCommandFlag
|
|||||||
CommandFlagOptions{}.DisableDefaultMessage()
|
CommandFlagOptions{}.DisableDefaultMessage()
|
||||||
},
|
},
|
||||||
TracksSelectedFlag{
|
TracksSelectedFlag{
|
||||||
TracksSelectedPred,
|
TracksSelectedPred, // exclude TimeTracks
|
||||||
|
{ []( const wxString &Name ){ return wxString::Format(
|
||||||
|
// i18n-hint: %s will be replaced by the name of an action, such as "Remove Tracks".
|
||||||
|
_("\"%s\" requires one or more tracks to be selected."),
|
||||||
|
Name
|
||||||
|
); },"FAQ:Errors:Select Tracks" }
|
||||||
|
},
|
||||||
|
AnyTracksSelectedFlag{
|
||||||
|
AnyTracksSelectedPred, // Allow TimeTracks
|
||||||
{ []( const wxString &Name ){ return wxString::Format(
|
{ []( const wxString &Name ){ return wxString::Format(
|
||||||
// i18n-hint: %s will be replaced by the name of an action, such as "Remove Tracks".
|
// i18n-hint: %s will be replaced by the name of an action, such as "Remove Tracks".
|
||||||
_("\"%s\" requires one or more tracks to be selected."),
|
_("\"%s\" requires one or more tracks to be selected."),
|
||||||
|
@ -27,6 +27,7 @@ extern AUDACITY_DLL_API const ReservedCommandFlag
|
|||||||
WaveTracksSelectedFlag,
|
WaveTracksSelectedFlag,
|
||||||
TracksExistFlag,
|
TracksExistFlag,
|
||||||
TracksSelectedFlag,
|
TracksSelectedFlag,
|
||||||
|
AnyTracksSelectedFlag,
|
||||||
TrackPanelHasFocus; //lll
|
TrackPanelHasFocus; //lll
|
||||||
|
|
||||||
extern AUDACITY_DLL_API const ReservedCommandFlag
|
extern AUDACITY_DLL_API const ReservedCommandFlag
|
||||||
|
@ -1299,7 +1299,7 @@ MenuTable::BaseItemPtr TracksMenu( AudacityProject & )
|
|||||||
Separator(),
|
Separator(),
|
||||||
|
|
||||||
Command( wxT("RemoveTracks"), XXO("Remo&ve Tracks"), FN(OnRemoveTracks),
|
Command( wxT("RemoveTracks"), XXO("Remo&ve Tracks"), FN(OnRemoveTracks),
|
||||||
AudioIONotBusyFlag | TracksSelectedFlag ),
|
AudioIONotBusyFlag | AnyTracksSelectedFlag ),
|
||||||
|
|
||||||
Separator(),
|
Separator(),
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user