X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view-private.h;h=feed78a919b49d0010986b73deea9ad289d10fef;hb=8370e4fa6c0a90a4d10294e3a74ed87d90b8db94;hp=ec1fa020f16bc8a3ea384011ae0a5ecebc4a14ae;hpb=6b9aeb5d0b86d0002db107ad79af550a4e39f07a;p=evince.git

diff --git a/shell/ev-view-private.h b/shell/ev-view-private.h
index ec1fa020..feed78a9 100644
--- a/shell/ev-view-private.h
+++ b/shell/ev-view-private.h
@@ -25,6 +25,7 @@
 #include "ev-pixbuf-cache.h"
 #include "ev-page-cache.h"
 #include "ev-image.h"
+#include "ev-form-field.h"
 
 /* Information for middle clicking and moving around the doc */
 typedef struct {
@@ -73,11 +74,10 @@ typedef enum {
 } EvPresentationState;
 
 struct _EvView {
-	GtkWidget parent_instance;
+	GtkLayout layout;
 
 	EvDocument *document;
 
-	char *status;
 	char *find_status;
 	int find_result;
 	gboolean jump_to_find_result;
@@ -104,9 +104,12 @@ struct _EvView {
 	gint end_page;
 	gint current_page;
 
-	int rotation;
-	double scale;
-	int spacing;
+	gint rotation;
+	gdouble scale;
+	gint spacing;
+	gdouble dpi;
+	gdouble max_scale;
+	gdouble min_scale;
 
 	gboolean loading;
 	gboolean continuous;
@@ -114,6 +117,7 @@ struct _EvView {
 	gboolean fullscreen;
 	gboolean presentation;
 	EvSizingMode sizing_mode;
+	cairo_surface_t *loading_text;
 
 	/* Presentation */
 	EvPresentationState presentation_state;
@@ -138,9 +142,11 @@ struct _EvView {
 	/* Image DND */
 	ImageDNDInfo image_dnd_info;
 
+#if !GTK_CHECK_VERSION (2, 11, 7)
 	/* Links */
 	GtkWidget *link_tooltip;
 	EvLink *hovered_link;
+#endif
 
 	/* Goto Popup */
 	GtkWidget *goto_window;
@@ -148,15 +154,14 @@ struct _EvView {
 };
 
 struct _EvViewClass {
-	GtkWidgetClass parent_class;
+	GtkLayoutClass parent_class;
 
-	void	(*set_scroll_adjustments) (EvView         *view,
-					   GtkAdjustment  *hadjustment,
-					   GtkAdjustment  *vadjustment);
 	void    (*binding_activated)	  (EvView         *view,
 					   EvScrollType   scroll,
 					   gboolean        horizontal);
 	void    (*zoom_invalid)		  (EvView         *view);
+	void    (*handle_link)		  (EvView         *view,
+					   EvLink         *link);
 	void    (*external_link)	  (EvView         *view,
 					   EvLinkAction   *action);
 	void    (*popup_menu)		  (EvView         *view,