From 465efaf4dd120b2b43ae3e593bc11c8364f36ec1 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Thu, 27 Apr 2000 17:09:20 +0000 Subject: Added addressbook/ename/Makefile. 2000-04-27 Christopher James Lahey * configure.in: Added addressbook/ename/Makefile. From addressbook/ChangeLog: 2000-04-27 Christopher James Lahey * backend/ebook/e-card.c, backend/ebook/e-card.h: Added file as, office, manager, assistant, spouse, and anniversary fields. These all use "X-EVOLUTION-" fields in the VCards. * backend/pas/pas-backend-file.c: Added all the new fields (except anniversary) to the list of fields. * contact-editor/contact-editor.glade, contact-editor/e-contact-editor-strings.h: Fixed some misnamed fields and fixed the placement of the comments field. * contact-editor/e-contact-editor.c: Made the newly added fields display properly. * Makefile.am: Added ename. * ename/e-name-western.h, ename/test-ename-western-gtk.c, ename/test-ename-western.c: Fixed up some #includes. * ename/.cvsignore: Added .cvsignore. svn path=/trunk/; revision=2658 --- .../gui/contact-editor/contact-editor.glade | 249 +++++++++++---------- .../gui/contact-editor/e-contact-editor-strings.h | 2 +- addressbook/gui/contact-editor/e-contact-editor.c | 118 ++++++++++ 3 files changed, 248 insertions(+), 121 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade index cd17ffd288..33721520e6 100644 --- a/addressbook/gui/contact-editor/contact-editor.glade +++ b/addressbook/gui/contact-editor/contact-editor.glade @@ -428,57 +428,6 @@ - - GtkHBox - hbox5 - False - 0 - - 0 - 7 - 10 - 11 - 0 - 0 - True - True - False - False - True - True - - - - GtkText - text-comments - True - True - - - 0 - True - True - - - - - GtkVScrollbar - vscrollbar-comments - GTK_UPDATE_CONTINUOUS - 0 - 0 - 0 - 0 - 0 - 0 - - 0 - False - False - - - - GtkAlignment alignment2 @@ -564,38 +513,6 @@ - - GtkAlignment - alignment4 - 1 - 0.5 - 0 - 1 - - 6 - 7 - 6 - 7 - 0 - 0 - False - False - False - False - True - True - - - - GtkButton - button-address1 - - - Placeholder - - - - GtkAlignment alignment5 @@ -692,32 +609,6 @@ - - GtkLabel - label-address1 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 5 - 6 - 6 - 7 - 0 - 0 - False - False - False - False - True - True - - - GtkHSeparator hseparator4 @@ -910,7 +801,7 @@ GtkCombo - combo-fileas + combo-file-as False True True @@ -935,7 +826,7 @@ GtkEntry GtkCombo:entry - combo-entry1 + entry-file-as True True True @@ -964,12 +855,63 @@ - GtkCheckButton - checkbutton-htmlmail - True - - False - True + GtkHBox + hbox5 + False + 0 + + 0 + 8 + 10 + 11 + 0 + 0 + True + True + False + False + True + True + + + + GtkText + text-comments + True + True + + + 0 + True + True + + + + + GtkVScrollbar + vscrollbar-comments + GTK_UPDATE_CONTINUOUS + 0 + 0 + 0 + 0 + 0 + 0 + + 0 + False + False + + + + + + GtkAlignment + alignment10 + 0.5 + 0 + 1 + 1 3 4 @@ -984,6 +926,73 @@ True True + + + GtkCheckButton + checkbutton-htmlmail + True + + False + True + + + + + GtkAlignment + alignment4 + 1 + 0.5 + 0 + 0 + + 6 + 7 + 6 + 7 + 0 + 0 + False + False + False + False + True + True + + + + GtkButton + button-address1 + + + Placeholder + + + + + + GtkLabel + label-address1 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 5 + 6 + 6 + 7 + 0 + 0 + False + False + False + False + True + True + @@ -1272,7 +1281,7 @@ GtkEntry - entry4 + entry-spouse True True True @@ -1464,7 +1473,7 @@ GtkEntry - entry13 + entry-assistant True True True @@ -1488,7 +1497,7 @@ GtkEntry - entry12 + entry-manager True True True diff --git a/addressbook/gui/contact-editor/e-contact-editor-strings.h b/addressbook/gui/contact-editor/e-contact-editor-strings.h index 7f0a8a83f1..42be016fbc 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-strings.h +++ b/addressbook/gui/contact-editor/e-contact-editor-strings.h @@ -17,8 +17,8 @@ gchar *s = N_("File As:"); gchar *s = N_("Web page address:"); gchar *s = N_("This is the mailing address"); gchar *s = N_("A_ddress..."); -gchar *s = N_("Business"); gchar *s = N_("Wants HTML mail"); +gchar *s = N_("Business"); gchar *s = N_("General"); gchar *s = N_("Department:"); gchar *s = N_("Office:"); diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 91339e9da3..5665e0d217 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -1,3 +1,4 @@ + /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * e-contact-editor.c @@ -781,6 +782,7 @@ fill_in_info(EContactEditor *editor) { ECard *card = editor->card; if (card) { + char *file_as; char *fname; ECardList *address_list; ECardList *phone_list; @@ -788,9 +790,14 @@ fill_in_info(EContactEditor *editor) char *title; char *org; char *org_unit; + char *office; char *url; char *role; + char *manager; + char *assistant; char *nickname; + char *spouse; + const ECardDate *anniversary; char *fburl; char *note; const ECardPhone *phone; @@ -803,6 +810,7 @@ fill_in_info(EContactEditor *editor) ECardIterator *iterator; gtk_object_get(GTK_OBJECT(card), + "file_as", &file_as, "full_name", &fname, "address_label", &address_list, "phone", &phone_list, @@ -810,9 +818,14 @@ fill_in_info(EContactEditor *editor) "url", &url, "org", &org, "org_unit", &org_unit, + "office", &office, "title", &title, "role", &role, + "manager", &manager, + "assistant", &assistant, "nickname", &nickname, + "spouse", &spouse, + "anniversary", &anniversary, "fburl", &fburl, "note", ¬e, "birth_date", &bday, @@ -824,6 +837,12 @@ fill_in_info(EContactEditor *editor) if (fname) gtk_editable_insert_text(editable, fname, strlen(fname), &position); + position = 0; + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-file-as")); + gtk_editable_delete_text(editable, 0, -1); + if (file_as) + gtk_editable_insert_text(editable, file_as, strlen(file_as), &position); + for (iterator = e_card_list_get_iterator(phone_list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) { int i; phone = e_card_iterator_get(iterator); @@ -878,18 +897,54 @@ fill_in_info(EContactEditor *editor) if (org_unit) gtk_editable_insert_text(editable, org_unit, strlen(org_unit), &position); + position = 0; + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-office")); + gtk_editable_delete_text(editable, 0, -1); + if (office) + gtk_editable_insert_text(editable, office, strlen(office), &position); + position = 0; editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-jobtitle")); gtk_editable_delete_text(editable, 0, -1); if (title) gtk_editable_insert_text(editable, title, strlen(title), &position); + position = 0; + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-manager")); + gtk_editable_delete_text(editable, 0, -1); + if (manager) + gtk_editable_insert_text(editable, manager, strlen(manager), &position); + + position = 0; + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-assistant")); + gtk_editable_delete_text(editable, 0, -1); + if (assistant) + gtk_editable_insert_text(editable, assistant, strlen(assistant), &position); + position = 0; editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-nickname")); gtk_editable_delete_text(editable, 0, -1); if (nickname) gtk_editable_insert_text(editable, nickname, strlen(nickname), &position); + position = 0; + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-spouse")); + gtk_editable_delete_text(editable, 0, -1); + if (spouse) + gtk_editable_insert_text(editable, spouse, strlen(spouse), &position); + + if (anniversary) { + struct tm time_struct = {0,0,0,0,0,0,0,0,0}; + time_t time_val; + GnomeDateEdit *dateedit; + time_struct.tm_mday = anniversary->day; + time_struct.tm_mon = anniversary->month - 1; + time_struct.tm_year = anniversary->year - 1900; + time_val = mktime(&time_struct); + dateedit = GNOME_DATE_EDIT(glade_xml_get_widget(editor->gui, "dateedit-anniversary")); + gnome_date_edit_set_time(dateedit, time_val); + } + position = 0; editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-fburl")); gtk_editable_delete_text(editable, 0, -1); @@ -928,6 +983,7 @@ extract_info(EContactEditor *editor) { ECard *card = editor->card; if (card) { + char *file_as; char *fname; ECardList *address_list; ECardList *phone_list; @@ -935,9 +991,14 @@ extract_info(EContactEditor *editor) char *url; char *org; char *org_unit; + char *office; char *title; char *role; + char *manager; + char *assistant; char *nickname; + char *spouse; + ECardDate *anniversary; char *fburl; char *note; const ECardPhone *phone; @@ -960,6 +1021,15 @@ extract_info(EContactEditor *editor) "email", &email_list, NULL); + position = 0; + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-file-as")); + file_as = gtk_editable_get_chars(editable, 0, -1); + if (file_as && *file_as) + gtk_object_set(GTK_OBJECT(card), + "file_as", file_as, + NULL); + g_free(file_as); + position = 0; editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-fullname")); fname = gtk_editable_get_chars(editable, 0, -1); @@ -1081,6 +1151,15 @@ extract_info(EContactEditor *editor) NULL); g_free(org_unit); + position = 0; + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-office")); + office = gtk_editable_get_chars(editable, 0, -1); + if (office && *office) + gtk_object_set(GTK_OBJECT(card), + "office", office, + NULL); + g_free(office); + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-jobtitle")); title = gtk_editable_get_chars(editable, 0, -1); if (title && *title) @@ -1097,6 +1176,24 @@ extract_info(EContactEditor *editor) NULL); g_free(role); + position = 0; + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-manager")); + manager = gtk_editable_get_chars(editable, 0, -1); + if (manager && *manager) + gtk_object_set(GTK_OBJECT(card), + "manager", manager, + NULL); + g_free(manager); + + position = 0; + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-assistant")); + assistant = gtk_editable_get_chars(editable, 0, -1); + if (assistant && *assistant) + gtk_object_set(GTK_OBJECT(card), + "assistant", assistant, + NULL); + g_free(assistant); + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-nickname")); nickname = gtk_editable_get_chars(editable, 0, -1); if (nickname && *nickname) @@ -1105,6 +1202,27 @@ extract_info(EContactEditor *editor) NULL); g_free(nickname); + position = 0; + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-spouse")); + spouse = gtk_editable_get_chars(editable, 0, -1); + if (spouse && *spouse) + gtk_object_set(GTK_OBJECT(card), + "spouse", spouse, + NULL); + g_free(spouse); + + dateedit = GNOME_DATE_EDIT(glade_xml_get_widget(editor->gui, "dateedit-anniversary")); + time_val = gnome_date_edit_get_date(dateedit); + gmtime_r(&time_val, + &time_struct); + anniversary = g_new(ECardDate, 1); + anniversary->day = time_struct.tm_mday; + anniversary->month = time_struct.tm_mon + 1; + anniversary->year = time_struct.tm_year + 1900; + gtk_object_set(GTK_OBJECT(card), + "anniversary", anniversary, + NULL); + editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, "entry-fburl")); fburl = gtk_editable_get_chars(editable, 0, -1); if (fburl && *fburl) -- cgit v1.2.3