From eeb5ce779c492e81fbdc0c52d0ed1217e939f83a Mon Sep 17 00:00:00 2001
From: Dave Peticolas <dave@krondo.com>
Date: Mon, 12 Feb 2001 23:56:19 +0000
Subject: [PATCH] Use the same accelerator keys in register and date widget.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3649 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/gnome/gnc-dateedit.c            | 26 ++++++++++++++++++++------
 src/register/gnome/datecell-gnome.c |  6 +++---
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/gnome/gnc-dateedit.c b/src/gnome/gnc-dateedit.c
index 1b565ac103..44c3135916 100644
--- a/src/gnome/gnc-dateedit.c
+++ b/src/gnome/gnc-dateedit.c
@@ -567,16 +567,30 @@ date_accel_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
                 case GDK_plus:
                 case GDK_KP_Add:
                 case GDK_equal:
-                case GDK_KP_Equal:
-                        /* increment day */
-                        tm.tm_mday++;
+                        if (event->state & GDK_SHIFT_MASK)
+                                tm.tm_mday += 7;
+                        else if (event->state & GDK_MOD1_MASK)
+                                tm.tm_mon++;
+                        else if (event->state & GDK_CONTROL_MASK)
+                                tm.tm_year++;
+                        else
+                                tm.tm_mday++;
                         break;
 
-                case GDK_underscore:
                 case GDK_minus:
+                        if (dateSeparator () == '-')
+                                return FALSE;
+                        /* fall through */
+                case GDK_underscore:
                 case GDK_KP_Subtract:
-                        /* decrement day */
-                        tm.tm_mday--;
+                        if (event->state & GDK_SHIFT_MASK)
+                                tm.tm_mday -= 7;
+                        else if (event->state & GDK_MOD1_MASK)
+                                tm.tm_mon--;
+                        else if (event->state & GDK_CONTROL_MASK)
+                                tm.tm_year--;
+                        else
+                                tm.tm_mday--;
                         break;
 
                 case GDK_bracketright:
diff --git a/src/register/gnome/datecell-gnome.c b/src/register/gnome/datecell-gnome.c
index 20ebf82fc4..3ce4d62c9e 100644
--- a/src/register/gnome/datecell-gnome.c
+++ b/src/register/gnome/datecell-gnome.c
@@ -589,12 +589,12 @@ DateDirect (BasicCell *bcell,
         date->tm_mday++;
       break;
 
-    case GDK_KP_Subtract:
-    case GDK_underscore:
     case GDK_minus:
       if (dateSeparator () == '-')
         return FALSE;
-
+      /* fall through */
+    case GDK_KP_Subtract:
+    case GDK_underscore:
       if (event->state & GDK_SHIFT_MASK)
         date->tm_mday -= 7;
       else if (event->state & GDK_MOD1_MASK)