X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=backend%2Fpdf%2Fev-poppler.cc;h=7c3a594df50e1fd15be9485140fa961a322aac7f;hb=60b8f6615b70c2f828c66641e01585ac791d5dc8;hp=c4baa99f9956fe5803517a94a58e84ad2d67730e;hpb=f7e355c8f2621f8026a9461a25ee4e1d60b28bb7;p=evince.git

diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index c4baa99f..7c3a594d 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -45,6 +45,7 @@
 #include "ev-document-transition.h"
 #include "ev-document-forms.h"
 #include "ev-selection.h"
+#include "ev-transition-effect.h"
 #include "ev-attachment.h"
 #include "ev-image.h"
 
@@ -123,10 +124,8 @@ static EvLink     *ev_link_from_action      (PdfDocument       *pdf_document,
 static void        pdf_document_search_free (PdfDocumentSearch *search);
 static void        pdf_print_context_free   (PdfPrintContext   *ctx);
 
-G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
-                         {
-				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
-							pdf_document_document_iface_init);
+EV_BACKEND_REGISTER_WITH_CODE (PdfDocument, pdf_document,
+			 {
 				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_SECURITY,
 							pdf_document_security_iface_init);
 				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
@@ -859,7 +858,10 @@ ev_link_dest_from_dest (PdfDocument *pdf_document,
 			ev_dest = ev_link_dest_new_xyz (dest->page_num - 1,
 							dest->left,
 							height - dest->top,
-							dest->zoom);
+							dest->zoom,
+							dest->change_left,
+							dest->change_top,
+							dest->change_zoom);
 			g_object_unref (poppler_page);
 		}
 			break;
@@ -874,13 +876,15 @@ ev_link_dest_from_dest (PdfDocument *pdf_document,
 								  MAX (0, dest->page_num - 1));
 			poppler_page_get_size (poppler_page, NULL, &height);
 			ev_dest = ev_link_dest_new_fith (dest->page_num - 1,
-							 height - dest->top);
+							 height - dest->top,
+							 dest->change_top);
 			g_object_unref (poppler_page);
 		}
 			break;
 	        case POPPLER_DEST_FITV:
 			ev_dest = ev_link_dest_new_fitv (dest->page_num - 1,
-							 dest->left);
+							 dest->left,
+							 dest->change_left);
 			break;
 	        case POPPLER_DEST_FITR: {
 			PopplerPage *poppler_page;
@@ -1964,16 +1968,49 @@ pdf_document_get_page_duration (EvDocumentTransition *trans,
 	return duration;
 }
 
-static void
-pdf_document_page_transition_iface_init (EvDocumentTransitionIface *iface)
+static EvTransitionEffect *
+pdf_document_get_effect (EvDocumentTransition *trans,
+			 gint                  page)
 {
-	iface->get_page_duration = pdf_document_get_page_duration;
+	PdfDocument            *pdf_document;
+	PopplerPage            *poppler_page;
+	PopplerPageTransition  *page_transition;
+	EvTransitionEffect     *effect;
+
+	pdf_document = PDF_DOCUMENT (trans);
+	poppler_page = poppler_document_get_page (pdf_document->document, page);
+
+	if (!poppler_page)
+		return NULL;
+
+	page_transition = poppler_page_get_transition (poppler_page);
+
+	if (!page_transition) {
+		g_object_unref (poppler_page);
+		return NULL;
+	}
+
+	/* enums in PopplerPageTransition match the EvTransitionEffect ones */
+	effect = ev_transition_effect_new ((EvTransitionEffectType) page_transition->type,
+					   "alignment", page_transition->alignment,
+					   "direction", page_transition->direction,
+					   "duration", page_transition->duration,
+					   "angle", page_transition->angle,
+					   "scale", page_transition->scale,
+					   "rectangular", page_transition->rectangular,
+					   NULL);
+
+	poppler_page_transition_free (page_transition);
+	g_object_unref (poppler_page);
+
+	return effect;
 }
 
-PdfDocument *
-pdf_document_new (void)
+static void
+pdf_document_page_transition_iface_init (EvDocumentTransitionIface *iface)
 {
-	return PDF_DOCUMENT (g_object_new (PDF_TYPE_DOCUMENT, NULL));
+	iface->get_page_duration = pdf_document_get_page_duration;
+	iface->get_effect = pdf_document_get_effect;
 }
 
 /* Forms */