diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-07-02 22:44:09 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-07-02 22:44:09 +0000 |
| commit | a72aed4ea22a9951742919e00ed7c47f14731001 (patch) | |
| tree | 12895bf9e410e1c6e01bf64918ad563a5c80c11c /gtk/gtkiconfactory.h | |
| parent | 8982aa6723155a73976a0ad4ef00c1c68e886d3f (diff) | |
| download | gtk+-a72aed4ea22a9951742919e00ed7c47f14731001.tar.gz | |
Implement a loader for named themed icon based on from gnome-desktop
Wed Jul 2 18:00:56 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkicontheme.[ch]: Implement a loader for
named themed icon based on from gnome-desktop library
by Alex Larsson.
* gtk/gtkiconthemeparser.[ch]: .ini file parsing code
from gnome-desktop.
* gtk/gtkiconfactory.[ch]: Add
gtk_icon_source_set/get_icon_name() to allow stock icons
to be based off of named theme icons.
* gtk/gtkiconfactory.c: Rework sources so that the source
is *either* a pixbuf, or a filename, or an icon name,
instead of the pixbuf/filename mix it was before. Put a
workaround for get_pixbuf() so that it can return the
filename pixbuf, e.g, for render_icon().
* gtk/gtkiconfactory.c: Make the default setup use
themed icons, and add builtin icons to the default
icon theme for all the standard pixbufs, so we
don't rely on actually having an icon theme on disk.
* gtk/gtkrc.c: Add support for @"icon-name" to specify
a themed icon for a stock icon source.
* tests/Makefile.am test/testicontheme.c: Add a test
program from gnome-desktop.
* gdk/x11/gdkevents-x11.c gtk/gtksettings.c: Add
Net/IconThemeName / gtk-icon-theme-name setting.
* gtk/gtkiconfactory.c (ensure_cache_up_to_date): Actually
update the icon cache serial so we don't continually
* gtk/gtkwidget.c: Fix a couple of references in doc comments
to ::direction_set that should have been to ::direction-changed
Diffstat (limited to 'gtk/gtkiconfactory.h')
| -rw-r--r-- | gtk/gtkiconfactory.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h index 91ebdf6810..51fed289fd 100644 --- a/gtk/gtkiconfactory.h +++ b/gtk/gtkiconfactory.h @@ -142,11 +142,16 @@ void gtk_icon_source_free (GtkIconSource *so void gtk_icon_source_set_filename (GtkIconSource *source, const gchar *filename); +void gtk_icon_source_set_icon_name (GtkIconSource *source, + const gchar *icon_name); void gtk_icon_source_set_pixbuf (GtkIconSource *source, GdkPixbuf *pixbuf); +void gtk_icon_source_set_icon_name (GtkIconSource *source, + const gchar *icon_name); -G_CONST_RETURN gchar* gtk_icon_source_get_filename (const GtkIconSource *source); -GdkPixbuf* gtk_icon_source_get_pixbuf (const GtkIconSource *source); +G_CONST_RETURN gchar* gtk_icon_source_get_filename (const GtkIconSource *source); +G_CONST_RETURN gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source); +GdkPixbuf* gtk_icon_source_get_pixbuf (const GtkIconSource *source); void gtk_icon_source_set_direction_wildcarded (GtkIconSource *source, gboolean setting); |