From 95932f92ded06745ab6427cd4fe5c5fd6bdb0df4 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 28 Apr 2020 18:32:24 +0200 Subject: Remove redundant action prefix From Ardour5 to Ardour6 the AccessAction handle changes from "Editor/script-action-" to "LuaAction/script-" --- gtk2_ardour/ardour_ui_dependents.cc | 4 ++-- gtk2_ardour/editor_actions.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index d427a489aa..85dc0bab20 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -305,7 +305,7 @@ ARDOUR_UI::setup_windows () LuaInstance::instance()->ActionChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::action_script_changed)); for (int i = 0; i < MAX_LUA_ACTION_BUTTONS; ++i) { - std::string const a = string_compose (X_("script-action-%1"), i + 1); + std::string const a = string_compose (X_("script-%1"), i + 1); Glib::RefPtr act = ActionManager::get_action(X_("LuaAction"), a.c_str()); assert (act); action_script_call_btn[i].set_name ("lua action button"); @@ -439,7 +439,7 @@ ARDOUR_UI::action_script_changed (int i, const std::string& n) } } - std::string const a = string_compose (X_("script-action-%1"), i + 1); + std::string const a = string_compose (X_("script-%1"), i + 1); Glib::RefPtr act = ActionManager::get_action(X_("LuaAction"), a.c_str()); assert (act); if (n.empty ()) { diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 0c96a87124..164bcf56f8 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -490,7 +490,7 @@ Editor::register_actions () Glib::RefPtr lua_script_actions = ActionManager::create_action_group (bindings, X_("LuaAction")); for (int i = 1; i <= MAX_LUA_ACTION_SCRIPTS; ++i) { - string const a = string_compose (X_("script-action-%1"), i); + string const a = string_compose (X_("script-%1"), i); string const n = string_compose (_("Unset #%1"), i); act = ActionManager::register_action (lua_script_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::trigger_script), i - 1)); act->set_tooltip (_("no action bound")); -- cgit v1.2.3