X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-jobs.h;h=1f210ece96ab99aa7ee728f3f5780d449531a029;hb=c087ebf90ee6c32656ae925d0c1682b427a21e7e;hp=b91d8228f6b67ffceaea5e4ee7619ee80f615318;hpb=133ed2fb65129c8a36f674c06ae693f8ef77f77a;p=evince.git

diff --git a/shell/ev-jobs.h b/shell/ev-jobs.h
index b91d8228..1f210ece 100644
--- a/shell/ev-jobs.h
+++ b/shell/ev-jobs.h
@@ -41,8 +41,8 @@ typedef struct _EvJobLinksClass EvJobLinksClass;
 typedef struct _EvJobFonts EvJobFonts;
 typedef struct _EvJobFontsClass EvJobFontsClass;
 
-typedef struct _EvJobXfer EvJobXfer;
-typedef struct _EvJobXferClass EvJobXferClass;
+typedef struct _EvJobLoad EvJobLoad;
+typedef struct _EvJobLoadClass EvJobLoadClass;
 
 typedef struct _EvJobPrint EvJobPrint;
 typedef struct _EvJobPrintClass EvJobPrintClass;
@@ -72,14 +72,14 @@ typedef struct _EvJobPrintClass EvJobPrintClass;
 #define EV_JOB_FONTS_CLASS(klass)	     (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_FONTS, EvJobFontsClass))
 #define EV_IS_JOB_FONTS(object)		     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_FONTS))
 
-#define EV_TYPE_JOB_XFER		     (ev_job_xfer_get_type())
-#define EV_JOB_XFER(object)	     	     (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_XFER, EvJobXfer))
-#define EV_JOB_XFER_CLASS(klass)	     (G_TYPE_CHACK_CLASS_CAST((klass), EV_TYPE_JOB_XFER, EvJobXferClass))
-#define EV_IS_JOB_XFER(object)		     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_XFER))
+#define EV_TYPE_JOB_LOAD		     (ev_job_load_get_type())
+#define EV_JOB_LOAD(object)	     	     (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_LOAD, EvJobLoad))
+#define EV_JOB_LOAD_CLASS(klass)	     (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_LOAD, EvJobLoadClass))
+#define EV_IS_JOB_LOAD(object)		     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_LOAD))
 
 #define EV_TYPE_JOB_PRINT                     (ev_job_print_get_type())
 #define EV_JOB_PRINT(object)                  (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_PRINT, EvJobPrint))
-#define EV_JOB_PRINT_CLASS(klass)             (G_TYPE_CHACK_CLASS_CAST((klass), EV_TYPE_JOB_PRINT, EvJobPrintClass))
+#define EV_JOB_PRINT_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_PRINT, EvJobPrintClass))
 #define EV_IS_JOB_PRINT(object)               (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_PRINT))
 
 typedef enum {
@@ -125,6 +125,7 @@ struct _EvJobRender
 
 	GList *link_mapping;
 	GdkRegion *text_mapping;
+	GList *image_mapping;
 
 	GdkPixbuf *selection;
 	GdkRegion *selection_region;
@@ -135,6 +136,7 @@ struct _EvJobRender
 	gint include_links : 1;
 	gint include_text : 1;
 	gint include_selection : 1;
+	gint include_images : 1;
 };
 
 struct _EvJobRenderClass
@@ -146,9 +148,7 @@ struct _EvJobThumbnail
 {
 	EvJob parent;
 
-	gint page;
-	gint rotation;
-	gint requested_width;
+	EvRenderContext *rc;
 	GdkPixbuf *thumbnail;
 };
 
@@ -168,17 +168,17 @@ struct _EvJobFontsClass
         EvJobClass parent_class;
 };
 
-struct _EvJobXfer
+struct _EvJobLoad
 {
 	EvJob parent;
+	
 	EvLinkDest *dest;
 	EvWindowRunMode mode;
 	GError *error;
-	char *uri;
-	char *local_uri;
+	gchar *uri;
 };
 
-struct _EvJobXferClass
+struct _EvJobLoadClass
 {
 	EvJobClass parent_class;
 };
@@ -188,6 +188,7 @@ struct _EvJobPrint
 	EvJob parent;
 
 	GError *error;
+	const gchar *format;
 	gchar  *temp_file;
 	EvPrintRange *ranges;
 	gint n_ranges;
@@ -223,33 +224,35 @@ EvJob          *ev_job_render_new         (EvDocument      *document,
 					   GdkColor        *text,
 					   GdkColor        *base,
 					   gboolean         include_links,
+					   gboolean         include_images,
 					   gboolean         include_text,
 					   gboolean         include_selection);
 void            ev_job_render_run         (EvJobRender     *thumbnail);
 
 /* EvJobThumbnail */
 GType           ev_job_thumbnail_get_type (void) G_GNUC_CONST;
-EvJob          *ev_job_thumbnail_new      (EvDocument     *document,
-					   gint            page,
-					   int             rotation,
-					   gint            requested_width);
-void            ev_job_thumbnail_run      (EvJobThumbnail *thumbnail);
+EvJob          *ev_job_thumbnail_new      (EvDocument      *document,
+					   EvRenderContext *rc);
+void            ev_job_thumbnail_run      (EvJobThumbnail  *thumbnail);
 
 /* EvJobFonts */
 GType 		ev_job_fonts_get_type 	  (void) G_GNUC_CONST;
 EvJob 	       *ev_job_fonts_new 	  (EvDocument      *document);
 void		ev_job_fonts_run 	  (EvJobFonts 	   *fonts);
 
-/* EvJobXfer */
-GType 		ev_job_xfer_get_type 	  (void) G_GNUC_CONST;
-EvJob 	       *ev_job_xfer_new 	  (const gchar 	   *uri,
+/* EvJobLoad */
+GType 		ev_job_load_get_type 	  (void) G_GNUC_CONST;
+EvJob 	       *ev_job_load_new 	  (const gchar 	   *uri,
 					   EvLinkDest      *dest,
 					   EvWindowRunMode  mode);
-void		ev_job_xfer_run 	  (EvJobXfer 	   *xfer);
+void            ev_job_load_set_uri       (EvJobLoad       *load,
+					   const gchar     *uri);
+void		ev_job_load_run 	  (EvJobLoad 	   *load);
 
 /* EvJobPrint */
 GType           ev_job_print_get_type     (void) G_GNUC_CONST;
 EvJob          *ev_job_print_new          (EvDocument      *document,
+					   const gchar     *format,
 					   gdouble          width,
 					   gdouble          height,
 					   EvPrintRange    *ranges,