Reset also cups setting to 1 when printing multiple pages per sheet. Fixes

[evince.git] / shell / ev-jobs.h

diff --git a/shell/ev-jobs.h b/shell/ev-jobs.h
index 779c3736dbd9880913dab41e25b7edb80d864f4d..1f348d81ee0372a1726898db8544baccb27bc459 100644 (file)
--- a/shell/ev-jobs.h
+++ b/shell/ev-jobs.h
@@ -119,20 +119,23 @@ struct _EvJobRender
        EvJob parent;
 
        EvRenderContext *rc;
        EvJob parent;
 
        EvRenderContext *rc;

+       gboolean page_ready;

        gint target_width;
        gint target_height;
        gint target_width;
        gint target_height;

-       GdkPixbuf *pixbuf;
+       cairo_surface_t *surface;

 
        GList *link_mapping;
        GdkRegion *text_mapping;
        GList *image_mapping;
 
        GList *link_mapping;
        GdkRegion *text_mapping;
        GList *image_mapping;

+       GList *form_field_mapping;

 
 

-       GdkPixbuf *selection;
+       cairo_surface_t *selection;

        GdkRegion *selection_region;
        EvRectangle selection_points;
        GdkColor base;
        GdkColor text; 
 
        GdkRegion *selection_region;
        EvRectangle selection_points;
        GdkColor base;
        GdkColor text; 
 

+       gint include_forms : 1;

        gint include_links : 1;
        gint include_text : 1;
        gint include_selection : 1;
        gint include_links : 1;
        gint include_text : 1;
        gint include_selection : 1;


@@ -142,15 +145,15 @@ struct _EvJobRender
 struct _EvJobRenderClass
 {
        EvJobClass parent_class;
 struct _EvJobRenderClass
 {
        EvJobClass parent_class;

+
+       void    (* page_ready) (EvJobRender *job);

 };
 
 struct _EvJobThumbnail
 {
        EvJob parent;
 
 };
 
 struct _EvJobThumbnail
 {
        EvJob parent;
 

-       gint page;
-       gint rotation;
-       gint requested_width;
+       EvRenderContext *rc;

        GdkPixbuf *thumbnail;
 };
 
        GdkPixbuf *thumbnail;
 };
 


@@ -196,6 +199,7 @@ struct _EvJobPrint
        gint n_ranges;
        EvPrintPageSet page_set;
        gint copies;
        gint n_ranges;
        EvPrintPageSet page_set;
        gint copies;

+       gint pages_per_sheet;

        gboolean collate;
        gboolean reverse;
        gdouble width;
        gboolean collate;
        gboolean reverse;
        gdouble width;


@@ -225,6 +229,7 @@ EvJob          *ev_job_render_new         (EvDocument      *document,
                                           EvRectangle     *selection_points,
                                           GdkColor        *text,
                                           GdkColor        *base,
                                           EvRectangle     *selection_points,
                                           GdkColor        *text,
                                           GdkColor        *base,

+                                          gboolean         include_forms,

                                           gboolean         include_links,
                                           gboolean         include_images,
                                           gboolean         include_text,
                                           gboolean         include_links,
                                           gboolean         include_images,
                                           gboolean         include_text,


@@ -233,11 +238,9 @@ void            ev_job_render_run         (EvJobRender     *thumbnail);
 
 /* EvJobThumbnail */
 GType           ev_job_thumbnail_get_type (void) G_GNUC_CONST;
 
 /* 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;
 
 /* EvJobFonts */
 GType          ev_job_fonts_get_type     (void) G_GNUC_CONST;


@@ -262,6 +265,7 @@ EvJob          *ev_job_print_new          (EvDocument      *document,
                                           EvPrintRange    *ranges,
                                           gint             n_ranges,
                                           EvPrintPageSet   page_set,
                                           EvPrintRange    *ranges,
                                           gint             n_ranges,
                                           EvPrintPageSet   page_set,

+                                          gint             pages_per_sheet,

                                           gint             copies,
                                           gdouble          collate,
                                           gdouble          reverse);
                                           gint             copies,
                                           gdouble          collate,
                                           gdouble          reverse);