X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libview%2Fev-view-private.h;h=09f6163fbcee2493c4a90d671e4a8a32103f1331;hb=f9c2880d31bb2f5d4411849b9207c5d26a5c616a;hp=2f01f72a1b23c72be8c2168ff171346525986588;hpb=8f8663bd6503f53ad78c68aefe44800575959944;p=evince.git

diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h
index 2f01f72a..09f6163f 100644
--- a/libview/ev-view-private.h
+++ b/libview/ev-view-private.h
@@ -26,13 +26,14 @@
 #define __EV_VIEW_PRIVATE_H__
 
 #include "ev-view.h"
+#include "ev-document-model.h"
 #include "ev-pixbuf-cache.h"
 #include "ev-page-cache.h"
 #include "ev-jobs.h"
 #include "ev-image.h"
 #include "ev-form-field.h"
 #include "ev-selection.h"
-#include "ev-transition-animation.h"
+#include "ev-view-cursor.h"
 
 #define DRAG_HISTORY 10
 
@@ -100,23 +101,6 @@ typedef enum {
 	SCROLL_TO_FIND_LOCATION,
 } PendingScroll;
 
-typedef enum {
-	EV_VIEW_CURSOR_NORMAL,
-	EV_VIEW_CURSOR_IBEAM,
-	EV_VIEW_CURSOR_LINK,
-	EV_VIEW_CURSOR_WAIT,
-	EV_VIEW_CURSOR_HIDDEN,
-	EV_VIEW_CURSOR_DRAG,
-	EV_VIEW_CURSOR_AUTOSCROLL,
-} EvViewCursor;
-
-typedef enum {
-	EV_PRESENTATION_NORMAL,
-	EV_PRESENTATION_BLACK,
-	EV_PRESENTATION_WHITE,
-	EV_PRESENTATION_END
-} EvPresentationState;
-
 typedef struct _EvHeightToPageCache {
 	gint rotation;
 	gdouble *height_to_page;
@@ -133,9 +117,10 @@ struct _EvView {
 	gint find_result;
 	gboolean jump_to_find_result;
 	gboolean highlight_find_results;
-	
-	EvPageCache *page_cache;
+
+	EvDocumentModel *model;
 	EvPixbufCache *pixbuf_cache;
+	EvPageCache *page_cache;
 	EvHeightToPageCache *height_to_page_cache;
 	EvViewCursor cursor;
 	EvJobRender *current_job;
@@ -160,24 +145,14 @@ struct _EvView {
 	gint rotation;
 	gdouble scale;
 	gint spacing;
-	gdouble dpi;
-	gdouble max_scale;
-	gdouble min_scale;
 
 	gboolean loading;
 	gboolean continuous;
 	gboolean dual_page;
 	gboolean fullscreen;
-	gboolean presentation;
 	EvSizingMode sizing_mode;
 	cairo_surface_t *loading_text;
 
-	/* Presentation */
-	EvPresentationState presentation_state;
-	EvSizingMode sizing_mode_saved;
-	double scale_saved;
-	guint  trans_timeout_id;
-
 	/* Common for button press handling */
 	int pressed_button;
 
@@ -201,12 +176,6 @@ struct _EvView {
 	/* Image DND */
 	ImageDNDInfo image_dnd_info;
 
-	/* Goto Popup */
-	GtkWidget *goto_window;
-	GtkWidget *goto_entry;
-
-	EvTransitionAnimation *animation;
-
 	/* Annotations */
 	GList             *window_children;
 	EvViewWindowChild *window_child_focus;
@@ -224,6 +193,7 @@ struct _EvViewClass {
 					   EvLinkAction   *action);
 	void    (*popup_menu)		  (EvView         *view,
 					   EvLink         *link);
+	void    (*selection_changed)      (EvView         *view);
 };
 
 void _get_page_size_for_scale_and_rotation (EvDocument *document,