X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=libview%2Fev-jobs.c;h=561a0f98aaf1b179c67b3ba4865c24368ba85378;hb=e769474337c9a6ffdaed2327056e8de2f7ca9ee4;hp=7e522dfd756496ef57423ec943ea71b5bebfa9ff;hpb=e285bb88a28a9b510dc88f656aa39bc0093a86ec;p=evince.git

diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c
index 7e522dfd..561a0f98 100644
--- a/libview/ev-jobs.c
+++ b/libview/ev-jobs.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include "ev-jobs.h"
-#include "ev-document-thumbnails.h"
 #include "ev-document-links.h"
 #include "ev-document-images.h"
 #include "ev-document-forms.h"
@@ -50,6 +49,8 @@ static void ev_job_links_init             (EvJobLinks            *job);
 static void ev_job_links_class_init       (EvJobLinksClass       *class);
 static void ev_job_attachments_init       (EvJobAttachments      *job);
 static void ev_job_attachments_class_init (EvJobAttachmentsClass *class);
+static void ev_job_annots_init            (EvJobAnnots           *job);
+static void ev_job_annots_class_init      (EvJobAnnotsClass      *class);
 static void ev_job_render_init            (EvJobRender           *job);
 static void ev_job_render_class_init      (EvJobRenderClass      *class);
 static void ev_job_page_data_init         (EvJobPageData         *job);
@@ -92,6 +93,7 @@ static guint job_find_signals[FIND_LAST_SIGNAL] = { 0 };
 G_DEFINE_ABSTRACT_TYPE (EvJob, ev_job, G_TYPE_OBJECT)
 G_DEFINE_TYPE (EvJobLinks, ev_job_links, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobAttachments, ev_job_attachments, EV_TYPE_JOB)
+G_DEFINE_TYPE (EvJobAnnots, ev_job_annots, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobRender, ev_job_render, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobPageData, ev_job_page_data, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobThumbnail, ev_job_thumbnail, EV_TYPE_JOB)
@@ -329,6 +331,38 @@ ev_job_links_dispose (GObject *object)
 	(* G_OBJECT_CLASS (ev_job_links_parent_class)->dispose) (object);
 }
 
+static gboolean
+fill_page_labels (GtkTreeModel   *tree_model,
+		  GtkTreePath    *path,
+		  GtkTreeIter    *iter,
+		  EvJob          *job)
+{
+	EvDocumentLinks *document_links;
+	EvLink          *link;
+	gchar           *page_label;
+
+	gtk_tree_model_get (tree_model, iter,
+			    EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
+			    -1);
+
+	if (!link)
+		return FALSE;
+
+	document_links = EV_DOCUMENT_LINKS (job->document);
+	page_label = ev_document_links_get_link_page_label (document_links, link);
+	if (!page_label)
+		return FALSE;
+
+	gtk_tree_store_set (GTK_TREE_STORE (tree_model), iter,
+			    EV_DOCUMENT_LINKS_COLUMN_PAGE_LABEL, page_label,
+			    -1);
+
+	g_free (page_label);
+	g_object_unref (link);
+
+	return FALSE;
+}
+
 static gboolean
 ev_job_links_run (EvJob *job)
 {
@@ -340,7 +374,9 @@ ev_job_links_run (EvJob *job)
 	ev_document_doc_mutex_lock ();
 	job_links->model = ev_document_links_get_links_model (EV_DOCUMENT_LINKS (job->document));
 	ev_document_doc_mutex_unlock ();
-	
+
+	gtk_tree_model_foreach (job_links->model, (GtkTreeModelForeachFunc)fill_page_labels, job);
+
 	ev_job_succeeded (job);
 	
 	return FALSE;
@@ -435,6 +471,85 @@ ev_job_attachments_new (EvDocument *document)
 	return job;
 }
 
+/* EvJobAnnots */
+static void
+ev_job_annots_init (EvJobAnnots *job)
+{
+	EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+}
+
+static void
+ev_job_annots_dispose (GObject *object)
+{
+	EvJobAnnots *job;
+
+	ev_debug_message (DEBUG_JOBS, NULL);
+
+	job = EV_JOB_ANNOTS (object);
+
+	if (job->annots) {
+		g_list_foreach (job->annots, (GFunc)ev_mapping_list_unref, NULL);
+		g_list_free (job->annots);
+		job->annots = NULL;
+	}
+
+	G_OBJECT_CLASS (ev_job_annots_parent_class)->dispose (object);
+}
+
+static gboolean
+ev_job_annots_run (EvJob *job)
+{
+	EvJobAnnots *job_annots = EV_JOB_ANNOTS (job);
+	gint         i;
+
+	ev_debug_message (DEBUG_JOBS, NULL);
+	ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+
+	ev_document_doc_mutex_lock ();
+	for (i = 0; i < ev_document_get_n_pages (job->document); i++) {
+		EvMappingList *mapping_list;
+		EvPage        *page;
+
+		page = ev_document_get_page (job->document, i);
+		mapping_list = ev_document_annotations_get_annotations (EV_DOCUMENT_ANNOTATIONS (job->document),
+									page);
+		g_object_unref (page);
+
+		if (mapping_list)
+			job_annots->annots = g_list_prepend (job_annots->annots, mapping_list);
+	}
+	ev_document_doc_mutex_unlock ();
+
+	job_annots->annots = g_list_reverse (job_annots->annots);
+
+	ev_job_succeeded (job);
+
+	return FALSE;
+}
+
+static void
+ev_job_annots_class_init (EvJobAnnotsClass *class)
+{
+	GObjectClass *oclass = G_OBJECT_CLASS (class);
+	EvJobClass   *job_class = EV_JOB_CLASS (class);
+
+	oclass->dispose = ev_job_annots_dispose;
+	job_class->run = ev_job_annots_run;
+}
+
+EvJob *
+ev_job_annots_new (EvDocument *document)
+{
+	EvJob *job;
+
+	ev_debug_message (DEBUG_JOBS, NULL);
+
+	job = g_object_new (EV_TYPE_JOB_ANNOTS, NULL);
+	job->document = g_object_ref (document);
+
+	return job;
+}
+
 /* EvJobRender */
 static void
 ev_job_render_init (EvJobRender *job)
@@ -462,7 +577,7 @@ ev_job_render_dispose (GObject *object)
 	}
 
 	if (job->selection_region) {
-		gdk_region_destroy (job->selection_region);
+		cairo_region_destroy (job->selection_region);
 		job->selection_region = NULL;
 	}
 
@@ -683,6 +798,7 @@ ev_job_thumbnail_run (EvJob *job)
 {
 	EvJobThumbnail  *job_thumb = EV_JOB_THUMBNAIL (job);
 	EvRenderContext *rc;
+	GdkPixbuf       *pixbuf;
 	EvPage          *page;
 
 	ev_debug_message (DEBUG_JOBS, "%d (%p)", job_thumb->page, job);
@@ -694,11 +810,13 @@ ev_job_thumbnail_run (EvJob *job)
 	rc = ev_render_context_new (page, job_thumb->rotation, job_thumb->scale);
 	g_object_unref (page);
 
-	job_thumb->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (job->document),
-								     rc, TRUE);
+	pixbuf = ev_document_get_thumbnail (job->document, rc);
 	g_object_unref (rc);
 	ev_document_doc_mutex_unlock ();
 
+	job_thumb->thumbnail = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf);
+	g_object_unref (pixbuf);
+
 	ev_job_succeeded (job);
 	
 	return FALSE;