aboutsummaryrefslogtreecommitdiffstats
path: root/executive-summary/component
diff options
context:
space:
mode:
authorGediminas Paulauskas <menesis@src.gnome.org>2001-04-02 11:59:11 +0800
committerGediminas Paulauskas <menesis@src.gnome.org>2001-04-02 11:59:11 +0800
commit042704ddd3f26ef3becbe000547564127694c069 (patch)
treeda06292a7ffea58469c87ef330045163b2003d89 /executive-summary/component
parent9fc545eb953a65888f3ae78703e1500d8ad9f1be (diff)
downloadgsoc2013-evolution-042704ddd3f26ef3becbe000547564127694c069.tar.gz
gsoc2013-evolution-042704ddd3f26ef3becbe000547564127694c069.tar.zst
gsoc2013-evolution-042704ddd3f26ef3becbe000547564127694c069.zip
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
Diffstat (limited to 'executive-summary/component')
-rw-r--r--executive-summary/component/component-factory.c2
-rw-r--r--executive-summary/component/e-summary-factory.c38
2 files changed, 9 insertions, 31 deletions
diff --git a/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c
index 8036b7b346..f683b9d52c 100644
--- a/executive-summary/component/component-factory.c
+++ b/executive-summary/component/component-factory.c
@@ -44,7 +44,7 @@ static BonoboGenericFactory *factory = NULL;
static gint running_objects = 0;
static const EvolutionShellComponentFolderType folder_types[] = {
- { "executive-summary", "evolution-today.png" },
+ { "executive-summary", "exec-16-summary.xpm" },
{ NULL, NULL }
};
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
index e94ebaaec1..23110a0716 100644
--- a/executive-summary/component/e-summary-factory.c
+++ b/executive-summary/component/e-summary-factory.c
@@ -36,7 +36,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gal/util/e-util.h>
-#include <e-util/e-gui-utils.h>
+#include "e-util/e-gui-utils.h"
#include "e-summary-factory.h"
@@ -58,34 +58,11 @@ BonoboUIVerb verbs[] = {
BONOBO_UI_VERB_END
};
-static void
-set_pixmap (BonoboUIComponent *component,
- const char *xml_path,
- const char *icon)
-{
- char *path;
- GdkPixbuf *pixbuf;
-
-#if 0
- path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons", icon);
-#else
- path = e_pixmap_file (icon);
-#endif
-
- pixbuf = gdk_pixbuf_new_from_file (path);
- g_return_if_fail (pixbuf != NULL);
-
- bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf);
- gdk_pixbuf_unref (pixbuf);
- g_free (path);
-}
-
-static void
-update_pixmaps (BonoboUIComponent *component)
-{
- set_pixmap (component, "/Toolbar/AddService", "add-service.png");
- set_pixmap (component, "/Toolbar/NewMail", "compose-message.png");
-}
+static EPixmap pixmaps [] = {
+ E_PIXMAP ("/Toolbar/AddService", "buttons/add-service.png"),
+ E_PIXMAP ("/Toolbar/NewMail", "buttons/compose-message.png"),
+ E_PIXMAP_END
+};
static void
control_activate (BonoboControl *control,
@@ -106,7 +83,8 @@ control_activate (BonoboControl *control,
"evolution-executive-summary.xml",
"evolution-executive-summary");
- update_pixmaps (ui_component);
+ e_pixmaps_update (ui_component, pixmaps);
+
bonobo_ui_component_thaw (ui_component, NULL);
}