From 821a2bfb8c4b28ea0c0339a32d35d2a173aebbd1 Mon Sep 17 00:00:00 2001
From: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Date: Tue, 12 Jul 2005 08:45:59 +0000
Subject: Add keypad accelerators for zooming. Fix for bug 308128.

2005-07-12  Nickolay V. Shmyrev <nshmyrev@yandex.ru>

        * data/evince-ui.xml, shell/ev-window.c:

        Add keypad accelerators for zooming. Fix for bug 308128.
---
diff --git a/ChangeLog b/ChangeLog
index 404ed2f..782c7fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-12  Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+	* data/evince-ui.xml, shell/ev-window.c:
+	
+	Add keypad accelerators for zooming. Fix for bug 308128.
+
 2005-07-11  Marco Pesenti Gritti  <mpg@redhat.com>
 
 	* Makefile.am:
diff --git a/data/evince-ui.xml b/data/evince-ui.xml
index 90c6699..3966f55 100644
--- a/data/evince-ui.xml
+++ b/data/evince-ui.xml
@@ -73,4 +73,7 @@
   <accelerator name="CtrlEqualAccel" action="CtrlEqual"/>
   <accelerator name="GoBackwardFastAccel" action="GoBackwardFast"/>
   <accelerator name="GoForwardFastAccel" action="GoForwardFast"/>
+  <accelerator name="KpPlusAccel" action="KpPlus"/>
+  <accelerator name="KpMinusAccel" action="KpMinus"/>
+  
 </ui>
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 4ac2bb3..1982f8c 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2844,6 +2844,12 @@ static const GtkActionEntry entries[] = {
         { "GoForwardFast", NULL, "", "<shift>Page_Down",
           N_("Go ten pages forward"),
           G_CALLBACK (ev_window_cmd_go_forward) },
+        { "KpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add",
+          N_("Enlarge the document"),
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract",
+          N_("Shrink the document"),
+          G_CALLBACK (ev_window_cmd_view_zoom_out) },
 };
 
 /* Toggle items */
@@ -3085,7 +3091,7 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
 
 
 static void
-set_view_actions_sensitivity (EvWindow *window, gboolean sensitive)
+ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
 {
 	if (window->priv->action_group) {
 		set_action_sensitive (window, "PageDown", sensitive);
@@ -3097,6 +3103,8 @@ set_view_actions_sensitivity (EvWindow *window, gboolean sensitive)
 		set_action_sensitive (window, "Slash", sensitive);
 		set_action_sensitive (window, "Plus", sensitive);
 		set_action_sensitive (window, "Minus", sensitive);
+		set_action_sensitive (window, "KpPlus", sensitive);
+		set_action_sensitive (window, "KpMinus", sensitive);
 	}
 }
 
@@ -3106,7 +3114,7 @@ view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *win
 	update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, FALSE);
 	set_action_sensitive (window, "ViewToolbar", TRUE);
 
-	set_view_actions_sensitivity (window, TRUE);
+	ev_window_set_view_accels_sensitivity (window, TRUE);
 
 	return FALSE;
 }
@@ -3114,7 +3122,7 @@ view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *win
 static gboolean
 view_actions_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {
-	set_view_actions_sensitivity (window, FALSE);
+	ev_window_set_view_accels_sensitivity (window, FALSE);
 
 	return FALSE;
 }
@@ -3220,7 +3228,7 @@ ev_window_init (EvWindow *ev_window)
 		gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager);
 	gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group);
 
-	set_view_actions_sensitivity (ev_window, FALSE);
+	ev_window_set_view_accels_sensitivity (ev_window, FALSE);
 
 	g_signal_connect (ev_window->priv->ui_manager, "connect_proxy",
 			  G_CALLBACK (connect_proxy_cb), ev_window);
--
cgit v0.9.1