From 5f10817126b80b88303856fe85140a480b8f6652 Mon Sep 17 00:00:00 2001
From: Ben Loftis <ben@harrisonconsoles.com>
Date: Mon, 31 Jan 2022 19:26:39 -0600
Subject: [PATCH] trigger_ui: add menu items and bindings to trigger Cues A-H

---
 gtk2_ardour/ardour.menus.in   | 11 +++++++++++
 gtk2_ardour/editor_actions.cc |  1 +
 gtk2_ardour/trigger.bindings  | 11 +++++++++--
 gtk2_ardour/trigger_page.cc   |  4 ++--
 gtk2_ardour/trigger_ui.cc     |  6 +++---
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index ceb8caebfd..57b73ef43b 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -155,6 +155,17 @@
         <menuitem action='set-session-end-from-playhead'/>
       </menu>
 
+      <menu action="CueMenu">
+        <menuitem action='trigger-cue-0'/>
+        <menuitem action='trigger-cue-1'/>
+        <menuitem action='trigger-cue-2'/>
+        <menuitem action='trigger-cue-3'/>
+        <menuitem action='trigger-cue-4'/>
+        <menuitem action='trigger-cue-5'/>
+        <menuitem action='trigger-cue-6'/>
+        <menuitem action='trigger-cue-7'/>
+      </menu>
+
       <separator/>
       <menuitem action='ToggleTimeMaster'/>
       <menuitem action='TogglePunch'/>
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index c94e93821d..95d1cb209f 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -149,6 +149,7 @@ Editor::register_actions ()
 	ActionManager::register_action (editor_menu_actions, X_("ZoomFocusMenu"), _("Zoom Focus"));
 	ActionManager::register_action (editor_menu_actions, X_("LocateToMarker"), _("Locate to Markers"));
 	ActionManager::register_action (editor_menu_actions, X_("MarkerMenu"), _("Markers"));
+	ActionManager::register_action (editor_menu_actions, X_("CueMenu"), _("Cues"));
 	ActionManager::register_action (editor_menu_actions, X_("MeterFalloff"), _("Meter falloff"));
 	ActionManager::register_action (editor_menu_actions, X_("MeterHold"), _("Meter hold"));
 	ActionManager::register_action (editor_menu_actions, X_("MIDI"), _("MIDI Options"));
diff --git a/gtk2_ardour/trigger.bindings b/gtk2_ardour/trigger.bindings
index b72c2a5e98..e9163aa916 100644
--- a/gtk2_ardour/trigger.bindings
+++ b/gtk2_ardour/trigger.bindings
@@ -1,5 +1,12 @@
-<Bindings name="Triggers">
+<Bindings name="Cues">
   <Press>
-     <Binding key="F1" action="Triggers/trigger-scene-1"/>
+     <Binding key="F1" action="Cues/trigger-cue-0"/>
+     <Binding key="F2" action="Cues/trigger-cue-1"/>
+     <Binding key="F3" action="Cues/trigger-cue-2"/>
+     <Binding key="F4" action="Cues/trigger-cue-3"/>
+     <Binding key="F5" action="Cues/trigger-cue-4"/>
+     <Binding key="F6" action="Cues/trigger-cue-5"/>
+     <Binding key="F7" action="Cues/trigger-cue-6"/>
+     <Binding key="F8" action="Cues/trigger-cue-7"/>
   </Press>
 </Bindings>
diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc
index f58ea8b114..086843cbed 100644
--- a/gtk2_ardour/trigger_page.cc
+++ b/gtk2_ardour/trigger_page.cc
@@ -244,13 +244,13 @@ TriggerPage::set_state (const XMLNode& node, int version)
 void
 TriggerPage::load_bindings ()
 {
-	bindings = Bindings::get_bindings (X_("TriggerPage"));
+	bindings = Bindings::get_bindings (X_("Cues"));
 }
 
 void
 TriggerPage::register_actions ()
 {
-	Glib::RefPtr<ActionGroup> group = ActionManager::create_action_group (bindings, X_("TriggerPage"));
+	//this was done by TriggerUI ?
 }
 
 void
diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc
index cfb605f0b7..93be04ac59 100644
--- a/gtk2_ardour/trigger_ui.cc
+++ b/gtk2_ardour/trigger_ui.cc
@@ -149,7 +149,7 @@ TriggerUI::setup_actions_and_bindings ()
 void
 TriggerUI::load_bindings ()
 {
-	bindings = Bindings::get_bindings (X_("Triggers"));
+	bindings = Bindings::get_bindings (X_("Cues"));
 }
 
 void
@@ -159,9 +159,9 @@ TriggerUI::register_actions ()
 
 	for (int32_t n = 0; n < default_triggers_per_box; ++n) {
 		const std::string action_name  = string_compose ("trigger-cue-%1", n);
-		const std::string display_name = string_compose (_("Trigger Cue %1"), n);
+		const std::string display_name = string_compose (_("Trigger Cue %1"), (char) ('A' + n));
 
-		ActionManager::register_toggle_action (trigger_actions, action_name.c_str (), display_name.c_str (), sigc::bind (sigc::ptr_fun (TriggerUI::trigger_cue), n));
+		ActionManager::register_action (trigger_actions, action_name.c_str (), display_name.c_str (), sigc::bind (sigc::ptr_fun (TriggerUI::trigger_cue), n));
 	}
 }