+#include <config.h>
#include "ev-jobs.h"
#include "ev-job-queue.h"
#include "ev-document-thumbnails.h"
#include <glib/gstdio.h>
#include <glib/gi18n.h>
#include <unistd.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
static void ev_job_init (EvJob *job);
static void ev_job_class_init (EvJobClass *class);
job->rc->page);
if (job->include_images && EV_IS_DOCUMENT_IMAGES (EV_JOB (job)->document))
job->image_mapping =
- ev_document_images_get_images (EV_DOCUMENT_IMAGES (EV_JOB (job)->document),
- job->rc->page);
+ ev_document_images_get_image_mapping (EV_DOCUMENT_IMAGES (EV_JOB (job)->document),
+ job->rc->page);
EV_JOB (job)->finished = TRUE;
}
job->dest = NULL;
}
+ if (job->search_string) {
+ g_free (job->search_string);
+ job->search_string = NULL;
+ }
+
(* G_OBJECT_CLASS (ev_job_load_parent_class)->dispose) (object);
}
EvJob *
-ev_job_load_new (const gchar *uri, EvLinkDest *dest, EvWindowRunMode mode)
+ev_job_load_new (const gchar *uri,
+ EvLinkDest *dest,
+ EvWindowRunMode mode,
+ const gchar *search_string)
{
EvJobLoad *job;
job->dest = g_object_ref (dest);
job->mode = mode;
+ if (search_string)
+ job->search_string = g_strdup (search_string);
return EV_JOB (job);
}
job->page_set = page_set;
- job->pages_per_sheet = pages_per_sheet;
+ job->pages_per_sheet = CLAMP (pages_per_sheet, 1, 16);
job->copies = copies;
job->collate = collate;
gint n_copies;
step = job->reverse ? -1 * job->pages_per_sheet : job->pages_per_sheet;
- page = job->reverse ? (n_pages / job->pages_per_sheet) * job->pages_per_sheet : 0;
- n_copies = job->collate ? job->copies : 1;
+ page = job->reverse ? ((n_pages - 1) / job->pages_per_sheet) * job->pages_per_sheet : 0;
+ n_copies = job->collate ? 1 : job->copies;
while ((job->reverse && (page >= 0)) || (!job->reverse && (page < n_pages))) {
gint k;
- ev_file_exporter_begin_page (EV_FILE_EXPORTER (document));
-
- for (j = 0; j < job->pages_per_sheet; j++) {
- gint p = page + j;
+ for (k = 0; k < n_copies; k++) {
+ ev_file_exporter_begin_page (EV_FILE_EXPORTER (document));
- if (p < 0 || p >= n_pages)
- break;
-
- ev_render_context_set_page (rc, page_list[p]);
+ for (j = 0; j < job->pages_per_sheet; j++) {
+ gint p = page + j;
- for (k = 0; k < n_copies; k++) {
+ if (p < 0 || p >= n_pages)
+ break;
+
+ ev_render_context_set_page (rc, page_list[p]);
ev_file_exporter_do_page (EV_FILE_EXPORTER (document), rc);
}
- }
- ev_file_exporter_end_page (EV_FILE_EXPORTER (document));
+ ev_file_exporter_end_page (EV_FILE_EXPORTER (document));
+ }
page += step;
}
- if (job->collate)
+ if (!job->collate)
break;
}