projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove debug output
[ardour.git]
/
gtk2_ardour
/
keyeditor.cc
diff --git
a/gtk2_ardour/keyeditor.cc
b/gtk2_ardour/keyeditor.cc
index 2ee265a3969297c154f212a0d69eab69fa13428a..0f70998c09124bf09c3e322439d82f33f617f2a3 100644
(file)
--- a/
gtk2_ardour/keyeditor.cc
+++ b/
gtk2_ardour/keyeditor.cc
@@
-30,10
+30,12
@@
#include <glib.h>
#include <glib/gstdio.h>
#include <glib.h>
#include <glib/gstdio.h>
-#include <gtkmm/stock.h>
-#include <gtkmm/label.h>
#include <gtkmm/accelkey.h>
#include <gtkmm/accelmap.h>
#include <gtkmm/accelkey.h>
#include <gtkmm/accelmap.h>
+#include <gtkmm/label.h>
+#include <gtkmm/separator.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/treemodelsort.h>
#include <gtkmm/uimanager.h>
#include "gtkmm2ext/bindings.h"
#include <gtkmm/uimanager.h>
#include "gtkmm2ext/bindings.h"
@@
-62,10
+64,11
@@
using Gtkmm2ext::Bindings;
sigc::signal<void> KeyEditor::UpdateBindings;
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);
{
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);
dialog.get_vbox()->pack_start (label, true, true);
dialog.add_button (_("Ok"), Gtk::RESPONSE_ACCEPT);
@@
-74,7
+77,7
@@
void bindings_collision_dialog (Gtk::Window& parent)
}
KeyEditor::KeyEditor ()
}
KeyEditor::KeyEditor ()
- : ArdourWindow (_("Key
Binding
s"))
+ : ArdourWindow (_("Key
board Shortcut
s"))
, unbind_button (_("Remove shortcut"))
, unbind_box (BUTTONBOX_END)
, filter_entry (_("Search..."), true)
, unbind_button (_("Remove shortcut"))
, unbind_box (BUTTONBOX_END)
, filter_entry (_("Search..."), true)
@@
-119,7
+122,7
@@
KeyEditor::KeyEditor ()
reset_label.show ();
print_button.show ();
reset_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::reset));
reset_label.show ();
print_button.show ();
reset_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::reset));
- vpacker.pack_start (*(manage (new HSeparator())),
true, tru
e, 5);
+ vpacker.pack_start (*(manage (new HSeparator())),
false, fals
e, 5);
vpacker.pack_start (reset_box, false, false);
add (vpacker);
vpacker.pack_start (reset_box, false, false);
add (vpacker);
@@
-319,7
+322,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)) {
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;
}
return;
}
@@
-368,8
+371,10
@@
KeyEditor::Tab::populate ()
}
//kinda kludgy way to avoid displaying menu items as mappable
}
//kinda kludgy way to avoid displaying menu items as mappable
- if ((action_name.find ("Menu") == action_name.length() - 4) ||
- (action_name.find ("menu") == action_name.length() - 4) ||
+ if ((action_name.find (X_("Menu")) == action_name.length() - 4) ||
+ (action_name.find (X_("menu")) == action_name.length() - 4) ||
+ (category.find (X_("Menu")) == category.length() - 4) ||
+ (category.find (X_("menu")) == category.length() - 4) ||
(action_name == _("RegionList"))) {
continue;
}
(action_name == _("RegionList"))) {
continue;
}