Blessed by Ettore.

Guided by Jacub Stener's mail, where he explaned which icons were renamed or
added, I added a bunch of new icons to menus, fixed renamed ones. Changed Trash
and Executive summary folder type icons. Fixed art/Makefile.am for these
changes.

Also, pulled icon cache from mailer and moved it to e-util/e-gui-utils.h, made
all components and dialogs use cache and not load pixmaps every time.

Accidentally got a couple of includes fix in, but they won't break anything.

svn path=/trunk/; revision=9092

3 files changed, 80 insertions, 2 deletions

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index b0124f356b..e20785e782 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
+
+	* e-gui-utils.h: new type EPixmap, which is used to cache pixmaps for
+	bonobo components. use e_pixmaps_update to load icons into ui
+	component.
+	* e-gui-utils.c: implementation of EPixmap cache, moved here from
+	mail/folder-browser-factory.c.
+
 2001-03-31  Jon Trowbridge  <trow@ximian.com>
 
 	* e-url.c (e_url_shroud): Check that first_colon < last_at,
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
index 356ed41cc0..2ed26448f3 100644
--- a/e-util/e-gui-utils.c
+++ b/e-util/e-gui-utils.c
@@ -10,14 +10,15 @@
  */
 #include <config.h>
 
+#include "e-gui-utils.h"
+
 #include <gtk/gtksignal.h>
 #include <gtk/gtkalignment.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-
-#include "e-gui-utils.h"
+#include <bonobo/bonobo-ui-util.h>
 
 GtkWidget *e_create_image_widget(gchar *name,
 				 gchar *string1, gchar *string2,
@@ -63,3 +64,57 @@ GtkWidget *e_create_image_widget(gchar *name,
 	} else
 		return NULL;
 }
+
+static GSList *inited_arrays=NULL;
+
+static void
+free_pixmaps (void)
+{
+	int i;
+	GSList *li;
+
+	for (li = inited_arrays; li != NULL; li = li->next) {
+		EPixmap *pixcache = li->data;
+		for (i = 0; pixcache [i].path; i++)
+			g_free (pixcache [i].pixbuf);
+	}
+	
+	g_slist_free(inited_arrays);
+}
+
+void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache)
+{
+	static int done_init = 0;
+	int i;
+
+	if (!done_init) {
+		g_atexit (free_pixmaps);
+		done_init = 1;
+	}
+
+	if (g_slist_find(inited_arrays, pixcache) == NULL)
+		inited_arrays = g_slist_prepend (inited_arrays, pixcache);
+
+	for (i = 0; pixcache [i].path; i++) {
+		if (!pixcache [i].pixbuf) {
+			char *path;
+			GdkPixbuf *pixbuf;
+
+			path = g_concat_dir_and_file (EVOLUTION_IMAGES,
+						      pixcache [i].fname);
+			
+			pixbuf = gdk_pixbuf_new_from_file (path);
+			if (pixbuf == NULL) {
+				g_warning ("Cannot load image -- %s", path);
+			} else {
+				pixcache [i].pixbuf = bonobo_ui_util_pixbuf_to_xml (pixbuf);
+				gdk_pixbuf_unref (pixbuf);
+			}
+			
+			g_free (path);
+		}
+		bonobo_ui_component_set_prop (uic, pixcache [i].path, "pixname",
+					      pixcache [i].pixbuf, NULL);
+	}
+}
+
diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h
index 9cbb64fbf6..95df438915 100644
--- a/e-util/e-gui-utils.h
+++ b/e-util/e-gui-utils.h
@@ -2,7 +2,22 @@
 #define E_GUI_UTILS_H
 
 #include <gtk/gtkwidget.h>
+#include <bonobo/bonobo-ui-component.h>
 
 GtkWidget *e_create_image_widget     (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);
 
+typedef struct _EPixmap EPixmap;
+
+struct _EPixmap {
+	const char *path;
+	const char *fname;
+	char       *pixbuf;
+};
+
+#define E_PIXMAP(path,fname)	{ (path), (fname), NULL }
+#define E_PIXMAP_END		{ NULL, NULL, NULL }
+
+/* Takes an array of pixmaps, terminated by (NULL, NULL), and loads into uic */
+void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache);
+
 #endif /* E_GUI_UTILS_H */