projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak some colours as per Chris' suggestions in #3254.
[ardour.git]
/
gtk2_ardour
/
keyboard.cc
diff --git
a/gtk2_ardour/keyboard.cc
b/gtk2_ardour/keyboard.cc
index bcdd551c0ab82a67e24de16b805aed5162dd2f8c..983d5e2ddfbea9493d80d7b00dadfcbcb8b2b213 100644
(file)
--- a/
gtk2_ardour/keyboard.cc
+++ b/
gtk2_ardour/keyboard.cc
@@
-22,6
+22,7
@@
#include "ardour/filesystem_paths.h"
#include "ardour/filesystem_paths.h"
+#include "ardour_ui.h"
#include "keyboard.h"
#include "opts.h"
#include "keyboard.h"
#include "opts.h"
@@
-38,9
+39,11
@@
accel_map_changed (GtkAccelMap* /*map*/,
gchar* /*path*/,
guint /*key*/,
GdkModifierType /*mod*/,
gchar* /*path*/,
guint /*key*/,
GdkModifierType /*mod*/,
- gpointer
/*arg*/
)
+ gpointer
keyboard
)
{
{
+ ArdourKeyboard* me = (ArdourKeyboard*)keyboard;
Keyboard::keybindings_changed ();
Keyboard::keybindings_changed ();
+ me->ui.setup_tooltips ();
}
void
}
void
@@
-129,7
+132,7
@@
ArdourKeyboard::setup_keybindings ()
if ( ! find_file_in_search_path (spath, keybindings_path, keybindings_file)) {
if (keybindings_path == default_bindings) {
if ( ! find_file_in_search_path (spath, keybindings_path, keybindings_file)) {
if (keybindings_path == default_bindings) {
- error <<
_("Default keybindings not found - Ardour will be hard to use!"
) << endmsg;
+ error <<
string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME
) << endmsg;
return;
} else {
warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"),
return;
} else {
warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"),
@@
-153,7
+156,7
@@
ArdourKeyboard::setup_keybindings ()
if (!Glib::file_test (keybindings_path, Glib::FILE_TEST_EXISTS)) {
if (keybindings_path == default_bindings) {
if (!Glib::file_test (keybindings_path, Glib::FILE_TEST_EXISTS)) {
if (keybindings_path == default_bindings) {
- error <<
_("Default keybindings not found - Ardour will be hard to use!"
) << endmsg;
+ error <<
string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME
) << endmsg;
return;
} else {
warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"),
return;
} else {
warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"),
@@
-173,7
+176,7
@@
ArdourKeyboard::setup_keybindings ()
/* catch changes */
GtkAccelMap* accelmap = gtk_accel_map_get();
/* catch changes */
GtkAccelMap* accelmap = gtk_accel_map_get();
- g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed,
0
);
+ g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed,
this
);
}
Selection::Operation
}
Selection::Operation