From 86dfaaef767cb77f5265967aa2a1831e461df55e Mon Sep 17 00:00:00 2001
From: Jacob Leach <jleach@src.gnome.org>
Date: Tue, 31 Jul 2001 15:19:47 +0000
Subject: Use the new Send and Send Later icons for the toolbar and menus in
 the composer.  (Beautiful work Tuomas and Jakub!)

svn path=/trunk/; revision=11511
---
 art/Makefile.am                   |  3 +++
 composer/ChangeLog                |  5 +++++
 composer/e-msg-composer.c         |  7 ++++++-
 ui/ChangeLog                      |  5 +++++
 ui/evolution-message-composer.xml | 14 ++++++++------
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/art/Makefile.am b/art/Makefile.am
index 9eedf461d3..7ef6458a98 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -57,6 +57,7 @@ images_DATA = \
 	evolution-trash.png 		\
 	executive-summary-bg.png	\
 	executive-summary-curve.png	\
+	fetch-mail.png			\
 	globe.png           		\
 	hide_deleted_messages.xpm	\
 	hide_read_messages.xpm		\
@@ -78,6 +79,8 @@ images_DATA = \
 	new_appointment.xpm		\
 	new_contact.xpm			\
 	new-message.xpm			\
+	send-16.png                     \
+	send-later-16.png		\
 	send-receive.xpm		\
 	service-close.png		\
 	service-configure.png		\
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 07ca532004..f24831b9de 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-31  Jason Leach  <jleach@ximian.com>
+
+	* e-msg-composer.c: Use Tuomas' and Jakub's new (and beautiful)
+	icons for Send and Send Later in the toolbar and menus.
+
 2001-07-30  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* e-msg-composer.c (message_rfc822_dnd): Properly add the
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 0586b3b12f..421ffff728 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1682,7 +1682,12 @@ static BonoboUIVerb verbs [] = {
 
 static EPixmap pixcache [] = {
 	E_PIXMAP ("/Toolbar/FileAttach", "buttons/add-attachment.png"),
-	
+	E_PIXMAP ("/Toolbar/FileSend", "buttons/send-24.png"),
+
+/*	E_PIXMAP ("/menu/Insert/FileAttach", "buttons/add-attachment.png"), */
+	E_PIXMAP ("/menu/File/FileSend", "send-16.png"),
+	E_PIXMAP ("/menu/File/FileSendLater", "send-later-16.png"),
+
 	E_PIXMAP_END
 };
 
diff --git a/ui/ChangeLog b/ui/ChangeLog
index de7d5c700c..a7a06a39c5 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-31  Jason Leach  <jleach@ximian.com>
+
+	* evolution-message-composer.xml: Use the new Send and Send Later
+	icons from Jakub and Tuomas.
+
 2001-07-29  Damon Chaplin  <damon@ximian.com>
 
 	* evolution-tasks.xml: use the new print icons.
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
index 362881008d..9041b774f8 100644
--- a/ui/evolution-message-composer.xml
+++ b/ui/evolution-message-composer.xml
@@ -25,10 +25,10 @@
 		
 		<cmd name="FileSend" _label="Send" _tip="Send this message now"
 		accel="*Ctrl*Return"
-                pixtype="stock" pixname="Send Mail"/>
+                pixtype="pixbuf"/>
 		
 		<cmd name="FileSendLater" _label="Send _later" _tip="Send the message later"
-		pixtype="stock" pixname="Send Mail"/> 
+		pixtype="pixbuf"/>
 		
 		<cmd name="FileAttach" _label="Attach" _tip="Attach a file"
 		accel="*Ctrl**Alt*a"
@@ -83,8 +83,10 @@
 		<submenu name="File" _label="_File">
 			<menuitem name="FileOpen" verb="" _label="_Open..."/>
 			<placeholder name="FileOps"/>
-			<menuitem name="FileSend" verb="" _label="Send"/>
-			<menuitem name="FileSendLater" verb="" _label="Send _Later"/>
+			<menuitem name="FileSend" verb=""
+			_label="Send" pixtype="pixbuf"/>
+			<menuitem name="FileSendLater" verb=""
+			_label="Send _Later" pixtype="pixbuf"/>
 			<separator/>
 			<menuitem name="FileSave" verb="" _label="_Save"/>
 			<menuitem name="FileSaveAs" verb="" _label="Save _As..."/>
@@ -117,7 +119,7 @@
 		
                 <submenu name="Insert" _label="_Insert">
 	                <menuitem name="FileAttach" verb=""
-	                _label="_Attachment..."/>
+	                _label="_Attachment..." pixtype="pixbuf"/>
 			<menuitem name="FileInsertFile" verb="" 
                         _label="Inline Text _File..."/>
                 	<placeholder name="Component"/>
@@ -144,7 +146,7 @@
 	
 	<dockitem name="Toolbar" behavior="exclusive" hlook="text" vlook="icon">
 	
-		<toolitem name="FileSend" verb="" priority="1"/>
+		<toolitem name="FileSend" verb="" pixtype="pixbuf" priority="1"/>
 		
 		<toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/>
 		
-- 
cgit