From 191bfb7baf9d1602d6ba6e5d747fd5ffad1e59a9 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Tue, 10 Jul 2012 18:26:54 +0200
Subject: Shortcuts. Fix for Bug #167796 (zoom keys (shortcuts) 3,4,6 on
 numeric pad not working).

(bzr r11537)
---
 share/keys/default.xml  | 4 +++-
 share/keys/inkscape.xml | 2 ++
 src/pen-context.cpp     | 4 ----
 src/select-context.cpp  | 4 ----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/share/keys/default.xml b/share/keys/default.xml
index 3b1138555..ff3ceb943 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -233,8 +233,10 @@ override) the bindings in the main default.xml.
 
   <bind key="grave" modifiers="Shift" action="ZoomNext" display="true" /> <!-- ` -->
   <bind key="asciitilde" modifiers="Shift" action="ZoomNext" /> <!-- ~ -->
+  <bind key="KP_9" action="ZoomNext" />
   <bind key="grave" action="ZoomPrev" display="true" /> <!-- ` -->
-
+  <bind key="KP_8" action="ZoomPrev" />
+  
 <!-- View -->
 
   <bind key="F11" action="FullScreen" display="true" /> 
diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index 8272fc785..f143f0835 100644
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -230,7 +230,9 @@ override) the bindings in the main default.xml.
 
   <bind key="grave" modifiers="Shift" action="ZoomNext" display="true" /> <!-- ` -->
   <bind key="asciitilde" modifiers="Shift" action="ZoomNext" /> <!-- ~ -->
+  <bind key="KP_9" action="ZoomNext" />
   <bind key="grave" action="ZoomPrev" display="true" /> <!-- ` -->
+  <bind key="KP_8" action="ZoomPrev" />
 
 <!-- View -->
 
diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index 6bf6531be..ade041019 100644
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -978,7 +978,6 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
 
         case GDK_KEY_Left: // move last point left
         case GDK_KEY_KP_Left:
-        case GDK_KEY_KP_4:
             if (!MOD__CTRL) { // not ctrl
                 if (MOD__ALT) { // alt
                     if (MOD__SHIFT) pen_lastpoint_move_screen(pc, -10, 0); // shift
@@ -993,7 +992,6 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
             break;
         case GDK_KEY_Up: // move last point up
         case GDK_KEY_KP_Up:
-        case GDK_KEY_KP_8:
             if (!MOD__CTRL) { // not ctrl
                 if (MOD__ALT) { // alt
                     if (MOD__SHIFT) pen_lastpoint_move_screen(pc, 0, 10); // shift
@@ -1008,7 +1006,6 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
             break;
         case GDK_KEY_Right: // move last point right
         case GDK_KEY_KP_Right:
-        case GDK_KEY_KP_6:
             if (!MOD__CTRL) { // not ctrl
                 if (MOD__ALT) { // alt
                     if (MOD__SHIFT) pen_lastpoint_move_screen(pc, 10, 0); // shift
@@ -1023,7 +1020,6 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
             break;
         case GDK_KEY_Down: // move last point down
         case GDK_KEY_KP_Down:
-        case GDK_KEY_KP_2:
             if (!MOD__CTRL) { // not ctrl
                 if (MOD__ALT) { // alt
                     if (MOD__SHIFT) pen_lastpoint_move_screen(pc, 0, -10); // shift
diff --git a/src/select-context.cpp b/src/select-context.cpp
index 974a587ea..91e0e6298 100644
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
@@ -910,7 +910,6 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
 			switch (get_group0_keyval (&event->key)) {
                 case GDK_KEY_Left: // move selection left
                 case GDK_KEY_KP_Left:
-                case GDK_KEY_KP_4:
                     if (!MOD__CTRL) { // not ctrl
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
@@ -927,7 +926,6 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                     break;
                 case GDK_KEY_Up: // move selection up
                 case GDK_KEY_KP_Up:
-                case GDK_KEY_KP_8:
                     if (!MOD__CTRL) { // not ctrl
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
@@ -944,7 +942,6 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                     break;
                 case GDK_KEY_Right: // move selection right
                 case GDK_KEY_KP_Right:
-                case GDK_KEY_KP_6:
                     if (!MOD__CTRL) { // not ctrl
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
@@ -961,7 +958,6 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                     break;
                 case GDK_KEY_Down: // move selection down
                 case GDK_KEY_KP_Down:
-                case GDK_KEY_KP_2:
                     if (!MOD__CTRL) { // not ctrl
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
-- 
cgit v1.2.3