Translation updated by Tino Meinen.

[evince.git] / shell / ev-view.c

diff --git a/shell/ev-view.c b/shell/ev-view.c
index ebbd784872de17c1ea08ad36e83463622526289d..bf441533ff45c2df43ebd075fa58d9779b266404 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -113,6 +113,7 @@ static void       ev_view_set_scroll_adjustments             (EvView
                                                              GtkAdjustment      *vadjustment);
 static void       add_scroll_binding_keypad                  (GtkBindingSet      *binding_set,
                                                              guint               keyval,
                                                              GtkAdjustment      *vadjustment);
 static void       add_scroll_binding_keypad                  (GtkBindingSet      *binding_set,
                                                              guint               keyval,

+                                                             GdkModifierType modifiers,

                                                              GtkScrollType       scroll,
                                                              gboolean            horizontal);
 static void       ev_view_binding_activated                  (EvView             *view,
                                                              GtkScrollType       scroll,
                                                              gboolean            horizontal);
 static void       ev_view_binding_activated                  (EvView             *view,


@@ -420,6 +421,8 @@ view_set_adjustment_values (EvView         *view,
 static void
 view_update_range_and_current_page (EvView *view)
 {
 static void
 view_update_range_and_current_page (EvView *view)
 {

+       gint current_page;
+       

        if (view->pending_scroll != SCROLL_TO_KEEP_POSITION)
                return;
 
        if (view->pending_scroll != SCROLL_TO_KEEP_POSITION)
                return;
 


@@ -430,7 +433,6 @@ view_update_range_and_current_page (EvView *view)
        } else if (view->continuous) {
                GdkRectangle current_area, unused, page_area;
                GtkBorder border;
        } else if (view->continuous) {
                GdkRectangle current_area, unused, page_area;
                GtkBorder border;

-               gint current_page;

                gboolean found = FALSE;
                int i;
 
                gboolean found = FALSE;
                int i;
 


@@ -458,28 +460,33 @@ view_update_range_and_current_page (EvView *view)
                        }
                }
 
                        }
                }
 

-               current_page = ev_page_cache_get_current_page (view->page_cache);
-
-               if (current_page < view->start_page || current_page > view->end_page) {
-                       view->current_page = view->start_page;
-                       ev_page_cache_set_current_page (view->page_cache, view->start_page);
-               }

        } else {
                if (view->dual_page) {
        } else {
                if (view->dual_page) {

-                       if (view->current_page % 2 == 0) {
+                       if (view->current_page % 2 == DUAL_EVEN_LEFT) {

                                view->start_page = view->current_page;
                                if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache))
                                        view->end_page = view->start_page + 1;
                                else 
                                        view->end_page = view->start_page;
                        } else {
                                view->start_page = view->current_page;
                                if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache))
                                        view->end_page = view->start_page + 1;
                                else 
                                        view->end_page = view->start_page;
                        } else {

-                               view->start_page = view->current_page - 1;
+                               if (view->current_page - 1 < 0)
+                                       view->start_page = view->current_page;
+                               else
+                                       view->start_page = view->current_page - 1;

                                view->end_page = view->current_page;
                        }
                } else {
                        view->start_page = view->current_page;
                        view->end_page = view->current_page;
                }
                                view->end_page = view->current_page;
                        }
                } else {
                        view->start_page = view->current_page;
                        view->end_page = view->current_page;
                }

+
+       }
+
+       current_page = ev_page_cache_get_current_page (view->page_cache);
+
+       if (current_page < view->start_page || current_page > view->end_page) {
+               view->current_page = view->start_page;
+               ev_page_cache_set_current_page (view->page_cache, view->start_page);

        }
 
        ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
        }
 
        ev_pixbuf_cache_set_page_range (view->pixbuf_cache,


@@ -535,16 +542,17 @@ ev_view_set_scroll_adjustments (EvView *view,
 static void
 add_scroll_binding_keypad (GtkBindingSet  *binding_set,
                           guint           keyval,
 static void
 add_scroll_binding_keypad (GtkBindingSet  *binding_set,
                           guint           keyval,

+                          GdkModifierType modifiers,

                           GtkScrollType   scroll,
                           gboolean        horizontal)
 {
   guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
 
                           GtkScrollType   scroll,
                           gboolean        horizontal)
 {
   guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
 

-  gtk_binding_entry_add_signal (binding_set, keyval, 0,
+  gtk_binding_entry_add_signal (binding_set, keyval, modifiers,

                                 "binding_activated", 2,
                                 GTK_TYPE_SCROLL_TYPE, scroll,
                                G_TYPE_BOOLEAN, horizontal);
                                 "binding_activated", 2,
                                 GTK_TYPE_SCROLL_TYPE, scroll,
                                G_TYPE_BOOLEAN, horizontal);

-  gtk_binding_entry_add_signal (binding_set, keypad_keyval, 0,
+  gtk_binding_entry_add_signal (binding_set, keypad_keyval, modifiers,

                                 "binding_activated", 2,
                                 GTK_TYPE_SCROLL_TYPE, scroll,
                                G_TYPE_BOOLEAN, horizontal);
                                 "binding_activated", 2,
                                 GTK_TYPE_SCROLL_TYPE, scroll,
                                G_TYPE_BOOLEAN, horizontal);


@@ -578,7 +586,7 @@ ev_view_scroll (EvView        *view,
                                /* At the top of a page, assign the upper bound limit of previous page */
                        } else if (value == (adjustment->lower)) {
                                value = adjustment->upper - adjustment->page_size;
                                /* At the top of a page, assign the upper bound limit of previous page */
                        } else if (value == (adjustment->lower)) {
                                value = adjustment->upper - adjustment->page_size;

-                               ev_page_cache_set_current_page (view->page_cache, view->current_page - 1);
+                               ev_view_previous_page (view);

                                /* Jump to the top */
                        } else {
                                value = MAX (value - increment, adjustment->lower);
                                /* Jump to the top */
                        } else {
                                value = MAX (value - increment, adjustment->lower);


@@ -591,7 +599,7 @@ ev_view_scroll (EvView        *view,
                        /* At the bottom of a page, assign the lower bound limit of next page */
                        } else if (value == (adjustment->upper - adjustment->page_size)) {
                                value = 0;
                        /* At the bottom of a page, assign the lower bound limit of next page */
                        } else if (value == (adjustment->upper - adjustment->page_size)) {
                                value = 0;

-                               ev_page_cache_set_current_page (view->page_cache, view->current_page + 1);
+                               ev_view_next_page (view);

                        /* Jump to the bottom */
                        } else {
                                value = MIN (value + increment, adjustment->upper - adjustment->page_size);
                        /* Jump to the bottom */
                        } else {
                                value = MIN (value + increment, adjustment->upper - adjustment->page_size);


@@ -641,6 +649,12 @@ ev_view_binding_activated (EvView *view,
                case GTK_SCROLL_STEP_FORWARD:
                        value += adjustment->step_increment;
                        break;
                case GTK_SCROLL_STEP_FORWARD:
                        value += adjustment->step_increment;
                        break;

+               case GTK_SCROLL_STEP_DOWN:
+                       value -= adjustment->step_increment/10;
+                       break;
+               case GTK_SCROLL_STEP_UP:
+                       value += adjustment->step_increment/10;
+                       break;

                default:
                        break;
        }
                default:
                        break;
        }


@@ -717,7 +731,7 @@ get_page_y_offset (EvView *view, int page, double zoom, int *y_offset)
        if (view->dual_page) {
                ev_page_cache_get_height_to_page (view->page_cache, page,
                                                  view->rotation, zoom, NULL, &offset);
        if (view->dual_page) {
                ev_page_cache_get_height_to_page (view->page_cache, page,
                                                  view->rotation, zoom, NULL, &offset);

-               offset += (page / 2 + 1) * view->spacing + (page / 2) * (border.top + border.bottom);
+               offset += ((page + DUAL_EVEN_LEFT) / 2 + 1) * view->spacing + ((page + DUAL_EVEN_LEFT) / 2 ) * (border.top + border.bottom);

        } else {
                ev_page_cache_get_height_to_page (view->page_cache, page,
                                                  view->rotation, zoom, &offset, NULL);
        } else {
                ev_page_cache_get_height_to_page (view->page_cache, page,
                                                  view->rotation, zoom, &offset, NULL);


@@ -760,9 +774,9 @@ get_page_extents (EvView       *view,
                max_width = max_width + border->left + border->right;
                /* Get the location of the bounding box */
                if (view->dual_page) {
                max_width = max_width + border->left + border->right;
                /* Get the location of the bounding box */
                if (view->dual_page) {

-                       x = view->spacing + (page % 2) * (max_width + view->spacing);
+                       x = view->spacing + ((page % 2 == DUAL_EVEN_LEFT) ? 0 : 1) * (max_width + view->spacing);

                        x = x + MAX (0, widget->allocation.width - (max_width * 2 + view->spacing * 3)) / 2;
                        x = x + MAX (0, widget->allocation.width - (max_width * 2 + view->spacing * 3)) / 2;

-                       if (page % 2 == 0)
+                       if (page % 2 == DUAL_EVEN_LEFT)

                                x = x + (max_width - width - border->left - border->right);
                } else {
                        x = view->spacing;
                                x = x + (max_width - width - border->left - border->right);
                } else {
                        x = view->spacing;


@@ -782,10 +796,11 @@ get_page_extents (EvView       *view,
                        GtkBorder overall_border;
                        gint other_page;
 
                        GtkBorder overall_border;
                        gint other_page;
 

-                       other_page = page ^ 1;
+                       other_page = (page % 2 == DUAL_EVEN_LEFT) ? page + 1: page - 1;

 
                        /* First, we get the bounding box of the two pages */
 
                        /* First, we get the bounding box of the two pages */

-                       if (other_page < ev_page_cache_get_n_pages (view->page_cache)) {
+                       if (other_page < ev_page_cache_get_n_pages (view->page_cache)
+                           && (0 <= other_page)) {

                                ev_page_cache_get_size (view->page_cache,
                                                        other_page,
                                                        view->rotation,
                                ev_page_cache_get_size (view->page_cache,
                                                        other_page,
                                                        view->rotation,


@@ -803,7 +818,7 @@ get_page_extents (EvView       *view,
                        y = view->spacing;
 
                        /* Adjust for being the left or right page */
                        y = view->spacing;
 
                        /* Adjust for being the left or right page */

-                       if (page % 2 == 0)
+                       if (page % 2 == DUAL_EVEN_LEFT)

                                x = x + max_width - width;
                        else
                                x = x + (max_width + overall_border.left + overall_border.right) + view->spacing;
                                x = x + max_width - width;
                        else
                                x = x + (max_width + overall_border.left + overall_border.right) + view->spacing;


@@ -2537,10 +2552,14 @@ ev_view_class_init (EvViewClass *class)
 
        binding_set = gtk_binding_set_by_class (class);
 
 
        binding_set = gtk_binding_set_by_class (class);
 

-       add_scroll_binding_keypad (binding_set, GDK_Left,  GTK_SCROLL_STEP_BACKWARD, TRUE);
-       add_scroll_binding_keypad (binding_set, GDK_Right, GTK_SCROLL_STEP_FORWARD,  TRUE);
-       add_scroll_binding_keypad (binding_set, GDK_Up,    GTK_SCROLL_STEP_BACKWARD, FALSE);
-       add_scroll_binding_keypad (binding_set, GDK_Down,  GTK_SCROLL_STEP_FORWARD,  FALSE);
+       add_scroll_binding_keypad (binding_set, GDK_Left,  0, GTK_SCROLL_STEP_BACKWARD, TRUE);
+       add_scroll_binding_keypad (binding_set, GDK_Right, 0, GTK_SCROLL_STEP_FORWARD,  TRUE);
+       add_scroll_binding_keypad (binding_set, GDK_Left,  GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, TRUE);
+       add_scroll_binding_keypad (binding_set, GDK_Right, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  TRUE);
+       add_scroll_binding_keypad (binding_set, GDK_Up,    0, GTK_SCROLL_STEP_BACKWARD, FALSE);
+       add_scroll_binding_keypad (binding_set, GDK_Down,  0, GTK_SCROLL_STEP_FORWARD,  FALSE);
+       add_scroll_binding_keypad (binding_set, GDK_Up,    GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, FALSE);
+       add_scroll_binding_keypad (binding_set, GDK_Down,  GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  FALSE);

 }
 
 static void
 }
 
 static void


@@ -3938,6 +3957,9 @@ ev_view_next_page (EvView *view)
        if (page < ev_page_cache_get_n_pages (view->page_cache)) {
                ev_page_cache_set_current_page (view->page_cache, page);
                return TRUE;
        if (page < ev_page_cache_get_n_pages (view->page_cache)) {
                ev_page_cache_set_current_page (view->page_cache, page);
                return TRUE;

+       } else if (ev_view_get_dual_page (view) && page == ev_page_cache_get_n_pages (view->page_cache)) {
+               ev_page_cache_set_current_page (view->page_cache, page - 1);
+               return TRUE;

        } else {
                return FALSE;
        }
        } else {
                return FALSE;
        }


@@ -3956,7 +3978,10 @@ ev_view_previous_page (EvView *view)
        if (page >= 0) {
                ev_page_cache_set_current_page (view->page_cache, page);
                return TRUE;
        if (page >= 0) {
                ev_page_cache_set_current_page (view->page_cache, page);
                return TRUE;

-       } else {
+       } else if (ev_view_get_dual_page (view) && page == -1) {
+               ev_page_cache_set_current_page (view->page_cache, 0);
+               return TRUE;
+       } else {        

                return FALSE;
        }
 }
                return FALSE;
        }
 }