Skip to content

Commit

Permalink
libdocument: Added can-have-popup property to EvAnnotationMarkups.
Browse files Browse the repository at this point in the history
This patch adds a property can-have-popup to EvAnnotationMarkup.

https://bugzilla.gnome.org/show_bug.cgi?id=733603
  • Loading branch information
Philipp Reinkemeier authored and Carlos Garcia Campos committed Apr 12, 2015
1 parent 8b4fc1d commit e39e492
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
32 changes: 32 additions & 0 deletions libdocument/ev-annotation.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ enum {
PROP_MARKUP_0,
PROP_MARKUP_LABEL,
PROP_MARKUP_OPACITY,
PROP_MARKUP_CAN_HAVE_POPUP,
PROP_MARKUP_HAS_POPUP,
PROP_MARKUP_RECTANGLE,
PROP_MARKUP_POPUP_IS_OPEN
Expand Down Expand Up @@ -656,6 +657,7 @@ ev_annotation_set_rgba (EvAnnotation *annot,
typedef struct {
gchar *label;
gdouble opacity;
gboolean can_have_popup;
gboolean has_popup;
gboolean popup_is_open;
EvRectangle rectangle;
Expand Down Expand Up @@ -683,6 +685,14 @@ ev_annotation_markup_default_init (EvAnnotationMarkupInterface *iface)
1.,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
g_param_spec_boolean ("can-have-popup",
"Can have popup",
"Whether it is allowed to have a popup "
"window for this type of markup annotation",
FALSE,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
g_param_spec_boolean ("has-popup",
"Has popup",
Expand Down Expand Up @@ -753,6 +763,13 @@ ev_annotation_markup_set_property (GObject *object,
case PROP_MARKUP_OPACITY:
ev_annotation_markup_set_opacity (markup, g_value_get_double (value));
break;
case PROP_MARKUP_CAN_HAVE_POPUP: {
EvAnnotationMarkupProps *props;

props = ev_annotation_markup_get_properties (markup);
props->can_have_popup = g_value_get_boolean (value);
break;
}
case PROP_MARKUP_HAS_POPUP:
ev_annotation_markup_set_has_popup (markup, g_value_get_boolean (value));
break;
Expand Down Expand Up @@ -784,6 +801,9 @@ ev_annotation_markup_get_property (GObject *object,
case PROP_MARKUP_OPACITY:
g_value_set_double (value, props->opacity);
break;
case PROP_MARKUP_CAN_HAVE_POPUP:
g_value_set_boolean (value, props->can_have_popup);
break;
case PROP_MARKUP_HAS_POPUP:
g_value_set_boolean (value, props->has_popup);
break;
Expand All @@ -806,6 +826,7 @@ ev_annotation_markup_class_install_properties (GObjectClass *klass)

g_object_class_override_property (klass, PROP_MARKUP_LABEL, "label");
g_object_class_override_property (klass, PROP_MARKUP_OPACITY, "opacity");
g_object_class_override_property (klass, PROP_MARKUP_CAN_HAVE_POPUP, "can-have-popup");
g_object_class_override_property (klass, PROP_MARKUP_HAS_POPUP, "has-popup");
g_object_class_override_property (klass, PROP_MARKUP_RECTANGLE, "rectangle");
g_object_class_override_property (klass, PROP_MARKUP_POPUP_IS_OPEN, "popup-is-open");
Expand Down Expand Up @@ -874,6 +895,17 @@ ev_annotation_markup_set_opacity (EvAnnotationMarkup *markup,
return TRUE;
}

gboolean
ev_annotation_markup_can_have_popup (EvAnnotationMarkup *markup)
{
EvAnnotationMarkupProps *props;

g_return_val_if_fail (EV_IS_ANNOTATION_MARKUP (markup), FALSE);

props = ev_annotation_markup_get_properties (markup);
return props->can_have_popup;
}

gboolean
ev_annotation_markup_has_popup (EvAnnotationMarkup *markup)
{
Expand Down
1 change: 1 addition & 0 deletions libdocument/ev-annotation.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ gboolean ev_annotation_markup_set_label (EvAnnotationMarkup
gdouble ev_annotation_markup_get_opacity (EvAnnotationMarkup *markup);
gboolean ev_annotation_markup_set_opacity (EvAnnotationMarkup *markup,
gdouble opacity);
gboolean ev_annotation_markup_can_have_popup (EvAnnotationMarkup *markup);
gboolean ev_annotation_markup_has_popup (EvAnnotationMarkup *markup);
gboolean ev_annotation_markup_set_has_popup (EvAnnotationMarkup *markup,
gboolean has_popup);
Expand Down

0 comments on commit e39e492

Please sign in to comment.