Added new icons.

2001-03-20  Miguel de Icaza  <miguel@ximian.com>

	* folder-browser-factory.c: Added new icons.

2001-03-18  Miguel de Icaza  <miguel@ximian.com>

	* folder-browser-factory.c: Remove duplicated verb.

2001-03-20  Miguel de Icaza  <miguel@ximian.com>

	* gui/component/addressbook.c (update_pixmaps): Added artwork from
	Jakub.

2001-03-20  Miguel de Icaza  <miguel@ximian.com>

	* evolution-addressbook.xml: Added artwork from Jakub.

2001-03-20  Miguel de Icaza  <miguel@ximian.com>

	* art/Makefile.am (images_DATA): Added all the new icons to the
	distribution.

svn path=/trunk/; revision=8859

8 files changed, 56 insertions, 26 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 21956f8bcc..2e127a6751 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* gui/component/addressbook.c (update_pixmaps): Added artwork from
+	Jakub. 
+
 2001-03-19  Christopher James Lahey  <clahey@ximian.com>
 
 	* Merged branch:
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 3205a46a3d..09b45a65d2 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -314,7 +314,8 @@ update_pixmaps (BonoboUIComponent *uic)
 	set_pixmap (uic, "/menu/Tools/Component/AddressbookConfig", "16_configure_addressbook.xpm");
 
 	set_pixmap (uic, "/Toolbar/View All", "24_all_contacts.xpm");
-	set_pixmap (uic, "/Toolbar/Find", "24_find_contact.xpm"); 
+	set_pixmap (uic, "/Toolbar/Find", "24_find_contact.xpm");
+	set_pixmap (uic, "/Toolbar/New", "new_contact.xpm");
 }
 
 static void
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 30a866dcf3..0daf0f575b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* folder-browser-factory.c: Added new icons. 
+
+2001-03-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* folder-browser-factory.c: Remove duplicated verb. 
+
 2001-03-20  Iain Holmes  <iain@ximian.com>
 
 	* importers/evolution-mbox-importer.c (process_item_fn): Step the parser
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 22e0817c34..3ec1d27c0f 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -68,7 +68,6 @@ BonoboUIVerb verbs [] = {
 	BONOBO_UI_UNSAFE_VERB ("MessageForwardAttached", forward_attached),
 	BONOBO_UI_UNSAFE_VERB ("MessageForwardInlined", forward_inlined),
 	BONOBO_UI_UNSAFE_VERB ("MessageForwardQuoted", forward_quoted),
-	BONOBO_UI_UNSAFE_VERB ("MessageForwardAttachment", forward_attached),
 	
 	BONOBO_UI_UNSAFE_VERB ("MessageMarkAsRead", mark_as_seen),
 	BONOBO_UI_UNSAFE_VERB ("MessageMarkAsUnRead", mark_as_unseen),
@@ -120,6 +119,12 @@ static struct {
 	{ "/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 },
diff --git a/ui/ChangeLog b/ui/ChangeLog
index ac73f93936..af36db03b4 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* evolution-addressbook.xml: Added artwork from Jakub.
+
 2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* evolution-mail.xml: Add Resend Message under the File menu.
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 19290f24e2..2f6f111566 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -57,7 +57,7 @@
 	<dockitem name="Toolbar">
 		<toolitem name="New" _label="New contact"
 		_tip="Create new contact" verb="ContactNew"
-		pixtype="stock" pixname="New" priority="1"/>
+		pixtype="pixbuf" priority="1"/>
 
 		<separator/>
 
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index 069083a2c4..162a541a49 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -14,7 +14,10 @@
     <cmd name="MailCompose"
      pixtype="pixbuf" _label="_Compose"/>
 	    
-    <cmd name="MailGetSend" pixtype="pixbuf" _tip="Send queued mail and retrieve new mail"/>
+    <cmd name="MailGetSend" pixtype="pixbuf" _tip="Send queued mail
+    and retrieve new mail"/>
+
+    <cmd name="MessageForwardAttached" accel="*Control*f"/>
   </commands>
 
   <keybindings>
@@ -88,11 +91,13 @@
 	    
         <menuitem name="MessageDelete" verb=""
         _label="_Delete"
-         accel="*Control*d"/>
+         accel="*Control*d"
+	 pixtype="pixbuf"/>
 
         <menuitem name="MessageUndelete" verb=""
         _label="_Undelete"
-         accel="*Control*u"/>
+         accel="*Control*u"
+	 pixtype="pixbuf"/>
 
 	<separator/>
 		  
@@ -120,10 +125,13 @@
 	<menuitem name="Source" verb="ViewSource" accel=""/>
       	<separator/>
       
-      	<menuitem name="MessageHideClear" verb="" _label="Show _All"/>
-      	<menuitem name="MessageHideSelected" verb="" _label="Hide S_elected Messages"/>
-      	<menuitem name="MessageHideRead" verb="" _label="Hide _Read messages"/>
-      	<menuitem name="MessageHideDeleted" verb="" _label="Hide _Deleted Messages"/>
+      	<menuitem name="MessageHideClear" verb="" _label="Show _All" pixtype="pixbuf"/>
+      	<menuitem name="MessageHideSelected" verb=""
+	 _label="Hide S_elected Messages" pixtype="pixbuf"/>
+      	<menuitem name="MessageHideRead" verb=""
+	  _label="Hide _Read messages" pixtype="pixbuf"/>
+      	<menuitem name="MessageHideDeleted" verb=""
+	_label="Hide _Deleted Messages" pixtype="pixbuf"/>
     </submenu>
 
     <submenu name="Actions">
@@ -142,7 +150,6 @@
       	    _label="Reply to _All"
       	    pixtype="pixbuf"
       	    accel="*Control**Shift*r"/>
-      	    
       	    <menuitem name="MessageForwardAttached" verb=""
       	    _label="_Forward"
       	     accel="*Control*f"/>
@@ -151,17 +158,17 @@
                 <menuitem name="MessageForwardInlined" verb=""
       	  	 _label="_Inline"
       	  	 accel="*Control**Shift*j"/>
-                
-                <menuitem name="MessageForwardQuoted" verb=""
-      	  	 _label="_Quoted"/>
-                
-                <menuitem name="MessageForwardAttachment" verb=""
-      	  	 _label="_Attachment"/>
-                
-      	  	<separator/>
-                
-      	  	<menuitem name="Redirect" verb=""
-                 _label="Redirect (FIXME: implement me)"/>
+
+      	  	 <menuitem name="MessageForwardQuoted" verb=""
+      	  	  _label="_Quoted"/>
+
+      	  	  <menuitem verb="MessageForwardAttached"
+      	  	  _label="_Attachment"/>
+      	  
+      	  	 <separator/>
+      	  		    
+      	  	 <menuitem name="Redirect" verb=""
+      	  	  _label="Redirect (FIXME: implement me)"/>
       	    </submenu>
       	    
             <separator/>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index cdc8fd0b8e..7af5a7118a 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -111,6 +111,10 @@
 
 		<placeholder name="Component"/>
 
+	        <submenu name="Actions" _label="_Actions">
+	                <placeholder name="Component"/>
+	        </submenu>
+
 	        <submenu name="Tools" _label="_Tools">
 		        <placeholder name="Component"/>
 
@@ -118,10 +122,6 @@
 			 _label="Customi_ze Toolbars..." pos="bottom"/>
 		</submenu>
 
-	        <submenu name="Actions" _label="_Actions">
-	                <placeholder name="Component"/>
-	        </submenu>
-
 		<submenu name="Help" _label="_Help">
 
 			<menuitem name="HelpIndex" verb=""