X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pixbuf%2Fpixbuf-document.c;h=f19d2d5e6f2a9899ce8373de56edfcddebb338cf;hb=86c64a5457135c89d6234c8671e89993f03f9dea;hp=d4a8c9afb1f41984dab2ff03b5be1ce0a15649a7;hpb=e93b3a265bbc02546d230204402e3f41e83d6ab5;p=evince.git

diff --git a/pixbuf/pixbuf-document.c b/pixbuf/pixbuf-document.c
index d4a8c9af..f19d2d5e 100644
--- a/pixbuf/pixbuf-document.c
+++ b/pixbuf/pixbuf-document.c
@@ -20,6 +20,11 @@
 #include "pixbuf-document.h"
 #include "ev-document-thumbnails.h"
 
+#include <libgnomevfs/gnome-vfs-uri.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
+#include <libgnomevfs/gnome-vfs-ops.h>
+#include <libgnomevfs/gnome-vfs-xfer.h>
+
 struct _PixbufDocumentClass
 {
 	GObjectClass parent_class;
@@ -30,7 +35,8 @@ struct _PixbufDocument
 	GObject parent_instance;
 
 	GdkPixbuf *pixbuf;
-	EvOrientation orientation;
+	
+	gchar *uri;
 };
 
 typedef struct _PixbufDocumentClass PixbufDocumentClass;
@@ -66,6 +72,8 @@ pixbuf_document_load (EvDocument  *document,
 		return FALSE;
 
 	pixbuf_document->pixbuf = pixbuf;
+	g_free (pixbuf_document->uri);
+	pixbuf_document->uri = g_strdup (uri);
 	
 	return TRUE;
 }
@@ -75,8 +83,32 @@ pixbuf_document_save (EvDocument  *document,
 		      const char  *uri,
 		      GError     **error)
 {
-	g_warning ("pixbuf_document_save not implemented"); /* FIXME */
-	return TRUE;
+	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
+	GnomeVFSResult result;
+	GnomeVFSURI *source_uri;
+	GnomeVFSURI *target_uri;
+	
+	if (!pixbuf_document->uri)
+		return FALSE;
+	
+	source_uri = gnome_vfs_uri_new (pixbuf_document->uri);
+	target_uri = gnome_vfs_uri_new (uri);
+
+	result = gnome_vfs_xfer_uri (source_uri, target_uri, 
+				     GNOME_VFS_XFER_DEFAULT | GNOME_VFS_XFER_FOLLOW_LINKS,
+				     GNOME_VFS_XFER_ERROR_MODE_ABORT,
+				     GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
+				     NULL,
+				     NULL);
+	gnome_vfs_uri_unref (target_uri);
+	gnome_vfs_uri_unref (source_uri);
+    
+	if (result != GNOME_VFS_OK)
+		g_set_error (error,
+			     EV_DOCUMENT_ERROR,
+			     0,
+			     gnome_vfs_result_to_string (result));			
+	return (result == GNOME_VFS_OK);
 }
 
 static int
@@ -85,41 +117,6 @@ pixbuf_document_get_n_pages (EvDocument  *document)
 	return 1;
 }
 
-static EvOrientation
-pixbuf_document_get_orientation (EvDocument *document)
-{
-	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
-
-	return pixbuf_document->orientation;
-}
-
-static void
-pixbuf_document_set_orientation (EvDocument *document,
-			         EvOrientation   orientation)
-{
-	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
-
-	pixbuf_document->orientation = orientation;
-}
-
-static GdkPixbuf *
-rotate_pixbuf (EvDocument *document, GdkPixbuf *pixbuf)
-{
-	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
-
-	switch (pixbuf_document->orientation)
-	{
-		case EV_ORIENTATION_LANDSCAPE:
-			return gdk_pixbuf_rotate_simple (pixbuf, 90);
-		case EV_ORIENTATION_UPSIDEDOWN:
-			return gdk_pixbuf_rotate_simple (pixbuf, 180);
-		case EV_ORIENTATION_SEASCAPE:
-			return gdk_pixbuf_rotate_simple (pixbuf, 270);
-		default:
-			return g_object_ref (pixbuf);
-	}
-}
-
 static void
 pixbuf_document_get_page_size (EvDocument   *document,
 			       int           page,
@@ -128,14 +125,8 @@ pixbuf_document_get_page_size (EvDocument   *document,
 {
 	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
 
-	if (pixbuf_document->orientation == EV_ORIENTATION_PORTRAIT ||
-	    pixbuf_document->orientation ==  EV_ORIENTATION_UPSIDEDOWN) {
-		*width = gdk_pixbuf_get_width (pixbuf_document->pixbuf);
-		*height = gdk_pixbuf_get_height (pixbuf_document->pixbuf);
-	} else {
-		*width = gdk_pixbuf_get_height (pixbuf_document->pixbuf);
-		*height = gdk_pixbuf_get_width (pixbuf_document->pixbuf);
-	}
+	*width = gdk_pixbuf_get_width (pixbuf_document->pixbuf);
+	*height = gdk_pixbuf_get_height (pixbuf_document->pixbuf);
 }
 
 static GdkPixbuf*
@@ -150,8 +141,8 @@ pixbuf_document_render_pixbuf (EvDocument      *document,
 					         gdk_pixbuf_get_height (pixbuf_document->pixbuf) * rc->scale,
 					         GDK_INTERP_BILINEAR);
 
-	rotated_pixbuf = rotate_pixbuf (document, scaled_pixbuf);
-	g_object_unref (scaled_pixbuf);
+        rotated_pixbuf = gdk_pixbuf_rotate_simple (scaled_pixbuf, 360 - rc->rotation);
+        g_object_unref (scaled_pixbuf);
 
 	return rotated_pixbuf;
 }
@@ -162,6 +153,7 @@ pixbuf_document_finalize (GObject *object)
 	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (object);
 
 	g_object_unref (pixbuf_document->pixbuf);
+	g_free (pixbuf_document->uri);
 	
 	G_OBJECT_CLASS (pixbuf_document_parent_class)->finalize (object);
 }
@@ -201,18 +193,17 @@ pixbuf_document_document_iface_init (EvDocumentIface *iface)
 	iface->get_page_size = pixbuf_document_get_page_size;
 	iface->render_pixbuf = pixbuf_document_render_pixbuf;
 	iface->get_info = pixbuf_document_get_info;
-	iface->get_orientation = pixbuf_document_get_orientation;
-	iface->set_orientation = pixbuf_document_set_orientation;
 }
 
 static GdkPixbuf *
 pixbuf_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 					  gint 			  page,
+					  gint 			  rotation,
 					  gint			  size,
 					  gboolean                border)
 {
 	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
-	GdkPixbuf *pixbuf;
+	GdkPixbuf *pixbuf, *rotated_pixbuf;
 	gdouble scale_factor;
 	gint height;
 	
@@ -222,8 +213,11 @@ pixbuf_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 	
 	pixbuf = gdk_pixbuf_scale_simple (pixbuf_document->pixbuf, size, height,
 					  GDK_INTERP_BILINEAR);
-	
-	return pixbuf;
+
+	rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, 360 - rotation);
+        g_object_unref (pixbuf);
+
+        return rotated_pixbuf;
 }
 
 static void