From 4d099c5ed51a94ad8cce0ae3a7a267a5cb1e0f02 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Sat, 1 Dec 2001 02:18:42 +0000 Subject: Merging changes: 2001-11-28 Christopher James Lahey * 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 --- .../contact-list-editor/e-contact-list-editor.c | 47 ++++++++++++++++++++-- 1 file changed, 44 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/contact-list-editor/e-contact-list-editor.c') 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 + +#include "e-contact-list-editor.h" + #include #include #include @@ -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 */ @@ -415,6 +418,36 @@ file_save_cb (GtkWidget *widget, gpointer data) save_card (cle, FALSE); } +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) { @@ -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 }; -- cgit v1.2.3