From e29699086edec0238ed61260788eb211ffae884d Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Wed, 7 Feb 2018 17:20:45 +0000
Subject: [PATCH] More Menus Items, Better prompting Dialogs.

---
 src/Menus.cpp                    | 22 +++++++++++++++-------
 src/commands/AudacityCommand.cpp |  2 +-
 src/commands/GetInfoCommand.cpp  |  4 ++--
 src/effects/EffectManager.cpp    |  1 +
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index 9184136f5..6bbb21d32 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -1594,19 +1594,27 @@ void AudacityProject::CreateMenusAndCommands()
       // whereas the short-form used here must not.
       // (If you did write "CompareAudio" for the PLUGIN_SYMBOL name, then
       // you would have to use "Compareaudio" here.)
-      c->AddItem(wxT("Demo"), _("Just a Demo!"), FN(OnAudacityCommand),
+      c->AddItem(wxT("Demo"), _("Just a Demo..."), FN(OnAudacityCommand),
          AudioIONotBusyFlag,  AudioIONotBusyFlag);
-      c->AddItem(wxT("Screenshot"), _("Screenshot (Vanilla)"), FN(OnAudacityCommand),
+      c->AddItem(wxT("Screenshot"), _("Screenshot (Vanilla)..."), FN(OnAudacityCommand),
          AudioIONotBusyFlag,  AudioIONotBusyFlag);
-      c->AddItem(wxT("SetTrackInfo"), _("Set Track Info"), FN(OnAudacityCommand),
+      c->AddItem(wxT("CompareAudio"), _("Compare Audio..."), FN(OnAudacityCommand),
          AudioIONotBusyFlag,  AudioIONotBusyFlag);
-      c->AddItem(wxT("CompareAudio"), _("Compare Audio"), FN(OnAudacityCommand),
+      c->AddItem(wxT("SelectTime"), _("Select Time..."), FN(OnAudacityCommand),
          AudioIONotBusyFlag,  AudioIONotBusyFlag);
-      c->AddItem(wxT("SelectTime"), _("Select Time"), FN(OnAudacityCommand),
+      c->AddItem(wxT("SelectTracks"), _("Select Tracks..."), FN(OnAudacityCommand),
          AudioIONotBusyFlag,  AudioIONotBusyFlag);
-      c->AddItem(wxT("SelectTracks"), _("Select Tracks"), FN(OnAudacityCommand),
+      c->AddItem(wxT("Select"), _("Select..."), FN(OnAudacityCommand),
          AudioIONotBusyFlag,  AudioIONotBusyFlag);
-      c->AddItem(wxT("Select"), _("Select"), FN(OnAudacityCommand),
+      c->AddItem(wxT("SetPreference"), _("Set Preference..."), FN(OnAudacityCommand),
+         AudioIONotBusyFlag,  AudioIONotBusyFlag);
+      c->AddItem(wxT("SetTrackInfo"), _("Set Track Info..."), FN(OnAudacityCommand),
+         AudioIONotBusyFlag,  AudioIONotBusyFlag);
+      c->AddItem(wxT("GetPreference"), _("Get Preference..."), FN(OnAudacityCommand),
+         AudioIONotBusyFlag,  AudioIONotBusyFlag);
+      c->AddItem(wxT("GetInfo"), _("Get Info..."), FN(OnAudacityCommand),
+         AudioIONotBusyFlag,  AudioIONotBusyFlag);
+      c->AddItem(wxT("GetTrackInfo"), _("Get Track Info..."), FN(OnAudacityCommand),
          AudioIONotBusyFlag,  AudioIONotBusyFlag);
 
 
diff --git a/src/commands/AudacityCommand.cpp b/src/commands/AudacityCommand.cpp
index b8f18315f..49f1d3cff 100644
--- a/src/commands/AudacityCommand.cpp
+++ b/src/commands/AudacityCommand.cpp
@@ -131,7 +131,7 @@ bool AudacityCommand::ShowInterface(wxWindow *parent, bool WXUNUSED(forceModal))
 wxDialog *AudacityCommand::CreateUI(wxWindow *parent, AudacityCommand * WXUNUSED(client))
 {
    Destroy_ptr<AudacityCommandDialog> dlg { safenew AudacityCommandDialog{
-      parent, "Generic Dialog", this}};
+      parent, GetTranslatedName(), this}};
 
    if (dlg->Init())
    {
diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp
index f38410f8b..fc5be4fcd 100644
--- a/src/commands/GetInfoCommand.cpp
+++ b/src/commands/GetInfoCommand.cpp
@@ -378,7 +378,7 @@ bool GetInfoCommand::SendBoxesAsJson(const CommandContext &context)
    context.Status("Boxes");
    wxWindow * pWin = context.GetProject();
 
-   context.Status( "AudacityBoxes[" );
+   context.Status( "[" );
    wxRect R = pWin->GetScreenRect();
 
    //R.SetPosition( wxPoint(0,0) );
@@ -388,7 +388,7 @@ bool GetInfoCommand::SendBoxesAsJson(const CommandContext &context)
          0, R.GetLeft(), R.GetTop(), R.GetRight(), R.GetBottom(), "Audacity Window" )); 
    ExploreAdornments( context, pWin->GetPosition()+wxSize( 6,-1), pWin, pWin->GetId(), 1 );
    ExploreWindows( context, pWin->GetPosition()+wxSize( 6,-1), pWin, pWin->GetId(), 1 );
-   context.Status( "];" );
+   context.Status( "]" );
    return true;
 }
 
diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp
index 50c4c8bde..74accfc1b 100644
--- a/src/effects/EffectManager.cpp
+++ b/src/effects/EffectManager.cpp
@@ -863,6 +863,7 @@ AudacityCommand *EffectManager::GetAudacityCommand(const PluginID & ID)
       auto command = dynamic_cast<AudacityCommand *>(PluginManager::Get().GetInstance(ID));
       if (command )//&& command->Startup(NULL))
       {
+         command->Init();
          mCommands[ID] = command;
          return command;
       }