NO-OP; clean up script spacing and remove goto

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index c39a44c451e43749fe5f0e862a3c37952fff162f..0c052924bd5a7dba8940d88c95dd078733e4259e 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -41,6 +41,7 @@
 #include "luawindow.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
+#include "keyeditor.h"
 #include "splash.h"
 #include "rc_option_editor.h"
 #include "route_params_ui.h"
@@ -410,12 +411,16 @@ ARDOUR_UI::bind_lua_action_script (GdkEventButton*ev, int i)
                return false;
        }
        LuaInstance *li = LuaInstance::instance();
-       li->interactive_add (LuaScriptInfo::EditorAction, i);
+       if (Gtkmm2ext::Keyboard::modifier_state_equals (ev->state, Gtkmm2ext::Keyboard::TertiaryModifier)) {
+               li->remove_lua_action (i);
+       } else {
+               li->interactive_add (LuaScriptInfo::EditorAction, i);
+       }
        return true;
 }
 
 void
-ARDOUR_UI::update_action_script_btn (int i, const std::string&)
+ARDOUR_UI::update_action_script_btn (int i, const std::string& n)
 {
        if (LuaInstance::instance()->lua_action_has_icon (i)) {
                uintptr_t ii = i;
@@ -423,4 +428,18 @@ ARDOUR_UI::update_action_script_btn (int i, const std::string&)
        } else {
                action_script_call_btn[i].set_icon (0, 0);
        }
+
+       std::string const a = string_compose (X_("script-action-%1"), i + 1);
+       Glib::RefPtr<Action> act = ActionManager::get_action(X_("Editor"), a.c_str());
+       assert (act);
+       if (n.empty ()) {
+               act->set_label (string_compose (_("Unset #%1"), i + 1));
+               act->set_tooltip (_("No action bound\nRight-click to assign"));
+               act->set_sensitive (false);
+       } else {
+               act->set_label (n);
+               act->set_tooltip (string_compose (_("%1\n\nClick to run\nRight-click to re-assign\nShift+right-click to unassign"), n));
+               act->set_sensitive (true);
+       }
+       KeyEditor::UpdateBindings ();
 }