From 2d62013facd37ffcc0a36145ef16514173695a99 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Fri, 16 Mar 2018 18:38:06 +0000
Subject: [PATCH] Add Macros Palette to Apply Macro -> submenu,

---
 src/BatchProcessDialog.cpp | 15 ++++++++-------
 src/Menus.cpp              |  8 +++-----
 src/Menus.h                |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp
index f3f034fb2..6d05846ef 100644
--- a/src/BatchProcessDialog.cpp
+++ b/src/BatchProcessDialog.cpp
@@ -70,7 +70,7 @@ BEGIN_EVENT_TABLE(ApplyMacroDialog, wxDialogWrapper)
 END_EVENT_TABLE()
 
 ApplyMacroDialog::ApplyMacroDialog(wxWindow * parent, bool bInherited):
-   wxDialogWrapper(parent, wxID_ANY, _("Apply Macro"),
+   wxDialogWrapper(parent, wxID_ANY, _("Apply Macros"),
             wxDefaultPosition, wxDefaultSize,
             wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
    , mCatalog( GetActiveProject() )
@@ -80,8 +80,8 @@ ApplyMacroDialog::ApplyMacroDialog(wxWindow * parent, bool bInherited):
    mbExpanded = false;
    if( bInherited )
       return;
-   SetLabel(_("Apply Macro"));         // Provide visual label
-   SetName(_("Apply Macro"));          // Provide audible label
+   SetLabel(_("Apply Macros"));         // Provide visual label
+   SetName(_("Apply Macros"));          // Provide audible label
    Populate();
 
 }
@@ -533,9 +533,10 @@ MacrosWindow::MacrosWindow(wxWindow * parent, bool bExpanded):
    ApplyMacroDialog(parent, true)
 {
    mbExpanded = bExpanded;
-   SetLabel(_("Manage Macros"));         // Provide visual label
-   SetName(_("Manage Macros"));          // Provide audible label
-   SetTitle(_("Manage Macros"));
+   wxString Title = mbExpanded ? _("Manage Macros") : _("Apply Macros");
+   SetLabel( Title );   // Provide visual label
+   SetName(  Title );   // Provide audible label
+   SetTitle( Title );
 
    mChanged = false;
    mSelectedCommand = 0;
@@ -735,7 +736,7 @@ void MacrosWindow::UpdateDisplay( bool bExpanded )
    SetPosition( p );
    mResize->SetFocus();
 
-   wxString Title = mbExpanded ? _("Manage Macros") : _("Apply Macro");
+   wxString Title = mbExpanded ? _("Manage Macros") : _("Apply Macros");
    SetLabel( Title );         // Provide visual label
    SetName( Title );          // Provide audible label
    SetTitle( Title );
diff --git a/src/Menus.cpp b/src/Menus.cpp
index 6ed5344a8..da77c0b9f 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -1195,13 +1195,11 @@ void AudacityProject::CreateMenusAndCommands()
       //c->AddSeparator();
 #endif
 
-      //Not needed anymore as ManageMacros does both.
-      //c->AddItem(wxT("ApplyMacro"), _("Appl&y Macro..."), FN(OnApplyMacro),
-      //   AudioIONotBusyFlag,
-      //   AudioIONotBusyFlag);
       c->AddItem(wxT("ManageMacros"), XXO("&Macros..."), FN(OnManageMacros));
 
       c->BeginSubMenu(_("&Apply Macro"));
+      c->AddItem(wxT("ApplyMacrosPalette"), XXO("&Palette..."), FN(OnApplyMacrosPalette));
+      c->AddSeparator();
       PopulateMacrosMenu( c, AudioIONotBusyFlag );
       c->EndSubMenu();
       c->AddSeparator();
@@ -6896,7 +6894,7 @@ void AudacityProject::OnApplyMacroDirectly(const CommandContext &context )
    ModifyUndoMenuItems();
 }
 
-void AudacityProject::OnApplyMacro(const CommandContext &WXUNUSED(context) )
+void AudacityProject::OnApplyMacrosPalette(const CommandContext &WXUNUSED(context) )
 {
    const bool bExpanded = false;
    if (!mMacrosWindow)
diff --git a/src/Menus.h b/src/Menus.h
index 1c4276f5f..86fa4f914 100644
--- a/src/Menus.h
+++ b/src/Menus.h
@@ -494,8 +494,8 @@ bool DoEffect(const PluginID & ID, const CommandContext & context, int flags);
 void OnEffect(const CommandContext &context );
 void OnRepeatLastEffect(const CommandContext &context );
 bool DoAudacityCommand(const PluginID & ID, const CommandContext &, int flags);
-void OnApplyMacro(const CommandContext &context );
 void OnApplyMacroDirectly(const CommandContext &context );
+void OnApplyMacrosPalette(const CommandContext &context );
 void OnManageMacros(const CommandContext &context );
 void OnStereoToMono(const CommandContext &context );
 void OnAudacityCommand(const CommandContext &context );