when calculating average slave/master delta, use absolute value.

[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 6c0083291b0f8b215d553f942ec6d2c709af6d37..87beab6b0e417faddad7fd0b2bafae52d61f638c 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"
@@ -152,7 +153,7 @@ ARDOUR_UI::tab_window_root_drop (GtkNotebook* src,
        using namespace std;
        Gtk::Notebook* nb = 0;
        Gtk::Window* win = 0;
-       Gtkmm2ext::Tabbable* tabbable = 0;
+       ArdourWidgets::Tabbable* tabbable = 0;
 
 
        if (w == GTK_WIDGET(editor->contents().gobj())) {
@@ -218,10 +219,10 @@ ARDOUR_UI::main_window_delete_event (GdkEventAny* ev)
 
 static GtkNotebook*
 tab_window_root_drop (GtkNotebook* src,
-                     GtkWidget* w,
-                     gint x,
-                     gint y,
-                     gpointer user_data)
+                      GtkWidget* w,
+                      gint x,
+                      gint y,
+                      gpointer user_data)
 {
        return ARDOUR_UI::instance()->tab_window_root_drop (src, w, x, y, user_data);
 }
@@ -270,7 +271,7 @@ ARDOUR_UI::setup_windows ()
        mixer->add_to_notebook (_tabs, _("Mixer"));
        editor->add_to_notebook (_tabs, _("Editor"));
 
-       time_info_box = new TimeInfoBox (false);
+       time_info_box = new TimeInfoBox ("ToolbarTimeInfo", false);
        /* all other dialogs are created conditionally */
 
        we_have_dependents ();
@@ -304,6 +305,8 @@ ARDOUR_UI::setup_windows ()
        main_vpacker.pack_start (status_bar_hpacker, false, false);
 #endif
 
+       LuaInstance::instance()->ActionChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_action_script_btn));
+
        for (int i = 0; i < 9; ++i) {
                std::string const a = string_compose (X_("script-action-%1"), i + 1);
                Glib::RefPtr<Action> act = ActionManager::get_action(X_("Editor"), a.c_str());
@@ -408,6 +411,35 @@ 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& n)
+{
+       if (LuaInstance::instance()->lua_action_has_icon (i)) {
+               uintptr_t ii = i;
+               action_script_call_btn[i].set_icon (&LuaInstance::render_action_icon, (void*)ii);
+       } 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 ();
+}