Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.926
diff -u -r1.926 ChangeLog
--- addressbook/ChangeLog	2001/11/17 08:56:03	1.926
+++ addressbook/ChangeLog	2001/11/28 11:25:40
@@ -1,3 +1,10 @@
+2001-11-28  Christopher James Lahey  <clahey@ximian.com>
+
+	* gui/contact-list-editor/e-contact-list-editor.c: 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-11-15  Zbigniew Chyla  <cyba@gnome.pl>
 
 	* printing/e-contact-print-envelope.c (ecpe_linelist_dimensions),
Index: addressbook/gui/contact-list-editor/e-contact-list-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/e-contact-list-editor.c,v
retrieving revision 1.21
diff -u -r1.21 e-contact-list-editor.c
--- addressbook/gui/contact-list-editor/e-contact-list-editor.c	2001/11/12 17:51:23	1.21
+++ addressbook/gui/contact-list-editor/e-contact-list-editor.c	2001/11/28 11:25:40
@@ -19,6 +19,9 @@
  */
 
 #include <config.h>
+
+#include "e-contact-list-editor.h"
+
 #include <glib.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
@@ -31,7 +34,7 @@
 #include "addressbook/gui/widgets/e-addressbook-util.h"
 
 #include "e-contact-editor.h"
-#include "e-contact-list-editor.h"
+#include "e-contact-save-as.h"
 #include "e-contact-list-model.h"
 
 /* Signal IDs */
@@ -416,6 +419,36 @@
 }
 
 static void
+file_save_as_cb (GtkWidget *widget, gpointer data)
+{
+	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
+
+	extract_info (cle);
+
+	e_contact_save_as(_("Save List as VCard"), cle->card);
+}
+
+static void
+file_send_as_cb (GtkWidget *widget, gpointer data)
+{
+	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
+
+	extract_info (cle);
+
+	e_card_send(cle->card, E_CARD_DISPOSITION_AS_ATTACHMENT);
+}
+
+static void
+file_send_to_cb (GtkWidget *widget, gpointer data)
+{
+	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
+
+	extract_info (cle);
+
+	e_card_send(cle->card, E_CARD_DISPOSITION_AS_TO);
+}
+
+static void
 tb_save_and_close_cb (GtkWidget *widget, gpointer data)
 {
 	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
@@ -468,18 +501,26 @@
 	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSave", file_save_cb),
 	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSaveClose", tb_save_and_close_cb),
 	BONOBO_UI_UNSAFE_VERB ("ContactListEditorDelete", delete_cb),
-#if 0
 	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),
 	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendAs", file_send_as_cb),
 	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendTo", file_send_to_cb),
-#endif
 	BONOBO_UI_UNSAFE_VERB ("ContactListEditorClose", file_close_cb),
 	BONOBO_UI_VERB_END
 };
 
 static EPixmap pixmaps[] = {
 	E_PIXMAP ("/commands/ContactListEditorSave", "save-16.png"),
+	E_PIXMAP ("/commands/ContactListEditorSaveClose", "save-16.png"),
 	E_PIXMAP ("/commands/ContactListEditorSaveAs", "save-as-16.png"),
+
+	E_PIXMAP ("/commands/ContactListEditorDelete", "evolution-trash-mini.png"),
+#if 0 /* Envelope printing is disabled for Evolution 1.0. */
+	E_PIXMAP ("/commands/ContactListEditorPrint", "print.xpm"),
+	E_PIXMAP ("/commands/ContactListEditorPrintEnvelope", "print.xpm"),
+#endif
+	E_PIXMAP ("/Toolbar/ContactListEditorSaveClose", "buttons/save-24.png"),
+	E_PIXMAP ("/Toolbar/ContactListEditorDelete", "buttons/delete-message.png"),
+	E_PIXMAP ("/Toolbar/ContactListEditorPrint", "buttons/print.png"),
 
 	E_PIXMAP_END
 };
Index: ui/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ui/ChangeLog,v
retrieving revision 1.261
diff -u -r1.261 ChangeLog
--- ui/ChangeLog	2001/10/31 11:20:02	1.261
+++ ui/ChangeLog	2001/11/28 11:25:40
@@ -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
Index: ui/evolution-contact-list-editor.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-contact-list-editor.xml,v
retrieving revision 1.6
diff -u -r1.6 evolution-contact-list-editor.xml
--- ui/evolution-contact-list-editor.xml	2001/10/28 00:16:10	1.6
+++ ui/evolution-contact-list-editor.xml	2001/11/28 11:25:40
@@ -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/>
 
