X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fps%2Fps-document.c;h=5e636871bfa91794468b8acc3e87efc6f23d0a27;hb=6eb03f602ee62c901002c973b2b42b2fb208076b;hp=d1b456d28478e74da4d077b6b92bc6300a5e398f;hpb=47aaea1c335331495e2dd94998e97a3b89c9d311;p=evince.git

diff --git a/backend/ps/ps-document.c b/backend/ps/ps-document.c
index d1b456d2..5e636871 100644
--- a/backend/ps/ps-document.c
+++ b/backend/ps/ps-document.c
@@ -169,7 +169,7 @@ document_load (PSDocument *ps_document, const gchar *fname, GError **error)
 		g_set_error (error,
 			     G_FILE_ERROR,
 			     G_FILE_ERROR_NOENT,
-			     _("Cannot open file “%s”.\n"), /* FIXME: remove \n after freeze */
+			     _("Cannot open file “%s”."),
 			     filename_dsp);
 		g_free (filename_dsp);
 		
@@ -183,7 +183,7 @@ document_load (PSDocument *ps_document, const gchar *fname, GError **error)
 		g_set_error (error,
 			     G_FILE_ERROR,
 			     G_FILE_ERROR_NOENT,
-			     _("Cannot open file “%s”.\n"), /* FIXME: remove \n after freeze */
+			     _("Cannot open file “%s”."),
 			     filename_dsp);
 		g_free (filename_dsp);
 		
@@ -516,15 +516,11 @@ ps_document_render_thumbnail (PSDocument *ps_document)
 
 static GdkPixbuf *
 ps_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails,
-				      gint                  page,
-				      gint                  rotation,
-				      gint                  size,
+				      EvRenderContext      *rc, 
 				      gboolean              border)
 {
 	PSDocument *ps_document;
 	GdkPixbuf  *pixbuf = NULL;
-	gdouble     page_width, page_height;
-	gdouble     scale;
 
 	ps_document = PS_DOCUMENT (document_thumbnails);
 	
@@ -543,19 +539,9 @@ ps_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails,
 		ps_document->thumbs_mutex = g_mutex_new ();
 	ps_document->thumbs_cond = g_cond_new ();
 
-	ps_document_get_page_size (EV_DOCUMENT (ps_document), page,
-				   &page_width, &page_height);
-	scale = size / page_width;
-
-	rotation = (rotation + ps_document_get_page_rotation (ps_document, page)) % 360;
-	
-	if (!ps_document->thumbs_rc) {
-		ps_document->thumbs_rc = ev_render_context_new (rotation, page, scale);
-	} else {
-		ev_render_context_set_page (ps_document->thumbs_rc, page);
-		ev_render_context_set_scale (ps_document->thumbs_rc, scale);
-		ev_render_context_set_rotation (ps_document->thumbs_rc, rotation);
-	}
+	if (ps_document->thumbs_rc)
+		g_object_unref (ps_document->thumbs_rc);
+	ps_document->thumbs_rc = g_object_ref (rc);
 
 	ev_document_doc_mutex_unlock ();
 	g_mutex_lock (ps_document->thumbs_mutex);
@@ -572,7 +558,7 @@ ps_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails,
 	if (border) {
 		GdkPixbuf *border_pixbuf;
 		
-		border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf);
+		border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf);
 		g_object_unref (pixbuf);
 		pixbuf = border_pixbuf;
 	}
@@ -582,8 +568,7 @@ ps_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails,
 
 static void
 ps_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnails,
-				       gint                  page,
-				       gint                  size,
+				       EvRenderContext      *rc, 
 				       gint                 *width,
 				       gint                 *height)
 {
@@ -593,10 +578,16 @@ ps_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnails
 	ps_document = PS_DOCUMENT (document_thumbnails);
 	
 	ps_document_get_page_size (EV_DOCUMENT (ps_document),
-				   page,
+				   rc->page,
 				   &page_width, &page_height);
-	*width = size;
-	*height = (int) (size * page_height / page_width);
+	
+	if (rc->rotation == 90 || rc->rotation == 270) {
+		*width = (gint) (page_height * rc->scale);
+		*height = (gint) (page_width * rc->scale);
+	} else {
+		*width = (gint) (page_width * rc->scale);
+		*height = (gint) (page_height * rc->scale);
+	}
 }
 
 static void
@@ -607,22 +598,9 @@ ps_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface)
 }
 
 /* EvFileExporterIface */
-static gboolean
-ps_document_file_exporter_format_supported (EvFileExporter      *exporter,
-					    EvFileExporterFormat format)
-{
-	return (format == EV_FILE_FORMAT_PS);
-}
-
 static void
-ps_document_file_exporter_begin (EvFileExporter      *exporter,
-				 EvFileExporterFormat format,
-				 const char          *filename,
-				 int                  first_page,
-				 int                  last_page,
-				 double               width,
-				 double               height,
-				 gboolean             duplex)
+ps_document_file_exporter_begin (EvFileExporter        *exporter,
+				 EvFileExporterContext *fc)
 {
 	PSDocument *document = PS_DOCUMENT (exporter);
 
@@ -632,11 +610,12 @@ ps_document_file_exporter_begin (EvFileExporter      *exporter,
 		document->ps_export_pagelist = g_new0 (int, document->doc->numpages);
 	}
 
-	document->ps_export_filename = g_strdup (filename);
+	document->ps_export_filename = g_strdup (fc->filename);
 }
 
 static void
-ps_document_file_exporter_do_page (EvFileExporter *exporter, EvRenderContext *rc)
+ps_document_file_exporter_do_page (EvFileExporter  *exporter,
+				   EvRenderContext *rc)
 {
 	PSDocument *document = PS_DOCUMENT (exporter);
 	
@@ -662,11 +641,18 @@ ps_document_file_exporter_end (EvFileExporter *exporter)
 	}
 }
 
+static EvFileExporterCapabilities
+ps_document_file_exporter_get_capabilities (EvFileExporter *exporter)
+{
+	return  EV_FILE_EXPORTER_CAN_PAGE_SET |
+		EV_FILE_EXPORTER_CAN_GENERATE_PS;
+}
+
 static void
 ps_document_file_exporter_iface_init (EvFileExporterIface *iface)
 {
-	iface->format_supported = ps_document_file_exporter_format_supported;
 	iface->begin = ps_document_file_exporter_begin;
 	iface->do_page = ps_document_file_exporter_do_page;
 	iface->end = ps_document_file_exporter_end;
+	iface->get_capabilities = ps_document_file_exporter_get_capabilities;
 }