From 11a0617cffb17bdbec9e0e53bed9f403e8212119 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Sat, 19 Mar 2022 16:56:28 -0500 Subject: [PATCH] Revert trigger_ui: 'Inhibit' change This reverts commit c814726dc0c1d34f012686773aa7fff5e66bec19. --- gtk2_ardour/slot_properties_box.cc | 1 + gtk2_ardour/trigger_ui.cc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/slot_properties_box.cc b/gtk2_ardour/slot_properties_box.cc index 9d750f9605..dfe4c139ab 100644 --- a/gtk2_ardour/slot_properties_box.cc +++ b/gtk2_ardour/slot_properties_box.cc @@ -158,6 +158,7 @@ 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 d3e3540197..7c5ff46c3a 100644 --- a/gtk2_ardour/trigger_ui.cc +++ b/gtk2_ardour/trigger_ui.cc @@ -576,6 +576,7 @@ 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)))); @@ -747,7 +748,7 @@ TriggerUI::follow_action_to_string (FollowAction const & fa, bool with_targets) { switch (fa.type) { case FollowAction::None: - return _("Inhibit"); + return _("None"); case FollowAction::Stop: return _("Stop"); case FollowAction::Again: