diff options
| author | Robin Gareus <robin@gareus.org> | 2017-01-12 20:51:29 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-01-12 20:53:20 +0100 |
| commit | d36f19ded9d77f37102bb7986d01aa1629916d84 (patch) | |
| tree | 1fed2d00115024a310c6ed60a8ffe0e995debb5a /gtk2_ardour/keyeditor.cc | |
| parent | cd14e8f2e10c45116274da4c902f63a76e5d3a01 (diff) | |
Display name of conflicting keyboard binding
Diffstat (limited to 'gtk2_ardour/keyeditor.cc')
| -rw-r--r-- | gtk2_ardour/keyeditor.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index 9df62ccb53..d6ecbd1159 100644 --- 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); @@ -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; } |