callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtkimage: Add GtkImage::resource property

Browse Source 
This is designed for GtkBuilder scenarios:

    <object class="GtkImage" id="blah">
        <property name="resource">/org/myapp/blah.png</property>
    </object>

https://bugzilla.gnome.org/show_bug.cgi?id=692481
This commit is contained in:
Jasper St. Pierre
2013-01-24 17:09:51 -05:00
parent c1aeab0859
commit 86f024ba0d
1 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gtk/gtkimage.c
View File

@ -139,6 +139,7 @@ struct _GtkImagePrivate
GdkPixbufAnimationIter *animation_iter; GdkPixbufAnimationIter *animation_iter;
gchar *filename; /* Only used with GTK_IMAGE_ANIMATION, GTK_IMAGE_PIXBUF */ gchar *filename; /* Only used with GTK_IMAGE_ANIMATION, GTK_IMAGE_PIXBUF */
gchar *resource_path; /* Only used with GTK_IMAGE_PIXBUF */
}; };
@ -184,6 +185,7 @@ enum
PROP_ICON_NAME, PROP_ICON_NAME,
PROP_STORAGE_TYPE, PROP_STORAGE_TYPE,
PROP_GICON, PROP_GICON,
PROP_RESOURCE,
PROP_USE_FALLBACK PROP_USE_FALLBACK
}; };
@ -310,6 +312,21 @@ gtk_image_class_init (GtkImageClass *class)
G_TYPE_ICON, G_TYPE_ICON,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE));
/**
* GtkImage:resource:
*
* A path to a resource file to display.
*
* Since: 3.8
*/
g_object_class_install_property (gobject_class,
PROP_RESOURCE,
g_param_spec_string ("resource",
P_("Resource"),
P_("The resource path being displayed"),
NULL,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_STORAGE_TYPE, PROP_STORAGE_TYPE,
g_param_spec_enum ("storage-type", g_param_spec_enum ("storage-type",
@ -418,6 +435,9 @@ gtk_image_set_property (GObject *object,
gtk_image_set_from_gicon (image, g_value_get_object (value), gtk_image_set_from_gicon (image, g_value_get_object (value),
icon_size); icon_size);
break; break;
case PROP_RESOURCE:
gtk_image_set_from_resource (image, g_value_get_string (value));
break;
case PROP_USE_FALLBACK: case PROP_USE_FALLBACK:
_gtk_icon_helper_set_use_fallback (priv->icon_helper, g_value_get_boolean (value)); _gtk_icon_helper_set_use_fallback (priv->icon_helper, g_value_get_boolean (value));
@ -467,6 +487,9 @@ gtk_image_get_property (GObject *object,
case PROP_GICON: case PROP_GICON:
g_value_set_object (value, _gtk_icon_helper_peek_gicon (priv->icon_helper)); g_value_set_object (value, _gtk_icon_helper_peek_gicon (priv->icon_helper));
break; break;
case PROP_RESOURCE:
g_value_set_string (value, priv->resource_path);
break;
case PROP_USE_FALLBACK: case PROP_USE_FALLBACK:
g_value_set_boolean (value, _gtk_icon_helper_get_use_fallback (priv->icon_helper)); g_value_set_boolean (value, _gtk_icon_helper_get_use_fallback (priv->icon_helper));
break; break;
@ -791,11 +814,14 @@ void
gtk_image_set_from_resource (GtkImage *image, gtk_image_set_from_resource (GtkImage *image,
const gchar *resource_path) const gchar *resource_path)
{ {
GtkImagePrivate *priv;
GdkPixbuf *pixbuf = NULL; GdkPixbuf *pixbuf = NULL;
GInputStream *stream; GInputStream *stream;
g_return_if_fail (GTK_IS_IMAGE (image)); g_return_if_fail (GTK_IS_IMAGE (image));
priv = image->priv;
g_object_freeze_notify (G_OBJECT (image)); g_object_freeze_notify (G_OBJECT (image));
gtk_image_clear (image); gtk_image_clear (image);
@ -822,8 +848,12 @@ gtk_image_set_from_resource (GtkImage *image,
return; return;
} }
priv->resource_path = g_strdup (resource_path);
gtk_image_set_from_pixbuf (image, pixbuf); gtk_image_set_from_pixbuf (image, pixbuf);
g_object_notify (G_OBJECT (image), "resource");
g_object_unref (pixbuf); g_object_unref (pixbuf);
g_object_thaw_notify (G_OBJECT (image)); g_object_thaw_notify (G_OBJECT (image));
@ -1468,6 +1498,13 @@ gtk_image_reset (GtkImage *image)
g_object_notify (G_OBJECT (image), "file"); g_object_notify (G_OBJECT (image), "file");
} }
if (priv->resource_path)
{
g_free (priv->resource_path);
priv->resource_path = NULL;
g_object_notify (G_OBJECT (image), "resource");
}
_gtk_icon_helper_clear (priv->icon_helper); _gtk_icon_helper_clear (priv->icon_helper);
g_object_thaw_notify (G_OBJECT (image)); g_object_thaw_notify (G_OBJECT (image));