s/next page/page down s/previous page/page up

2005-01-04  Marco Pesenti Gritti  <marco@gnome.org>

        * data/evince-ui.xml:
        * shell/ev-window.c: (update_action_sensitivity),
        (ev_window_cmd_go_page_up), (ev_window_cmd_go_page_down):

        s/next page/page down
        s/previous page/page up

diff --git a/ChangeLog b/ChangeLog
index 603bfa1f71f868fa3f99a56a4f8faa1f4a35f47b..3b26cef7de3377ffefb579d115790dca6553a893 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-04  Marco Pesenti Gritti  <marco@gnome.org>
+
+       * data/evince-ui.xml:
+       * shell/ev-window.c: (update_action_sensitivity),
+       (ev_window_cmd_go_page_up), (ev_window_cmd_go_page_down):
+
+       s/next page/page down
+       s/previous page/page up
+
 2005-01-04  Marco Pesenti Gritti  <marco@gnome.org>
 
        * data/evince-ui.xml:

diff --git a/data/evince-ui.xml b/data/evince-ui.xml
index f24b84a99a3e1c00972231bed7ea85966358f135..be37be0cae8d9a3db8ab452fbaaacc08e53b581b 100644 (file)
--- a/data/evince-ui.xml
+++ b/data/evince-ui.xml
@@ -31,8 +31,8 @@
       <menuitem name="GoBackMenu" action="GoBack"/>
       <menuitem name="GoForwardMenu" action="GoForward"/>
       <separator name="GoSep1"/>
-      <menuitem name="GoPreviousPageMenu" action="GoPreviousPage"/>
-      <menuitem name="GoNextPageMenu" action="GoNextPage"/>
+      <menuitem name="GoPageUpMenu" action="GoPageUp"/>
+      <menuitem name="GoPageDownMenu" action="GoPageDown"/>
       <separator name="GoSep2"/>
       <menuitem name="GoFirstPageMenu" action="GoFirstPage"/>
       <menuitem name="GoLastPageMenu" action="GoLastPage"/>
@@ -49,8 +49,8 @@
     <toolitem action="NavigationForward"/>
     <separator/>
     <toolitem action="PageSelector"/>
-    <toolitem action="GoPreviousPage"/>
-    <toolitem action="GoNextPage"/>
+    <toolitem action="GoPageUp"/>
+    <toolitem action="GoPageDown"/>
     <separator/>
     <toolitem action="ViewZoomIn"/>
     <toolitem action="ViewZoomOut"/>

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 1128214bb7a82b4cb8b029a4dc09c0f5fa7761ac..007ca8893ac86d434178bde2ad9beb9d35b3695e 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -185,8 +185,8 @@ update_action_sensitivity (EvWindow *ev_window)
        page = ev_view_get_page (EV_VIEW (ev_window->priv->view));
 
        set_action_sensitive (ev_window, "GoFirstPage", page > 1);
-       set_action_sensitive (ev_window, "GoPreviousPage", page > 1);
-       set_action_sensitive (ev_window, "GoNextPage", page < n_pages);
+       set_action_sensitive (ev_window, "GoPageDown", page > 1);
+       set_action_sensitive (ev_window, "GoPageUp", page < n_pages);
        set_action_sensitive (ev_window, "GoLastPage", page < n_pages);
 }
 
@@ -755,7 +755,7 @@ ev_window_cmd_go_forward (GtkAction *action, EvWindow *ev_window)
 }
 
 static void
-ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_go_page_up (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
@@ -764,7 +764,7 @@ ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
 }
 
 static void
-ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_go_page_down (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
@@ -1152,12 +1152,12 @@ static GtkActionEntry entries[] = {
         { "GoForward", GTK_STOCK_GO_FORWARD, N_("Fo_rward"), "<mod1>Right",
           N_("Go to the page viewed before this one"),
           G_CALLBACK (ev_window_cmd_go_forward) },
-        { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<control>Page_Up",
+        { "GoPageDown", GTK_STOCK_GO_UP, N_("_Page Up"), "<control>Page_Up",
           N_("Go to the previous page"),
-          G_CALLBACK (ev_window_cmd_go_previous_page) },
-        { "GoNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<control>Page_Down",
+          G_CALLBACK (ev_window_cmd_go_page_up) },
+        { "GoPageUp", GTK_STOCK_GO_DOWN, N_("_Page Down"), "<control>Page_Down",
           N_("Go to the next page"),
-          G_CALLBACK (ev_window_cmd_go_next_page) },
+          G_CALLBACK (ev_window_cmd_go_page_down) },
         { "GoFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
           N_("Go to the first page"),
           G_CALLBACK (ev_window_cmd_go_first_page) },