diff options
author | William Jon McCann <william.jon.mccann@gmail.com> | 2013-11-05 16:39:50 -0500 |
---|---|---|
committer | William Jon McCann <william.jon.mccann@gmail.com> | 2013-11-05 16:39:50 -0500 |
commit | 46cb6e8291f588d812f23caca9a678487fe0fab2 (patch) | |
tree | a067d1e311f71432770f56e0c25348b786184047 /demos | |
parent | 628abd4e87c051db62cee49cfb0ba837873e1324 (diff) | |
download | gtk+-46cb6e8291f588d812f23caca9a678487fe0fab2.tar.gz |
widget-factory: use new icon instead of gtk logo
Diffstat (limited to 'demos')
-rw-r--r-- | demos/widget-factory/Makefile.am | 3 | ||||
-rw-r--r-- | demos/widget-factory/gtk-logo-256.png | bin | 10688 -> 0 bytes | |||
-rw-r--r-- | demos/widget-factory/widget-factory.c | 7 | ||||
-rw-r--r-- | demos/widget-factory/widget-factory.gresource.xml | 3 | ||||
-rw-r--r-- | demos/widget-factory/widget-factory.ui | 2 |
5 files changed, 3 insertions, 12 deletions
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am index 742c17723e..9772204429 100644 --- a/demos/widget-factory/Makefile.am +++ b/demos/widget-factory/Makefile.am @@ -60,7 +60,6 @@ uninstall-update-icon-cache: EXTRA_DIST += \ widget-factory.ui \ - widget-factory.gresource.xml \ - gtk-logo-256.png + widget-factory.gresource.xml -include $(top_srcdir)/git.mk diff --git a/demos/widget-factory/gtk-logo-256.png b/demos/widget-factory/gtk-logo-256.png Binary files differdeleted file mode 100644 index f488e4535c..0000000000 --- a/demos/widget-factory/gtk-logo-256.png +++ /dev/null diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index ef3f1d403f..df301e732a 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -56,15 +56,12 @@ activate_about (GSimpleAction *action, gpointer user_data) { GtkWidget *window = user_data; - GdkPixbuf *pixbuf; const gchar *authors[] = { "Andrea Cimitan", "Cosimo Cecchi", NULL }; - pixbuf = gdk_pixbuf_new_from_resource ("/logos/gtk-logo-256.png", NULL); - gtk_show_about_dialog (GTK_WINDOW (window), "program-name", "GTK+ Widget Factory", "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d", @@ -77,11 +74,9 @@ activate_about (GSimpleAction *action, "website", "http://www.gtk.org", "comments", "Program to demonstrate GTK+ themes and widgets", "authors", authors, - "logo", pixbuf, + "logo-icon-name", "gtk3-widget-factory", "title", "About GTK+ Widget Factory", NULL); - - g_object_unref (pixbuf); } static void diff --git a/demos/widget-factory/widget-factory.gresource.xml b/demos/widget-factory/widget-factory.gresource.xml index 79bad5ba25..ec660fff81 100644 --- a/demos/widget-factory/widget-factory.gresource.xml +++ b/demos/widget-factory/widget-factory.gresource.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <gresources> - <gresource prefix="/logos"> - <file>gtk-logo-256.png</file> - </gresource> <gresource prefix="/ui"> <file preprocess="xml-stripblanks">widget-factory.ui</file> </gresource> diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index d1242c05f8..b4b6d2854b 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -1883,7 +1883,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property> <child> <object class="GtkImage" id="imageo"> <property name="visible">True</property> - <property name="resource">/logos/gtk-logo-256.png</property> + <property name="icon-name">gtk3-widget-factory</property> </object> <packing> <property name="name">page2</property> |