diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 6 | ||||
| -rw-r--r-- | composer/e-msg-composer-select-file.c | 12 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 26 |
3 files changed, 31 insertions, 13 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 39441ef567..4f3c66878f 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,9 @@ +2004-04-19 Michael Terry <mike@mterry.name> + + * e-msg-composer-select-file.c: + * e-msg-composer.c: Update the composer to use the icon theme via + the EIconFactory object in e-util + 2004-04-15 Jeffrey Stedfast <fejj@ximian.com> * e-msg-composer-attachment-bar.c (attach_to_multipart): Same idea diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c index 3726124837..cc07205a52 100644 --- a/composer/e-msg-composer-select-file.c +++ b/composer/e-msg-composer-select-file.c @@ -34,9 +34,9 @@ #include <gtk/gtksignal.h> #include <libgnomeui/gnome-uidefs.h> -#include <libgnomeui/gnome-window-icon.h> #include "e-msg-composer-select-file.h" +#include <e-util/e-icon-factory.h> static GtkFileSelection * run_selector(EMsgComposer *composer, const char *title, int multi, gboolean *showinline_p) @@ -44,12 +44,20 @@ run_selector(EMsgComposer *composer, const char *title, int multi, gboolean *sho GtkFileSelection *selection; GtkWidget *showinline = NULL; char *path; + GList *icon_list; selection = (GtkFileSelection *)gtk_file_selection_new(title); gtk_window_set_transient_for((GtkWindow *)selection, (GtkWindow *)composer); gtk_window_set_wmclass((GtkWindow *)selection, "fileselection", "Evolution:composer"); gtk_window_set_modal((GtkWindow *)selection, TRUE); - gnome_window_icon_set_from_file((GtkWindow *)selection, EVOLUTION_DATADIR "/images/evolution/compose-message.png"); + + icon_list = e_icon_factory_get_icon_list ("stock_mail-compose"); + if (icon_list) { + gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list); + g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); + g_list_free (icon_list); + } + gtk_file_selection_set_select_multiple((GtkFileSelection *)selection, multi); /* restore last path used */ diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index c73ab320f0..52eb68dd16 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -114,8 +114,7 @@ #include "e-msg-composer-select-file.h" #include "evolution-shell-component-utils.h" - -#include "art/attachment.xpm" +#include <e-util/e-icon-factory.h> #include "Editor.h" #include "listener.h" @@ -2020,13 +2019,13 @@ static BonoboUIVerb verbs [] = { }; static EPixmap pixcache [] = { - E_PIXMAP ("/Toolbar/FileAttach", "buttons/add-attachment.png"), - E_PIXMAP ("/Toolbar/FileSend", "buttons/send-24.png"), + E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", 24), + E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", 24), -/* E_PIXMAP ("/menu/Insert/FileAttach", "buttons/add-attachment.png"), */ - E_PIXMAP ("/commands/FileSend", "send-16.png"), - E_PIXMAP ("/commands/FileSave", "save-16.png"), - E_PIXMAP ("/commands/FileSaveAs", "save-as-16.png"), +/* E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", 24), */ + E_PIXMAP ("/commands/FileSend", "stock_mail-send", 16), + E_PIXMAP ("/commands/FileSave", "stock_save", 16), + E_PIXMAP ("/commands/FileSaveAs", "stock_save_as", 16), E_PIXMAP_END }; @@ -3166,6 +3165,7 @@ create_composer (int visible_mask) CORBA_Environment ev; GConfClient *gconf; int vis; + GList *icon_list; BonoboControlFrame *control_frame; GdkPixbuf *attachment_pixbuf; @@ -3181,8 +3181,12 @@ create_composer (int visible_mask) G_CALLBACK (msg_composer_destroy_notify), NULL); - gnome_window_icon_set_from_file (GTK_WINDOW (composer), EVOLUTION_IMAGESDIR - "/compose-message.png"); + icon_list = e_icon_factory_get_icon_list ("stock_mail-compose"); + if (icon_list) { + gtk_window_set_icon_list (GTK_WINDOW (composer), icon_list); + g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); + g_list_free (icon_list); + } /* DND support */ gtk_drag_dest_set (GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL, @@ -3293,7 +3297,7 @@ create_composer (int visible_mask) gtk_misc_set_alignment (GTK_MISC (composer->attachment_expander_num), 1.0, 0.5); expander_hbox = gtk_hbox_new (FALSE, 0); - attachment_pixbuf = gdk_pixbuf_new_from_xpm_data (attachment_xpm); + attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", 16); composer->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf); gtk_misc_set_alignment (GTK_MISC (composer->attachment_expander_icon), 1, 0.5); gtk_widget_set_size_request (composer->attachment_expander_icon, 100, -1); |