Add control+keypad bindings to zoom.

diff --git a/ChangeLog b/ChangeLog
index 32f645475f863ba01b64e1247d24a1b50b511040..cbc75f12e909aa2b4b54ffd8923334cced3263b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-02  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+       * data/evince-ui.xml:
+       * shell/ev-window.c: (ev_window_set_view_accels_sensitivity):
+       
+       Add <ctrl>KP_Add and <ctrl>KP_Substract bindings.
+
 2005-09-27  Christian Persch  <chpe@cvs.gnome.org>
 
        * shell/ev-window.c: (launch_link), (launch_external_uri),

diff --git a/data/evince-ui.xml b/data/evince-ui.xml
index b8e772df4b32508fb323893c4fec971e53ba26a1..e280cbbe9a9677c37f7566cda92cf1f616506c39 100644 (file)
--- a/data/evince-ui.xml
+++ b/data/evince-ui.xml
@@ -60,6 +60,8 @@
 
   <accelerator name="PageDownAccel" action="PageDown"/>
   <accelerator name="PageUpAccel" action="PageUp"/>
+  <accelerator name="GoBackwardFastAccel" action="GoBackwardFast"/>
+  <accelerator name="GoForwardFastAccel" action="GoForwardFast"/>
   <accelerator name="EscapeAccel" action="Escape"/>
   <accelerator name="SlashAccel" action="Slash"/>
   <accelerator name="SpaceAccel" action="Space"/>
@@ -69,10 +71,11 @@
   <accelerator name="FocusPageSelectorAccel" action="FocusPageSelector"/>
   <accelerator name="PlusAccel" action="Plus"/>
   <accelerator name="MinusAccel" action="Minus"/>
+  <accelerator name="Equal" action="Equal"/>
   <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"/>
+  <accelerator name="CtrlKpPlusAccel" action="CtrlKpPlus"/>
+  <accelerator name="CtrlKpMinusAccel" action="CtrlKpMinus"/>
   
 </ui>

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 979298fdb5b9ed6e8263bdf331ff58574dff5e86..d3ac46a540a9efb0523c5a2ee9256ff9c9baf163 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2924,6 +2924,8 @@ static const GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_view_zoom_in) },
         { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "<control>equal", NULL,
           G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "Equal", GTK_STOCK_ZOOM_IN, NULL, "equal", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
         { "Minus", GTK_STOCK_ZOOM_OUT, NULL, "minus", NULL,
           G_CALLBACK (ev_window_cmd_view_zoom_out) },
         { "FocusPageSelector", NULL, "", "<control>l", NULL,
@@ -2936,6 +2938,10 @@ static const GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_view_zoom_in) },
         { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract", NULL,
           G_CALLBACK (ev_window_cmd_view_zoom_out) },
+        { "CtrlKpPlus", GTK_STOCK_ZOOM_IN, NULL, "<control>KP_Add", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "CtrlKpMinus", GTK_STOCK_ZOOM_OUT, NULL, "<control>KP_Subtract", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_out) },
 };
 
 /* Toggle items */
@@ -3156,6 +3162,7 @@ ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
                set_action_sensitive (window, "Minus", sensitive);
                set_action_sensitive (window, "KpPlus", sensitive);
                set_action_sensitive (window, "KpMinus", sensitive);
+               set_action_sensitive (window, "Equal", sensitive);
        }
 }