Pretty print control-outputs in generic-UI

[ardour.git] / gtk2_ardour / keyeditor.cc

diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index 9df62ccb53a67c12ece4e9beed43488e5382dd7f..ef7a7dc4ed4d5d8c7c07433d7270b82b23169839 100644 (file)
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -62,10 +62,11 @@ using Gtkmm2ext::Bindings;
 
 sigc::signal<void> KeyEditor::UpdateBindings;
 
-void bindings_collision_dialog (Gtk::Window& parent)
+static void bindings_collision_dialog (Gtk::Window& parent, const std::string& bound_name)
 {
        ArdourDialog dialog (parent, _("Colliding keybindings"), true);
-       Label label (_("The key sequence is already bound. Please remove the other binding first."));
+       Label label (string_compose(
+                               _("The key sequence is already bound to '%1'. Please remove the other binding first."), bound_name));
 
        dialog.get_vbox()->pack_start (label, true, true);
        dialog.add_button (_("Ok"), Gtk::RESPONSE_ACCEPT);
@@ -119,7 +120,7 @@ KeyEditor::KeyEditor ()
        reset_label.show ();
        print_button.show ();
        reset_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::reset));
-       vpacker.pack_start (*(manage (new  HSeparator())), true, true, 5);
+       vpacker.pack_start (*(manage (new  HSeparator())), false, false, 5);
        vpacker.pack_start (reset_box, false, false);
 
        add (vpacker);
@@ -319,7 +320,7 @@ KeyEditor::Tab::bind (GdkEventKey* release_event, guint pressed_key)
        Gtkmm2ext::KeyboardKey new_binding (mod, pressed_key);
 
        if (bindings->is_bound (new_binding, Gtkmm2ext::Bindings::Press)) {
-               bindings_collision_dialog (owner);
+               bindings_collision_dialog (owner, bindings->bound_name (new_binding, Gtkmm2ext::Bindings::Press));
                return;
        }