Mostly finished ECardSimple.

2000-05-06  Christopher James Lahey  <clahey@helixcode.com>

	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
	Mostly finished ECardSimple.

	* contact-editor/e-contact-editor.c: Changed this to match with
	some of the changes to ECardSimple.

	* gui/component/addressbook.c: Changed this to look for
	"addressbook.db" in the given directory if it doesn't find the
	file "uri".

	* gui/minicard/e-minicard.c, gui/minicard/e-minicard.h: Changed
	this to use ECardSimple.

svn path=/trunk/; revision=2839

6 files changed, 134 insertions, 209 deletions

diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 72bd8967ba..f86a58a005 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -442,7 +442,6 @@ set_prop (BonoboPropertyBag *bag,
 	EBook *book;
 	char *uri_file;
 	char *uri_data;
-	char *uri;
 	
 	switch (arg_id) {
 
@@ -461,12 +460,11 @@ set_prop (BonoboPropertyBag *bag,
 		uri_file = g_concat_dir_and_file(view->uri + 7, "uri");
 
 		uri_data = e_read_file(uri_file);
-		if (uri_data)
-			uri = uri_data;
-		else
-			uri = view->uri;
+
+		if (!uri_data)
+			uri_data = g_concat_dir_and_file(view->uri + 7, "addressbook.db");
 		
-		if (! e_book_load_uri (book, uri, book_open_cb, view))
+		if (! e_book_load_uri (book, uri_data, book_open_cb, view))
 			{
 				printf ("error calling load_uri!\n");
 			}
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 42e1759bea..6205ecdcc6 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -188,16 +188,11 @@ phone_entry_changed (GtkWidget *widget, EContactEditor *editor)
 	} else
 		return;
 	string = gtk_entry_get_text(entry);
-	phone = e_card_simple_get_phone(editor->simple, editor->phone_choice[which - 1]);
-	if (phone) {
-		g_free(phone->number);
-	} else {
-		phone = e_card_phone_new();
-		e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
-		e_card_phone_free(phone);
-		phone = e_card_simple_get_phone(editor->simple, editor->phone_choice[which - 1]);
-	}
-	phone->number = g_strdup(string);
+	phone = e_card_phone_new();
+	phone->number = string;
+	e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
+	phone->number = NULL;
+	e_card_phone_free(phone);
 	set_fields(editor);
 }
 
@@ -215,24 +210,16 @@ email_entry_changed (GtkWidget *widget, EContactEditor *editor)
 static void
 address_text_changed (GtkWidget *widget, EContactEditor *editor)
 {
-	gchar *string;
 	GtkEditable *editable = GTK_EDITABLE(widget);
 	ECardAddrLabel *address;
 
 	if (editor->address_choice == -1)
 		return;
-	address = e_card_simple_get_address(editor->simple, editor->address_choice);
-	if (address) {
-		g_free(address->data);
-	} else {
-		address = e_card_address_label_new();
-		e_card_simple_set_address(editor->simple, editor->address_choice, address);
-		e_card_address_label_free(address);
-		address = e_card_simple_get_address(editor->simple, editor->address_choice);
-	}
 
-	string = gtk_editable_get_chars(editable, 0, -1);
-	address->data = string;
+	address = e_card_address_label_new();
+	address->data = gtk_editable_get_chars(editable, 0, -1);
+	e_card_simple_set_address(editor->simple, editor->address_choice, address);
+	e_card_address_label_free(address);
 }
 
 /* This function tells you whether name_to_style will make sense.  */
@@ -944,7 +931,7 @@ set_address_field(EContactEditor *editor, int result)
 {
 	GtkEditable *editable;
 	int position;
-	ECardAddrLabel *address;
+	const ECardAddrLabel *address;
 	if (result == -1)
 		result = editor->address_choice;
 	editor->address_choice = -1;
diff --git a/addressbook/gui/minicard/e-minicard.c b/addressbook/gui/minicard/e-minicard.c
index 76aec54854..b75d1779d4 100644
--- a/addressbook/gui/minicard/e-minicard.c
+++ b/addressbook/gui/minicard/e-minicard.c
@@ -122,6 +122,7 @@ e_minicard_init (EMinicard *minicard)
   minicard->has_focus = FALSE;
   
   minicard->card = NULL;
+  minicard->simple = e_card_simple_new(NULL);
 
   e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);
 }
@@ -166,6 +167,9 @@ e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 		e_minicard->card = E_CARD(GTK_VALUE_OBJECT (*arg));
 		if (e_minicard->card)
 			gtk_object_ref (GTK_OBJECT(e_minicard->card));
+		gtk_object_set(GTK_OBJECT(e_minicard->simple),
+			       "card", e_minicard->card,
+			       NULL);
 		remodel(e_minicard);
 		e_canvas_item_request_reflow(item);
 		break;
@@ -190,6 +194,7 @@ e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 		GTK_VALUE_ENUM (*arg) = e_minicard->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
 		break;
 	case ARG_CARD:
+		e_card_simple_sync_card(e_minicard->simple);
 		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard->card);
 		break;
 	default:
@@ -210,6 +215,8 @@ e_minicard_destroy (GtkObject *object)
 
 	if (e_minicard->card)
 		gtk_object_unref (GTK_OBJECT(e_minicard->card));
+	if (e_minicard->simple)
+		gtk_object_unref (GTK_OBJECT(e_minicard->simple));
 
 	if (GTK_OBJECT_CLASS (parent_class)->destroy)
 		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
@@ -427,117 +434,79 @@ e_minicard_resize_children( EMinicard *e_minicard )
 }
 
 static void
-add_field (EMinicard *e_minicard, char *fieldname, char* field)
+field_changed (EText *text, EMinicard *e_minicard)
+{
+	ECardSimpleType type;
+	char *string;
+
+	type = GPOINTER_TO_INT
+		(gtk_object_get_data(GTK_OBJECT(text),
+				     "EMinicard:field"));
+	gtk_object_get(GTK_OBJECT(text),
+		       "text", &string,
+		       NULL);
+	e_card_simple_set(e_minicard->simple,
+			  type,
+			  string);
+	g_free(string);
+}
+
+static void
+add_field (EMinicard *e_minicard, ECardSimpleField field)
 {
 	GnomeCanvasItem *new_item;
 	GnomeCanvasGroup *group;
+	ECardSimpleType type;
+	char *name;
+	char *string;
 
 	group = GNOME_CANVAS_GROUP( e_minicard );
+	
+	type = e_card_simple_type(e_minicard->simple, field);
+	name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard->simple, field));
+	string = e_card_simple_get(e_minicard->simple, field);
 
 	new_item = e_minicard_label_new(group);
 	gnome_canvas_item_set( new_item,
 			       "width", e_minicard->width - 4.0,
-			       "fieldname", fieldname,
-			       "field", field,
+			       "fieldname", name,
+			       "field", string,
 			       NULL );
+	gtk_signal_connect(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
+			   "changed", GTK_SIGNAL_FUNC(field_changed), e_minicard);
+	gtk_object_set_data(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
+			    "EMinicard:field",
+			    GINT_TO_POINTER(field));
 	e_minicard->fields = g_list_append( e_minicard->fields, new_item);
 	e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
+	g_free(name);
+	g_free(string);
 }
-		
+
 
 static void
 remodel( EMinicard *e_minicard )
 {
-	if (e_minicard->card) {
-		char *fname;
+	int count = 0;
+	if (e_minicard->simple) {
+		ECardSimpleField field;
 		char *file_as;
-		char *url;
-		char *org;
-		char *title;
-		char *role;
-		ECardList *address_list;
-		ECardList *phone_list;
-		ECardList *email_list;
-
-		ECardIterator *iterator;
-
-		GList *list;
+		file_as = e_card_simple_get(e_minicard->simple, E_CARD_SIMPLE_FIELD_FILE_AS);
+		gnome_canvas_item_set( e_minicard->header_text,
+				       "text", file_as ? file_as : "",
+				       NULL );
+		g_free(file_as);
 
-		for ( list = e_minicard->fields; list; list = g_list_next( list ) ) {
-			gtk_object_destroy( GTK_OBJECT( list->data ) );
-		}
+		g_list_foreach(e_minicard->fields, (GFunc) gtk_object_destroy, NULL);
 		g_list_free(e_minicard->fields);
 		e_minicard->fields = NULL;
 
-		gtk_object_get(GTK_OBJECT(e_minicard->card),
-			       "full_name",  &fname,
-			       "file_as",    &file_as,
-			       "address",    &address_list,
-			       "phone",      &phone_list,
-			       "email",      &email_list,
-			       "url",        &url,
-			       "org",        &org,
-			       "title",      &title,
-			       "role",       &role,
-			       NULL);
-
-		if (e_minicard->header_text) {
-			if (file_as)
-				gnome_canvas_item_set(e_minicard->header_text,
-						      "text", file_as,
-						      NULL);
-			else
-				gnome_canvas_item_set(e_minicard->header_text,
-						      "text", "",
-						      NULL);
-		}
-
-		if (fname)
-			add_field(e_minicard, "Name:", fname);
-
-		if (org)
-			add_field(e_minicard, "Company:", org);
-
-		if (title)
-			add_field(e_minicard, "Title:", title);
-
-		if (role)
-			add_field(e_minicard, "Profession:", role);
-
-		if (address_list) {
-			for (iterator = e_card_list_get_iterator(address_list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {
-				const ECardDeliveryAddress *address = e_card_iterator_get(iterator);
-				if (address->flags & E_CARD_ADDR_WORK) {
-					add_field(e_minicard, "Work Address:", address->city);
-				} else if (address->flags & E_CARD_ADDR_HOME) {
-					add_field(e_minicard, "Home Address:", address->city);
-				} else {
-					add_field(e_minicard, "Address:", address->city);
-				}
-			}
-		}
-		if (phone_list) {
-			for (iterator = e_card_list_get_iterator(phone_list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {
-				const ECardPhone *phone = e_card_iterator_get(iterator);
-				if (phone->flags & E_CARD_PHONE_WORK) {
-					add_field(e_minicard, "Work Phone:", phone->number);
-				} else if (phone->flags & E_CARD_PHONE_HOME) {
-					add_field(e_minicard, "Home Phone:", phone->number);
-				} else if (phone->flags & E_CARD_PHONE_CELL) {
-					add_field(e_minicard, "Mobile Phone:", phone->number);
-				} else {
-					add_field(e_minicard, "Phone:", phone->number);
-				}
-			}
-		}
-		if (email_list) {
-			for (iterator = e_card_list_get_iterator(email_list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {
-				add_field(e_minicard, "Email:", (char *) e_card_iterator_get(iterator));
+		for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST && count < 5; field++) {
+			if (e_card_simple_get(e_minicard->simple, field)) {
+				add_field(e_minicard, field);
+				count++;
 			}
 		}
-
-		if (url)
-			add_field(e_minicard, "Web page:", url);
 	}
 }
 
diff --git a/addressbook/gui/minicard/e-minicard.h b/addressbook/gui/minicard/e-minicard.h
index 6844e136bd..81a6f8bae6 100644
--- a/addressbook/gui/minicard/e-minicard.h
+++ b/addressbook/gui/minicard/e-minicard.h
@@ -23,6 +23,7 @@
 
 #include <gnome.h>
 #include <ebook/e-card.h>
+#include <ebook/e-card-simple.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,14 +62,14 @@ struct _EMinicard
 	GnomeCanvasGroup parent;
 	
 	/* item specific fields */
-	/*  ECard *card; */
+	ECard *card;
+	ECardSimple *simple;
 	
 	GnomeCanvasItem *rect;
 	GnomeCanvasItem *header_rect;
 	GnomeCanvasItem *header_text;
-	GList *fields; /* Of type GnomeCanvasItem. */
 
-	ECard *card;
+	GList *fields; /* Of type GnomeCanvasItem. */
 	guint needs_remodeling : 1;
 	
 	gboolean has_focus;
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 76aec54854..b75d1779d4 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -122,6 +122,7 @@ e_minicard_init (EMinicard *minicard)
   minicard->has_focus = FALSE;
   
   minicard->card = NULL;
+  minicard->simple = e_card_simple_new(NULL);
 
   e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);
 }
@@ -166,6 +167,9 @@ e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 		e_minicard->card = E_CARD(GTK_VALUE_OBJECT (*arg));
 		if (e_minicard->card)
 			gtk_object_ref (GTK_OBJECT(e_minicard->card));
+		gtk_object_set(GTK_OBJECT(e_minicard->simple),
+			       "card", e_minicard->card,
+			       NULL);
 		remodel(e_minicard);
 		e_canvas_item_request_reflow(item);
 		break;
@@ -190,6 +194,7 @@ e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 		GTK_VALUE_ENUM (*arg) = e_minicard->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
 		break;
 	case ARG_CARD:
+		e_card_simple_sync_card(e_minicard->simple);
 		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard->card);
 		break;
 	default:
@@ -210,6 +215,8 @@ e_minicard_destroy (GtkObject *object)
 
 	if (e_minicard->card)
 		gtk_object_unref (GTK_OBJECT(e_minicard->card));
+	if (e_minicard->simple)
+		gtk_object_unref (GTK_OBJECT(e_minicard->simple));
 
 	if (GTK_OBJECT_CLASS (parent_class)->destroy)
 		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
@@ -427,117 +434,79 @@ e_minicard_resize_children( EMinicard *e_minicard )
 }
 
 static void
-add_field (EMinicard *e_minicard, char *fieldname, char* field)
+field_changed (EText *text, EMinicard *e_minicard)
+{
+	ECardSimpleType type;
+	char *string;
+
+	type = GPOINTER_TO_INT
+		(gtk_object_get_data(GTK_OBJECT(text),
+				     "EMinicard:field"));
+	gtk_object_get(GTK_OBJECT(text),
+		       "text", &string,
+		       NULL);
+	e_card_simple_set(e_minicard->simple,
+			  type,
+			  string);
+	g_free(string);
+}
+
+static void
+add_field (EMinicard *e_minicard, ECardSimpleField field)
 {
 	GnomeCanvasItem *new_item;
 	GnomeCanvasGroup *group;
+	ECardSimpleType type;
+	char *name;
+	char *string;
 
 	group = GNOME_CANVAS_GROUP( e_minicard );
+	
+	type = e_card_simple_type(e_minicard->simple, field);
+	name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard->simple, field));
+	string = e_card_simple_get(e_minicard->simple, field);
 
 	new_item = e_minicard_label_new(group);
 	gnome_canvas_item_set( new_item,
 			       "width", e_minicard->width - 4.0,
-			       "fieldname", fieldname,
-			       "field", field,
+			       "fieldname", name,
+			       "field", string,
 			       NULL );
+	gtk_signal_connect(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
+			   "changed", GTK_SIGNAL_FUNC(field_changed), e_minicard);
+	gtk_object_set_data(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
+			    "EMinicard:field",
+			    GINT_TO_POINTER(field));
 	e_minicard->fields = g_list_append( e_minicard->fields, new_item);
 	e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
+	g_free(name);
+	g_free(string);
 }
-		
+
 
 static void
 remodel( EMinicard *e_minicard )
 {
-	if (e_minicard->card) {
-		char *fname;
+	int count = 0;
+	if (e_minicard->simple) {
+		ECardSimpleField field;
 		char *file_as;
-		char *url;
-		char *org;
-		char *title;
-		char *role;
-		ECardList *address_list;
-		ECardList *phone_list;
-		ECardList *email_list;
-
-		ECardIterator *iterator;
-
-		GList *list;
+		file_as = e_card_simple_get(e_minicard->simple, E_CARD_SIMPLE_FIELD_FILE_AS);
+		gnome_canvas_item_set( e_minicard->header_text,
+				       "text", file_as ? file_as : "",
+				       NULL );
+		g_free(file_as);
 
-		for ( list = e_minicard->fields; list; list = g_list_next( list ) ) {
-			gtk_object_destroy( GTK_OBJECT( list->data ) );
-		}
+		g_list_foreach(e_minicard->fields, (GFunc) gtk_object_destroy, NULL);
 		g_list_free(e_minicard->fields);
 		e_minicard->fields = NULL;
 
-		gtk_object_get(GTK_OBJECT(e_minicard->card),
-			       "full_name",  &fname,
-			       "file_as",    &file_as,
-			       "address",    &address_list,
-			       "phone",      &phone_list,
-			       "email",      &email_list,
-			       "url",        &url,
-			       "org",        &org,
-			       "title",      &title,
-			       "role",       &role,
-			       NULL);
-
-		if (e_minicard->header_text) {
-			if (file_as)
-				gnome_canvas_item_set(e_minicard->header_text,
-						      "text", file_as,
-						      NULL);
-			else
-				gnome_canvas_item_set(e_minicard->header_text,
-						      "text", "",
-						      NULL);
-		}
-
-		if (fname)
-			add_field(e_minicard, "Name:", fname);
-
-		if (org)
-			add_field(e_minicard, "Company:", org);
-
-		if (title)
-			add_field(e_minicard, "Title:", title);
-
-		if (role)
-			add_field(e_minicard, "Profession:", role);
-
-		if (address_list) {
-			for (iterator = e_card_list_get_iterator(address_list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {
-				const ECardDeliveryAddress *address = e_card_iterator_get(iterator);
-				if (address->flags & E_CARD_ADDR_WORK) {
-					add_field(e_minicard, "Work Address:", address->city);
-				} else if (address->flags & E_CARD_ADDR_HOME) {
-					add_field(e_minicard, "Home Address:", address->city);
-				} else {
-					add_field(e_minicard, "Address:", address->city);
-				}
-			}
-		}
-		if (phone_list) {
-			for (iterator = e_card_list_get_iterator(phone_list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {
-				const ECardPhone *phone = e_card_iterator_get(iterator);
-				if (phone->flags & E_CARD_PHONE_WORK) {
-					add_field(e_minicard, "Work Phone:", phone->number);
-				} else if (phone->flags & E_CARD_PHONE_HOME) {
-					add_field(e_minicard, "Home Phone:", phone->number);
-				} else if (phone->flags & E_CARD_PHONE_CELL) {
-					add_field(e_minicard, "Mobile Phone:", phone->number);
-				} else {
-					add_field(e_minicard, "Phone:", phone->number);
-				}
-			}
-		}
-		if (email_list) {
-			for (iterator = e_card_list_get_iterator(email_list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {
-				add_field(e_minicard, "Email:", (char *) e_card_iterator_get(iterator));
+		for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST && count < 5; field++) {
+			if (e_card_simple_get(e_minicard->simple, field)) {
+				add_field(e_minicard, field);
+				count++;
 			}
 		}
-
-		if (url)
-			add_field(e_minicard, "Web page:", url);
 	}
 }
 
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index 6844e136bd..81a6f8bae6 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -23,6 +23,7 @@
 
 #include <gnome.h>
 #include <ebook/e-card.h>
+#include <ebook/e-card-simple.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,14 +62,14 @@ struct _EMinicard
 	GnomeCanvasGroup parent;
 	
 	/* item specific fields */
-	/*  ECard *card; */
+	ECard *card;
+	ECardSimple *simple;
 	
 	GnomeCanvasItem *rect;
 	GnomeCanvasItem *header_rect;
 	GnomeCanvasItem *header_text;
-	GList *fields; /* Of type GnomeCanvasItem. */
 
-	ECard *card;
+	GList *fields; /* Of type GnomeCanvasItem. */
 	guint needs_remodeling : 1;
 	
 	gboolean has_focus;