From 770b189556e22e53d7e28a9d53a87dcf55e7be92 Mon Sep 17 00:00:00 2001
From: Christopher James Lahey <clahey@ximian.com>
Date: Sat, 1 Dec 2001 02:17:10 +0000
Subject: Merging changes:

2001-11-28  Christopher James Lahey  <clahey@ximian.com>

	* evolution-contact-list-editor.xml: Consistency fixes with
	standard contact editor.  Added Save As, Send As, and Send To.
	Replaced Save toolbar with Save and Close and added Save and Close
	menu item.  Added a trash icon.

svn path=/trunk/; revision=14842
---
 ui/ChangeLog                         |  7 +++++++
 ui/evolution-contact-list-editor.xml | 15 +++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 6bf7be2005..40d95f5e98 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-28  Christopher James Lahey  <clahey@ximian.com>
+
+	* evolution-contact-list-editor.xml: Consistency fixes with
+	standard contact editor.  Added Save As, Send As, and Send To.
+	Replaced Save toolbar with Save and Close and added Save and Close
+	menu item.  Added a trash icon.
+
 2001-10-30  Federico Mena Quintero  <federico@ximian.com>
 
 	* evolution-calendar.xml: Renamed the cut/copy/paste/delete
diff --git a/ui/evolution-contact-list-editor.xml b/ui/evolution-contact-list-editor.xml
index bcbdd63abe..5dbd0644fd 100644
--- a/ui/evolution-contact-list-editor.xml
+++ b/ui/evolution-contact-list-editor.xml
@@ -22,16 +22,14 @@
 
 		<submenu name="File" _label="_File">
 
-		        <menuitem name="ContactListEditorSave" verb=""
-			_label="_Save"/>
+		        <menuitem name="ContactListEditorSave" verb="" _label="_Save"/>
+		        <menuitem name="ContactListEditorSaveClose" verb="" _label="Save and Close" pixtype="pixbuf"/>
 
-		        <menuitem name="ContactListEditorSaveAs" verb=""
-			_label="Save _As..."/>
+		        <menuitem name="ContactListEditorSaveAs" verb="" _label="Save _As..."/>
 
 			<separator/>
 
-		        <menuitem name="ContactListEditorDelete" verb=""
-			_label="Delete..."/>
+		        <menuitem name="ContactListEditorDelete" verb="" _label="Delete..." pixtype="pixbuf"/>
 
 			<separator/>
 
@@ -40,7 +38,6 @@
 
 		</submenu>
 
-<!-- Not Yet Implemented
 		<submenu name="Actions" _label="_Actions">
 		        <menuitem name="ContactListEditorSendAs" verb=""
 			_label="Se_nd list to other..."/>
@@ -48,14 +45,12 @@
 		        <menuitem name="ContactListEditorSendTo" verb=""
 			_label="Send _message to list..."/>
 		</submenu>
--->
 
 	</menu>
 
 	<dockitem name="Toolbar" relief="none" behavior="exclusive"
 			hlook="text" vlook="icon">
-	        <toolitem name="ContactListEditorSave" verb=""
-		_label="Save" priority="1" />
+	        <toolitem name="ContactListEditorSaveClose" verb="" _label="Save and Close" priority="1" pixtype="pixbuf"/>
 
 		<separator/>
 
-- 
cgit v1.2.3