More happy icons for the mailer.

svn path=/trunk/; revision=7807

4 files changed, 41 insertions, 5 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index bcc738c3b8..455d1f4888 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
 2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
 
+	* folder-browser-factory.c (update_pixmaps): Set the print icon
+	for various other items.
+	(set_pixmap): Be a bit more verbose in the warning message if the
+	icon isn't found [i.e. report the name of the file too].
+
+2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
+
 	* folder-browser-factory.c (update_pixmaps): Set the pixmaps for
 	the "/menu/Folder/FolderConfig" and "/menu/Settings/SetMailConfig"
 	items.
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index d57b657ac2..e04ddf7aef 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -111,7 +111,11 @@ set_pixmap (BonoboUIComponent *uic,
 	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution", icon);
 
 	pixbuf = gdk_pixbuf_new_from_file (path);
-	g_return_if_fail (pixbuf != NULL);
+	if (pixbuf == NULL) {
+		g_warning ("Cannot load image -- %s", path);
+		g_free (path);
+		return;
+	}
 
 	bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf);
 
@@ -123,7 +127,18 @@ set_pixmap (BonoboUIComponent *uic,
 static void
 update_pixmaps (BonoboUIComponent *uic)
 {
+	set_pixmap (uic, "/menu/File/Print/Print", "16_print.xpm");
+	set_pixmap (uic, "/menu/File/Print/Print Preview", "16_print.xpm");
+
+	set_pixmap (uic, "/menu/Component/Message/MessageEdit", "16_edit.xpm");
+	set_pixmap (uic, "/menu/Component/Message/MessageSaveAs", "16_save.xpm");
+	set_pixmap (uic, "/menu/Component/Message/MessagePrint", "16_print.xpm");
+	set_pixmap (uic, "/menu/Component/Message/MessageMove", "16_move_message.xpm");
+	set_pixmap (uic, "/menu/Component/Message/MessageReplyAll", "16_reply_to_all.xpm");
+	set_pixmap (uic, "/menu/Component/Message/MessageReplySndr", "16_reply.xpm");
+
 	set_pixmap (uic, "/menu/Component/Folder/FolderConfig", "16_configure_folder.xpm");
+
 	set_pixmap (uic, "/menu/Settings/SetMailConfig", "16_configure_mail.xpm");
 
 	set_pixmap (uic, "/Toolbar/MailGet", "buttons/fetch-mail.png");
diff --git a/ui/ChangeLog b/ui/ChangeLog
index cfb3eb8ae9..3e8c99ffba 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,5 +1,12 @@
 2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
 
+	* evolution-mail.xml: Set the `pixtype' of the "PrintMessage" and
+	"PrintPreviewMessage" items to "pixbuf".  Likewise for
+	"MessageSaveAs", "MessageEdit", "MessagePrint", "MessageMove", "MessageReplySndr"
+	and "MessageReplyAll".
+
+2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
+
 	* evolution-mail.xml: Set the `pixtype' of the "Configure Folder"
 	and "Mail Configuration" items to "pixbuf".
 
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index 7418abfeff..e17314f863 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -23,12 +23,12 @@
         <menuitem name="Print" verb="PrintMessage"
         _label="Print message..."
         _tip="Print message to the printer"
-        pixtype="stock" pixname="Print" accel="*Control*P"/>
+        pixtype="pixbuf" accel="*Control*P"/>
 
         <menuitem name="Print Preview" verb="PrintPreviewMessage"
         _label="Print Preview of message..."
         _tip="Previews the message to be printed"
-        pixtype="stock" pixname="Print"/>
+        pixtype="pixbuf"/>
 
       </placeholder>
 
@@ -88,24 +88,30 @@
 
         <menuitem name="MessageEdit" verb=""
         _label="_Edit Message"
+	pixbuf="pixbuf"
          accel="*Control*e"/>
 
         <menuitem name="MessageSaveAs" verb=""
         _label="_Save Message As..."
+	pixtype="pixbuf"
          accel="*Control**Alt*s"/>
 
         <menuitem name="MessagePrint" verb=""
         _label="_Print Message"
+	pixtype="pixbuf"
          accel="*Control*p"/>
 
         <separator/>
 
         <menuitem name="MessageReplySndr" verb=""
         _label="Reply to _Sender"
+	pixtype="pixbuf"
         accel="*Control*r"/>
 
         <menuitem name="MessageReplyAll" verb=""
-        _label="Reply to _All" accel="*Control**Shift*r"/>
+        _label="Reply to _All"
+	pixtype="pixbuf"
+	accel="*Control**Shift*r"/>
 
         <menuitem name="MessageForwardAttached" verb=""
         _label="_Forward"
@@ -129,7 +135,8 @@
 
         <menuitem name="MessageMove" verb=""
         _label="_Move to Folder..."
-         accel="*Control*m"/>
+	pixtype="pixbuf"
+	accel="*Control*m"/>
 
         <menuitem name="MessageCopy" verb=""
         _label="_Copy to Folder..."