[gtk+] demo: use the installed named icon
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] demo: use the installed named icon
- Date: Tue, 5 Nov 2013 20:46:37 +0000 (UTC)
commit cdc2f07a1efa7a23878bf5cf6d8dca4170ffc561
Author: William Jon McCann <william jon mccann gmail com>
Date: Tue Nov 5 15:29:54 2013 -0500
demo: use the installed named icon
demos/gtk-demo/Makefile.am | 3 ---
demos/gtk-demo/application.c | 6 +-----
demos/gtk-demo/demo.gresource.xml | 5 -----
demos/gtk-demo/gtk-logo-24.png | Bin 674 -> 0 bytes
demos/gtk-demo/gtk-logo-48.png | Bin 2405 -> 0 bytes
demos/gtk-demo/gtk-logo-old.png | Bin 5895 -> 0 bytes
demos/gtk-demo/images.c | 7 +------
demos/gtk-demo/listbox.c | 4 +---
demos/gtk-demo/main.c | 16 +---------------
demos/gtk-demo/stack.ui | 2 +-
demos/gtk-demo/textview.c | 15 ++++++++-------
11 files changed, 13 insertions(+), 45 deletions(-)
---
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 3cc92d6..cbfabeb 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -134,9 +134,6 @@ RESOURCES= $(demos) \
gnome-gmush.png \
gnome-gsame.png \
gnu-keys.png \
- gtk-logo-24.png \
- gtk-logo-48.png \
- gtk-logo-old.png \
messages.txt \
css_accordion.css \
css_basics.css \
diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c
index 048535a..d250586 100644
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -95,7 +95,6 @@ activate_about (GSimpleAction *action,
gpointer user_data)
{
GtkWidget *window = user_data;
- GdkPixbuf *pixbuf;
const gchar *authors[] = {
"Peter Mattis",
@@ -113,8 +112,6 @@ activate_about (GSimpleAction *action,
NULL
};
- pixbuf = gdk_pixbuf_new_from_resource ("/application/gtk-logo-48.png", NULL);
-
gtk_show_about_dialog (GTK_WINDOW (window),
"program-name", "GTK+ Code Demos",
"version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
@@ -128,10 +125,9 @@ activate_about (GSimpleAction *action,
"comments", "Program to demonstrate GTK+ functions.",
"authors", authors,
"documenters", documentors,
- "logo", pixbuf,
+ "logo-icon-name", "gtk3-demo",
"title", "About GTK+ Code Demos",
NULL);
- g_object_unref (pixbuf);
}
static void
diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index 66a65c4..f856681 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/application">
- <file preprocess="to-pixdata">gtk-logo-24.png</file>
- <file preprocess="to-pixdata">gtk-logo-48.png</file>
<file>application.ui</file>
<file>menus.ui</file>
</gresource>
@@ -59,7 +57,6 @@
<gresource prefix="/images">
<file>alphatest.png</file>
<file>floppybuddy.gif</file>
- <file>gtk-logo-old.png</file>
</gresource>
<gresource prefix="/pixbufs">
<file>apple-red.png</file>
@@ -125,12 +122,10 @@
</gresource>
<gresource prefix="/textview">
<file>floppybuddy.gif</file>
- <file>gtk-logo-old.png</file>
</gresource>
<gresource prefix="/listbox">
<file>listbox.ui</file>
<file>messages.txt</file>
- <file>gtk-logo-48.png</file>
<file>apple-red.png</file>
</gresource>
</gresources>
diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index 4065ee5..ef1386b 100644
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -329,7 +329,6 @@ do_images (GtkWidget *do_widget)
GtkWidget *image;
GtkWidget *label;
GtkWidget *button;
- GdkPixbuf *pixbuf;
GIcon *gicon;
if (!window)
@@ -361,11 +360,7 @@ do_images (GtkWidget *do_widget)
gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
- pixbuf = gdk_pixbuf_new_from_resource ("/images/gtk-logo-old.png", NULL);
- /* The image loading must work, we ensure that the resources are valid. */
- g_assert (pixbuf);
-
- image = gtk_image_new_from_pixbuf (pixbuf);
+ image = gtk_image_new_from_icon_name ("gtk3-demo", GTK_ICON_SIZE_DIALOG);
gtk_container_add (GTK_CONTAINER (frame), image);
diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c
index e58ba4e..3941f2d 100644
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -9,7 +9,6 @@
#include <stdlib.h>
#include <string.h>
-static GdkPixbuf *avatar_pixbuf_gtk;
static GdkPixbuf *avatar_pixbuf_other;
static GtkWidget *window = NULL;
@@ -183,7 +182,7 @@ gtk_message_row_update (GtkMessageRow *row)
gtk_button_set_label (GTK_BUTTON (priv->resent_by_button), priv->message->resent_by);
if (strcmp (priv->message->sender_nick, "@GTKtoolkit") == 0)
- gtk_image_set_from_pixbuf (priv->avatar_image, avatar_pixbuf_gtk);
+ gtk_image_set_from_icon_name (priv->avatar_image, "gtk3-demo", GTK_ICON_SIZE_DND);
else
gtk_image_set_from_pixbuf (priv->avatar_image, avatar_pixbuf_other);
@@ -317,7 +316,6 @@ do_listbox (GtkWidget *do_widget)
if (!window)
{
- avatar_pixbuf_gtk = gdk_pixbuf_new_from_resource_at_scale ("/listbox/gtk-logo-48.png", 32, 32, FALSE,
NULL);
avatar_pixbuf_other = gdk_pixbuf_new_from_resource_at_scale ("/listbox/apple-red.png", 32, 32, FALSE,
NULL);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index cb9a1a6..19b2dd7 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -882,20 +882,6 @@ create_tree (void)
return box;
}
-static void
-setup_default_icon (void)
-{
- GdkPixbuf *pixbuf;
-
- pixbuf = gdk_pixbuf_new_from_resource ("/application/gtk-logo-48.png", NULL);
- /* We load a resource, so we can guarantee that loading it is successful */
- g_assert (pixbuf);
-
- gtk_window_set_default_icon (pixbuf);
-
- g_object_unref (pixbuf);
-}
-
int
main (int argc, char **argv)
{
@@ -915,7 +901,7 @@ main (int argc, char **argv)
gtk_init (&argc, &argv);
- setup_default_icon ();
+ gtk_window_set_default_icon_name ("gtk3-demo");
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), "GTK+ Code Demos");
diff --git a/demos/gtk-demo/stack.ui b/demos/gtk-demo/stack.ui
index d400dc1..334c145 100644
--- a/demos/gtk-demo/stack.ui
+++ b/demos/gtk-demo/stack.ui
@@ -32,7 +32,7 @@
<property name="can_focus">False</property>
<property name="margin-top">20</property>
<property name="margin-bottom">20</property>
- <property name="resource">/application/gtk-logo-48.png</property>
+ <property name="icon-name">gtk3-demo</property>
</object>
<packing>
<property name="name">page1</property>
diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index 2bb6e28..775ede6 100644
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -129,15 +129,16 @@ insert_text (GtkTextBuffer *buffer)
GtkTextIter iter;
GtkTextIter start, end;
GdkPixbuf *pixbuf;
- GdkPixbuf *scaled;
-
- pixbuf = gdk_pixbuf_new_from_resource ("/textview/gtk-logo-old.png", NULL);
+ GtkIconTheme *icon_theme;
+
+ icon_theme = gtk_icon_theme_get_default ();
+ pixbuf = gtk_icon_theme_load_icon (icon_theme,
+ "gtk3-demo",
+ 32,
+ GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+ NULL);
g_assert (pixbuf);
- scaled = gdk_pixbuf_scale_simple (pixbuf, 32, 32, GDK_INTERP_BILINEAR);
- g_object_unref (pixbuf);
- pixbuf = scaled;
-
/* get start of buffer; each insertion will revalidate the
* iterator to point to just after the inserted text.
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]