Merging changes:

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.

svn path=/trunk/; revision=14844

2 files changed, 51 insertions, 3 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 821a9e0362..30a0402599 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,12 @@
 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-28  Christopher James Lahey  <clahey@ximian.com>
+
 	* gui/contact-editor/e-contact-editor-address.c (setup_tab_order):
 	Setup the tab order here.  Fixes Ximian bug #13751.
 
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 2bc4a5749e..a5676e1f19 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -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 @@ file_save_cb (GtkWidget *widget, gpointer data)
 }
 
 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,19 +501,27 @@ BonoboUIVerb verbs [] = {
 	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
 };