aboutsummaryrefslogtreecommitdiffstats
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
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
-rw-r--r--ChangeLog4
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/contact-editor/contact-editor.glade2
-rw-r--r--addressbook/gui/component/addressbook.c47
-rw-r--r--addressbook/gui/contact-editor/contact-editor.glade2
-rw-r--r--art/Makefile.am14
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/calendar-commands.c62
-rw-r--r--calendar/gui/tasks-control.c12
-rw-r--r--e-util/ChangeLog8
-rw-r--r--e-util/e-gui-utils.c59
-rw-r--r--e-util/e-gui-utils.h15
-rw-r--r--executive-summary/ChangeLog7
-rw-r--r--executive-summary/component/component-factory.c2
-rw-r--r--executive-summary/component/e-summary-factory.c38
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/component-factory.c2
-rw-r--r--mail/folder-browser-factory.c98
-rw-r--r--mail/subscribe-dialog.c38
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell-view-menu.c12
-rw-r--r--ui/ChangeLog6
-rw-r--r--ui/evolution-addressbook.xml2
-rw-r--r--ui/evolution-calendar.xml13
-rw-r--r--ui/evolution-mail.xml7
-rw-r--r--ui/evolution-tasks.xml3
-rw-r--r--ui/evolution.xml24
27 files changed, 270 insertions, 234 deletions
diff --git a/ChangeLog b/ChangeLog
index cfc3fbff3a..8904c930db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-01 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * art/Makefile.am: added missing (new) files.
+
2001-03-30 Dan Winship <danw@ximian.com>
* configure.in (EVOLUTION_MICRO_VERSION): Bump this to 10. (We
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 57ad3c492b..0b50538b45 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-01 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * contact-editor/contact-editor.glade: changed icon to
+ evolution-contacts-plain.png.
+ * gui/component/addressbook.c: use new pixmap cache. Added icon for new
+ contact, print, print preview, changed filenames of renamed icons.
+
2001-03-31 Jon Trowbridge <trow@ximian.com>
* gui/component/select-names/e-select-names.c
diff --git a/addressbook/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade
index 30f7feb1a5..c6afe583f5 100644
--- a/addressbook/contact-editor/contact-editor.glade
+++ b/addressbook/contact-editor/contact-editor.glade
@@ -1616,7 +1616,7 @@
<name>custom5</name>
<cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
- <string1>evolution-contacts.png</string1>
+ <string1>evolution-contacts-plain.png</string1>
<string2></string2>
<int1>0</int1>
<int2>0</int2>
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 8447ac68c1..f165217f14 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -21,16 +21,17 @@
#include <gal/util/e-util.h>
#include <gal/widgets/e-unicode.h>
-#include <select-names/e-select-names.h>
-#include <select-names/e-select-names-manager.h>
+#include "select-names/e-select-names.h"
+#include "select-names/e-select-names-manager.h"
+#include "e-util/e-gui-utils.h"
#include "e-contact-editor.h"
#include "e-contact-save-as.h"
#include "addressbook-config.h"
#include "addressbook.h"
#include "addressbook/gui/search/e-addressbook-search-dialog.h"
#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include <addressbook/printing/e-contact-print.h>
+#include "addressbook/printing/e-contact-print.h"
#include <ebook/e-book.h>
#include <widgets/misc/e-search-bar.h>
@@ -290,36 +291,18 @@ BonoboUIVerb verbs [] = {
BONOBO_UI_VERB_END
};
-static void
-set_pixmap (BonoboUIComponent *uic,
- const char *xml_path,
- const char *icon)
-{
- char *path;
- GdkPixbuf *pixbuf;
-
- path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution", icon);
-
- pixbuf = gdk_pixbuf_new_from_file (path);
- g_return_if_fail (pixbuf != NULL);
-
- bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf);
-
- gdk_pixbuf_unref (pixbuf);
+static EPixmap pixmaps [] = {
+ E_PIXMAP ("/menu/File/New/NewFirstItem/New", "evolution-contacts-mini.png"),
+ E_PIXMAP ("/menu/File/Print/Print", "print.xpm"),
+ E_PIXMAP ("/menu/File/Print/Print Preview", "print-preview.xpm"),
+ E_PIXMAP ("/menu/Tools/Component/AddressbookConfig", "configure_16_addressbook.xpm"),
- g_free (path);
-}
-
-static void
-update_pixmaps (BonoboUIComponent *uic)
-{
-/* set_pixmap (uic, "/menu/File/Print/Print", "16_print.xpm"); FIXME it doesn't seem to work */
- set_pixmap (uic, "/menu/Tools/Component/AddressbookConfig", "16_configure_addressbook.xpm");
+ E_PIXMAP ("/Toolbar/View All", "all_contacts.xpm"),
+ E_PIXMAP ("/Toolbar/Find", "find_contact.xpm"),
+ E_PIXMAP ("/Toolbar/New", "new_contact.xpm"),
- set_pixmap (uic, "/Toolbar/View All", "24_all_contacts.xpm");
- set_pixmap (uic, "/Toolbar/Find", "24_find_contact.xpm");
- set_pixmap (uic, "/Toolbar/New", "new_contact.xpm");
-}
+ E_PIXMAP_END
+};
static void
control_activate (BonoboControl *control,
@@ -345,7 +328,7 @@ control_activate (BonoboControl *control,
update_view_type (view);
- update_pixmaps (uic);
+ e_pixmaps_update (uic, pixmaps);
bonobo_ui_component_thaw (uic, NULL);
}
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 30f7feb1a5..c6afe583f5 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -1616,7 +1616,7 @@
<name>custom5</name>
<cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
- <string1>evolution-contacts.png</string1>
+ <string1>evolution-contacts-plain.png</string1>
<string2></string2>
<int1>0</int1>
<int2>0</int2>
diff --git a/art/Makefile.am b/art/Makefile.am
index d1d4f93f5c..2a2fd57464 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1,16 +1,19 @@
imagesdir = $(datadir)/images/evolution
images_DATA = \
configure_16_addressbook.xpm \
- configure_16_addressbook.xpm \
+ configure_16_calendar.xpm \
configure_16_folder.xpm \
configure_16_mail.xpm \
copy_16_message.xpm \
edit.xpm \
encrypt.xpm \
+ exec-16-summary.xpm \
+ folder.xpm \
forward.xpm \
+ import.xpm \
move_message.xpm \
print.xpm \
- print.xpm \
+ print-preview.xpm \
reply.xpm \
reply_to_all.xpm \
save.xpm \
@@ -40,7 +43,10 @@ images_DATA = \
hide_selected_messages.xpm \
house.png \
malehead.png \
+ new_appointment.xpm \
new_contact.xpm \
+ new-message.xpm \
+ send-receive.xpm \
service-close.png \
service-configure.png \
service-down.png \
@@ -53,7 +59,8 @@ images_DATA = \
service-up-disabled.png \
show_all_messages.xpm \
splash.png \
- undelete_message.xpm
+ undelete_message.xpm \
+ work_offline.xpm
buttonsdir = $(datadir)/images/evolution/buttons
buttons_DATA = \
@@ -68,6 +75,7 @@ buttons_DATA = \
new_appointment.png \
reply.png \
reply-to-all.png \
+ send-24-receive.png \
weekview.xpm \
workweekview.xpm \
yearview.xpm
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 92668ba1e8..e29149e637 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-01 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * gui/calendar-commands.c: use new pixmap cache. Added some menu icons
+ and changed filenames of renamed icons.
+ * gui/tasks-control.c: added icons for new task and print in menu.
+
2001-03-29 Federico Mena Quintero <federico@ximian.com>
Engine for live queries to calendars. A query object watches a
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index e60f381f47..029e417b2e 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -32,11 +32,17 @@
#include <string.h>
#include <ctype.h>
#include <errno.h>
-#include <glib.h>
+
#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtkfilesel.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtksignal.h>
+
+#include <libgnomeui/gnome-dialog-util.h>
+#include <libgnomeui/gnome-messagebox.h>
+#include <libgnomeui/gnome-stock.h>
#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-messagebox.h>
#include <bonobo/bonobo-ui-util.h>
#include <cal-util/timeutil.h>
#include "calendar-commands.h"
@@ -44,7 +50,7 @@
#include "goto.h"
#include "print.h"
#include "dialogs/cal-prefs-dialog.h"
-
+#include "e-util/e-gui-utils.h"
/* A list of all of the calendars started */
static GList *all_calendars = NULL;
@@ -372,40 +378,22 @@ static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB_END
};
-static void
-set_pixmap (BonoboUIComponent *uic,
- const char *xml_path,
- const char *icon)
+static EPixmap pixmaps [] =
{
- char *path;
- GdkPixbuf *pixbuf;
-
- path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution", icon);
-
- pixbuf = gdk_pixbuf_new_from_file (path);
- if (pixbuf == NULL) {
- g_warning ("Cannot load image -- %s", path);
- g_free (path);
- return;
- }
-
- bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf);
-
- gdk_pixbuf_unref (pixbuf);
-
- g_free (path);
-}
-
-static void
-update_pixmaps (BonoboUIComponent *uic)
-{
- set_pixmap (uic, "/Toolbar/New", "buttons/new_appointment.png");
-
- set_pixmap (uic, "/Toolbar/DayView", "buttons/dayview.xpm");
- set_pixmap (uic, "/Toolbar/WorkWeekView", "buttons/workweekview.xpm");
- set_pixmap (uic, "/Toolbar/WeekView", "buttons/weekview.xpm");
- set_pixmap (uic, "/Toolbar/MonthView", "buttons/monthview.xpm");
-}
+ E_PIXMAP ("/menu/File/New/NewFirstItem/CalendarNew", "new_appointment.xpm"),
+ E_PIXMAP ("/menu/File/Print/Print", "print.xpm"),
+ E_PIXMAP ("/menu/File/Print/Print Preview", "print-preview.xpm"),
+ E_PIXMAP ("/menu/Actions/Component/CalendarNew", "new_appointment.xpm"),
+ E_PIXMAP ("/menu/Tools/Component/CalendarPreferences", "configure_16_calendar.xpm"),
+ E_PIXMAP ("/Toolbar/New", "buttons/new_appointment.png"),
+
+ E_PIXMAP ("/Toolbar/DayView", "buttons/dayview.xpm"),
+ E_PIXMAP ("/Toolbar/WorkWeekView", "buttons/workweekview.xpm"),
+ E_PIXMAP ("/Toolbar/WeekView", "buttons/weekview.xpm"),
+ E_PIXMAP ("/Toolbar/MonthView", "buttons/monthview.xpm"),
+
+ E_PIXMAP_END
+};
void
calendar_control_activate (BonoboControl *control,
@@ -446,7 +434,7 @@ calendar_control_activate (BonoboControl *control,
"evolution-calendar.xml",
"evolution-calendar");
- update_pixmaps (uic);
+ e_pixmaps_update (uic, pixmaps);
bonobo_ui_component_thaw (uic, NULL);
}
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 7fb981d868..eb99241262 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -23,15 +23,15 @@
*/
#include <config.h>
-#include <glib.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
+#include <libgnome/gnome-util.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-ui-util.h>
#include "e-tasks.h"
#include "tasks-control.h"
-
+#include "e-util/e-gui-utils.h"
#define TASKS_CONTROL_PROPERTY_URI "folder_uri"
#define TASKS_CONTROL_PROPERTY_URI_IDX 1
@@ -183,6 +183,12 @@ static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB_END
};
+static EPixmap pixmaps [] = {
+ E_PIXMAP ("/menu/File/New/NewFirstItem/NewTask", "evolution-tasks-mini.png"),
+ E_PIXMAP ("/menu/File/Print/Print", "print.xpm"),
+ E_PIXMAP_END
+};
+
static void
tasks_control_activate (BonoboControl *control,
ETasks *tasks)
@@ -207,6 +213,8 @@ tasks_control_activate (BonoboControl *control,
e_tasks_setup_menus(tasks, uic);
+ e_pixmaps_update (uic, pixmaps);
+
bonobo_ui_component_thaw (uic, NULL);
}
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 */
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index 2f3a585d6b..d2252994a5 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-01 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * component/component-factory.c: Changed folder type icon to tiny
+ executive summary icon.
+ * component/e-summary-factory.c: replaced set_pixmap with new EPixmap
+ cache.
+
2001-03-29 Kjartan Maraas <kmaraas@gnome.org>
* *.*: Clean up includes. Remove/replace <gnome.h>, <bonobo.h>
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);
}
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 2b7e546853..c914b2dd80 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-01 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * component-factory.c: changed vtrash icon to trash. doh
+ * folder-browser-factory.c: pixmap cache got moved from here to
+ e-util/e-gui-utils.c. Changed pixmap paths according to file renames.
+ Added icons for print, get mail, etc., changed get mail icon as Jacub
+ suggested.
+ * subscribe-dialog.c: also use new pixmap cache.
+
2001-03-30 Dan Winship <danw@ximian.com>
* mail-config.c (check_service_check): Register for cancellation.
diff --git a/mail/component-factory.c b/mail/component-factory.c
index a2f32c56b3..215abfd9d1 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -282,7 +282,7 @@ debug_cb (EvolutionShellComponent *shell_component, gpointer user_data)
static const EvolutionShellComponentFolderType folder_types[] = {
{ "mail", "evolution-inbox.png" },
{ "mailstorage", "evolution-inbox.png" },
- { "vtrash", "evolution-inbox.png" },
+ { "vtrash", "delete_message.xpm" },
{ NULL, NULL }
};
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 45d5a17cd7..7dbb768645 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -37,6 +37,8 @@
#include "mail-ops.h"
#include "mail-session.h"
+#include "e-util/e-gui-utils.h"
+
/* The FolderBrowser BonoboControls we have. */
static EList *control_list = NULL;
@@ -110,77 +112,37 @@ BonoboUIVerb verbs [] = {
BONOBO_UI_VERB_END
};
-static struct {
- const char *path;
- const char *fname;
- char *pixbuf;
-} pixcache [] = {
- { "/menu/File/Print/Print Preview", "16_print.xpm", NULL },
- { "/menu/Actions/Component/MessageMove", "16_move_message.xpm", NULL },
- { "/menu/Actions/Component/MessageReplyAll", "16_reply_to_all.xpm", NULL },
- { "/menu/Actions/Component/MessageReplySndr", "16_reply.xpm", NULL },
- { "/menu/File/Folder/FolderConfig", "16_configure_folder.xpm", NULL },
- { "/menu/Tools/Component/SetMailConfig", "16_configure_mail.xpm", NULL },
- { "/menu/Edit/MessageDelete", "delete_message.xpm", NULL },
- { "/menu/Edit/MessageUndelete", "undelete_message.xpm", NULL },
- /*{ "/menu/View/MessageHideDeleted", "hide_deleted_messages.xpm", NULL },*/
- { "/menu/View/MessageHideRead", "hide_read_messages.xpm", NULL },
- { "/menu/View/MessageHideSelected", "hide_selected_messages.xpm", NULL },
- { "/menu/View/MessageHideClear", "show_all_messages.xpm", NULL },
- { "/Toolbar/MailGet", "buttons/fetch-mail.png", NULL },
- { "/Toolbar/MailCompose", "buttons/compose-message.png", NULL },
- { "/Toolbar/Reply", "buttons/reply.png", NULL },
- { "/Toolbar/ReplyAll", "buttons/reply-to-all.png", NULL },
- { "/Toolbar/Forward", "buttons/forward.png", NULL },
- { "/Toolbar/Move", "buttons/move-message.png", NULL },
- { "/Toolbar/Copy", "buttons/copy-message.png", NULL },
- { NULL, NULL, NULL }
-};
-
-static void
-free_pixmaps (void)
-{
- int i;
+static EPixmap pixcache [] = {
+ E_PIXMAP ("/menu/File/New/NewFirstItem/MessageNew", "new-message.xpm"),
+ E_PIXMAP ("/menu/File/Folder/FolderConfig", "configure_16_folder.xpm"),
+ E_PIXMAP ("/menu/File/Print/Print", "print.xpm"),
+ E_PIXMAP ("/menu/File/Print/Print Preview", "print-preview.xpm"),
- for (i = 0; pixcache [i].path; i++)
- g_free (pixcache [i].pixbuf);
-}
+ E_PIXMAP ("/menu/Edit/MessageDelete", "delete_message.xpm"),
+ E_PIXMAP ("/menu/Edit/MessageUndelete", "undelete_message.xpm"),
-static void
-update_pixmaps (BonoboUIComponent *uic)
-{
- static int done_init = 0;
- int i;
+ /*E_PIXMAP ("/menu/View/MessageHideDeleted", "hide_deleted_messages.xpm"),*/
+ E_PIXMAP ("/menu/View/MessageHideRead", "hide_read_messages.xpm"),
+ E_PIXMAP ("/menu/View/MessageHideSelected", "hide_selected_messages.xpm"),
+ E_PIXMAP ("/menu/View/MessageHideClear", "show_all_messages.xpm"),
+ E_PIXMAP ("/menu/Actions/Component/SendReceive", "send-receive.xpm"),
+ E_PIXMAP ("/menu/Actions/Component/MessageMove", "move_message.xpm"),
+ E_PIXMAP ("/menu/Actions/Component/MessageReplyAll", "reply_to_all.xpm"),
+ E_PIXMAP ("/menu/Actions/Component/MessageReplySndr", "reply.xpm"),
- if (!done_init) {
- g_atexit (free_pixmaps);
- done_init = 1;
- }
-
- for (i = 0; pixcache [i].path; i++) {
- if (!pixcache [i].pixbuf) {
- char *path;
- GdkPixbuf *pixbuf;
-
- path = g_concat_dir_and_file (
- EVOLUTION_DATADIR "/images/evolution",
- 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);
- }
-}
+ E_PIXMAP ("/menu/Tools/Component/SetMailConfig", "configure_16_mail.xpm"),
+
+ E_PIXMAP ("/Toolbar/MailGet", "buttons/send-24-receive.png"),
+ E_PIXMAP ("/Toolbar/MailCompose", "buttons/compose-message.png"),
+ E_PIXMAP ("/Toolbar/Reply", "buttons/reply.png"),
+ E_PIXMAP ("/Toolbar/ReplyAll", "buttons/reply-to-all.png"),
+ E_PIXMAP ("/Toolbar/Forward", "buttons/forward.png"),
+ E_PIXMAP ("/Toolbar/Move", "buttons/move-message.png"),
+ E_PIXMAP ("/Toolbar/Copy", "buttons/copy-message.png"),
+
+ E_PIXMAP_END
+};
static void
display_view(GalViewCollection *collection,
@@ -304,7 +266,7 @@ control_activate (BonoboControl *control,
folder_browser_setup_view_menus (fb, uic);
folder_browser_setup_property_menu (fb, uic);
- update_pixmaps (uic);
+ e_pixmaps_update (uic, pixcache);
bonobo_ui_component_set_prop(uic, "/commands/MailStop", "sensitive", "0", NULL);
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index 657661c01d..5608c44820 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -51,7 +51,8 @@
#include <gal/e-paned/e-hpaned.h>
-#include <e-util/e-html-utils.h>
+#include "e-util/e-html-utils.h"
+#include "e-util/e-gui-utils.h"
#include "mail.h"
#include "mail-tools.h"
#include "mail-mt.h"
@@ -110,33 +111,12 @@ static GtkObjectClass *subscribe_dialog_parent_class;
static void build_tree (SubscribeDialog *sc, CamelStore *store);
-static void
-set_pixmap (BonoboUIComponent *component,
- const char *xml_path,
- const char *icon)
-{
- char *path;
- GdkPixbuf *pixbuf;
-
- path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons", icon);
-
- 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/SubscribeFolder", "fetch-mail.png"); /* XXX */
- set_pixmap (component, "/Toolbar/UnsubscribeFolder", "compose-message.png"); /* XXX */
- set_pixmap (component, "/Toolbar/RefreshList", "forward.png"); /* XXX */
-}
+static EPixmap pixmaps [] = {
+ E_PIXMAP ("/Toolbar/SubscribeFolder", "buttons/fetch-mail.png"), /* XXX */
+ E_PIXMAP ("/Toolbar/UnsubscribeFolder", "buttons/compose-message.png"), /* XXX */
+ E_PIXMAP ("/Toolbar/RefreshList", "buttons/forward.png"), /* XXX */
+ E_PIXMAP_END
+};
static GtkWidget*
make_folder_search_widget (GtkSignalFunc start_search_func,
@@ -910,7 +890,7 @@ subscribe_dialog_gui_init (SubscribeDialog *sc)
"evolution-subscribe.xml",
"evolution-subscribe");
- update_pixmaps (component);
+ e_pixmaps_update (component, pixmaps);
bonobo_ui_component_thaw (component, NULL);
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 1927a6b4d7..0b5c3836e1 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -2,6 +2,11 @@
* evolution-storage-set-view.c: Include <gal/util/e-util.h> here.
+2001-04-01 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * e-shell-view-menu.c: set up menu icons for new folder, import and work
+ offline.
+
2001-03-30 Iain Holmes <iain@ximian.com>
* importer/importer.c (start_import): If the importer can't be started, then
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index f3fd95f6be..a84a913051 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -47,6 +47,8 @@
#include "e-shell-view-menu.h"
#include "importer/importer.h"
+#include "e-util/e-gui-utils.h"
+
const char *authors[] = {
"Seth Alves",
@@ -479,6 +481,14 @@ BonoboUIVerb help_verbs [] = {
BONOBO_UI_VERB_END
};
+static EPixmap pixmaps [] = {
+ E_PIXMAP ("/menu/File/New/Folder", "folder.xpm"),
+ E_PIXMAP ("/menu/File/Folder/Folder", "folder.xpm"),
+ E_PIXMAP ("/menu/File/FileImporter", "import.xpm"),
+ E_PIXMAP ("/menu/File/WorkOffLine", "work_offline.xpm"),
+ E_PIXMAP_END
+};
+
static void
menu_do_misc (BonoboUIComponent *component,
EShellView *shell_view)
@@ -525,6 +535,8 @@ e_shell_view_menu_setup (EShellView *shell_view)
menu_do_misc (uic, shell_view);
+ e_pixmaps_update (uic, pixmaps);
+
gtk_signal_connect (GTK_OBJECT (shell_view), "shortcut_bar_mode_changed",
GTK_SIGNAL_FUNC (shortcut_bar_mode_changed_cb),
SHORTCUT_BAR_TOGGLE_PATH);
diff --git a/ui/ChangeLog b/ui/ChangeLog
index e5e43744d8..27d40aeade 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-01 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * evolution-addressbook.xml, evolution-calendar.xml, evolution-mail.xml,
+ evolution-tasks.xml, evolution.xml: as Jacub suggested, added some icons,
+ replaced stock Print with ours, etc.
+
2001-03-29 Not Zed <NotZed@Ximian.com>
* evolution-mail.xml: Move the 'hide deleted' to the option list
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 2f6f111566..1547e62f33 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -8,7 +8,7 @@
<menuitem name="New"
_label="_Contact"
verb="ContactNew"
- pixtype="stock" pixname="New"
+ pixtype="pixbuf"
accel="*Control*n"/>
<separator/>
</placeholder>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index adf8b3cf9d..680d03f92c 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -32,7 +32,8 @@
<placeholder name="NewFirstItem">
<menuitem name="CalendarNew" verb="EditNewAppointment"
- _label="_Appointment" accel="*Control*n"/>
+ _label="_Appointment" accel="*Control*n"
+ pixtype="pixbuf"/>
</placeholder>
</submenu>
@@ -49,12 +50,12 @@
<placeholder name="Print">
<menuitem name="Print Preview" verb="CalendarPrintPreview"
_label="Print Preview"
- _tip="Previews the message to be printed"/>
+ _tip="Previews the calendar to be printed"
+ pixtype="pixbuf"/>
<menuitem name="Print" verb="CalendarPrint"
_label="_Print..." _tip="Print calendar"
- pixtype="stock" pixname="Print"/>
- accel="*Control*p"/>
+ accel="*Control*p" pixtype="pixbuf"/>
</placeholder>
</submenu>
@@ -86,13 +87,13 @@
<submenu name="Tools" _label="_Tools">
<placeholder name="Component">
<menuitem name="CalendarPreferences" verb=""
- _label="Settings..."/>
+ _label="Settings..." pixtype="pixbuf"/>
</placeholder>
</submenu>
<submenu name="Actions">
<placeholder name="Component">
- <menuitem verb="EditNewAppointment"/>
+ <menuitem name="CalendarNew" verb="EditNewAppointment"/>
<menuitem verb="EditNewEvent"/>
</placeholder>
</submenu>
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index 0b4a8adce3..e894971911 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -34,7 +34,8 @@
<submenu name="New">
<placeholder name="NewFirstItem">
<menuitem name="MessageNew" verb="MailCompose"
- accel="*Control*n" _label="_Mail Message"/>
+ accel="*Control*n" _label="_Mail Message"
+ pixtype="pixbuf"/>
<separator/>
</placeholder>
</submenu>
@@ -73,7 +74,7 @@
<menuitem name="Print" verb="PrintMessage"
_label="Print..."
_tip="Print message to the printer"
- pixtype="stock" pixname="Print" accel="*Control*P"/>
+ pixtype="pixbuf" accel="*Control*P"/>
</placeholder>
@@ -139,7 +140,7 @@
<submenu name="Actions">
<placeholder name="Component">
<menuitem name="SendReceive" verb="MailGetSend"
- _label="_Send / Receive"/>
+ _label="_Send / Receive"pixtype="pixbuf"/>
<separator/>
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index ff41ec6a91..c0cbe55166 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -13,7 +13,8 @@
<menuitem name="NewTask"
verb="TasksNewTask"
_label="_Task"
- accel="*Control*n"/>
+ accel="*Control*n"
+ pixtype="pixbuf"/>
</placeholder>
</submenu>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 7af5a7118a..401ae2f927 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -39,7 +39,8 @@
<menuitem name="Folder" verb="NewFolder"
_label="_Folder"
- accel="*Control**Shift*e"/>
+ accel="*Control**Shift*e"
+ pixtype="pixbuf"/>
<menuitem name="Shortcut" verb="NewBarShortcut"
_label="Evolution bar _shortcut"
@@ -73,7 +74,8 @@
<submenu name="Folder" _label="_Folder">
<menuitem name="Folder" verb="NewFolder"
_label="_New Folder"
- accel="*Control**Shift*e"/>
+ accel="*Control**Shift*e"
+ pixtype="pixbuf"/>
</submenu>
<menuitem name="FileGoToFolder" verb=""
@@ -84,14 +86,16 @@
<menuitem name="FileImporter" verb=""
_label="_Import file..."
- _tip="Import an external file format" accel="*Control*i"/>
+ _tip="Import an external file format" accel="*Control*i"
+ pixtype="pixbuf"/>
<placeholder name="Print" delimit="top"/>
<separator/>
<menuitem name="WorkOffLine" verb=""
- _label="Work Offline"/>
+ _label="Work Offline"
+ pixtype="pixbuf"/>
<menuitem name="FileClose" verb=""
_label="_Close"/>
@@ -165,15 +169,3 @@
<control name="Progress"/>
</status>
</Root>
-
-
-
-
-
-
-
-
-
-
-
-