some fixes/improvements for track selection; add upload target to manual makefile...

[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 0603fc6baa5acb95ee365736ac18eb2be21734c1..9c6daa8952f724a439cfcbdb0894432cb0b94956 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -27,6 +27,7 @@
 #include <gtkmm/accelmap.h>
 
 #include <pbd/error.h>
+
 #include "ardour_ui.h"
 #include "public_editor.h"
 #include "mixer_ui.h"
@@ -57,6 +58,17 @@ void
 ARDOUR_UI::we_have_dependents ()
 {
        setup_keybindings ();
+       editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
+}
+
+static void 
+accel_map_changed (GtkAccelMap* map,
+                  gchar* path,
+                  guint  key,
+                  GdkModifierType mod,
+                  gpointer arg)
+{
+       static_cast<ARDOUR_UI*>(arg)->save_keybindings ();
 }
 
 void
@@ -65,13 +77,20 @@ ARDOUR_UI::setup_keybindings ()
        install_actions ();
        RedirectBox::register_actions ();
        
-       std::string key_binding_file = ARDOUR::find_config_file("ardour.bindings");
+       cerr << "loading bindings from " << keybindings_path << endl;
 
        try {
-               AccelMap::load (key_binding_file);
+               AccelMap::load (keybindings_path);
        } catch (...) {
-               error << "ardour key bindings file not found" << endmsg;
+               error << string_compose (_("Ardour key bindings file not found at \"%1\" or contains errors."), keybindings_path)
+                     << endmsg;
        }
+
+       /* catch changes */
+
+       GtkAccelMap* accelmap = gtk_accel_map_get();
+       g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, this);
+
 }
 
 void
@@ -79,6 +98,10 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 {
        editor->connect_to_session (s);
        mixer->connect_to_session (s);
+
+       /* its safe to do this now */
+       
+       s->restore_history ("");
 }
 
 void