enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / step_entry.cc

diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc
index c2b6c2c6e8da60cd8a3fac4c994175dec76c6de0..855766b1c8ea9983dac0ff8227afd0d0905bb81f 100644 (file)
--- a/gtk2_ardour/step_entry.cc
+++ b/gtk2_ardour/step_entry.cc
@@ -33,7 +33,7 @@
 #include "tooltips.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -85,6 +85,7 @@ StepEntry::StepEntry (StepEditor& seditor)
        , _piano (0)
        , piano (0)
        , se (&seditor)
+       , myactions (X_("step entry"))
 {
         register_actions ();
         load_bindings ();
@@ -495,26 +496,18 @@ StepEntry::on_key_press_event (GdkEventKey* ev)
            forward to main window
         */
 
-       if (!gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) {
-                KeyboardKey k (ev->state, ev->keyval);
-
-                if (bindings->activate (k, Bindings::Press)) {
-                        return true;
-                }
+       if (gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) {
+               return true;
        }
 
-        return relay_key_press (ev);
+       return relay_key_press (ev, this);
 }
 
 bool
 StepEntry::on_key_release_event (GdkEventKey* ev)
 {
-       if (!gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) {
-                KeyboardKey k (ev->state, ev->keyval);
-
-                if (bindings->activate (k, Bindings::Release)) {
-                        return true;
-                }
+       if (gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) {
+               return true;
        }
 
         /* don't forward releases */
@@ -691,7 +684,7 @@ StepEntry::register_actions ()
 
 
         RadioAction::Group dot_group;
-                                         
+
         myactions.register_radio_action (group, dot_group, "no-dotted", _("No Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 0);
         myactions.register_radio_action (group, dot_group, "toggle-dotted", _("Toggled Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 1);
         myactions.register_radio_action (group, dot_group, "toggle-double-dotted", _("Toggled Double-Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 2);
@@ -701,7 +694,7 @@ StepEntry::register_actions ()
 void
 StepEntry::load_bindings ()
 {
-       bindings = Bindings::get_bindings (X_("step-editing"), myactions);
+       bindings = Bindings::get_bindings (X_("Step Editing"), myactions);
         set_data ("ardour-bindings", bindings);
 }