From c814726dc0c1d34f012686773aa7fff5e66bec19 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Fri, 18 Mar 2022 09:03:12 -0500 Subject: [PATCH] trigger_ui: FA:None did not convey the meaning; try 'Inhibit' * Inhibit prevents any FAs, FA Count, Probability, etc ... but leaves settings intact * Removed Inhibit from the Right FA menu ... it only needs to be set on the Left * Removed Inhibit from the clip context menu, we only want shortcuts to explicit actions there --- gtk2_ardour/slot_properties_box.cc | 1 - gtk2_ardour/trigger_ui.cc | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gtk2_ardour/slot_properties_box.cc b/gtk2_ardour/slot_properties_box.cc index dfe4c139ab..9d750f9605 100644 --- a/gtk2_ardour/slot_properties_box.cc +++ b/gtk2_ardour/slot_properties_box.cc @@ -158,7 +158,6 @@ SlotPropertyTable::SlotPropertyTable () _follow_left.set_sizing_text (longest_follow); _follow_right.set_name("FollowAction"); - _follow_right.AddMenuElem (MenuElem (follow_action_to_string(FollowAction (FollowAction::None)), sigc::bind (sigc::mem_fun (*this, &SlotPropertyTable::set_follow_action), FollowAction (FollowAction::None), 1))); _follow_right.AddMenuElem (MenuElem (follow_action_to_string(FollowAction (FollowAction::Stop)), sigc::bind (sigc::mem_fun (*this, &SlotPropertyTable::set_follow_action), FollowAction (FollowAction::Stop), 1))); _follow_right.AddMenuElem (MenuElem (follow_action_to_string(FollowAction (FollowAction::Again)), sigc::bind (sigc::mem_fun (*this, &SlotPropertyTable::set_follow_action), FollowAction (FollowAction::Again), 1))); _follow_right.AddMenuElem (MenuElem (follow_action_to_string(FollowAction (FollowAction::ReverseTrigger)), sigc::bind (sigc::mem_fun (*this, &SlotPropertyTable::set_follow_action), FollowAction (FollowAction::ReverseTrigger), 1))); diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc index 7c5ff46c3a..d3e3540197 100644 --- a/gtk2_ardour/trigger_ui.cc +++ b/gtk2_ardour/trigger_ui.cc @@ -576,7 +576,6 @@ TriggerUI::follow_context_menu () _ignore_menu_action = true; - items.push_back (MenuElem (TriggerUI::follow_action_to_string(FollowAction (FollowAction::None)), sigc::bind(sigc::mem_fun (*this, &TriggerUI::set_follow_action), FollowAction (FollowAction::None)))); items.push_back (MenuElem (TriggerUI::follow_action_to_string(FollowAction (FollowAction::Stop)), sigc::bind(sigc::mem_fun (*this, &TriggerUI::set_follow_action), FollowAction (FollowAction::Stop)))); items.push_back (MenuElem (TriggerUI::follow_action_to_string(FollowAction (FollowAction::Again)), sigc::bind(sigc::mem_fun (*this, &TriggerUI::set_follow_action), FollowAction (FollowAction::Again)))); items.push_back (MenuElem (TriggerUI::follow_action_to_string(FollowAction (FollowAction::ForwardTrigger)), sigc::bind(sigc::mem_fun (*this, &TriggerUI::set_follow_action), FollowAction (FollowAction::ForwardTrigger)))); @@ -748,7 +747,7 @@ TriggerUI::follow_action_to_string (FollowAction const & fa, bool with_targets) { switch (fa.type) { case FollowAction::None: - return _("None"); + return _("Inhibit"); case FollowAction::Stop: return _("Stop"); case FollowAction::Again: