diff options
Diffstat (limited to 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-save-as.c | 44 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-save-as.h | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/Makefile.am | 38 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-view-model.c | 681 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-view-model.h | 69 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-view.c | 610 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-view.h | 20 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.c | 149 |
8 files changed, 1052 insertions, 561 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c index 5381fb8b2d..8ed7bad549 100644 --- a/addressbook/gui/contact-editor/e-contact-save-as.c +++ b/addressbook/gui/contact-editor/e-contact-save-as.c @@ -29,17 +29,17 @@ typedef struct { GtkFileSelection *filesel; - ECard *card; + char *vcard; } SaveAsInfo; static void save_it(GtkWidget *widget, SaveAsInfo *info) { - char *vcard = e_card_get_vcard(info->card); - const char *filename = gtk_file_selection_get_filename(info->filesel); - e_write_file(filename, vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC); - g_free(vcard); - gtk_object_unref(GTK_OBJECT(info->card)); + const char *filename = gtk_file_selection_get_filename (info->filesel); + + e_write_file (filename, info->vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC); + + g_free (info->vcard); gtk_widget_destroy(GTK_WIDGET(info->filesel)); g_free(info); } @@ -47,16 +47,16 @@ save_it(GtkWidget *widget, SaveAsInfo *info) static void close_it(GtkWidget *widget, SaveAsInfo *info) { - gtk_object_unref(GTK_OBJECT(info->card)); - gtk_widget_destroy(GTK_WIDGET(info->filesel)); - g_free(info); + g_free (info->vcard); + gtk_widget_destroy (GTK_WIDGET (info->filesel)); + g_free (info); } static void delete_it(GtkWidget *widget, SaveAsInfo *info) { - gtk_object_unref(GTK_OBJECT(info->card)); - g_free(info); + g_free (info->vcard); + g_free (info); } void @@ -68,7 +68,27 @@ e_contact_save_as(char *title, ECard *card) filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title)); info->filesel = filesel; - info->card = e_card_duplicate(card); + info->vcard = e_card_get_vcard(card); + + gtk_signal_connect(GTK_OBJECT(filesel->ok_button), "clicked", + save_it, info); + gtk_signal_connect(GTK_OBJECT(filesel->cancel_button), "clicked", + close_it, info); + gtk_signal_connect(GTK_OBJECT(filesel), "delete_event", + delete_it, info); + gtk_widget_show(GTK_WIDGET(filesel)); +} + +void +e_contact_list_save_as(char *title, GList *list) +{ + GtkFileSelection *filesel; + SaveAsInfo *info = g_new(SaveAsInfo, 1); + + filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title)); + + info->filesel = filesel; + info->vcard = e_card_list_get_vcard (list); gtk_signal_connect(GTK_OBJECT(filesel->ok_button), "clicked", save_it, info); diff --git a/addressbook/gui/contact-editor/e-contact-save-as.h b/addressbook/gui/contact-editor/e-contact-save-as.h index d304d4d558..a746720c53 100644 --- a/addressbook/gui/contact-editor/e-contact-save-as.h +++ b/addressbook/gui/contact-editor/e-contact-save-as.h @@ -32,6 +32,8 @@ extern "C" { void e_contact_save_as(gchar *title, ECard *card); +void +e_contact_list_save_as(gchar *title, GList *list); #ifdef __cplusplus } diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 5fe7d9ea7c..fdb97866d3 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -27,6 +27,8 @@ libeminicard_a_SOURCES = \ e-minicard-label.h \ e-minicard-view-widget.c \ e-minicard-view-widget.h \ + e-minicard-view-model.c \ + e-minicard-view-model.h \ e-minicard-view.c \ e-minicard-view.h \ e-minicard-widget.c \ @@ -41,8 +43,8 @@ libeminicard_a_SOURCES = \ noinst_PROGRAMS = \ minicard-widget-test \ minicard-label-test \ - minicard-test \ - reflow-test + minicard-test +# reflow-test # minicard-view-test minicard_label_test_SOURCES = \ @@ -71,22 +73,22 @@ minicard_test_LDADD = \ $(BONOBO_GNOME_LIBS) \ $(GNOME_PRINT_LIBS) -reflow_test_SOURCES = \ - test-reflow.c - -reflow_test_LDADD = \ - libeminicard.a \ - $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/libversit/libversit.la \ - $(top_builddir)/e-util/ename/libename.la \ - $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ - $(top_builddir)/addressbook/printing/libecontactprint.a \ - $(top_builddir)/widgets/misc/libemiscwidgets.a \ - $(top_builddir)/e-util/libeutil.la \ - $(EXTRA_GNOME_LIBS) \ - $(BONOBO_GNOME_LIBS) \ - $(GNOME_PRINT_LIBS) +#reflow_test_SOURCES = \ +# test-reflow.c +# +#reflow_test_LDADD = \ +# libeminicard.a \ +# $(top_builddir)/addressbook/backend/ebook/libebook.la \ +# $(top_builddir)/e-util/libeutil.la \ +# $(top_builddir)/libversit/libversit.la \ +# $(top_builddir)/e-util/ename/libename.la \ +# $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ +# $(top_builddir)/addressbook/printing/libecontactprint.a \ +# $(top_builddir)/widgets/misc/libemiscwidgets.a \ +# $(top_builddir)/e-util/libeutil.la \ +# $(EXTRA_GNOME_LIBS) \ +# $(BONOBO_GNOME_LIBS) \ +# $(GNOME_PRINT_LIBS) #minicard_view_test_SOURCES = \ # test-minicard-view.c diff --git a/addressbook/gui/widgets/e-minicard-view-model.c b/addressbook/gui/widgets/e-minicard-view-model.c new file mode 100644 index 0000000000..d2e60d569e --- /dev/null +++ b/addressbook/gui/widgets/e-minicard-view-model.c @@ -0,0 +1,681 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * + * Author: + * Christopher James Lahey <clahey@helixcode.com> + * + * (C) 1999 Helix Code, Inc. + */ + +#include <config.h> + +#include "e-minicard-view-model.h" + +#include <gal/util/e-i18n.h> + +#include "e-minicard.h" +#include <gal/widgets/e-unicode.h> +#include <gal/widgets/e-font.h> +#include <gal/widgets/e-popup-menu.h> +#include "e-contact-save-as.h" +#include "addressbook/printing/e-contact-print.h" +#include "addressbook/printing/e-contact-print-envelope.h" + +#define PARENT_TYPE e_reflow_model_get_type() +EReflowModelClass *parent_class; + +#define d(x) + +/* + * EMinicardViewModel callbacks + * These are the callbacks that define the behavior of our custom model. + */ +static void e_minicard_view_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); +static void e_minicard_view_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id); + + +enum { + ARG_0, + ARG_BOOK, + ARG_QUERY, + ARG_EDITABLE, +}; + +enum { + STATUS_MESSAGE, + LAST_SIGNAL +}; + +static guint e_minicard_view_model_signals [LAST_SIGNAL] = {0, }; + +static void +disconnect_signals(EMinicardViewModel *model) +{ + if (model->book_view && model->create_card_id) + gtk_signal_disconnect(GTK_OBJECT (model->book_view), + model->create_card_id); + if (model->book_view && model->remove_card_id) + gtk_signal_disconnect(GTK_OBJECT (model->book_view), + model->remove_card_id); + if (model->book_view && model->modify_card_id) + gtk_signal_disconnect(GTK_OBJECT (model->book_view), + model->modify_card_id); + if (model->book_view && model->status_message_id) + gtk_signal_disconnect(GTK_OBJECT (model->book_view), + model->status_message_id); + + model->create_card_id = 0; + model->remove_card_id = 0; + model->modify_card_id = 0; + model->status_message_id = 0; +} + +static void +remove_book_view(EMinicardViewModel *model) +{ + disconnect_signals (model); + if (model->book_view) + gtk_object_unref(GTK_OBJECT(model->book_view)); + + model->book_view = NULL; +} + +static int +count_lines (const gchar *text) +{ + int num_lines = 1; + gunichar unival; + + for (text = e_unicode_get_utf8 (text, &unival); (unival && text); text = e_unicode_get_utf8 (text, &unival)) { + if (unival == '\n') { + num_lines ++; + } + } + + return num_lines; +} + +static int +text_height (GnomeCanvas *canvas, const gchar *text) +{ + EFont *font = e_font_from_gdk_font (((GtkWidget *) canvas)->style->font); + gint height = e_font_height (font) * count_lines (text) / canvas->pixels_per_unit; + + e_font_unref (font); + return height; +} + +typedef struct { + EMinicardViewModel *emvm; + ESelectionModel *selection; +} ModelAndSelection; + +static void +model_and_selection_free (ModelAndSelection *mns) +{ + gtk_object_unref(GTK_OBJECT(mns->emvm)); + gtk_object_unref(GTK_OBJECT(mns->selection)); + g_free(mns); +} + +static void +add_to_list (int model_row, gpointer closure) +{ + GList **list = closure; + *list = g_list_prepend (*list, GINT_TO_POINTER (model_row)); +} + +static GList * +get_card_list (ModelAndSelection *mns) +{ + GList *list; + GList *iterator; + + list = NULL; + e_selection_model_foreach (mns->selection, add_to_list, &list); + + for (iterator = list; iterator; iterator = iterator->next) { + iterator->data = mns->emvm->data [GPOINTER_TO_INT (iterator->data)]; + } + list = g_list_reverse (list); + return list; +} + +static void +save_as (GtkWidget *widget, ModelAndSelection *mns) +{ + GList *list; + + list = get_card_list (mns); + if (list) + e_contact_list_save_as (_("Save as VCard"), list); + g_list_free (list); + model_and_selection_free (mns); +} + +static void +send_as (GtkWidget *widget, ModelAndSelection *mns) +{ + GList *list; + + list = get_card_list (mns); + if (list) + e_card_list_send (list, E_CARD_DISPOSITION_AS_ATTACHMENT); + g_list_free (list); + model_and_selection_free (mns); +} + +static void +send_to (GtkWidget *widget, ModelAndSelection *mns) +{ + GList *list; + + list = get_card_list (mns); + if (list) + e_card_list_send (list, E_CARD_DISPOSITION_AS_TO); + g_list_free (list); + model_and_selection_free (mns); +} + +static void +print (GtkWidget *widget, ModelAndSelection *mns) +{ + GList *list; + + list = get_card_list (mns); + if (list) + gtk_widget_show (e_contact_print_card_list_dialog_new (list)); + g_list_free (list); + model_and_selection_free (mns); +} + +static void +print_envelope (GtkWidget *widget, ModelAndSelection *mns) +{ + GList *list; + + list = get_card_list (mns); + if (list) + gtk_widget_show (e_contact_print_envelope_list_dialog_new (list)); + g_list_free (list); + model_and_selection_free (mns); +} + +static void +card_changed_cb (EBook* book, EBookStatus status, gpointer user_data) +{ + d(g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status)); +} + +static void +delete (GtkWidget *widget, ModelAndSelection *mns) +{ + GList *list; + + list = get_card_list (mns); + if (list) { + + if (e_contact_editor_confirm_delete(NULL)) { /*FIXME: Give a GtkWindow here. */ + GList *iterator; + EBook *book; + + book = mns->emvm->book; + + for (iterator = list; iterator; iterator = iterator->next) { + ECard *card = iterator->data; + + gtk_object_ref(GTK_OBJECT(card)); + + e_book_remove_card (book, + card, + card_changed_cb, + NULL); + + gtk_object_unref(GTK_OBJECT(card)); + } + } + } + + g_list_free (list); + model_and_selection_free (mns); +} + +gint +e_minicard_view_model_right_click (EMinicardViewModel *emvm, GdkEvent *event, ESelectionModel *selection) +{ + ModelAndSelection *mns = g_new(ModelAndSelection, 1); + EPopupMenu menu[] = { {N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0}, + {N_("Send contact to other"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0}, + {N_("Send message to contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0}, + {N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0}, + {N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0}, + {N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, 0}, + {NULL, NULL, NULL, 0}}; + + mns->emvm = emvm; + mns->selection = selection; + gtk_object_ref(GTK_OBJECT(mns->emvm)); + gtk_object_ref(GTK_OBJECT(mns->selection)); + e_popup_menu_run (menu, event, 0, 0, mns); + return TRUE; +} + +static void +addressbook_destroy(GtkObject *object) +{ + EMinicardViewModel *model = E_MINICARD_VIEW_MODEL(object); + int i; + + if (model->get_view_idle) + g_source_remove(model->get_view_idle); + + remove_book_view (model); + + g_free(model->query); + if (model->book) + gtk_object_unref(GTK_OBJECT(model->book)); + + for ( i = 0; i < model->data_count; i++ ) { + gtk_object_unref(GTK_OBJECT(model->data[i])); + } + g_free(model->data); +} + +static void +addressbook_set_width (EReflowModel *erm, int width) +{ +} + +/* This function returns the number of items in our EReflowModel. */ +static int +addressbook_count (EReflowModel *erm) +{ + EMinicardViewModel *addressbook = E_MINICARD_VIEW_MODEL(erm); + return addressbook->data_count; +} + +/* This function returns the number of items in our EReflowModel. */ +static int +addressbook_height (EReflowModel *erm, int i, GnomeCanvasGroup *parent) +{ + /* FIXME */ + ECardSimpleField field; + int count = 0; + int height; + char *string; + EMinicardViewModel *emvm = E_MINICARD_VIEW_MODEL(erm); + ECardSimple *simple = e_card_simple_new (emvm->data[i]); + + string = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FILE_AS); + height = text_height (GNOME_CANVAS_ITEM (parent)->canvas, string ? string : "") + 10.0; + g_free(string); + + for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST - 2 && count < 5; field++) { + string = e_card_simple_get(simple, field); + if (string && *string) { + int this_height; + int field_text_height; + + this_height = text_height (GNOME_CANVAS_ITEM (parent)->canvas, e_card_simple_get_name(simple, field)); + + field_text_height = text_height (GNOME_CANVAS_ITEM (parent)->canvas, string); + if (this_height < field_text_height) + this_height = field_text_height; + + this_height += 3; + + height += this_height; + count ++; + } + g_free (string); + } + height += 2; + + gtk_object_unref (GTK_OBJECT (simple)); + + return height; +} + +static int +addressbook_compare (EReflowModel *erm, int n1, int n2) +{ + ECard *card1, *card2; + EMinicardViewModel *emvm = E_MINICARD_VIEW_MODEL(erm); + + card1 = emvm->data[n1]; + card2 = emvm->data[n2]; + + if (card1 && card2) { + char *file_as1, *file_as2; + file_as1 = card1->file_as; + file_as2 = card2->file_as; + if (file_as1 && file_as2) + return strcasecmp(file_as1, file_as2); + if (file_as1) + return -1; + if (file_as2) + return 1; + return strcmp(e_card_get_id(card1), e_card_get_id(card2)); + } + if (card1) + return -1; + if (card2) + return 1; + return 0; +} + +static GnomeCanvasItem * +addressbook_incarnate (EReflowModel *erm, int i, GnomeCanvasGroup *parent) +{ + EMinicardViewModel *emvm = E_MINICARD_VIEW_MODEL (erm); + GnomeCanvasItem *item; + + item = gnome_canvas_item_new(parent, + e_minicard_get_type(), + "card", emvm->data[i], + "editable", emvm->editable, + NULL); + +#if 0 + gtk_signal_connect (GTK_OBJECT (item), "selected", + GTK_SIGNAL_FUNC(card_selected), emvm); +#endif + return item; +} + +static void +addressbook_reincarnate (EReflowModel *erm, int i, GnomeCanvasItem *item) +{ + EMinicardViewModel *emvm = E_MINICARD_VIEW_MODEL (erm); + + gnome_canvas_item_set(item, + "card", emvm->data[i], + NULL); +} + + + +static void +create_card(EBookView *book_view, + const GList *cards, + EMinicardViewModel *model) +{ + int old_count = model->data_count; + int length = g_list_length ((GList *)cards); + + if (model->data_count + length > model->allocated_count) { + while (model->data_count + length > model->allocated_count) + model->allocated_count += 256; + model->data = g_renew(ECard *, model->data, model->allocated_count); + } + + for ( ; cards; cards = cards->next) { + model->data[model->data_count++] = cards->data; + gtk_object_ref (cards->data); + } + e_reflow_model_items_inserted (E_REFLOW_MODEL (model), + old_count, + model->data_count - old_count); +} + +static void +remove_card(EBookView *book_view, + const char *id, + EMinicardViewModel *model) +{ + int i; + gboolean found = FALSE; + for ( i = 0; i < model->data_count; i++) { + if (!strcmp(e_card_get_id(model->data[i]), id) ) { + gtk_object_unref(GTK_OBJECT(model->data[i])); + memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (ECardSimple *)); + found = TRUE; + } + } + if (found) + e_reflow_model_changed (E_REFLOW_MODEL (model)); +} + +static void +modify_card(EBookView *book_view, + const GList *cards, + EMinicardViewModel *model) +{ + for ( ; cards; cards = cards->next) { + int i; + for ( i = 0; i < model->data_count; i++) { + if ( !strcmp(e_card_get_id(model->data[i]), e_card_get_id(cards->data)) ) { + gtk_object_unref (GTK_OBJECT (model->data[i])); + model->data[i] = cards->data; + gtk_object_ref (GTK_OBJECT (model->data[i])); + e_reflow_model_item_changed (E_REFLOW_MODEL (model), i); + break; + } + } + } +} + +static void +status_message (EBookView *book_view, + char* status, + EMinicardViewModel *model) +{ + gtk_signal_emit (GTK_OBJECT (model), + e_minicard_view_model_signals [STATUS_MESSAGE], + status); +} + +static void +e_minicard_view_model_class_init (GtkObjectClass *object_class) +{ + EReflowModelClass *model_class = (EReflowModelClass *) object_class; + + parent_class = gtk_type_class (PARENT_TYPE); + + object_class->destroy = addressbook_destroy; + object_class->set_arg = e_minicard_view_model_set_arg; + object_class->get_arg = e_minicard_view_model_get_arg; + + gtk_object_add_arg_type ("EMinicardViewModel::book", GTK_TYPE_OBJECT, + GTK_ARG_READWRITE, ARG_BOOK); + gtk_object_add_arg_type ("EMinicardViewModel::query", GTK_TYPE_STRING, + GTK_ARG_READWRITE, ARG_QUERY); + gtk_object_add_arg_type ("EMinicardViewModel::editable", GTK_TYPE_BOOL, + GTK_ARG_READWRITE, ARG_EDITABLE); + + e_minicard_view_model_signals [STATUS_MESSAGE] = + gtk_signal_new ("status_message", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (EMinicardViewModelClass, status_message), + gtk_marshal_NONE__POINTER, + GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); + + gtk_object_class_add_signals (object_class, e_minicard_view_model_signals, LAST_SIGNAL); + + model_class->set_width = addressbook_set_width; + model_class->count = addressbook_count; + model_class->height = addressbook_height; + model_class->compare = addressbook_compare; + model_class->incarnate = addressbook_incarnate; + model_class->reincarnate = addressbook_reincarnate; +} + +static void +e_minicard_view_model_init (GtkObject *object) +{ + EMinicardViewModel *model = E_MINICARD_VIEW_MODEL(object); + model->book = NULL; + model->query = g_strdup("(contains \"x-evolution-any-field\" \"\")"); + model->book_view = NULL; + model->get_view_idle = 0; + model->create_card_id = 0; + model->remove_card_id = 0; + model->modify_card_id = 0; + model->status_message_id = 0; + model->data = NULL; + model->data_count = 0; + model->allocated_count = 0; + model->editable = FALSE; + model->first_get_view = TRUE; +} + +static void +book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure) +{ + EMinicardViewModel *model = closure; + int i; + remove_book_view(model); + model->book_view = book_view; + if (model->book_view) + gtk_object_ref(GTK_OBJECT(model->book_view)); + model->create_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view), + "card_added", + GTK_SIGNAL_FUNC(create_card), + model); + model->remove_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view), + "card_removed", + GTK_SIGNAL_FUNC(remove_card), + model); + model->modify_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view), + "card_changed", + GTK_SIGNAL_FUNC(modify_card), + model); + model->status_message_id = gtk_signal_connect(GTK_OBJECT(model->book_view), + "status_message", + GTK_SIGNAL_FUNC(status_message), + model); + + for ( i = 0; i < model->data_count; i++ ) { + gtk_object_unref(GTK_OBJECT(model->data[i])); + } + + g_free(model->data); + model->data = NULL; + model->data_count = 0; + model->allocated_count = 0; + e_reflow_model_changed(E_REFLOW_MODEL(model)); +} + +static gboolean +get_view (EMinicardViewModel *model) +{ + if (model->book && model->query) { + if (model->first_get_view) { + char *capabilities; + capabilities = e_book_get_static_capabilities (model->book); + if (capabilities && strstr (capabilities, "local")) { + e_book_get_book_view (model->book, model->query, book_view_loaded, model); + } + model->first_get_view = FALSE; + } + else + e_book_get_book_view (model->book, model->query, book_view_loaded, model); + } + + model->get_view_idle = 0; + return FALSE; +} + +ECard * +e_minicard_view_model_get_card(EMinicardViewModel *model, + int row) +{ + if (model->data && row < model->data_count) { + gtk_object_ref(GTK_OBJECT(model->data[row])); + return model->data[row]; + } + return NULL; +} + +static void +e_minicard_view_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) +{ + EMinicardViewModel *model; + + model = E_MINICARD_VIEW_MODEL (o); + + switch (arg_id){ + case ARG_BOOK: + if (model->book) + gtk_object_unref(GTK_OBJECT(model->book)); + model->book = E_BOOK(GTK_VALUE_OBJECT (*arg)); + if (model->book) { + gtk_object_ref(GTK_OBJECT(model->book)); + if (model->get_view_idle == 0) + model->get_view_idle = g_idle_add((GSourceFunc)get_view, model); + } + break; + case ARG_QUERY: + if (model->query) + g_free(model->query); + model->query = g_strdup(GTK_VALUE_STRING (*arg)); + if (model->get_view_idle == 0) + model->get_view_idle = g_idle_add((GSourceFunc)get_view, model); + break; + case ARG_EDITABLE: + model->editable = GTK_VALUE_BOOL (*arg); + break; + } +} + +static void +e_minicard_view_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) +{ + EMinicardViewModel *e_minicard_view_model; + + e_minicard_view_model = E_MINICARD_VIEW_MODEL (object); + + switch (arg_id) { + case ARG_BOOK: + GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard_view_model->book); + break; + case ARG_QUERY: + GTK_VALUE_STRING (*arg) = g_strdup(e_minicard_view_model->query); + break; + case ARG_EDITABLE: + GTK_VALUE_BOOL (*arg) = e_minicard_view_model->editable; + break; + default: + arg->type = GTK_TYPE_INVALID; + break; + } +} + +GtkType +e_minicard_view_model_get_type (void) +{ + static GtkType type = 0; + + if (!type){ + GtkTypeInfo info = { + "EMinicardViewModel", + sizeof (EMinicardViewModel), + sizeof (EMinicardViewModelClass), + (GtkClassInitFunc) e_minicard_view_model_class_init, + (GtkObjectInitFunc) e_minicard_view_model_init, + NULL, /* reserved 1 */ + NULL, /* reserved 2 */ + (GtkClassInitFunc) NULL + }; + + type = gtk_type_unique (PARENT_TYPE, &info); + } + + return type; +} + +EReflowModel * +e_minicard_view_model_new (void) +{ + EMinicardViewModel *et; + + et = gtk_type_new (e_minicard_view_model_get_type ()); + + return E_REFLOW_MODEL(et); +} + +void e_minicard_view_model_stop (EMinicardViewModel *model) +{ + remove_book_view(model); +} diff --git a/addressbook/gui/widgets/e-minicard-view-model.h b/addressbook/gui/widgets/e-minicard-view-model.h new file mode 100644 index 0000000000..c0e1029522 --- /dev/null +++ b/addressbook/gui/widgets/e-minicard-view-model.h @@ -0,0 +1,69 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +#ifndef _E_MINICARD_VIEW_MODEL_H_ +#define _E_MINICARD_VIEW_MODEL_H_ + +#include <gal/widgets/e-reflow-model.h> +#include <gal/widgets/e-selection-model.h> +#include "addressbook/backend/ebook/e-book.h" +#include "addressbook/backend/ebook/e-book-view.h" +#include "addressbook/backend/ebook/e-card.h" + +#define E_MINICARD_VIEW_MODEL_TYPE (e_minicard_view_model_get_type ()) +#define E_MINICARD_VIEW_MODEL(o) (GTK_CHECK_CAST ((o), E_MINICARD_VIEW_MODEL_TYPE, EMinicardViewModel)) +#define E_MINICARD_VIEW_MODEL_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_MINICARD_VIEW_MODEL_TYPE, EMinicardViewModelClass)) +#define E_IS_MINICARD_VIEW_MODEL(o) (GTK_CHECK_TYPE ((o), E_MINICARD_VIEW_MODEL_TYPE)) +#define E_IS_MINICARD_VIEW_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_MINICARD_VIEW_MODEL_TYPE)) + +/* Virtual Column list: + 0 Email + 1 Full Name + 2 Street + 3 Phone +*/ + +typedef struct _EMinicardViewModel EMinicardViewModel; +typedef struct _EMinicardViewModelClass EMinicardViewModelClass; + +struct _EMinicardViewModel { + EReflowModel parent; + + /* item specific fields */ + EBook *book; + char *query; + EBookView *book_view; + + int get_view_idle; + + ECard **data; + int data_count; + int allocated_count; + + int create_card_id, remove_card_id, modify_card_id, status_message_id; + + guint editable : 1; + guint first_get_view : 1; +}; + + +struct _EMinicardViewModelClass { + EReflowModelClass parent_class; + + /* + * Signals + */ + void (*status_message) (EMinicardViewModel *model, const gchar *message); +}; + + +GtkType e_minicard_view_model_get_type (void); +EReflowModel *e_minicard_view_model_new (void); + +/* Returns object with ref count of 1. */ +ECard *e_minicard_view_model_get_card (EMinicardViewModel *model, + int row); +void e_minicard_view_model_stop (EMinicardViewModel *model); +gint e_minicard_view_model_right_click (EMinicardViewModel *emvm, + GdkEvent *event, + ESelectionModel *selection); + +#endif /* _E_MINICARD_VIEW_MODEL_H_ */ diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 972bbd1c9c..85a456cde1 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -22,33 +22,28 @@ #include <config.h> +#include "e-minicard-view.h" + +#include "e-contact-editor.h" + #include <gtk/gtkselection.h> #include <gtk/gtkdnd.h> #include <gal/widgets/e-canvas.h> #include <gal/widgets/e-unicode.h> #include <libgnome/gnome-i18n.h> -#include "e-minicard-view.h" -#include "e-minicard.h" -#include "e-contact-editor.h" - -static void e_minicard_view_init (EMinicardView *reflow); -static void e_minicard_view_class_init (EMinicardViewClass *klass); -static void e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); -static void e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id); -static void e_minicard_view_destroy (GtkObject *object); -static gboolean e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event); +#if 0 static void canvas_destroy (GtkObject *object, EMinicardView *view); -static void disconnect_signals (EMinicardView *view); -static void e_minicard_view_update_selection (EMinicardView *view); static void e_minicard_view_drag_data_get(GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint time, EMinicardView *view); +#endif -static EReflowSortedClass *parent_class = NULL; +static EReflowClass *parent_class = NULL; +#define PARENT_TYPE (E_REFLOW_TYPE) /* The arguments we take */ enum { @@ -63,6 +58,7 @@ enum { LAST_SIGNAL }; +#if 0 enum DndTargetType { DND_TARGET_TYPE_VCARD, }; @@ -71,110 +67,11 @@ static GtkTargetEntry drag_types[] = { { VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD } }; static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]); +#endif static guint e_minicard_view_signals [LAST_SIGNAL] = {0, }; -GtkType -e_minicard_view_get_type (void) -{ - static GtkType reflow_type = 0; - - if (!reflow_type) - { - static const GtkTypeInfo reflow_info = - { - "EMinicardView", - sizeof (EMinicardView), - sizeof (EMinicardViewClass), - (GtkClassInitFunc) e_minicard_view_class_init, - (GtkObjectInitFunc) e_minicard_view_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - reflow_type = gtk_type_unique (e_reflow_sorted_get_type (), &reflow_info); - } - - return reflow_type; -} - -static void -e_minicard_view_class_init (EMinicardViewClass *klass) -{ - GtkObjectClass *object_class; - GnomeCanvasItemClass *item_class; - - object_class = (GtkObjectClass*) klass; - item_class = (GnomeCanvasItemClass *) klass; - - parent_class = gtk_type_class (e_reflow_sorted_get_type ()); - - gtk_object_add_arg_type ("EMinicardView::book", GTK_TYPE_OBJECT, - GTK_ARG_READWRITE, ARG_BOOK); - gtk_object_add_arg_type ("EMinicardView::query", GTK_TYPE_STRING, - GTK_ARG_READWRITE, ARG_QUERY); - gtk_object_add_arg_type ("EMinicardView::editable", GTK_TYPE_BOOL, - GTK_ARG_READWRITE, ARG_EDITABLE); - - e_minicard_view_signals [STATUS_MESSAGE] = - gtk_signal_new ("status_message", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (EMinicardViewClass, status_message), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); - - gtk_object_class_add_signals (object_class, e_minicard_view_signals, LAST_SIGNAL); - - object_class->set_arg = e_minicard_view_set_arg; - object_class->get_arg = e_minicard_view_get_arg; - object_class->destroy = e_minicard_view_destroy; - - item_class->event = e_minicard_view_event; - - /* GnomeCanvasItem method overrides */ -} - -static void -selection_changed (ESelectionModel *selection, EMinicardView *view) -{ - e_minicard_view_update_selection (view); -} - -static void -e_minicard_view_init (EMinicardView *view) -{ - char *empty_message; - view->book = NULL; - view->query = g_strdup("(contains \"x-evolution-any-field\" \"\")"); - view->editable = FALSE; - view->book_view = NULL; - view->get_view_idle = 0; - view->create_card_id = 0; - view->remove_card_id = 0; - view->modify_card_id = 0; - view->status_message_id = 0; - view->canvas_destroy_id = 0; - view->first_get_view = TRUE; - - view->selection = e_selection_model_simple_new(); - - gtk_signal_connect(GTK_OBJECT(view->selection), "selection_changed", - GTK_SIGNAL_FUNC(selection_changed), view); - - empty_message = e_utf8_from_locale_string(_("\n\nThere are no items to show in this view\n\n" - "Double-click here to create a new Contact.")); - gtk_object_set (GTK_OBJECT(view), - "empty_message", - empty_message, - NULL); - g_free (empty_message); - - E_REFLOW_SORTED(view)->compare_func = (GCompareFunc) e_minicard_compare; - E_REFLOW_SORTED(view)->string_func = (EReflowStringFunc) e_minicard_get_card_id; -} - +#if 0 static void e_minicard_view_drag_data_get(GtkWidget *widget, GdkDragContext *context, @@ -221,160 +118,83 @@ e_minicard_view_drag_begin (EMinicard *card, GdkEvent *event, EMinicardView *vie return TRUE; } +#endif -static gint -card_selected (EMinicard *card, GdkEvent *event, EMinicardView *view) +#if 0 +static void +status_message (EBookView *book_view, + char* status, + EMinicardView *view) { - int i = 0; - GList *item; - for (item = E_REFLOW(view)->items; item->data != card; item = item->next, i++) - /* Empty for loop */; - switch(event->type) { - case GDK_BUTTON_PRESS: - e_selection_model_do_something(E_SELECTION_MODEL(view->selection), i, 0, event->button.state); - return TRUE; - break; - default: - e_selection_model_do_something(E_SELECTION_MODEL(view->selection), i, 0, 0); - return FALSE; - break; - } + gtk_signal_emit (GTK_OBJECT (view), + e_minicard_view_signals [STATUS_MESSAGE], + status); } +#endif static void -create_card(EBookView *book_view, const GList *cards, EMinicardView *view) +card_added_cb (EBook* book, EBookStatus status, const char *id, + gpointer user_data) { - for (; cards; cards = g_list_next(cards)) { - int position; - GnomeCanvasItem *item = gnome_canvas_item_new(GNOME_CANVAS_GROUP(view), - e_minicard_get_type(), - "card", cards->data, - "editable", view->editable, - NULL); - gtk_signal_connect(GTK_OBJECT(item), "selected", - GTK_SIGNAL_FUNC(card_selected), view); - - gtk_signal_connect(GTK_OBJECT(item), "drag_begin", - GTK_SIGNAL_FUNC(e_minicard_view_drag_begin), view); - - e_reflow_add_item(E_REFLOW(view), item, &position); - - e_selection_model_simple_insert_rows(view->selection, position, 1); - } + g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__); } static void -modify_card(EBookView *book_view, const GList *cards, EMinicardView *view) +card_changed_cb (EBook* book, EBookStatus status, gpointer user_data) { - for (; cards; cards = g_list_next(cards)) { - ECard *card = cards->data; - gchar *id = e_card_get_id(card); - GnomeCanvasItem *item = e_reflow_sorted_get_item(E_REFLOW_SORTED(view), id, NULL); - if (item && !GTK_OBJECT_DESTROYED(item)) { - int old_pos; - int new_pos; - - gnome_canvas_item_set(item, - "card", card, - NULL); + g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status); +} - e_reflow_sorted_reorder_item(E_REFLOW_SORTED(view), id, &old_pos, &new_pos); +/* Callback for the add_card signal from the contact editor */ +static void +add_card_cb (EContactEditor *ce, ECard *card, gpointer data) +{ + EBook *book; - e_selection_model_simple_move_row(view->selection, old_pos, new_pos); - } - } + book = E_BOOK (data); + e_book_add_card (book, card, card_added_cb, NULL); } +/* Callback for the commit_card signal from the contact editor */ static void -status_message (EBookView *book_view, - char* status, - EMinicardView *view) +commit_card_cb (EContactEditor *ce, ECard *card, gpointer data) { - gtk_signal_emit (GTK_OBJECT (view), - e_minicard_view_signals [STATUS_MESSAGE], - status); + EBook *book; + + book = E_BOOK (data); + e_book_commit_card (book, card, card_changed_cb, NULL); } +/* Callback used when the contact editor is closed */ static void -remove_card(EBookView *book_view, const char *id, EMinicardView *view) +editor_closed_cb (EContactEditor *ce, gpointer data) { - int position; - e_reflow_sorted_remove_item(E_REFLOW_SORTED(view), id, &position); - e_selection_model_simple_delete_rows(view->selection, position, 1); + gtk_object_unref (GTK_OBJECT (ce)); } static void -book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure) +supported_fields_cb (EBook *book, EBookStatus status, EList *fields, EMinicardView *view) { - EMinicardView *view = closure; - disconnect_signals(view); - if (view->book_view) - gtk_object_unref(GTK_OBJECT(view->book_view)); - - if (!view->canvas_destroy_id) - view->canvas_destroy_id = - gtk_signal_connect(GTK_OBJECT(GNOME_CANVAS_ITEM(view)->canvas), - "destroy", GTK_SIGNAL_FUNC(canvas_destroy), - view); - - if (!view->canvas_drag_data_get_id) - view->canvas_drag_data_get_id = - gtk_signal_connect (GTK_OBJECT (GNOME_CANVAS_ITEM (view)->canvas), - "drag_data_get", - GTK_SIGNAL_FUNC (e_minicard_view_drag_data_get), - view); - - view->book_view = book_view; - if (view->book_view) - gtk_object_ref(GTK_OBJECT(view->book_view)); - + ECard *card; + EContactEditor *ce; + gboolean editable; - view->create_card_id = - gtk_signal_connect(GTK_OBJECT(view->book_view), - "card_added", - GTK_SIGNAL_FUNC(create_card), - view); - view->remove_card_id = - gtk_signal_connect(GTK_OBJECT(view->book_view), - "card_removed", - GTK_SIGNAL_FUNC(remove_card), - view); - view->modify_card_id = - gtk_signal_connect(GTK_OBJECT(view->book_view), - "card_changed", - GTK_SIGNAL_FUNC(modify_card), - view); - view->status_message_id = - gtk_signal_connect(GTK_OBJECT(view->book_view), - "status_message", - GTK_SIGNAL_FUNC(status_message), - view); - - g_list_foreach(E_REFLOW(view)->items, (GFunc) gtk_object_unref, NULL); - g_list_foreach(E_REFLOW(view)->items, (GFunc) gtk_object_destroy, NULL); - g_list_free(E_REFLOW(view)->items); - E_REFLOW(view)->items = NULL; - e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(view)); -} + card = e_card_new(""); -static gboolean -get_view(EMinicardView *view) -{ - if (view->book && view->query) { - if (view->first_get_view) { - char *capabilities; - capabilities = e_book_get_static_capabilities(view->book); - if (strstr(capabilities, "local")) { - e_book_get_book_view(view->book, view->query, book_view_loaded, view); - } - view->first_get_view = FALSE; - } - else - e_book_get_book_view(view->book, view->query, book_view_loaded, view); - } + gtk_object_get (GTK_OBJECT (view->model), + "editable", &editable, + NULL); - view->get_view_idle = 0; - return FALSE; + ce = e_contact_editor_new (card, TRUE, fields, !editable); + + gtk_signal_connect (GTK_OBJECT (ce), "add_card", + GTK_SIGNAL_FUNC (add_card_cb), book); + gtk_signal_connect (GTK_OBJECT (ce), "commit_card", + GTK_SIGNAL_FUNC (commit_card_cb), book); + gtk_signal_connect (GTK_OBJECT (ce), "editor_closed", + GTK_SIGNAL_FUNC (editor_closed_cb), NULL); + + gtk_object_sink(GTK_OBJECT(card)); } static void @@ -388,53 +208,46 @@ e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) switch (arg_id){ case ARG_BOOK: - if (view->book) - gtk_object_unref(GTK_OBJECT(view->book)); - if (GTK_VALUE_OBJECT (*arg)) { - view->book = E_BOOK(GTK_VALUE_OBJECT (*arg)); - gtk_object_ref(GTK_OBJECT(view->book)); - if (view->get_view_idle == 0) - view->get_view_idle = g_idle_add((GSourceFunc)get_view, view); - } - else - view->book = NULL; + gtk_object_set (GTK_OBJECT (view->model), + "book", GTK_VALUE_OBJECT (*arg), + NULL); break; case ARG_QUERY: - g_free(view->query); - view->query = g_strdup(GTK_VALUE_STRING (*arg)); - if (view->get_view_idle == 0) - view->get_view_idle = g_idle_add((GSourceFunc)get_view, view); + gtk_object_set (GTK_OBJECT (view->model), + "query", GTK_VALUE_STRING (*arg), + NULL); break; - case ARG_EDITABLE: { - GList *l; - view->editable = GTK_VALUE_BOOL (*arg); - /* bit of a hack */ - for (l = E_REFLOW (view)->items; l; l = g_list_next(l)) { - gtk_object_set (GTK_OBJECT (l->data), - "editable", view->editable, - NULL); - } + case ARG_EDITABLE: + gtk_object_set (GTK_OBJECT (view->model), + "editable", GTK_VALUE_BOOL (*arg), + NULL); break; } - } } static void e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) { - EMinicardView *e_minicard_view; + EMinicardView *view; - e_minicard_view = E_MINICARD_VIEW (object); + view = E_MINICARD_VIEW (object); switch (arg_id) { case ARG_BOOK: - GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard_view->book); + gtk_object_get (GTK_OBJECT (view->model), + "book", >K_VALUE_OBJECT (*arg), + NULL); + break; break; case ARG_QUERY: - GTK_VALUE_STRING (*arg) = g_strdup(e_minicard_view->query); + gtk_object_get (GTK_OBJECT (view->model), + "query", >K_VALUE_STRING (*arg), + NULL); break; case ARG_EDITABLE: - GTK_VALUE_BOOL (*arg) = e_minicard_view->editable; + gtk_object_get (GTK_OBJECT (view->model), + "editable", >K_VALUE_BOOL (*arg), + NULL); break; default: arg->type = GTK_TYPE_INVALID; @@ -447,79 +260,10 @@ e_minicard_view_destroy (GtkObject *object) { EMinicardView *view = E_MINICARD_VIEW(object); - if (view->get_view_idle) - g_source_remove(view->get_view_idle); - if (view->canvas_destroy_id) - gtk_signal_disconnect(GTK_OBJECT (GNOME_CANVAS_ITEM(view)->canvas), - view->canvas_destroy_id); - disconnect_signals(view); - g_free(view->query); - if (view->book) - gtk_object_unref(GTK_OBJECT(view->book)); - if (view->book_view) - gtk_object_unref(GTK_OBJECT(view->book_view)); - - GTK_OBJECT_CLASS(parent_class)->destroy (object); -} - -static void -card_added_cb (EBook* book, EBookStatus status, const char *id, - gpointer user_data) -{ - g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__); -} - -static void -card_changed_cb (EBook* book, EBookStatus status, gpointer user_data) -{ - g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status); -} - -/* Callback for the add_card signal from the contact editor */ -static void -add_card_cb (EContactEditor *ce, ECard *card, gpointer data) -{ - EBook *book; - - book = E_BOOK (data); - e_book_add_card (book, card, card_added_cb, NULL); -} - -/* Callback for the commit_card signal from the contact editor */ -static void -commit_card_cb (EContactEditor *ce, ECard *card, gpointer data) -{ - EBook *book; - - book = E_BOOK (data); - e_book_commit_card (book, card, card_changed_cb, NULL); -} - -/* Callback used when the contact editor is closed */ -static void -editor_closed_cb (EContactEditor *ce, gpointer data) -{ - gtk_object_unref (GTK_OBJECT (ce)); -} - -static void -supported_fields_cb (EBook *book, EBookStatus status, EList *fields, EMinicardView *view) -{ - ECard *card; - EContactEditor *ce; - - card = e_card_new(""); - - ce = e_contact_editor_new (card, TRUE, fields, !view->editable); - - gtk_signal_connect (GTK_OBJECT (ce), "add_card", - GTK_SIGNAL_FUNC (add_card_cb), book); - gtk_signal_connect (GTK_OBJECT (ce), "commit_card", - GTK_SIGNAL_FUNC (commit_card_cb), book); - gtk_signal_connect (GTK_OBJECT (ce), "editor_closed", - GTK_SIGNAL_FUNC (editor_closed_cb), NULL); + + gtk_object_unref (GTK_OBJECT (view->model)); - gtk_object_sink(GTK_OBJECT(card)); + GTK_OBJECT_CLASS(parent_class)->destroy (object); } static gboolean @@ -553,60 +297,83 @@ e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event) } } +static gint +e_minicard_view_selection_event (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event) +{ + EMinicardView *view; + int return_val = FALSE; + + view = E_MINICARD_VIEW (reflow); + if (parent_class->selection_event) { + return_val = parent_class->selection_event (reflow, item, event); + } + + switch (event->type) { + case GDK_BUTTON_PRESS: + if (event->button.button == 3) { + return_val = e_minicard_view_model_right_click (view->model, event, reflow->selection); + } + break; + default: + break; + } + return return_val; +} + static void disconnect_signals(EMinicardView *view) { - if (view->book_view && view->create_card_id) - gtk_signal_disconnect(GTK_OBJECT (view->book_view), - view->create_card_id); - if (view->book_view && view->remove_card_id) - gtk_signal_disconnect(GTK_OBJECT (view->book_view), - view->remove_card_id); - if (view->book_view && view->modify_card_id) - gtk_signal_disconnect(GTK_OBJECT (view->book_view), - view->modify_card_id); - if (view->book_view && view->status_message_id) - gtk_signal_disconnect(GTK_OBJECT (view->book_view), + if (view->model && view->status_message_id) + gtk_signal_disconnect(GTK_OBJECT (view->model), view->status_message_id); - view->create_card_id = 0; - view->remove_card_id = 0; - view->modify_card_id = 0; view->status_message_id = 0; } +#if 0 static void canvas_destroy(GtkObject *object, EMinicardView *view) { disconnect_signals(view); } +#endif + +typedef struct { + EMinicardView *view; + EBookCallback cb; + gpointer closure; +} ViewCbClosure; + +static void +do_remove (int i, gpointer user_data) +{ + ECard *card; + ViewCbClosure *viewcbclosure = user_data; + EMinicardView *view = viewcbclosure->view; + EBookCallback cb = viewcbclosure->cb; + gpointer closure = viewcbclosure->closure; + gtk_object_get(GTK_OBJECT(view->model->data[i]), + "card", &card, + NULL); + e_book_remove_card(view->model->book, card, cb, closure); +} void e_minicard_view_remove_selection(EMinicardView *view, EBookCallback cb, gpointer closure) { - if (view->book) { - EReflow *reflow = E_REFLOW(view); - GList *list; - for (list = reflow->items; list; list = g_list_next(list)) { - GnomeCanvasItem *item = list->data; - gboolean has_focus; - gtk_object_get(GTK_OBJECT(item), - "has_focus", &has_focus, - NULL); - if (has_focus) { - ECard *card; - gtk_object_get(GTK_OBJECT(item), - "card", &card, - NULL); - e_book_remove_card(view->book, card, cb, closure); - return; - } - } - } + ViewCbClosure viewcbclosure; + viewcbclosure.view = view; + viewcbclosure.cb = cb; + viewcbclosure.closure = closure; + + e_selection_model_foreach (E_REFLOW (view)->selection, + do_remove, + &viewcbclosure); } +#if 0 static int compare_to_letter(EMinicard *card, char *letter) { @@ -629,35 +396,104 @@ compare_to_letter(EMinicard *card, char *letter) return 0; } } +#endif + + void e_minicard_view_jump_to_letter (EMinicardView *view, char letter) { +#if 0 e_reflow_sorted_jump(E_REFLOW_SORTED(view), (GCompareFunc) compare_to_letter, &letter); +#endif } void e_minicard_view_stop (EMinicardView *view) { + e_minicard_view_model_stop (view->model); disconnect_signals(view); - if (view->book_view) - gtk_object_unref(GTK_OBJECT(view->book_view)); - view->book_view = NULL; +} + + +static void +e_minicard_view_class_init (EMinicardViewClass *klass) +{ + GtkObjectClass *object_class; + GnomeCanvasItemClass *item_class; + EReflowClass *reflow_class; + + object_class = (GtkObjectClass*) klass; + item_class = (GnomeCanvasItemClass *) klass; + reflow_class = (EReflowClass *) klass; + + parent_class = gtk_type_class (PARENT_TYPE); + + gtk_object_add_arg_type ("EMinicardView::book", GTK_TYPE_OBJECT, + GTK_ARG_READWRITE, ARG_BOOK); + gtk_object_add_arg_type ("EMinicardView::query", GTK_TYPE_STRING, + GTK_ARG_READWRITE, ARG_QUERY); + gtk_object_add_arg_type ("EMinicardView::editable", GTK_TYPE_BOOL, + GTK_ARG_READWRITE, ARG_EDITABLE); + + e_minicard_view_signals [STATUS_MESSAGE] = + gtk_signal_new ("status_message", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (EMinicardViewClass, status_message), + gtk_marshal_NONE__POINTER, + GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); + + gtk_object_class_add_signals (object_class, e_minicard_view_signals, LAST_SIGNAL); + + object_class->set_arg = e_minicard_view_set_arg; + object_class->get_arg = e_minicard_view_get_arg; + object_class->destroy = e_minicard_view_destroy; + + item_class->event = e_minicard_view_event; + + reflow_class->selection_event = e_minicard_view_selection_event; + /* GnomeCanvasItem method overrides */ } static void -e_minicard_view_update_selection (EMinicardView *view) +e_minicard_view_init (EMinicardView *view) { - int i; - GList *item; - - for (i = 0, item = E_REFLOW(view)->items; item; item = item->next, i++) { - if (E_IS_MINICARD(item->data)) - gtk_object_set(GTK_OBJECT(item->data), - "selected", e_selection_model_is_row_selected(E_SELECTION_MODEL(view->selection), i), - NULL); + char *empty_message; + + view->model = E_MINICARD_VIEW_MODEL(e_minicard_view_model_new()); + + empty_message = e_utf8_from_locale_string(_("\n\nThere are no items to show in this view\n\n" + "Double-click here to create a new Contact.")); + gtk_object_set (GTK_OBJECT(view), + "empty_message", empty_message, + "model", view->model, + NULL); + g_free (empty_message); +} + +GtkType +e_minicard_view_get_type (void) +{ + static GtkType reflow_type = 0; + + if (!reflow_type) { + static const GtkTypeInfo reflow_info = { + "EMinicardView", + sizeof (EMinicardView), + sizeof (EMinicardViewClass), + (GtkClassInitFunc) e_minicard_view_class_init, + (GtkObjectInitFunc) e_minicard_view_init, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, + (GtkClassInitFunc) NULL, + }; + + reflow_type = gtk_type_unique (PARENT_TYPE, &reflow_info); } + + return reflow_type; } diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index 50a2fa00a7..253eedd3ac 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -22,7 +22,9 @@ #define __E_MINICARD_VIEW_H__ #include "e-minicard.h" -#include <gal/widgets/e-reflow-sorted.h> +#include "e-minicard-view-model.h" + +#include <gal/widgets/e-reflow.h> #include <gal/widgets/e-selection-model-simple.h> #include "addressbook/backend/ebook/e-book.h" @@ -62,31 +64,25 @@ typedef struct _EMinicardViewClass EMinicardViewClass; struct _EMinicardView { - EReflowSorted parent; + EReflow parent; + + EMinicardViewModel *model; /* item specific fields */ - EBook *book; - char *query; - guint editable : 1; - EBookView *book_view; ESelectionModelSimple *selection; EMinicard *drag_card; - int get_view_idle; - int canvas_destroy_id; int canvas_drag_data_get_id; - int create_card_id, remove_card_id, modify_card_id, status_message_id; - - guint first_get_view : 1; + int status_message_id; }; struct _EMinicardViewClass { - EReflowSortedClass parent_class; + EReflowClass parent_class; /* * Signals diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index b5c11bd27f..0db903a790 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -31,15 +31,11 @@ #include <gal/util/e-util.h> #include <gal/widgets/e-canvas-utils.h> #include <gal/widgets/e-canvas.h> -#include <gal/widgets/e-popup-menu.h> #include "addressbook/backend/ebook/e-book.h" -#include "addressbook/printing/e-contact-print.h" -#include "addressbook/printing/e-contact-print-envelope.h" #include "e-minicard.h" #include "e-minicard-label.h" #include "e-minicard-view.h" #include "e-contact-editor.h" -#include "e-contact-save-as.h" static void e_minicard_init (EMinicard *card); static void e_minicard_class_init (EMinicardClass *klass); @@ -442,113 +438,6 @@ card_changed_cb (EBook* book, EBookStatus status, gpointer user_data) g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status); } -typedef struct { - EMinicard *minicard; - GnomeCanvasItem *parent; - GtkWidget *canvas; -} MinicardAndParent; - -static void -e_minicard_and_parent_free (MinicardAndParent *mnp) -{ - gtk_object_unref(GTK_OBJECT(mnp->minicard)); - gtk_object_unref(GTK_OBJECT(mnp->parent)); - gtk_object_unref(GTK_OBJECT(mnp->canvas)); - g_free(mnp); -} - -static void -save_as (GtkWidget *widget, MinicardAndParent *mnp) -{ - EMinicard *minicard = mnp->minicard; - if (!GTK_OBJECT_DESTROYED(minicard)) { - e_card_simple_sync_card(minicard->simple); - e_contact_save_as(_("Save as VCard"), minicard->card); - } - e_minicard_and_parent_free (mnp); -} - -static void -send_as (GtkWidget *widget, MinicardAndParent *mnp) -{ - EMinicard *minicard = mnp->minicard; - if (!GTK_OBJECT_DESTROYED(minicard)) { - e_card_simple_sync_card(minicard->simple); - e_card_send(minicard->card, E_CARD_DISPOSITION_AS_ATTACHMENT); - } - e_minicard_and_parent_free (mnp); -} - -static void -send_to (GtkWidget *widget, MinicardAndParent *mnp) -{ - EMinicard *minicard = mnp->minicard; - if (!GTK_OBJECT_DESTROYED(minicard)) { - e_card_simple_sync_card(minicard->simple); - e_card_send(minicard->card, E_CARD_DISPOSITION_AS_TO); - } - e_minicard_and_parent_free (mnp); -} - -static void -delete (GtkWidget *widget, MinicardAndParent *mnp) -{ - EMinicard *minicard = mnp->minicard; - - if (!GTK_OBJECT_DESTROYED(minicard)) { - EBook *book; - ECard *card = minicard->card; - ECardSimple *simple = minicard->simple; - - gtk_object_get(GTK_OBJECT(mnp->parent), - "book", &book, - NULL); - - gtk_object_ref(GTK_OBJECT(card)); - gtk_object_ref(GTK_OBJECT(simple)); - - if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(mnp->canvas)))) { - e_card_simple_sync_card(simple); - - - /* Add the card in the contact editor to our ebook */ - e_book_remove_card (book, - card, - card_changed_cb, - NULL); - } - - gtk_object_unref(GTK_OBJECT(card)); - gtk_object_unref(GTK_OBJECT(simple)); - } - - e_minicard_and_parent_free (mnp); -} - -static void -print (GtkWidget *widget, MinicardAndParent *mnp) -{ - EMinicard *minicard = mnp->minicard; - - if (!GTK_OBJECT_DESTROYED(minicard)) { - e_card_simple_sync_card(minicard->simple); - gtk_widget_show(e_contact_print_card_dialog_new(minicard->card)); - } - e_minicard_and_parent_free (mnp); -} - -static void -print_envelope (GtkWidget *widget, MinicardAndParent *mnp) -{ - EMinicard *minicard = mnp->minicard; - - if (!GTK_OBJECT_DESTROYED(minicard)) { - e_card_simple_sync_card(minicard->simple); - gtk_widget_show(e_contact_print_envelope_dialog_new(minicard->card)); - } - e_minicard_and_parent_free (mnp); -} - /* Callback for the add_card signal from the contact editor */ static void add_card_cb (EContactEditor *ce, ECard *card, gpointer data) @@ -664,21 +553,7 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) e_minicard->drag_button_down = TRUE; return ret_val; } else if (event->button.button == 3) { - MinicardAndParent *mnp = g_new(MinicardAndParent, 1); - EPopupMenu menu[] = { {N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0}, - {N_("Send contact to other"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0}, - {N_("Send message to contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0}, - {N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0}, - {N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0}, - {N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, 1}, - {NULL, NULL, NULL, 0}}; - mnp->minicard = e_minicard; - mnp->parent = item->parent; - mnp->canvas = GTK_WIDGET(item->canvas); - gtk_object_ref(GTK_OBJECT(mnp->minicard)); - gtk_object_ref(GTK_OBJECT(mnp->parent)); - gtk_object_ref(GTK_OBJECT(mnp->canvas)); - e_popup_menu_run (menu, event, 0, E_IS_MINICARD_VIEW(mnp->parent) ? 0 : 1, mnp); + return e_minicard_selected(e_minicard, event); } break; case GDK_BUTTON_RELEASE: @@ -877,7 +752,7 @@ remodel( EMinicard *e_minicard ) NULL ); g_free(file_as); } - + list = e_minicard->fields; e_minicard->fields = NULL; @@ -889,7 +764,7 @@ remodel( EMinicard *e_minicard ) if (minicard_field && minicard_field->field == field) { GList *this_list = list; char *string; - + string = e_card_simple_get(e_minicard->simple, field); if (string && *string) { e_minicard->fields = g_list_append(e_minicard->fields, minicard_field); @@ -917,7 +792,7 @@ remodel( EMinicard *e_minicard ) g_free(string); } } - + g_list_foreach(list, (GFunc) e_minicard_field_destroy, NULL); g_list_free(list); } @@ -1017,9 +892,19 @@ int e_minicard_selected (EMinicard *minicard, GdkEvent *event) { gint ret_val = 0; - gtk_signal_emit(GTK_OBJECT(minicard), - e_minicard_signals[SELECTED], - event, &ret_val); + GnomeCanvasItem *item = GNOME_CANVAS_ITEM (minicard); + if (item->parent) { + guint signal_id = gtk_signal_lookup ("selection_event", GTK_OBJECT_TYPE (item->parent)); + /* We should probably check the signature here, but I + * don't think it's worth the time required to code + * it. + */ + if (signal_id != 0) { + gtk_signal_emit(GTK_OBJECT(item->parent), + signal_id, + item, event, &ret_val); + } + } return ret_val; } |