[shell] Use correct timestamps

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

diff --git a/libview/ev-view.c b/libview/ev-view.c
index b2fb610d8bcb5706355e9477633899ef46a686d7..973da901eb5be6aaaa2f7194e47873086be2d3e3 100644 (file)
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -34,7 +34,6 @@
 #include "ev-document-links.h"
 #include "ev-document-misc.h"
 #include "ev-document-transition.h"
 #include "ev-document-links.h"
 #include "ev-document-misc.h"
 #include "ev-document-transition.h"

-#include "ev-page-cache.h"

 #include "ev-pixbuf-cache.h"
 #include "ev-transition-animation.h"
 #include "ev-view-marshal.h"
 #include "ev-pixbuf-cache.h"
 #include "ev-transition-animation.h"
 #include "ev-view-marshal.h"


@@ -85,14 +84,9 @@ typedef enum {
 #define ZOOM_IN_FACTOR  1.2
 #define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR)
 
 #define ZOOM_IN_FACTOR  1.2
 #define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR)
 

-#define MIN_SCALE 0.05409
-#define MAX_SCALE 4.0
-

 #define SCROLL_TIME 150
 
 /*** Scrolling ***/
 #define SCROLL_TIME 150
 
 /*** Scrolling ***/

-static void       scroll_to_current_page                    (EvView *view,
-                                                             GtkOrientation orientation);

 static void       ev_view_set_scroll_adjustments             (GtkLayout          *layout,
                                                              GtkAdjustment      *hadjustment,
                                                              GtkAdjustment      *vadjustment);
 static void       ev_view_set_scroll_adjustments             (GtkLayout          *layout,
                                                              GtkAdjustment      *hadjustment,
                                                              GtkAdjustment      *vadjustment);


@@ -135,7 +129,7 @@ static void       find_page_at_location                      (EvView
                                                              gint               *page,
                                                              gint               *x_offset,
                                                              gint               *y_offset);
                                                              gint               *page,
                                                              gint               *x_offset,
                                                              gint               *y_offset);

-static gboolean  doc_point_to_view_point                    (EvView             *view,
+static void       doc_point_to_view_point                   (EvView             *view,

                                                              int                 page,
                                                              EvPoint            *doc_point,
                                                              GdkPoint           *view_point);
                                                              int                 page,
                                                              EvPoint            *doc_point,
                                                              GdkPoint           *view_point);


@@ -216,11 +210,15 @@ static void       ev_view_reload_page                        (EvView
                                                              GdkRegion          *region);
 
 /*** Callbacks ***/
                                                              GdkRegion          *region);
 
 /*** Callbacks ***/

+static void       ev_view_change_page                        (EvView             *view,
+                                                             gint                new_page,
+                                                             gboolean            start_transition);

 static void       job_finished_cb                            (EvPixbufCache      *pixbuf_cache,
                                                              GdkRegion          *region,
                                                              EvView             *view);
 static void       job_finished_cb                            (EvPixbufCache      *pixbuf_cache,
                                                              GdkRegion          *region,
                                                              EvView             *view);

-static void       page_changed_cb                            (EvPageCache        *page_cache,
-                                                             int                 new_page,
+static void       ev_view_page_changed_cb                    (EvDocumentModel    *model,
+                                                             gint                old_page,
+                                                             gint                new_page,

                                                              EvView             *view);
 static void       on_adjustment_value_changed                (GtkAdjustment      *adjustment,
                                                              EvView             *view);
                                                              EvView             *view);
 static void       on_adjustment_value_changed                (GtkAdjustment      *adjustment,
                                                              EvView             *view);


@@ -483,42 +481,30 @@ ev_view_get_height_to_page (EvView *view,
 }
 
 static void
 }
 
 static void

-scroll_to_current_page (EvView *view, GtkOrientation orientation)
+scroll_to_point (EvView        *view,
+                gdouble        x,
+                gdouble        y,
+                GtkOrientation orientation)

 {
 {

-       GdkPoint view_point;
-
-       if (view->document == NULL) {
-               return;
-       }
-
-        doc_point_to_view_point (view, view->current_page, &view->pending_point, &view_point);
-
-       if (orientation == GTK_ORIENTATION_VERTICAL) {
-               view->pending_point.y = 0;
-       } else {
-               view->pending_point.x = 0;
-       }
-

        if (orientation == GTK_ORIENTATION_VERTICAL) {
                if (view->continuous) {
                        gtk_adjustment_clamp_page (view->vadjustment,
        if (orientation == GTK_ORIENTATION_VERTICAL) {
                if (view->continuous) {
                        gtk_adjustment_clamp_page (view->vadjustment,

-                                                  view_point.y - view->spacing / 2,
-                                                  view_point.y + view->vadjustment->page_size);
+                                                  y - view->spacing / 2,
+                                                  y + view->vadjustment->page_size);

                } else {
                        gtk_adjustment_set_value (view->vadjustment,
                } else {
                        gtk_adjustment_set_value (view->vadjustment,

-                                                 CLAMP (view_point.y,
+                                                 CLAMP (y,

                                                  view->vadjustment->lower,
                                                  view->vadjustment->upper -
                                                  view->vadjustment->page_size));
                }
        } else {
                if (view->dual_page) {
                                                  view->vadjustment->lower,
                                                  view->vadjustment->upper -
                                                  view->vadjustment->page_size));
                }
        } else {
                if (view->dual_page) {

-                       gtk_adjustment_clamp_page (view->hadjustment,
-                                                  view_point.x,
-                                                  view_point.x + view->hadjustment->page_size);
+                       gtk_adjustment_clamp_page (view->hadjustment, x,
+                                                  x + view->hadjustment->page_size);

                } else {
                        gtk_adjustment_set_value (view->hadjustment,
                } else {
                        gtk_adjustment_set_value (view->hadjustment,

-                                                 CLAMP (view_point.x,
+                                                 CLAMP (x,

                                                  view->hadjustment->lower,
                                                  view->hadjustment->upper -
                                                  view->hadjustment->page_size));
                                                  view->hadjustment->lower,
                                                  view->hadjustment->upper -
                                                  view->hadjustment->page_size));


@@ -526,6 +512,34 @@ scroll_to_current_page (EvView *view, GtkOrientation orientation)
        }
 }
 
        }
 }
 

+static void
+ev_view_scroll_to_page_position (EvView *view, GtkOrientation orientation)
+{
+       gdouble x, y;
+
+       if (!view->document)
+               return;
+
+       if ((orientation == GTK_ORIENTATION_VERTICAL && view->pending_point.y == 0) ||
+           (orientation == GTK_ORIENTATION_HORIZONTAL && view->pending_point.x == 0)) {
+               GdkRectangle page_area;
+               GtkBorder    border;
+
+               get_page_extents (view, view->current_page, &page_area, &border);
+               x = page_area.x;
+               y = page_area.y;
+       } else {
+               GdkPoint view_point;
+
+               doc_point_to_view_point (view, view->current_page,
+                                        &view->pending_point, &view_point);
+               x = view_point.x;
+               y = view_point.y;
+       }
+
+       scroll_to_point (view, x, y, orientation);
+}
+

 static void
 view_set_adjustment_values (EvView         *view,
                            GtkOrientation  orientation)
 static void
 view_set_adjustment_values (EvView         *view,
                            GtkOrientation  orientation)


@@ -580,7 +594,7 @@ view_set_adjustment_values (EvView         *view,
                        gtk_adjustment_set_value (adjustment, (int)new_value);
                        break;
                case SCROLL_TO_PAGE_POSITION:
                        gtk_adjustment_set_value (adjustment, (int)new_value);
                        break;
                case SCROLL_TO_PAGE_POSITION:

-                       scroll_to_current_page (view, orientation);
+                       ev_view_scroll_to_page_position (view, orientation);

                        break;
                case SCROLL_TO_CENTER:
                        new_value = CLAMP (adjustment->upper * factor - adjustment->page_size * 0.5 + 0.5,
                        break;
                case SCROLL_TO_CENTER:
                        new_value = CLAMP (adjustment->upper * factor - adjustment->page_size * 0.5 + 0.5,


@@ -663,11 +677,11 @@ view_update_range_and_current_page (EvView *view)
        }
 
        best_current_page = MAX (best_current_page, view->start_page);
        }
 
        best_current_page = MAX (best_current_page, view->start_page);

-       current_page = ev_page_cache_get_current_page (view->page_cache);
+       current_page = ev_document_model_get_page (view->model);

 
        if ((current_page != best_current_page) && (view->pending_scroll == SCROLL_TO_KEEP_POSITION)) {
                view->current_page = best_current_page;
 
        if ((current_page != best_current_page) && (view->pending_scroll == SCROLL_TO_KEEP_POSITION)) {
                view->current_page = best_current_page;

-               ev_page_cache_set_current_page (view->page_cache, best_current_page);
+               ev_document_model_set_page (view->model, best_current_page);

        }
 
        if (start != view->start_page || end != view->end_page) {
        }
 
        if (start != view->start_page || end != view->end_page) {


@@ -753,6 +767,79 @@ add_scroll_binding_keypad (GtkBindingSet  *binding_set,
                                G_TYPE_BOOLEAN, horizontal);
 }
 
                                G_TYPE_BOOLEAN, horizontal);
 }
 

+static gdouble
+compute_scroll_increment (EvView        *view,
+                         GtkScrollType  scroll)
+{
+       GtkWidget *widget = GTK_WIDGET (view);
+       GtkAdjustment *adjustment = view->vadjustment;
+       GdkRegion *text_region, *region;
+       gint page;
+       GdkRectangle rect;
+       EvRectangle doc_rect;
+       GdkRectangle page_area;
+       GtkBorder border;
+       GdkRectangle *recs;
+       gint n_recs;
+       gdouble fraction = 1.0;
+
+       if (scroll != GTK_SCROLL_PAGE_BACKWARD && scroll != GTK_SCROLL_PAGE_FORWARD)
+               return adjustment->page_size;
+
+       page = scroll == GTK_SCROLL_PAGE_BACKWARD ? view->start_page : view->end_page;
+
+       text_region = ev_pixbuf_cache_get_text_mapping (view->pixbuf_cache, page);
+       if (!text_region || gdk_region_empty (text_region))
+               return adjustment->page_size;
+
+       get_page_extents (view, page, &page_area, &border);
+       rect.x = page_area.x + view->scroll_x;
+       rect.y = view->scroll_y + (scroll == GTK_SCROLL_PAGE_BACKWARD ? 5 : widget->allocation.height - 5);
+       rect.width = page_area.width;
+       rect.height = 1;
+       view_rect_to_doc_rect (view, &rect, &page_area, &doc_rect);
+
+       /* Convert the doc rectangle into a GdkRectangle */
+       rect.x = doc_rect.x1;
+       rect.y = doc_rect.y1;
+       rect.width = doc_rect.x2 - doc_rect.x1;
+       rect.height = MAX (1, doc_rect.y2 - doc_rect.y1);
+       region = gdk_region_rectangle (&rect);
+
+       gdk_region_intersect (region, text_region);
+       gdk_region_get_rectangles (region, &recs, &n_recs);
+       gdk_region_destroy (region);
+       if (n_recs > 0) {
+               EvRenderContext *rc;
+               EvPage  *ev_page;
+
+               ev_page = ev_document_get_page (view->document, page);
+               rc = ev_render_context_new (ev_page, view->rotation, view->scale);
+               g_object_unref (ev_page);
+               /* Get the selection region to know the height of the line */
+               doc_rect.x1 = doc_rect.x2 = recs[0].x + 0.5;
+               doc_rect.y1 = doc_rect.y2 = recs[0].y + 0.5;
+
+               ev_document_doc_mutex_lock ();
+               region = ev_selection_get_selection_region (EV_SELECTION (view->document),
+                                                           rc, EV_SELECTION_STYLE_LINE,
+                                                           &doc_rect);
+               ev_document_doc_mutex_unlock ();
+
+               g_object_unref (rc);
+               g_free (recs);
+               gdk_region_get_rectangles (region, &recs, &n_recs);
+               gdk_region_destroy (region);
+               if (n_recs > 0) {
+                       fraction = 1 - (recs[0].height / adjustment->page_size);
+               }
+               g_free (recs);
+       }
+
+       return adjustment->page_size * fraction;
+
+}
+

 void
 ev_view_scroll (EvView        *view,
                GtkScrollType  scroll,
 void
 ev_view_scroll (EvView        *view,
                GtkScrollType  scroll,


@@ -783,7 +870,6 @@ ev_view_scroll (EvView        *view,
 
        /* Assign values for increment and vertical adjustment */
        adjustment = horizontal ? view->hadjustment : view->vadjustment;
 
        /* Assign values for increment and vertical adjustment */
        adjustment = horizontal ? view->hadjustment : view->vadjustment;

-       increment = adjustment->page_size * 0.75;

        value = adjustment->value;
 
        /* Assign boolean for first and last page */
        value = adjustment->value;
 
        /* Assign boolean for first and last page */


@@ -803,6 +889,7 @@ ev_view_scroll (EvView        *view,
                                ev_view_previous_page (view);
                                /* Jump to the top */
                        } else {
                                ev_view_previous_page (view);
                                /* Jump to the top */
                        } else {

+                               increment = compute_scroll_increment (view, GTK_SCROLL_PAGE_BACKWARD);

                                value = MAX (value - increment, adjustment->lower);
                        }
                        break;
                                value = MAX (value - increment, adjustment->lower);
                        }
                        break;


@@ -816,6 +903,7 @@ ev_view_scroll (EvView        *view,
                                ev_view_next_page (view);
                        /* Jump to the bottom */
                        } else {
                                ev_view_next_page (view);
                        /* Jump to the bottom */
                        } else {

+                               increment = compute_scroll_increment (view, GTK_SCROLL_PAGE_FORWARD);

                                value = MIN (value + increment, adjustment->upper - adjustment->page_size);
                        }
                        break;
                                value = MIN (value + increment, adjustment->upper - adjustment->page_size);
                        }
                        break;


@@ -1110,7 +1198,7 @@ view_rect_to_doc_rect (EvView *view,
        doc_rect->y2 = doc_rect->y1 + (double) view_rect->height / view->scale;
 }
 
        doc_rect->y2 = doc_rect->y1 + (double) view_rect->height / view->scale;
 }
 

-static gboolean
+static void

 doc_point_to_view_point (EvView       *view,
                          int           page,
                         EvPoint      *doc_point,
 doc_point_to_view_point (EvView       *view,
                          int           page,
                         EvPoint      *doc_point,


@@ -1141,13 +1229,10 @@ doc_point_to_view_point (EvView       *view,
 
        get_page_extents (view, page, &page_area, &border);
 
 
        get_page_extents (view, page, &page_area, &border);
 

-       view_x = x * view->scale;
-       view_y = y * view->scale;
+       view_x = CLAMP (x * view->scale, 0, page_area.width);
+       view_y = CLAMP (y * view->scale, 0, page_area.height);

        view_point->x = view_x + page_area.x;
        view_point->y = view_y + page_area.y;
        view_point->x = view_x + page_area.x;
        view_point->y = view_y + page_area.y;

-
-       return (view_x > 0 && view_x <= page_area.width &&
-               view_y > 0 && view_y <= page_area.height);

 }
 
 static void
 }
 
 static void


@@ -1218,7 +1303,7 @@ find_page_at_location (EvView  *view,
        g_assert (x_offset);
        g_assert (y_offset);
 
        g_assert (x_offset);
        g_assert (y_offset);
 

-       for (i = view->start_page; i <= view->end_page; i++) {
+       for (i = view->start_page; i >= 0 && i <= view->end_page; i++) {

                GdkRectangle page_area;
                GtkBorder border;
 
                GdkRectangle page_area;
                GtkBorder border;
 


@@ -1411,18 +1496,14 @@ goto_fitr_dest (EvView *view, EvLinkDest *dest)
                                       ev_view_get_width (view),
                                       ev_view_get_height (view));
 
                                       ev_view_get_width (view),
                                       ev_view_get_height (view));
 

-       ev_view_set_sizing_mode (view, EV_SIZING_FREE);
-       ev_view_set_zoom (view, zoom, FALSE);
+       ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE);
+       ev_document_model_set_scale (view->model, zoom);

 
        doc_point.x = change_left ? left : 0;
        doc_point.y = change_top ? top : 0;
 
        doc_point.x = change_left ? left : 0;
        doc_point.y = change_top ? top : 0;

-       
-       view->current_page = ev_link_dest_get_page (dest);
-       if (change_left || change_top)
-               view->pending_point = doc_point;
-       view->pending_scroll = SCROLL_TO_PAGE_POSITION;
+       view->pending_point = doc_point;

 
 

-       gtk_widget_queue_resize (GTK_WIDGET (view));
+       ev_view_change_page (view, ev_link_dest_get_page (dest), TRUE);

 }
 
 static void
 }
 
 static void


@@ -1445,15 +1526,12 @@ goto_fitv_dest (EvView *view, EvLinkDest *dest)
                                         ev_view_get_width (view),
                                         ev_view_get_height (view));
 
                                         ev_view_get_width (view),
                                         ev_view_get_height (view));
 

-       ev_view_set_sizing_mode (view, EV_SIZING_FREE);
-       ev_view_set_zoom (view, zoom, FALSE);
+       ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE);
+       ev_document_model_set_scale (view->model, zoom);

 
 

-       view->current_page = page;
-       if (change_left)
-               view->pending_point = doc_point;
-       view->pending_scroll = SCROLL_TO_PAGE_POSITION;
+       view->pending_point = doc_point;

 
 

-       gtk_widget_queue_resize (GTK_WIDGET (view));
+       ev_view_change_page (view, page, TRUE);

 }
 
 static void
 }
 
 static void


@@ -1477,15 +1555,12 @@ goto_fith_dest (EvView *view, EvLinkDest *dest)
                                        ev_view_get_width (view),
                                        ev_view_get_height (view));
 
                                        ev_view_get_width (view),
                                        ev_view_get_height (view));
 

-       ev_view_set_sizing_mode (view, EV_SIZING_FIT_WIDTH);
-       ev_view_set_zoom (view, zoom, FALSE);
+       ev_document_model_set_sizing_mode (view->model, EV_SIZING_FIT_WIDTH);
+       ev_document_model_set_scale (view->model, zoom);

 
 

-       view->current_page = page;
-       if (change_top)
-               view->pending_point = doc_point;
-       view->pending_scroll = SCROLL_TO_PAGE_POSITION;
+       view->pending_point = doc_point;

 
 

-       gtk_widget_queue_resize (GTK_WIDGET (view));
+       ev_view_change_page (view, page, TRUE);

 }
 
 static void
 }
 
 static void


@@ -1502,13 +1577,10 @@ goto_fit_dest (EvView *view, EvLinkDest *dest)
                                       ev_view_get_width (view),
                                       ev_view_get_height (view));
 
                                       ev_view_get_width (view),
                                       ev_view_get_height (view));
 

-       ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT);
-       ev_view_set_zoom (view, zoom, FALSE);
-
-       view->current_page = page;
-       view->pending_scroll = SCROLL_TO_PAGE_POSITION;
+       ev_document_model_set_sizing_mode (view->model, EV_SIZING_BEST_FIT);
+       ev_document_model_set_scale (view->model, zoom);

 
 

-       gtk_widget_queue_resize (GTK_WIDGET (view));
+       ev_view_change_page (view, page, TRUE);

 }
 
 static void
 }
 
 static void


@@ -1523,8 +1595,8 @@ goto_xyz_dest (EvView *view, EvLinkDest *dest)
        page = ev_link_dest_get_page (dest);
 
        if (change_zoom && zoom > 1) {
        page = ev_link_dest_get_page (dest);
 
        if (change_zoom && zoom > 1) {

-               ev_view_set_sizing_mode (view, EV_SIZING_FREE);
-               ev_view_set_zoom (view, zoom, FALSE);
+               ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE);
+               ev_document_model_set_scale (view->model, zoom);

        }
 
        left = ev_link_dest_get_left (dest, &change_left);
        }
 
        left = ev_link_dest_get_left (dest, &change_left);


@@ -1532,13 +1604,9 @@ goto_xyz_dest (EvView *view, EvLinkDest *dest)
 
        doc_point.x = change_left ? left : 0;
        doc_point.y = change_top ? top : 0;
 
        doc_point.x = change_left ? left : 0;
        doc_point.y = change_top ? top : 0;

+       view->pending_point = doc_point;

 
 

-       view->current_page = page;
-       if (change_left || change_top)
-               view->pending_point = doc_point;
-       view->pending_scroll = SCROLL_TO_PAGE_POSITION;
-
-       gtk_widget_queue_resize (GTK_WIDGET (view));
+       ev_view_change_page (view, page, TRUE);

 }
 
 static void
 }
 
 static void


@@ -1559,7 +1627,7 @@ goto_dest (EvView *view, EvLinkDest *dest)
 
        switch (type) {
                case EV_LINK_DEST_TYPE_PAGE:
 
        switch (type) {
                case EV_LINK_DEST_TYPE_PAGE:

-                       ev_page_cache_set_current_page (view->page_cache, page);
+                       ev_document_model_set_page (view->model, page);

                        break;
                case EV_LINK_DEST_TYPE_FIT:
                        goto_fit_dest (view, dest);
                        break;
                case EV_LINK_DEST_TYPE_FIT:
                        goto_fit_dest (view, dest);


@@ -1577,15 +1645,14 @@ goto_dest (EvView *view, EvLinkDest *dest)
                        goto_xyz_dest (view, dest);
                        break;
                case EV_LINK_DEST_TYPE_PAGE_LABEL:
                        goto_xyz_dest (view, dest);
                        break;
                case EV_LINK_DEST_TYPE_PAGE_LABEL:

-                       ev_page_cache_set_page_label (view->page_cache, ev_link_dest_get_page_label (dest));
+                       ev_document_model_set_page_by_label (view->model, ev_link_dest_get_page_label (dest));

                        break;
                default:
                        g_assert_not_reached ();
        }
 
        if (current_page != view->current_page)
                        break;
                default:
                        g_assert_not_reached ();
        }
 
        if (current_page != view->current_page)

-               ev_page_cache_set_current_page (view->page_cache,
-                                               view->current_page);
+               ev_document_model_set_page (view->model, view->current_page);

 }
 
 static void
 }
 
 static void


@@ -2816,6 +2883,8 @@ ev_view_size_allocate (GtkWidget      *widget,
 
        view->pending_scroll = SCROLL_TO_KEEP_POSITION;
        view->pending_resize = FALSE;
 
        view->pending_scroll = SCROLL_TO_KEEP_POSITION;
        view->pending_resize = FALSE;

+       view->pending_point.x = 0;
+       view->pending_point.y = 0;

 
        children = gtk_container_get_children (GTK_CONTAINER (widget));
        for (l = children; l && l->data; l = g_list_next (l)) {
 
        children = gtk_container_get_children (GTK_CONTAINER (widget));
        for (l = children; l && l->data; l = g_list_next (l)) {


@@ -2905,6 +2974,8 @@ ev_view_realize (GtkWidget *widget)
                gdk_window_set_background (view->layout.bin_window, &widget->style->black);
        else
                gdk_window_set_background (view->layout.bin_window, &widget->style->mid [GTK_STATE_NORMAL]);
                gdk_window_set_background (view->layout.bin_window, &widget->style->black);
        else
                gdk_window_set_background (view->layout.bin_window, &widget->style->mid [GTK_STATE_NORMAL]);

+
+       on_adjustment_value_changed (NULL, view);

 }
 
 static gboolean
 }
 
 static gboolean


@@ -3085,7 +3156,7 @@ ev_view_expose_event (GtkWidget      *widget,
 
        cr = gdk_cairo_create (view->layout.bin_window);
        
 
        cr = gdk_cairo_create (view->layout.bin_window);
        

-       for (i = view->start_page; i <= view->end_page; i++) {
+       for (i = view->start_page; i >= 0 && i <= view->end_page; i++) {

                GdkRectangle page_area;
                GtkBorder border;
                gboolean page_ready = TRUE;
                GdkRectangle page_area;
                GtkBorder border;
                gboolean page_ready = TRUE;


@@ -3881,8 +3952,9 @@ ev_view_goto_entry_activate (GtkEntry *entry,
        
        ev_view_goto_window_hide (view);
 
        
        ev_view_goto_window_hide (view);
 

-       if (page >= 0 && page < ev_document_get_n_pages (view->document))
-               ev_page_cache_set_current_page (view->page_cache, page);
+       if (page >= 0 && page < ev_document_get_n_pages (view->document)) {
+               ev_document_model_set_page (view->model, page);
+       }

 }
 
 static void
 }
 
 static void


@@ -4296,7 +4368,7 @@ draw_one_page (EvView       *view,
        if (!view->presentation) {
                gint current_page;
                
        if (!view->presentation) {
                gint current_page;
                

-               current_page = ev_page_cache_get_current_page (view->page_cache);
+               current_page = ev_document_model_get_page (view->model);

                ev_document_misc_paint_one_page (view->layout.bin_window,
                                                 GTK_WIDGET (view),
                                                 page_area, border, 
                ev_document_misc_paint_one_page (view->layout.bin_window,
                                                 GTK_WIDGET (view),
                                                 page_area, border, 


@@ -4406,6 +4478,11 @@ ev_view_destroy (GtkObject *object)
 {
        EvView *view = EV_VIEW (object);
 
 {
        EvView *view = EV_VIEW (object);
 

+       if (view->model) {
+               g_object_unref (view->model);
+               view->model = NULL;
+       }
+

        if (view->document) {
                g_object_unref (view->document);
                view->document = NULL;
        if (view->document) {
                g_object_unref (view->document);
                view->document = NULL;


@@ -4486,7 +4563,7 @@ ev_view_set_property (GObject      *object,
                        ev_view_set_sizing_mode (view, g_value_get_enum (value));
                        break;
                case PROP_ZOOM:
                        ev_view_set_sizing_mode (view, g_value_get_enum (value));
                        break;
                case PROP_ZOOM:

-                       ev_view_set_zoom (view, g_value_get_double (value), FALSE);
+                       ev_view_set_zoom (view, g_value_get_double (value));

                        break;
                case PROP_ROTATION:
                        ev_view_set_rotation (view, g_value_get_int (value));
                        break;
                case PROP_ROTATION:
                        ev_view_set_rotation (view, g_value_get_int (value));


@@ -4697,6 +4774,7 @@ ev_view_class_init (EvViewClass *class)
                                                              360,
                                                              0,
                                                              G_PARAM_READWRITE));
                                                              360,
                                                              0,
                                                              G_PARAM_READWRITE));

+

        g_object_class_install_property (object_class,
                                         PROP_HAS_SELECTION,
                                         g_param_spec_boolean ("has-selection",
        g_object_class_install_property (object_class,
                                         PROP_HAS_SELECTION,
                                         g_param_spec_boolean ("has-selection",


@@ -4861,10 +4939,14 @@ job_finished_cb (EvPixbufCache *pixbuf_cache,
 }
 
 static void
 }
 
 static void

-page_changed_cb (EvPageCache *page_cache,
-                int          new_page,
-                EvView      *view)
+ev_view_page_changed_cb (EvDocumentModel *model,
+                        gint             old_page,
+                        gint             new_page,
+                        EvView          *view)

 {
 {

+       if (!view->document)
+               return;
+

        if (view->current_page != new_page) {
                if (view->presentation)
                        ev_view_presentation_animation_start (view, new_page);
        if (view->current_page != new_page) {
                if (view->presentation)
                        ev_view_presentation_animation_start (view, new_page);


@@ -4949,14 +5031,9 @@ ev_view_new (void)
 static void
 setup_caches (EvView *view)
 {
 static void
 setup_caches (EvView *view)
 {

-       view->page_cache = ev_page_cache_get (view->document);

        view->height_to_page_cache = ev_view_get_height_to_page_cache (view);
        view->height_to_page_cache = ev_view_get_height_to_page_cache (view);

-       g_signal_connect (view->page_cache, "page-changed", G_CALLBACK (page_changed_cb), view);

        view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->document);
        g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view);
        view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->document);
        g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view);

-       page_changed_cb (view->page_cache,
-                        ev_page_cache_get_current_page (view->page_cache),
-                        view);

 }
 
 static void
 }
 
 static void


@@ -4966,10 +5043,6 @@ clear_caches (EvView *view)
                g_object_unref (view->pixbuf_cache);
                view->pixbuf_cache = NULL;
        }
                g_object_unref (view->pixbuf_cache);
                view->pixbuf_cache = NULL;
        }

-
-       if (view->page_cache) {
-               view->page_cache = NULL;
-       }

 }
 
 void
 }
 
 void


@@ -5053,20 +5126,20 @@ ev_view_autoscroll_stop (EvView *view)
        ev_view_handle_cursor_over_xy (view, x, y);
 }
 
        ev_view_handle_cursor_over_xy (view, x, y);
 }
 

-void
-ev_view_set_document (EvView     *view,
-                     EvDocument *document)
+static void
+ev_view_document_changed_cb (EvDocumentModel *model,
+                            GParamSpec      *pspec,
+                            EvView          *view)

 {
 {

-       g_return_if_fail (EV_IS_VIEW (view));
+       EvDocument *document = ev_document_model_get_document (model);

 
        view->loading = FALSE;
 
        view->loading = FALSE;

-       
+

        if (document != view->document) {
                clear_caches (view);
 
                if (view->document) {
                        g_object_unref (view->document);
        if (document != view->document) {
                clear_caches (view);
 
                if (view->document) {
                        g_object_unref (view->document);

-                       view->page_cache = NULL;

                 }
 
                view->document = document;
                 }
 
                view->document = document;


@@ -5077,10 +5150,151 @@ ev_view_set_document (EvView     *view,
                        setup_caches (view);
                 }
 
                        setup_caches (view);
                 }
 

-               view_update_range_and_current_page (view);
+               ev_view_change_page (view,
+                                    ev_document_model_get_page (model),
+                                    TRUE);
+       }
+}
+
+static void
+ev_view_rotation_changed_cb (EvDocumentModel *model,
+                            GParamSpec      *pspec,
+                            EvView          *view)
+{
+       gint rotation = ev_document_model_get_rotation (model);
+
+       ev_view_set_rotation (view, rotation);
+
+       if (view->pixbuf_cache) {
+               ev_pixbuf_cache_clear (view->pixbuf_cache);
+               if (!ev_document_is_page_size_uniform (view->document))
+                       view->pending_scroll = SCROLL_TO_PAGE_POSITION;
+               gtk_widget_queue_resize (GTK_WIDGET (view));
+       }
+
+       ev_view_remove_all (view);
+
+       if (rotation != 0)
+               clear_selection (view);
+}
+
+static void
+ev_view_sizing_mode_changed_cb (EvDocumentModel *model,
+                               GParamSpec      *pspec,
+                               EvView          *view)
+{
+       EvSizingMode mode = ev_document_model_get_sizing_mode (model);

 
 

+       ev_view_set_sizing_mode (view, mode);
+
+       if (mode != EV_SIZING_FREE)

                gtk_widget_queue_resize (GTK_WIDGET (view));
                gtk_widget_queue_resize (GTK_WIDGET (view));

+}
+
+#define EPSILON 0.0000001
+static void
+ev_view_scale_changed_cb (EvDocumentModel *model,
+                         GParamSpec      *pspec,
+                         EvView          *view)
+{
+       gdouble scale = ev_document_model_get_scale (model);
+
+       if (ABS (view->scale - scale) < EPSILON)
+               return;
+
+       if (view->loading_text) {
+               cairo_surface_destroy (view->loading_text);
+               view->loading_text = NULL;

        }
        }

+
+       ev_view_set_zoom (view, scale);
+
+       view->pending_resize = TRUE;
+       gtk_widget_queue_resize (GTK_WIDGET (view));
+}
+
+static void
+ev_view_continuous_changed_cb (EvDocumentModel *model,
+                              GParamSpec      *pspec,
+                              EvView          *view)
+{
+       gboolean continuous = ev_document_model_get_continuous (model);
+
+       ev_view_set_continuous (view, continuous);
+       view->pending_scroll = SCROLL_TO_PAGE_POSITION;
+       gtk_widget_queue_resize (GTK_WIDGET (view));
+}
+
+static void
+ev_view_dual_page_changed_cb (EvDocumentModel *model,
+                             GParamSpec      *pspec,
+                             EvView          *view)
+{
+       gboolean dual_page = ev_document_model_get_dual_page (model);
+
+       ev_view_set_dual_page (view, dual_page);
+       view->pending_scroll = SCROLL_TO_PAGE_POSITION;
+       /* FIXME: if we're keeping the pixbuf cache around, we should extend the
+        * preload_cache_size to be 2 if dual_page is set.
+        */
+       gtk_widget_queue_resize (GTK_WIDGET (view));
+}
+
+static void
+ev_view_fullscreen_changed_cb (EvDocumentModel *model,
+                              GParamSpec      *pspec,
+                              EvView          *view)
+{
+       gboolean fullscreen = ev_document_model_get_fullscreen (model);
+
+       ev_view_set_fullscreen (view, fullscreen);
+       gtk_widget_queue_resize (GTK_WIDGET (view));
+}
+
+void
+ev_view_set_model (EvView          *view,
+                  EvDocumentModel *model)
+{
+       g_return_if_fail (EV_IS_VIEW (view));
+       g_return_if_fail (EV_IS_DOCUMENT_MODEL (model));
+
+       if (model == view->model)
+               return;
+
+       if (view->model) {
+               g_signal_handlers_disconnect_by_func (view->model,
+                                                     ev_view_document_changed_cb,
+                                                     view);
+               g_signal_handlers_disconnect_by_func (view->model,
+                                                     ev_view_page_changed_cb,
+                                                     view);
+               g_object_unref (view->model);
+       }
+       view->model = g_object_ref (model);
+       g_signal_connect (view->model, "notify::document",
+                         G_CALLBACK (ev_view_document_changed_cb),
+                         view);
+       g_signal_connect (view->model, "notify::rotation",
+                         G_CALLBACK (ev_view_rotation_changed_cb),
+                         view);
+       g_signal_connect (view->model, "notify::sizing-mode",
+                         G_CALLBACK (ev_view_sizing_mode_changed_cb),
+                         view);
+       g_signal_connect (view->model, "notify::scale",
+                         G_CALLBACK (ev_view_scale_changed_cb),
+                         view);
+       g_signal_connect (view->model, "notify::continuous",
+                         G_CALLBACK (ev_view_continuous_changed_cb),
+                         view);
+       g_signal_connect (view->model, "notify::dual-page",
+                         G_CALLBACK (ev_view_dual_page_changed_cb),
+                         view);
+       g_signal_connect (view->model, "notify::fullscreen",
+                         G_CALLBACK (ev_view_fullscreen_changed_cb),
+                         view);
+       g_signal_connect (view->model, "page-changed",
+                         G_CALLBACK (ev_view_page_changed_cb),
+                         view);

 }
 
 static void
 }
 
 static void


@@ -5104,38 +5318,11 @@ ev_view_reload (EvView *view)
 
 /*** Zoom and sizing mode ***/
 
 
 /*** Zoom and sizing mode ***/
 

-#define EPSILON 0.0000001

 void
 ev_view_set_zoom (EvView   *view,
 void
 ev_view_set_zoom (EvView   *view,

-                 double    factor,
-                 gboolean  relative)
+                 double    scale)

 {
 {

-       double scale;
-
-       if (relative)
-               scale = view->scale * factor;
-       else
-               scale = factor;
-
-       scale = CLAMP (scale,
-                      view->sizing_mode == EV_SIZING_FREE ? view->min_scale : 0,
-                      view->max_scale);
-
-       if (scale == view->scale)
-               return;
-
-       if (ABS (view->scale - scale) < EPSILON)
-               return;
-
-       if (view->loading_text) {
-               cairo_surface_destroy (view->loading_text);
-               view->loading_text = NULL;
-       }
-

        view->scale = scale;
        view->scale = scale;

-       view->pending_resize = TRUE;
-
-       gtk_widget_queue_resize (GTK_WIDGET (view));

 
        g_object_notify (G_OBJECT (view), "zoom");
 }
 
        g_object_notify (G_OBJECT (view), "zoom");
 }


@@ -5146,18 +5333,6 @@ ev_view_get_zoom (EvView *view)
        return view->scale;
 }
 
        return view->scale;
 }
 

-void
-ev_view_set_screen_dpi (EvView  *view,
-                       gdouble  dpi)
-{
-       g_return_if_fail (EV_IS_VIEW (view));
-       g_return_if_fail (dpi > 0);
-
-       view->dpi = dpi;
-       view->min_scale = MIN_SCALE * dpi / 72.0;
-       view->max_scale = MAX_SCALE * dpi / 72.0;
-}
-

 gboolean
 ev_view_get_continuous (EvView *view)
 {
 gboolean
 ev_view_get_continuous (EvView *view)
 {


@@ -5172,13 +5347,7 @@ ev_view_set_continuous (EvView   *view,
 {
        g_return_if_fail (EV_IS_VIEW (view));
 
 {
        g_return_if_fail (EV_IS_VIEW (view));
 

-       continuous = continuous != FALSE;
-
-       if (view->continuous != continuous) {
-               view->continuous = continuous;
-               view->pending_scroll = SCROLL_TO_PAGE_POSITION;
-               gtk_widget_queue_resize (GTK_WIDGET (view));
-       }
+       view->continuous = continuous;

 
        g_object_notify (G_OBJECT (view), "continuous");
 }
 
        g_object_notify (G_OBJECT (view), "continuous");
 }


@@ -5197,17 +5366,7 @@ ev_view_set_dual_page (EvView   *view,
 {
        g_return_if_fail (EV_IS_VIEW (view));
 
 {
        g_return_if_fail (EV_IS_VIEW (view));
 

-       dual_page = dual_page != FALSE;
-
-       if (view->dual_page == dual_page)
-               return;
-
-       view->pending_scroll = SCROLL_TO_PAGE_POSITION;

        view->dual_page = dual_page;
        view->dual_page = dual_page;

-       /* FIXME: if we're keeping the pixbuf cache around, we should extend the
-        * preload_cache_size to be 2 if dual_page is set.
-        */
-       gtk_widget_queue_resize (GTK_WIDGET (view));

 
        g_object_notify (G_OBJECT (view), "dual-page");
 }
 
        g_object_notify (G_OBJECT (view), "dual-page");
 }


@@ -5218,14 +5377,8 @@ ev_view_set_fullscreen (EvView   *view,
 {
        g_return_if_fail (EV_IS_VIEW (view));
 
 {
        g_return_if_fail (EV_IS_VIEW (view));
 

-       fullscreen = fullscreen != FALSE;
-
-       if (view->fullscreen == fullscreen) 
-               return;
-               

        view->fullscreen = fullscreen;
        view->fullscreen = fullscreen;

-       gtk_widget_queue_resize (GTK_WIDGET (view));
-       
+

        g_object_notify (G_OBJECT (view), "fullscreen");
 }
 
        g_object_notify (G_OBJECT (view), "fullscreen");
 }
 


@@ -5259,8 +5412,8 @@ ev_view_set_presentation (EvView   *view,
                view->scale_saved = view->scale;
                ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT);
        } else {
                view->scale_saved = view->scale;
                ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT);
        } else {

-               ev_view_set_sizing_mode (view, view->sizing_mode_saved);
-               ev_view_set_zoom (view, view->scale_saved, FALSE);
+               ev_document_model_set_sizing_mode (view->model, view->sizing_mode_saved);
+               ev_document_model_set_scale (view->model, view->scale_saved);

        }
        
        gtk_widget_queue_resize (GTK_WIDGET (view));
        }
        
        gtk_widget_queue_resize (GTK_WIDGET (view));


@@ -5336,13 +5489,7 @@ void
 ev_view_set_sizing_mode (EvView       *view,
                         EvSizingMode  sizing_mode)
 {
 ev_view_set_sizing_mode (EvView       *view,
                         EvSizingMode  sizing_mode)
 {

-       g_return_if_fail (EV_IS_VIEW (view));
-
-       if (view->sizing_mode == sizing_mode)
-               return;
-

        view->sizing_mode = sizing_mode;
        view->sizing_mode = sizing_mode;

-       gtk_widget_queue_resize (GTK_WIDGET (view));

 
        g_object_notify (G_OBJECT (view), "sizing-mode");
 }
 
        g_object_notify (G_OBJECT (view), "sizing-mode");
 }


@@ -5358,61 +5505,43 @@ ev_view_get_sizing_mode (EvView *view)
 gboolean
 ev_view_can_zoom_in (EvView *view)
 {
 gboolean
 ev_view_can_zoom_in (EvView *view)
 {

-       return view->scale * ZOOM_IN_FACTOR <= view->max_scale;
+       return view->scale * ZOOM_IN_FACTOR <= ev_document_model_get_max_scale (view->model);

 }
 
 gboolean
 ev_view_can_zoom_out (EvView *view)
 {
 }
 
 gboolean
 ev_view_can_zoom_out (EvView *view)
 {

-       return view->scale * ZOOM_OUT_FACTOR >= view->min_scale;
+       return view->scale * ZOOM_OUT_FACTOR >= ev_document_model_get_min_scale (view->model);

 }
 
 void
 ev_view_zoom_in (EvView *view)
 {
 }
 
 void
 ev_view_zoom_in (EvView *view)
 {

+       gdouble scale;
+

        g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
 
        if (view->presentation)
                return;
        g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
 
        if (view->presentation)
                return;

-       
+

        view->pending_scroll = SCROLL_TO_CENTER;
        view->pending_scroll = SCROLL_TO_CENTER;

-       ev_view_set_zoom (view, ZOOM_IN_FACTOR, TRUE);
+       scale = ev_document_model_get_scale (view->model) * ZOOM_IN_FACTOR;
+       ev_document_model_set_scale (view->model, scale);

 }
 
 void
 ev_view_zoom_out (EvView *view)
 {
 }
 
 void
 ev_view_zoom_out (EvView *view)
 {

+       gdouble scale;
+

        g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
 
        if (view->presentation)
                return;
        g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
 
        if (view->presentation)
                return;

-       
-       view->pending_scroll = SCROLL_TO_CENTER;
-       ev_view_set_zoom (view, ZOOM_OUT_FACTOR, TRUE);
-}
-
-void
-ev_view_rotate_right (EvView *view)
-{
-       int rotation = view->rotation + 90;
-
-       if (rotation >= 360) {
-               rotation -= 360;
-       }
-
-       ev_view_set_rotation (view, rotation);
-}
-
-void
-ev_view_rotate_left (EvView *view)
-{
-       int rotation = view->rotation - 90;

 
 

-       if (rotation < 0) {
-               rotation += 360;
-       }
-
-       ev_view_set_rotation (view, rotation);
+       view->pending_scroll = SCROLL_TO_CENTER;
+       scale = ev_document_model_get_scale (view->model) * ZOOM_OUT_FACTOR;
+       ev_document_model_set_scale (view->model, scale);

 }
 
 void
 }
 
 void


@@ -5420,14 +5549,6 @@ ev_view_set_rotation (EvView *view, int rotation)
 {
        view->rotation = rotation;
 
 {
        view->rotation = rotation;
 

-       if (view->pixbuf_cache) {
-               ev_pixbuf_cache_clear (view->pixbuf_cache);
-               gtk_widget_queue_resize (GTK_WIDGET (view));
-       }
-
-       if (rotation != 0)
-               clear_selection (view);
-

        g_object_notify (G_OBJECT (view), "rotation");
 }
 
        g_object_notify (G_OBJECT (view), "rotation");
 }
 


@@ -5500,7 +5621,7 @@ ev_view_zoom_for_size_presentation (EvView *view,
 
        get_doc_page_size (view, view->current_page, &doc_width, &doc_height);
        scale = zoom_for_size_best_fit (doc_width, doc_height, width, height);
 
        get_doc_page_size (view, view->current_page, &doc_width, &doc_height);
        scale = zoom_for_size_best_fit (doc_width, doc_height, width, height);

-       ev_view_set_zoom (view, scale, FALSE);
+       ev_document_model_set_scale (view->model, scale);

 }
 
 static void
 }
 
 static void


@@ -5534,7 +5655,7 @@ ev_view_zoom_for_size_continuous_and_dual_page (EvView *view,
        else
                g_assert_not_reached ();
 
        else
                g_assert_not_reached ();
 

-       ev_view_set_zoom (view, scale, FALSE);
+       ev_document_model_set_scale (view->model, scale);

 }
 
 static void
 }
 
 static void


@@ -5567,7 +5688,7 @@ ev_view_zoom_for_size_continuous (EvView *view,
        else
                g_assert_not_reached ();
 
        else
                g_assert_not_reached ();
 

-       ev_view_set_zoom (view, scale, FALSE);
+       ev_document_model_set_scale (view->model, scale);

 }
 
 static void
 }
 
 static void


@@ -5606,7 +5727,7 @@ ev_view_zoom_for_size_dual_page (EvView *view,
        else
                g_assert_not_reached ();
 
        else
                g_assert_not_reached ();
 

-       ev_view_set_zoom (view, scale, FALSE);
+       ev_document_model_set_scale (view->model, scale);

 }
 
 static void
 }
 
 static void


@@ -5633,7 +5754,7 @@ ev_view_zoom_for_size_single_page (EvView *view,
        else
                g_assert_not_reached ();
 
        else
                g_assert_not_reached ();
 

-       ev_view_set_zoom (view, scale, FALSE);
+       ev_document_model_set_scale (view->model, scale);

 }
 
 static void
 }
 
 static void


@@ -5726,7 +5847,7 @@ jump_to_find_page (EvView *view, EvViewFindDirection direction, gint shift)
                        page = page + n_pages;
 
                if (ev_view_find_get_n_results (view, page) > 0) {
                        page = page + n_pages;
 
                if (ev_view_find_get_n_results (view, page) > 0) {

-                       ev_page_cache_set_current_page (view->page_cache, page);
+                       ev_document_model_set_page (view->model, page);

                        break;
                }
        }
                        break;
                }
        }


@@ -6390,7 +6511,7 @@ ev_view_next_page (EvView *view)
 
        g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
        
 
        g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
        

-       if (!view->page_cache)
+       if (!view->document)

                return FALSE;
 
        if (view->presentation &&
                return FALSE;
 
        if (view->presentation &&


@@ -6407,7 +6528,7 @@ ev_view_next_page (EvView *view)
        ev_view_presentation_transition_stop (view);
        ev_view_reset_presentation_state (view);
        
        ev_view_presentation_transition_stop (view);
        ev_view_reset_presentation_state (view);
        

-       page = ev_page_cache_get_current_page (view->page_cache);
+       page = ev_document_model_get_page (view->model);

        n_pages = ev_document_get_n_pages (view->document);
 
        if (view->dual_page && !view->presentation)
        n_pages = ev_document_get_n_pages (view->document);
 
        if (view->dual_page && !view->presentation)


@@ -6416,14 +6537,14 @@ ev_view_next_page (EvView *view)
                page = page + 1;
 
        if (page < n_pages) {
                page = page + 1;
 
        if (page < n_pages) {

-               ev_page_cache_set_current_page (view->page_cache, page);
+               ev_document_model_set_page (view->model, page);

                return TRUE;
        } else if (view->presentation && page == n_pages) {
                view->presentation_state = EV_PRESENTATION_END;
                gtk_widget_queue_draw (GTK_WIDGET (view));
                return TRUE;
        } else if (view->dual_page && page == n_pages) {
                return TRUE;
        } else if (view->presentation && page == n_pages) {
                view->presentation_state = EV_PRESENTATION_END;
                gtk_widget_queue_draw (GTK_WIDGET (view));
                return TRUE;
        } else if (view->dual_page && page == n_pages) {

-               ev_page_cache_set_current_page (view->page_cache, page - 1);
+               ev_document_model_set_page (view->model, page - 1);

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


@@ -6437,7 +6558,7 @@ ev_view_previous_page (EvView *view)
 
        g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
 
 
        g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
 

-       if (!view->page_cache)
+       if (!view->document)

                return FALSE;
 
        if (view->presentation &&
                return FALSE;
 
        if (view->presentation &&


@@ -6459,7 +6580,7 @@ ev_view_previous_page (EvView *view)
 
        ev_view_reset_presentation_state (view);
 
 
        ev_view_reset_presentation_state (view);
 

-       page = ev_page_cache_get_current_page (view->page_cache);
+       page = ev_document_model_get_page (view->model);

 
        if (view->dual_page && !view->presentation)
                page = page - 2; 
 
        if (view->dual_page && !view->presentation)
                page = page - 2; 


@@ -6467,10 +6588,10 @@ ev_view_previous_page (EvView *view)
                page = page - 1;
 
        if (page >= 0) {
                page = page - 1;
 
        if (page >= 0) {

-               ev_page_cache_set_current_page (view->page_cache, page);
+               ev_document_model_set_page (view->model, page);

                return TRUE;
        } else if (ev_view_get_dual_page (view) && page == -1) {
                return TRUE;
        } else if (ev_view_get_dual_page (view) && page == -1) {

-               ev_page_cache_set_current_page (view->page_cache, 0);
+               ev_document_model_set_page (view->model, 0);

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