From 825160b755577a764fdd0806fece45efed22fe23 Mon Sep 17 00:00:00 2001 From: James Crook Date: Sun, 18 Mar 2018 11:16:45 +0000 Subject: [PATCH] Add six (smaller) dialogs to commands. - These are the big dialogs, Select and SetTrack split into three smaller dialogs. --- src/commands/LoadCommands.cpp | 44 ++++++++++++++++++++--------------- src/commands/SelectCommand.h | 4 ++-- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/commands/LoadCommands.cpp b/src/commands/LoadCommands.cpp index 857c9993c..9245dabee 100644 --- a/src/commands/LoadCommands.cpp +++ b/src/commands/LoadCommands.cpp @@ -43,25 +43,31 @@ modelled on BuiltinEffectsModule // Define the list of COMMANDs that will be autoregistered and how to instantiate each // #define COMMAND_LIST \ - COMMAND( DEMO, DemoCommand, () ) \ - COMMAND( MESSAGE, MessageCommand, () ) \ - COMMAND( SCREENSHOT, ScreenshotCommand, () ) \ - COMMAND( DRAG, DragCommand, () ) \ - COMMAND( COMPARE_AUDIO, CompareAudioCommand, () ) \ - COMMAND( SET_TRACK, SetTrackCommand, () ) \ - COMMAND( SET_ENVELOPE, SetEnvelopeCommand, () ) \ - COMMAND( SET_CLIP, SetClipCommand, () ) \ - COMMAND( SET_LABEL, SetLabelCommand, () ) \ - COMMAND( SET_PROJECT, SetProjectCommand, () ) \ - COMMAND( SELECT, SelectCommand, () ) \ - COMMAND( GET_PREFERENCE, GetPreferenceCommand, () ) \ - COMMAND( SET_PREFERENCE, SetPreferenceCommand, () ) \ - COMMAND( GET_INFO, GetInfoCommand, () ) \ - COMMAND( HELP, HelpCommand, () ) \ - COMMAND( IMPORT, ImportCommand, () ) \ - COMMAND( EXPORT, ExportCommand, () ) \ - COMMAND( OPEN_PROJECT, OpenProjectCommand, () ) \ - COMMAND( SAVE_PROJECT, SaveProjectCommand, () ) \ + COMMAND( DEMO, DemoCommand, () ) \ + COMMAND( MESSAGE, MessageCommand, () ) \ + COMMAND( SCREENSHOT, ScreenshotCommand, () ) \ + COMMAND( DRAG, DragCommand, () ) \ + COMMAND( COMPARE_AUDIO, CompareAudioCommand, () ) \ + COMMAND( SET_TRACK, SetTrackCommand, () ) \ + COMMAND( SET_TRACK_STATUS, SetTrackStatusCommand, () ) \ + COMMAND( SET_TRACK_AUDIO, SetTrackAudioCommand, () ) \ + COMMAND( SET_TRACK_VISUALS, SetTrackVisualsCommand, () ) \ + COMMAND( SET_ENVELOPE, SetEnvelopeCommand, () ) \ + COMMAND( SET_CLIP, SetClipCommand, () ) \ + COMMAND( SET_LABEL, SetLabelCommand, () ) \ + COMMAND( SET_PROJECT, SetProjectCommand, () ) \ + COMMAND( SELECT, SelectCommand, () ) \ + COMMAND( SELECT_TIME, SelectTimeCommand, () ) \ + COMMAND( SELECT_FREQUENCIES, SelectFrequenciesCommand, () )\ + COMMAND( SELECT_TRACKS, SelectTracksCommand, () ) \ + COMMAND( GET_PREFERENCE, GetPreferenceCommand, () ) \ + COMMAND( SET_PREFERENCE, SetPreferenceCommand, () ) \ + COMMAND( GET_INFO, GetInfoCommand, () ) \ + COMMAND( HELP, HelpCommand, () ) \ + COMMAND( IMPORT, ImportCommand, () ) \ + COMMAND( EXPORT, ExportCommand, () ) \ + COMMAND( OPEN_PROJECT, OpenProjectCommand, () ) \ + COMMAND( SAVE_PROJECT, SaveProjectCommand, () ) \ // GET_TRACK_INFO subsumed by GET_INFO //COMMAND( GET_TRACK_INFO, GetTrackInfoCommand, () ) diff --git a/src/commands/SelectCommand.h b/src/commands/SelectCommand.h index 2edaa5a88..d61c2d941 100644 --- a/src/commands/SelectCommand.h +++ b/src/commands/SelectCommand.h @@ -26,7 +26,7 @@ #define SELECT_TIME_PLUGIN_SYMBOL XO("Select Time") -#define SELECT_FREQUENCY_PLUGIN_SYMBOL XO("Select Frequency") +#define SELECT_FREQUENCIES_PLUGIN_SYMBOL XO("Select Frequencies") #define SELECT_TRACKS_PLUGIN_SYMBOL XO("Select Tracks") #define SELECT_PLUGIN_SYMBOL XO("Select") @@ -58,7 +58,7 @@ class SelectFrequenciesCommand : public AudacityCommand { public: // CommandDefinitionInterface overrides - wxString GetSymbol() override {return SELECT_FREQUENCY_PLUGIN_SYMBOL;}; + wxString GetSymbol() override {return SELECT_FREQUENCIES_PLUGIN_SYMBOL;}; wxString GetDescription() override {return _("Selects a frequency range.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override;