X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libdocument%2Fev-annotation.h;h=159dc2c8f4e9a9d73a48798b01f935c57ca4209a;hb=f9c2880d31bb2f5d4411849b9207c5d26a5c616a;hp=456710c0be55615e75e9ccf9011ddfb1559e9ccd;hpb=26b1533e697112e62c0373f5d38ebf18d0f491f4;p=evince.git

diff --git a/libdocument/ev-annotation.h b/libdocument/ev-annotation.h
index 456710c0..159dc2c8 100644
--- a/libdocument/ev-annotation.h
+++ b/libdocument/ev-annotation.h
@@ -29,6 +29,7 @@
 #include <glib-object.h>
 
 #include "ev-document.h"
+#include "ev-attachment.h"
 
 G_BEGIN_DECLS
 
@@ -56,14 +57,25 @@ G_BEGIN_DECLS
 #define EV_IS_ANNOTATION_TEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_ANNOTATION_TEXT))
 #define EV_ANNOTATION_TEXT_GET_CLASS(object)    (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_ANNOTATION_TEXT, EvAnnotationTextClass))
 
-typedef struct _EvAnnotation             EvAnnotation;
-typedef struct _EvAnnotationClass        EvAnnotationClass;
+/* EvAnnotationText */
+#define EV_TYPE_ANNOTATION_ATTACHMENT              (ev_annotation_attachment_get_type())
+#define EV_ANNOTATION_ATTACHMENT(object)           (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_ANNOTATION_ATTACHMENT, EvAnnotationAttachment))
+#define EV_ANNOTATION_ATTACHMENT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_ANNOTATION_ATTACHMENT, EvAnnotationAttachmentClass))
+#define EV_IS_ANNOTATION_ATTACHMENT(object)        (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_ANNOTATION_ATTACHMENT))
+#define EV_IS_ANNOTATION_ATTACHMENT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_ANNOTATION_ATTACHMENT))
+#define EV_ANNOTATION_ATTACHMENT_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_ANNOTATION_ATTACHMENT, EvAnnotationAttachmentClass))
+
+typedef struct _EvAnnotation                EvAnnotation;
+typedef struct _EvAnnotationClass           EvAnnotationClass;
+
+typedef struct _EvAnnotationMarkup          EvAnnotationMarkup;
+typedef struct _EvAnnotationMarkupIface     EvAnnotationMarkupIface;
 
-typedef struct _EvAnnotationMarkup       EvAnnotationMarkup;
-typedef struct _EvAnnotationMarkupIface  EvAnnotationMarkupIface;
+typedef struct _EvAnnotationText            EvAnnotationText;
+typedef struct _EvAnnotationTextClass       EvAnnotationTextClass;
 
-typedef struct _EvAnnotationText         EvAnnotationText;
-typedef struct _EvAnnotationTextClass    EvAnnotationTextClass;
+typedef struct _EvAnnotationAttachment      EvAnnotationAttachment;
+typedef struct _EvAnnotationAttachmentClass EvAnnotationAttachmentClass;
 
 struct _EvAnnotation
 {
@@ -101,6 +113,18 @@ struct _EvAnnotationTextClass
 	EvAnnotationClass parent_class;
 };
 
+struct _EvAnnotationAttachment
+{
+	EvAnnotation parent;
+
+	EvAttachment *attachment;
+};
+
+struct _EvAnnotationAttachmentClass
+{
+	EvAnnotationClass parent_class;
+};
+
 /* EvAnnotation */
 GType         ev_annotation_get_type             (void) G_GNUC_CONST;
 
@@ -112,6 +136,7 @@ void          ev_annotation_markup_set_label     (EvAnnotationMarkup *markup,
 gdouble       ev_annotation_markup_get_opacity   (EvAnnotationMarkup *markup);
 void          ev_annotation_markup_set_opacity   (EvAnnotationMarkup *markup,
 						  gdouble             opacity);
+gboolean      ev_annotation_markup_has_popup     (EvAnnotationMarkup *markup);
 void          ev_annotation_markup_get_rectangle (EvAnnotationMarkup *markup,
 						  EvRectangle        *ev_rect);
 gboolean      ev_annotation_markup_get_is_open   (EvAnnotationMarkup *markup);
@@ -122,25 +147,10 @@ void          ev_annotation_markup_set_is_open   (EvAnnotationMarkup *markup,
 GType         ev_annotation_text_get_type        (void) G_GNUC_CONST;
 EvAnnotation *ev_annotation_text_new             (EvPage             *page);
 
-
-/* Annotation Mapping stuff */
-typedef struct _EvAnnotationMapping   EvAnnotationMapping;
-struct _EvAnnotationMapping
-{
-	        EvAnnotation *annotation;
-	        gdouble       x1;
-	        gdouble       y1;
-	        gdouble       x2;
-	        gdouble       y2;
-};
-
-void          ev_annotation_mapping_free     (GList       *annotation_mapping);
-EvAnnotation *ev_annotation_mapping_find     (GList       *annotation_mapping,
-					      gdouble       x,
-					      gdouble       y);
-void          ev_annotation_mapping_get_area (GList        *annotation_mapping,
-					      EvAnnotation *annotation,
-					      EvRectangle  *area);
+/* EvAnnotationText */
+GType         ev_annotation_attachment_get_type  (void) G_GNUC_CONST;
+EvAnnotation *ev_annotation_attachment_new       (EvPage             *page,
+						  EvAttachment       *attachment);
 
 G_END_DECLS