From 9b3f1a133593cccd381c68fc052511c8e6eb6198 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sat, 20 Oct 2018 17:47:57 -0400
Subject: [PATCH] Define table for Extra Focus menu

---
 src/Menus.cpp | 65 ++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index 5f385b1fc..378a0d254 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -549,6 +549,7 @@ MenuTable::BaseItemPtr ExtraSeekMenu( AudacityProject & );
 MenuTable::BaseItemPtr ExtraDeviceMenu( AudacityProject & );
 MenuTable::BaseItemPtr ExtraSelectionMenu( AudacityProject & );
 MenuTable::BaseItemPtr ExtraGlobalCommands( AudacityProject & );
+MenuTable::BaseItemPtr ExtraFocusMenu( AudacityProject & );
 }
 
 // Tables of menu factories.
@@ -566,6 +567,7 @@ static const std::shared_ptr<MenuTable::BaseItem> extraItems = MenuTable::Items(
    , MenuTable::Separator()
 
    , ExtraGlobalCommands
+   , ExtraFocusMenu
 );
 
 static const auto menuTree = MenuTable::Items(
@@ -1955,6 +1957,37 @@ MenuTable::BaseItemPtr ExtraGlobalCommands( AudacityProject & )
    );
 }
 
+MenuTable::BaseItemPtr ExtraFocusMenu( AudacityProject & )
+{
+   using namespace MenuTable;
+   constexpr auto FocusedTracksFlags = TracksExistFlag | TrackPanelHasFocus;
+
+   return Menu( _("F&ocus"),
+      Command( wxT("PrevFrame"),
+         XXO("Move &Backward from Toolbars to Tracks"), FN(OnPrevFrame),
+         AlwaysEnabledFlag, wxT("Ctrl+Shift+F6") ),
+      Command( wxT("NextFrame"),
+         XXO("Move F&orward from Toolbars to Tracks"), FN(OnNextFrame),
+         AlwaysEnabledFlag, wxT("Ctrl+F6") ),
+      Command( wxT("PrevTrack"), XXO("Move Focus to &Previous Track"),
+         FN(OnCursorUp), FocusedTracksFlags, wxT("Up") ),
+      Command( wxT("NextTrack"), XXO("Move Focus to &Next Track"),
+         FN(OnCursorDown), FocusedTracksFlags, wxT("Down") ),
+      Command( wxT("FirstTrack"), XXO("Move Focus to &First Track"),
+         FN(OnFirstTrack), FocusedTracksFlags, wxT("Ctrl+Home") ),
+      Command( wxT("LastTrack"), XXO("Move Focus to &Last Track"),
+         FN(OnLastTrack), FocusedTracksFlags, wxT("Ctrl+End") ),
+      Command( wxT("ShiftUp"), XXO("Move Focus to P&revious and Select"),
+         FN(OnShiftUp), FocusedTracksFlags, wxT("Shift+Up") ),
+      Command( wxT("ShiftDown"), XXO("Move Focus to N&ext and Select"),
+         FN(OnShiftDown), FocusedTracksFlags, wxT("Shift+Down") ),
+      Command( wxT("Toggle"), XXO("&Toggle Focused Track"), FN(OnToggle),
+         FocusedTracksFlags, wxT("Return") ),
+      Command( wxT("ToggleAlt"), XXO("Toggle Focuse&d Track"), FN(OnToggle),
+         FocusedTracksFlags, wxT("NUMPAD_ENTER") )
+   );
+}
+
 }
 
 void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
@@ -1989,38 +2022,6 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
 
       //////////////////////////////////////////////////////////////////////////
 
-      c->BeginMenu( _("F&ocus") );
-
-      c->AddItem( wxT("PrevFrame"),
-         XXO("Move &Backward from Toolbars to Tracks"), FN(OnPrevFrame),
-         AlwaysEnabledFlag, wxT("Ctrl+Shift+F6") );
-      c->AddItem( wxT("NextFrame"),
-         XXO("Move F&orward from Toolbars to Tracks"), FN(OnNextFrame),
-         AlwaysEnabledFlag, wxT("Ctrl+F6") );
-
-      constexpr auto FocusedTracksFlags = TracksExistFlag | TrackPanelHasFocus;
-      c->AddItem( wxT("PrevTrack"), XXO("Move Focus to &Previous Track"),
-         FN(OnCursorUp), FocusedTracksFlags, wxT("Up") );
-      c->AddItem( wxT("NextTrack"), XXO("Move Focus to &Next Track"),
-         FN(OnCursorDown), FocusedTracksFlags, wxT("Down") );
-      c->AddItem( wxT("FirstTrack"), XXO("Move Focus to &First Track"),
-         FN(OnFirstTrack), FocusedTracksFlags, wxT("Ctrl+Home") );
-      c->AddItem( wxT("LastTrack"), XXO("Move Focus to &Last Track"),
-         FN(OnLastTrack), FocusedTracksFlags, wxT("Ctrl+End") );
-
-      c->AddItem( wxT("ShiftUp"), XXO("Move Focus to P&revious and Select"),
-         FN(OnShiftUp), FocusedTracksFlags, wxT("Shift+Up") );
-      c->AddItem( wxT("ShiftDown"), XXO("Move Focus to N&ext and Select"),
-         FN(OnShiftDown), FocusedTracksFlags, wxT("Shift+Down") );
-
-      c->AddItem( wxT("Toggle"), XXO("&Toggle Focused Track"), FN(OnToggle),
-         FocusedTracksFlags, wxT("Return") );
-      c->AddItem( wxT("ToggleAlt"), XXO("Toggle Focuse&d Track"), FN(OnToggle),
-         FocusedTracksFlags, wxT("NUMPAD_ENTER") );
-      c->EndMenu();
-
-      //////////////////////////////////////////////////////////////////////////
-
       c->BeginMenu( _("&Cursor") );
 
       c->AddItem( wxT("CursorLeft"), XXO("Cursor &Left"), FN(OnCursorLeft),