From f23d334375ed6a00c8951745df8daedcd24822d2 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Thu, 9 Jan 2003 22:05:31 +0000 Subject: remove the select names stuff (the Related Contacts button/entry.) 2003-01-09 Chris Toshok * gui/contact-editor/e-contact-editor.[ch]: remove the select names stuff (the Related Contacts button/entry.) * gui/contact-editor/contact-editor.glade: same. svn path=/trunk/; revision=19376 --- .../gui/contact-editor/contact-editor.glade | 4648 ++++++++++---------- addressbook/gui/contact-editor/e-contact-editor.c | 171 +- addressbook/gui/contact-editor/e-contact-editor.h | 3 - 3 files changed, 2285 insertions(+), 2537 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade index 13616d09d9..765649da82 100644 --- a/addressbook/gui/contact-editor/contact-editor.glade +++ b/addressbook/gui/contact-editor/contact-editor.glade @@ -1,2389 +1,2269 @@ - + - - - - - 2 - no - GTK_WINDOW_TOPLEVEL - no - no - no - GTK_WIN_POS_NONE - - - - no - 4 - yes - - - - GTK_BUTTONBOX_END - 8 - yes - - - - yes - yes - yes - gtk-ok - yes - yes - - - - - - yes - yes - yes - gtk-apply - yes - yes - - - - - - yes - yes - yes - gtk-cancel - yes - yes - - - - - 0 - no - yes - GTK_PACK_END - - - - - - no - 0 - 2 - 2 - 2 - yes - - - - yes - yes - - 0 - yes - yes - - - 0 - 2 - 1 - 2 - 0 - 0 - expand|fill - - - - - - - no - 2 - yes - - - - 2 - yes - _Add - GTK_RELIEF_NORMAL - yes - yes - - - 0 - no - no - - - - - - 2 - yes - _Delete - GTK_RELIEF_NORMAL - yes - yes - - - 0 - no - no - - - - - 1 - 2 - 0 - 1 - 0 - 0 - fill - expand|fill - - - - - - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - 200 - yes - - - - yes - yes - yes - - - - CList:title - Phone Types - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - - - - - - GTK_UPDATE_CONTINUOUS - yes - - - - - - GTK_UPDATE_CONTINUOUS - yes - - - - - 0 - 1 - 0 - 1 - 0 - 0 - expand|fill - expand|fill - - - - - 0 - yes - yes - - - - - 4 - yes - yes - - - - - no - New phone type - GTK_WINDOW_TOPLEVEL - no - no - no - GTK_WIN_POS_NONE - - - - no - 8 - yes - - - - GTK_BUTTONBOX_END - 8 - yes - - - - yes - yes - yes - _Add - yes - yes - - - - - - yes - yes - yes - gtk-cancel - yes - yes - - - - - 0 - no - yes - GTK_PACK_END - - - - - - 4 - New phone type - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - 9 - 0.5 - 0.5 - 1 - 1 - yes - - - - yes - yes - yes - - 0 - yes - yes - - - - - - - 0 - yes - yes - - - - - 4 - yes - yes - - - - - no - Contact Editor - GTK_WINDOW_TOPLEVEL - no - no - yes - yes - GTK_WIN_POS_NONE - - - - yes - yes - - - - yes - yes - yes - GTK_POS_TOP - no - 2 - 2 - no - yes - - - - 7 - no - 4 - 4 - 14 - 8 - yes - - - - yes - yes - - 0 - yes - yes - - - 7 - 8 - 0 - 1 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 7 - 8 - 1 - 2 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 7 - 8 - 2 - 3 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 7 - 8 - 3 - 4 - 0 - 0 - expand|fill - - - - - - - yes - yes - - GTK_WRAP_WORD - 1 - 1 - yes - - - 7 - 8 - 5 - 9 - 0 - 0 - expand|fill - fill - - - - - - yes - Full _Name... - GTK_RELIEF_NORMAL - yes - yes - - - 1 - 3 - 0 - 1 - 0 - 0 - fill - fill - - - - - - 1 - 0.5 - 0 - 1 - yes - - - - GTK_RELIEF_NORMAL - yes - - - - - - - - - 2 - 3 - 5 - 6 - 0 - 0 - fill - fill - - - - - - 1 - 0.5 - 0 - 0 - yes - - - - GTK_RELIEF_NORMAL - yes - - - - - - - - - 6 - 7 - 3 - 4 - 0 - 0 - fill - fill - - - - - - 1 - 0.5 - 0 - 0 - yes - - - - GTK_RELIEF_NORMAL - yes - - - - - - - - - 6 - 7 - 1 - 2 - 0 - 0 - fill - fill - - - - - - 1 - 0.5 - 0 - 0 - yes - - - - GTK_RELIEF_NORMAL - yes - - - - - - - - - 6 - 7 - 0 - 1 - 0 - 0 - fill - fill - - - - - - yes - - - 4 - 8 - 4 - 5 - 0 - 2 - expand|fill - - - - - - - 1 - 0.5 - 0 - 0 - yes - - - - GTK_RELIEF_NORMAL - yes - - - - - - - - - 6 - 7 - 2 - 3 - 0 - 0 - fill - fill - - - - - - yes - yes - yes - yes - yes - - 0 - yes - yes - - - 3 - 4 - 0 - 1 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 3 - 4 - 1 - 2 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 3 - 4 - 2 - 3 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 3 - 4 - 5 - 6 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 3 - 4 - 8 - 9 - 0 - 0 - expand|fill - - - - - - - yes - - - 0 - 4 - 4 - 5 - 0 - 2 - expand|fill - - - - - - - no - yes - yes - no - yes - yes - - - - yes - yes - - 0 - yes - yes - - - - - - yes - - - - yes - - - - - 0.0 - yes - - - - - - - - - 3 - 4 - 3 - 4 - 0 - 0 - expand|fill - - - - - - - yes - - - 0 - 4 - 7 - 8 - 0 - 2 - expand|fill - fill - - - - - - 0.5 - 0 - 1 - 1 - yes - - - - yes - Wants to receive _HTML mail - no - yes - yes - yes - - - - - 3 - 4 - 6 - 7 - 0 - 0 - expand|shrink|fill - shrink|fill - - - - - - 1 - 0.5 - 0 - 0 - yes - - - - GTK_RELIEF_NORMAL - yes - - - - - - - - - 6 - 7 - 5 - 6 - 0 - 0 - fill - fill - - - - - - yes - - - - Business - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-phone1 - yes - - - - - 5 - 6 - 0 - 1 - 0 - 0 - fill - fill - - - - - - yes - - - - Home - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-phone2 - yes - - - - - 5 - 6 - 1 - 2 - 0 - 0 - fill - fill - - - - - - yes - - - - Business Fax - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-phone3 - yes - - - - - 5 - 6 - 2 - 3 - 0 - 0 - fill - fill - - - - - - yes - - - - Mobile - GTK_JUSTIFY_LEFT - no - 0 - 0.5 - 0 - 0 - entry-phone4 - yes - - - - - 5 - 6 - 3 - 4 - 0 - 0 - fill - fill - - - - - - yes - - - - Primary Email - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-email1 - yes - - - - - 1 - 2 - 5 - 6 - 0 - 0 - fill - fill - - - - - - yes - - - - Business - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - text-address - yes - - - - - 5 - 6 - 5 - 6 - 0 - 0 - fill - fill - - - - - - 0 - 0 - 0 - 0 - yes - - - - This is the _mailing address - no - yes - yes - yes - - - - - 7 - 8 - 9 - 10 - 0 - 0 - expand|fill - fill - - - - - - yes - - - 0 - 4 - 11 - 12 - 0 - 2 - expand|fill - fill - - - - - - yes - - - 4 - 8 - 11 - 12 - 0 - 0 - expand|fill - fill - - - - - - 0.5 - 0.5 - 1 - 0 - yes - - - - yes - C_ontacts... - GTK_RELIEF_NORMAL - yes - yes - - - - - 1 - 3 - 12 - 13 - 0 - 0 - fill - fill - - - - - - 0.5 - 0.5 - 1 - 0 - yes - - - - yes - yes - - 0 - yes - yes - - - - - 7 - 8 - 12 - 13 - 0 - 0 - expand|fill - fill - - - - - - 0.5 - 0.5 - 1 - 0 - yes - - - - yes - Ca_tegories... - GTK_RELIEF_NORMAL - yes - yes - - - - - 5 - 7 - 12 - 13 - 0 - 0 - fill - fill - - - - - - yes - - - - _Job title: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-jobtitle - yes - yes - - - - - 1 - 3 - 1 - 2 - 0 - 0 - fill - fill - - - - - - e_create_image_widget - malehead.png - - 0 - 0 - Thu, 18 May 2000 12:19:47 GMT - yes - - - 0 - 1 - 0 - 4 - 0 - 0 - fill - fill - - - - - - e_create_image_widget - cellphone.png - - 0 - 0 - Thu, 18 May 2000 12:20:02 GMT - yes - - - 4 - 5 - 0 - 4 - 0 - 0 - fill - fill - - - - - - e_create_image_widget - envelope.png - - 0 - 0 - Thu, 18 May 2000 12:19:51 GMT - yes - - - 0 - 1 - 5 - 7 - 0 - 0 - fill - fill - - - - - - e_create_image_widget - house.png - - 0 - 0 - Thu, 18 May 2000 12:20:06 GMT - yes - - - 4 - 5 - 5 - 10 - 0 - 0 - fill - fill - - - - - - e_create_image_widget - evolution-contacts-plain.png - - 0 - 0 - Thu, 18 May 2000 12:19:59 GMT - yes - - - 0 - 1 - 12 - 14 - 0 - 0 - fill - fill - - - - - - e_create_image_widget - briefcase.png - - 0 - 0 - Thu, 18 May 2000 12:20:09 GMT - yes - - - 4 - 5 - 12 - 14 - 0 - 0 - fill - fill - - - - - - e_create_image_widget - globe.png - - 0 - 0 - Thu, 18 May 2000 12:19:56 GMT - yes - - - 0 - 1 - 8 - 10 - 0 - 0 - fill - fill - - - - - - Organi_zation: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-company - yes - yes - - - 1 - 3 - 2 - 3 - 0 - 0 - fill - fill - - - - - - yes - Add_ress... - GTK_RELIEF_NORMAL - yes - yes - - - 5 - 7 - 6 - 7 - 0 - 0 - fill - fill - - - - - - 0.5 - 0.5 - 1 - 0 - yes - - - - no - 0 - 0 - 1 - 1 - yes - - - - - 3 - 4 - 12 - 13 - 0 - 0 - expand|fill - fill - - - - - - File A_s: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-file-as - yes - yes - - - 1 - 3 - 3 - 4 - 0 - 0 - fill - - - - - - - _Web page address: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-web - yes - yes - - - 1 - 3 - 8 - 9 - 0 - 0 - fill - - - - - - - - - General - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - tab - - - - - - 7 - no - 4 - 4 - 9 - 6 - yes - - - - D_epartment: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-department - yes - yes - - - 1 - 2 - 0 - 1 - 0 - 0 - fill - fill - - - - - - _Office: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-office - yes - yes - - - 1 - 2 - 1 - 2 - 0 - 0 - fill - fill - - - - - - P_rofession: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-profession - yes - yes - - - 1 - 2 - 2 - 3 - 0 - 0 - fill - fill - - - - - - _Nickname: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-nickname - yes - yes - - - 1 - 2 - 4 - 5 - 0 - 0 - fill - fill - - - - - - S_pouse: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-spouse - yes - yes - - - 1 - 2 - 5 - 6 - 0 - 0 - fill - fill - - - - - - Birthda_y: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - dateedit-birthday - yes - yes - - - 3 - 4 - 4 - 5 - 0 - 0 - fill - fill - - - - - - A_ssistant's name: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-assistant - yes - yes - - - 3 - 4 - 1 - 2 - 0 - 0 - fill - fill - - - - - - _Manager's Name: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-manager - yes - yes - - - 3 - 4 - 0 - 1 - 0 - 0 - fill - fill - - - - - - Anni_versary: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - dateedit-anniversary - yes - yes - - - 3 - 4 - 5 - 6 - 0 - 0 - fill - fill - - - - - - yes - yes - - 0 - yes - yes - - - 2 - 3 - 5 - 6 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 2 - 3 - 0 - 1 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 2 - 3 - 1 - 2 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 2 - 3 - 2 - 3 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 2 - 3 - 4 - 5 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 4 - 6 - 1 - 2 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 4 - 6 - 0 - 1 - 0 - 0 - expand|fill - - - - - - - yes - - - 0 - 6 - 3 - 4 - 0 - 2 - fill - fill - - - - - - No_tes: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - text-comments - yes - yes - - - 1 - 2 - 7 - 8 - 0 - 0 - fill - fill - - - - - - yes - - - 0 - 6 - 6 - 7 - 0 - 0 - expand|fill - fill - - - - - - e_create_image_widget - briefcase.png - - 0 - 0 - Thu, 18 May 2000 12:20:13 GMT - yes - - - 0 - 1 - 0 - 2 - 0 - 0 - fill - fill - - - - - - e_create_image_widget - malehead.png - - 0 - 0 - Thu, 18 May 2000 12:20:16 GMT - yes - - - 0 - 1 - 4 - 6 - 0 - 0 - fill - fill - - - - - - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - yes - - - - yes - yes - - GTK_WRAP_WORD - yes - - - - - - GTK_UPDATE_CONTINUOUS - yes - - - - - - GTK_UPDATE_CONTINUOUS - yes - - - - - 1 - 6 - 8 - 9 - 0 - 0 - expand|fill - expand|fill - - - - - - e_create_image_widget - globe.png - - 0 - 0 - Thu, 18 May 2000 12:20:19 GMT - yes - - - 0 - 1 - 7 - 9 - 0 - 0 - fill - fill - - - - - - yes - e_contact_editor_create_date - 0 - 0 - Tue, 05 Jun 2001 02:36:27 GMT - yes - - - 4 - 6 - 4 - 5 - 0 - 0 - expand|fill - fill - - - - - - yes - e_contact_editor_create_date - 0 - 0 - Tue, 05 Jun 2001 02:36:32 GMT - yes - - - 4 - 6 - 5 - 6 - 0 - 0 - expand|fill - fill - - - - - - - - Details - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - tab - - - - - - no - 0 - yes - - - - 7 - no - 4 - yes - - - - e_create_image_widget - globe.png - - 0 - 0 - Thu, 18 May 2000 12:20:13 GMT - yes - - - 0 - no - no - - - - - - If this person publishes free/busy or other calendar information on the Internet, enter the address + + + + + 2 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + + + + True + False + 4 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-apply + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + 2 + 2 + False + 0 + 2 + + + + True + True + True + True + 0 + + True + * + False + + + 0 + 2 + 1 + 2 + + + + + + + True + False + 2 + + + + 2 + True + True + _Add + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + + 2 + True + True + _Delete + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + 1 + 2 + 0 + 1 + fill + + + + + + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + 0 + 1 + 0 + 1 + + + + + 0 + True + True + + + + + + + + New phone type + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + + + + True + False + 8 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + True + _Add + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 4 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 9 + True + 0.5 + 0.5 + 1 + 1 + + + + True + True + True + True + True + 0 + + True + * + False + + + + + + + + True + New phone type + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + + + + Contact Editor + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + + + + True + True + + + + True + True + True + True + GTK_POS_TOP + False + 2 + 2 + False + + + + 7 + True + 14 + 8 + False + 4 + 4 + + + + True + True + True + True + 0 + + True + * + False + + + 7 + 8 + 0 + 1 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 7 + 8 + 1 + 2 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 7 + 8 + 2 + 3 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 7 + 8 + 3 + 4 + + + + + + + True + True + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + 7 + 8 + 5 + 9 + fill + + + + + + True + True + Full _Name... + True + GTK_RELIEF_NORMAL + + + 1 + 3 + 0 + 1 + fill + fill + + + + + + True + 1 + 0.5 + 0 + 1 + + + + True + GTK_RELIEF_NORMAL + + + + + + + + + 2 + 3 + 5 + 6 + fill + fill + + + + + + True + 1 + 0.5 + 0 + 0 + + + + True + GTK_RELIEF_NORMAL + + + + + + + + + 6 + 7 + 3 + 4 + fill + fill + + + + + + True + 1 + 0.5 + 0 + 0 + + + + True + GTK_RELIEF_NORMAL + + + + + + + + + 6 + 7 + 1 + 2 + fill + fill + + + + + + True + 1 + 0.5 + 0 + 0 + + + + True + GTK_RELIEF_NORMAL + + + + + + + + + 6 + 7 + 0 + 1 + fill + fill + + + + + + True + + + 4 + 8 + 4 + 5 + 2 + + + + + + + True + 1 + 0.5 + 0 + 0 + + + + True + GTK_RELIEF_NORMAL + + + + + + + + + 6 + 7 + 2 + 3 + fill + fill + + + + + + True + True + True + True + True + True + True + 0 + + True + * + False + + + 3 + 4 + 0 + 1 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 3 + 4 + 1 + 2 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 3 + 4 + 2 + 3 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 3 + 4 + 5 + 6 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 3 + 4 + 8 + 9 + + + + + + + True + + + 0 + 4 + 4 + 5 + 2 + + + + + + + True + False + True + True + True + False + + + + True + True + True + True + 0 + + True + * + False + + + + + + True + GTK_SELECTION_BROWSE + + + + True + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + + + + + + + 3 + 4 + 3 + 4 + + + + + + + True + + + 0 + 4 + 7 + 8 + 2 + fill + + + + + + True + 0.5 + 0 + 1 + 1 + + + + True + True + Wants to receive _HTML mail + True + GTK_RELIEF_NORMAL + False + False + True + + + + + 3 + 4 + 6 + 7 + expand|shrink|fill + shrink|fill + + + + + + True + 1 + 0.5 + 0 + 0 + + + + True + GTK_RELIEF_NORMAL + + + + + + + + + 6 + 7 + 5 + 6 + fill + fill + + + + + + True + + + + True + Business + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-phone1 + + + + + 5 + 6 + 0 + 1 + fill + fill + + + + + + True + + + + True + Home + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-phone2 + + + + + 5 + 6 + 1 + 2 + fill + fill + + + + + + True + + + + True + Business Fax + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-phone3 + + + + + 5 + 6 + 2 + 3 + fill + fill + + + + + + True + + + + True + Mobile + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + entry-phone4 + + + + + 5 + 6 + 3 + 4 + fill + fill + + + + + + True + + + + True + Primary Email + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-email1 + + + + + 1 + 2 + 5 + 6 + fill + fill + + + + + + True + + + + True + Business + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + text-address + + + + + 5 + 6 + 5 + 6 + fill + fill + + + + + + True + 0 + 0 + 0 + 0 + + + + True + This is the _mailing address + True + GTK_RELIEF_NORMAL + False + False + True + + + + + 7 + 8 + 9 + 10 + fill + + + + + + True + + + 0 + 4 + 11 + 12 + 2 + fill + + + + + + True + + + 4 + 8 + 11 + 12 + fill + + + + + + True + + + + True + _Job title: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-jobtitle + + + + + 1 + 3 + 1 + 2 + fill + fill + + + + + + True + e_create_image_widget + malehead.png + + 0 + 0 + Thu, 18 May 2000 12:19:47 GMT + + + 0 + 1 + 0 + 4 + fill + fill + + + + + + True + e_create_image_widget + cellphone.png + + 0 + 0 + Thu, 18 May 2000 12:20:02 GMT + + + 4 + 5 + 0 + 4 + fill + fill + + + + + + True + e_create_image_widget + envelope.png + + 0 + 0 + Thu, 18 May 2000 12:19:51 GMT + + + 0 + 1 + 5 + 7 + fill + fill + + + + + + True + e_create_image_widget + house.png + + 0 + 0 + Thu, 18 May 2000 12:20:06 GMT + + + 4 + 5 + 5 + 10 + fill + fill + + + + + + True + e_create_image_widget + globe.png + + 0 + 0 + Thu, 18 May 2000 12:19:56 GMT + + + 0 + 1 + 8 + 10 + fill + fill + + + + + + True + Organi_zation: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-company + + + 1 + 3 + 2 + 3 + fill + fill + + + + + + True + True + Add_ress... + True + GTK_RELIEF_NORMAL + + + 5 + 7 + 6 + 7 + fill + fill + + + + + + True + File A_s: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-file-as + + + 1 + 3 + 3 + 4 + fill + + + + + + + True + _Web page address: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-web + + + 1 + 3 + 8 + 9 + fill + + + + + + + True + 0.5 + 0.5 + 1 + 0 + + + + True + True + Ca_tegories... + True + GTK_RELIEF_NORMAL + + + + + 1 + 3 + 12 + 13 + fill + fill + + + + + + True + e_create_image_widget + briefcase.png + + 0 + 0 + Thu, 18 May 2000 12:20:09 GMT + + + 0 + 1 + 12 + 14 + fill + fill + + + + + + True + 0.5 + 0.5 + 1 + 0 + + + + True + True + True + True + 0 + + True + * + False + + + + + 3 + 4 + 12 + 13 + fill + fill + + + + + False + True + + + + + + True + General + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 7 + True + 9 + 6 + False + 4 + 4 + + + + True + D_epartment: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-department + + + 1 + 2 + 0 + 1 + fill + fill + + + + + + True + _Office: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-office + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + P_rofession: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-profession + + + 1 + 2 + 2 + 3 + fill + fill + + + + + + True + _Nickname: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-nickname + + + 1 + 2 + 4 + 5 + fill + fill + + + + + + True + S_pouse: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-spouse + + + 1 + 2 + 5 + 6 + fill + fill + + + + + + True + Birthda_y: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + dateedit-birthday + + + 3 + 4 + 4 + 5 + fill + fill + + + + + + True + A_ssistant's name: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-assistant + + + 3 + 4 + 1 + 2 + fill + fill + + + + + + True + _Manager's Name: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-manager + + + 3 + 4 + 0 + 1 + fill + fill + + + + + + True + Anni_versary: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + dateedit-anniversary + + + 3 + 4 + 5 + 6 + fill + fill + + + + + + True + True + True + True + 0 + + True + * + False + + + 2 + 3 + 5 + 6 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 2 + 3 + 0 + 1 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 2 + 3 + 1 + 2 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 2 + 3 + 2 + 3 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 2 + 3 + 4 + 5 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 4 + 6 + 1 + 2 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 4 + 6 + 0 + 1 + + + + + + + True + + + 0 + 6 + 3 + 4 + 2 + fill + fill + + + + + + True + No_tes: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + text-comments + + + 1 + 2 + 7 + 8 + fill + fill + + + + + + True + + + 0 + 6 + 6 + 7 + fill + + + + + + True + e_create_image_widget + briefcase.png + + 0 + 0 + Thu, 18 May 2000 12:20:13 GMT + + + 0 + 1 + 0 + 2 + fill + fill + + + + + + True + e_create_image_widget + malehead.png + + 0 + 0 + Thu, 18 May 2000 12:20:16 GMT + + + 0 + 1 + 4 + 6 + fill + fill + + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + 1 + 6 + 8 + 9 + + + + + + True + e_create_image_widget + globe.png + + 0 + 0 + Thu, 18 May 2000 12:20:19 GMT + + + 0 + 1 + 7 + 9 + fill + fill + + + + + + True + True + e_contact_editor_create_date + 0 + 0 + Tue, 05 Jun 2001 02:36:27 GMT + + + 4 + 6 + 4 + 5 + fill + + + + + + True + True + e_contact_editor_create_date + 0 + 0 + Tue, 05 Jun 2001 02:36:32 GMT + + + 4 + 6 + 5 + 6 + fill + + + + + False + True + + + + + + True + Details + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 0 + + + + 7 + True + False + 4 + + + + True + e_create_image_widget + globe.png + + 0 + 0 + Thu, 18 May 2000 12:20:13 GMT + + + 0 + False + False + + + + + + True + If this person publishes free/busy or other calendar information on the Internet, enter the address of that information here. - GTK_JUSTIFY_LEFT - no - 7.45058e-09 - 0.5 - 0 - 0 - yes - - - 0 - yes - yes - - - - - 0 - no - yes - - - - - - 0.5 - 0.5 - 0.75 - 1 - yes - - - - 7 - no - 4 - 4 - 2 - 2 - yes - - - - _Public Calendar URL: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-caluri - yes - yes - - - 0 - 1 - 0 - 1 - 0 - 0 - fill - fill - - - - - - F_ree/Busy URL: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - entry-fburl - yes - yes - - - 0 - 1 - 1 - 2 - 0 - 0 - fill - fill - - - - - - yes - yes - - 0 - yes - yes - - - 1 - 2 - 0 - 1 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 1 - 2 - 1 - 2 - 0 - 0 - expand|fill - - - - - - - - 0 - yes - yes - - - - - - - - Collaboration - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - tab - - - - - - - 0 - yes - yes - - - - - - yes - yes - yes - - - 0 - yes - yes - - - + False + False + GTK_JUSTIFY_LEFT + False + False + 7.45058e-09 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 0 + False + True + + + + + + True + 0.5 + 0.5 + 0.75 + 1 + + + + 7 + True + 2 + 2 + False + 4 + 4 + + + + True + _Public Calendar URL: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-caluri + + + 0 + 1 + 0 + 1 + fill + fill + + + + + + True + F_ree/Busy URL: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-fburl + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + + + + + + 0 + True + True + + + + + False + True + + + + + + True + Collaboration + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + + 0 + True + True + + + + + + True + True + True + + + 0 + True + True + + + + diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 0837fe6bd9..e6385bb433 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -650,82 +650,30 @@ set_entry_changed_signals(EContactEditor *editor) set_entry_changed_signal_phone(editor, "entry-phone2"); set_entry_changed_signal_phone(editor, "entry-phone3"); set_entry_changed_signal_phone(editor, "entry-phone4"); - widget = glade_xml_get_widget(editor->gui, "entry-email1"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect(widget, "changed", - G_CALLBACK (email_entry_changed), editor); - } + + set_entry_changed_signal_field(editor, "entry-email1"); + widget = glade_xml_get_widget(editor->gui, "text-address"); if (widget && GTK_IS_TEXT_VIEW(widget)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)); g_signal_connect(buffer, "changed", G_CALLBACK (address_text_changed), editor); } - widget = glade_xml_get_widget(editor->gui, "entry-fullname"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect(widget, "changed", - G_CALLBACK (name_entry_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-company"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect(widget, "changed", - G_CALLBACK (company_entry_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-web"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect(widget, "changed", - G_CALLBACK (widget_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-categories"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect(widget, "changed", - G_CALLBACK (widget_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-jobtitle"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect(widget, "changed", - G_CALLBACK (widget_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-file-as"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect(widget, "changed", - G_CALLBACK (widget_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-manager"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect (widget, "changed", - G_CALLBACK (widget_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-assistant"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect (widget, "changed", - G_CALLBACK (widget_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-office"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect (widget, "changed", - G_CALLBACK (widget_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-department"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect (widget, "changed", - G_CALLBACK (widget_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-profession"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect (widget, "changed", - G_CALLBACK (widget_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-nickname"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect (widget, "changed", - G_CALLBACK (widget_changed), editor); - } - widget = glade_xml_get_widget(editor->gui, "entry-spouse"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect (widget, "changed", - G_CALLBACK (widget_changed), editor); - } + + set_entry_changed_signal_field(editor, "entry-fullname"); + set_entry_changed_signal_field(editor, "entry-company"); + set_entry_changed_signal_field(editor, "entry-web"); + set_entry_changed_signal_field(editor, "entry-categories"); + set_entry_changed_signal_field(editor, "entry-jobtitle"); + set_entry_changed_signal_field(editor, "entry-file-as"); + set_entry_changed_signal_field(editor, "entry-manager"); + set_entry_changed_signal_field(editor, "entry-assistant"); + set_entry_changed_signal_field(editor, "entry-office"); + set_entry_changed_signal_field(editor, "entry-department"); + set_entry_changed_signal_field(editor, "entry-profession"); + set_entry_changed_signal_field(editor, "entry-nickname"); + set_entry_changed_signal_field(editor, "entry-spouse"); + widget = glade_xml_get_widget(editor->gui, "text-comments"); if (widget && GTK_IS_TEXT_VIEW(widget)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)); @@ -742,11 +690,9 @@ set_entry_changed_signals(EContactEditor *editor) g_signal_connect (widget, "changed", G_CALLBACK (widget_changed), editor); } - widget = glade_xml_get_widget(editor->gui, "entry-web"); - if (widget && GTK_IS_ENTRY(widget)) { - g_signal_connect (widget, "changed", - G_CALLBACK (widget_changed), editor); - } + + set_entry_changed_signal_field(editor, "entry-caluri"); + set_entry_changed_signal_field(editor, "entry-fburl"); } @@ -896,46 +842,6 @@ categories_clicked(GtkWidget *button, EContactEditor *editor) gtk_widget_destroy(GTK_WIDGET(dialog)); } -static void -ensure_select_names_contact (EContactEditor *editor) -{ - if (editor->select_names_contacts == NULL) { - editor->select_names_contacts = e_select_names_manager_new (); - e_select_names_manager_add_section (editor->select_names_contacts, - "contacts", - "Related Contacts"); - } - - set_entry_changed_signal_field(editor, "entry-caluri"); - set_entry_changed_signal_field(editor, "entry-fburl"); -} - -static void -contacts_clicked (GtkWidget *button, EContactEditor *editor) -{ - ensure_select_names_contact (editor); - e_select_names_manager_activate_dialog (editor->select_names_contacts, - "contacts"); -} - -static void -add_lists (EContactEditor *editor) -{ - GtkWidget *table = glade_xml_get_widget (editor->gui, "table-contacts"); - if (table && GTK_IS_TABLE (table)) { - GtkWidget *entry; - - ensure_select_names_contact (editor); - entry = e_select_names_manager_create_entry (editor->select_names_contacts, - "contacts"); - g_signal_connect (entry, "changed", - G_CALLBACK (widget_changed), editor); - gtk_table_attach_defaults (GTK_TABLE (table), entry, 0, 1, 0, 1); - gtk_widget_show (entry); - } -} - - typedef struct { EContactEditor *ce; gboolean should_close; @@ -1328,7 +1234,6 @@ setup_tab_order(GladeXML *gui) list = add_to_tab_order(list, gui, "entry-web"); list = add_to_tab_order(list, gui, "button-fulladdr"); list = add_to_tab_order(list, gui, "text-address"); - list = add_to_tab_order(list, gui, "alignment-contacts"); list = g_list_reverse(list); e_container_change_tab_order(GTK_CONTAINER(container), list); g_list_free(list); @@ -1386,7 +1291,6 @@ e_contact_editor_init (EContactEditor *e_contact_editor) e_contact_editor); _replace_buttons(e_contact_editor); - add_lists (e_contact_editor); set_entry_changed_signals(e_contact_editor); wants_html = glade_xml_get_widget(e_contact_editor->gui, "checkbutton-htmlmail"); @@ -1414,12 +1318,6 @@ e_contact_editor_init (EContactEditor *e_contact_editor) g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor); - widget = glade_xml_get_widget(e_contact_editor->gui, "button-contacts"); - if (widget && GTK_IS_BUTTON(widget)) - g_signal_connect (widget, "clicked", - G_CALLBACK (contacts_clicked), e_contact_editor); - - /* Construct the app */ bonobo_win = bonobo_window_new ("contact-editor-dialog", _("Contact Editor")); @@ -1529,11 +1427,6 @@ e_contact_editor_dispose (GObject *object) { e_contact_editor->book = NULL; } - if (e_contact_editor->select_names_contacts) { - g_object_unref(e_contact_editor->select_names_contacts); - e_contact_editor->select_names_contacts = NULL; - } - if (e_contact_editor->name) { e_card_name_unref(e_contact_editor->name); e_contact_editor->name = NULL; @@ -2183,7 +2076,6 @@ add_field_callback(GtkWidget *widget, EContactEditor *editor) "entry-spouse", "text-comments", "entry-categories", - "entry-contacts", "entry-file-as", "dateedit-anniversary", "dateedit-birthday", @@ -2594,12 +2486,6 @@ fill_in_info(EContactEditor *editor) e_date_edit_set_time (dateedit, -1); } - if (editor->select_names_contacts && related_contacts && *related_contacts) { - ESelectNamesModel *model = e_select_names_manager_get_source (editor->select_names_contacts, - "contacts"); - e_select_names_model_import_destinationv (model, related_contacts); - } - set_fields(editor); } } @@ -2681,21 +2567,6 @@ extract_info(EContactEditor *editor) extract_single_field(editor, list->data); } - if (editor->select_names_contacts) { - ESelectNamesModel *model = e_select_names_manager_get_source (editor->select_names_contacts, - "contacts"); - char *string = e_select_names_model_export_destinationv (model); - if (string && *string) - g_object_set (card, - "related_contacts", string, - NULL); - else - g_object_set (card, - "related_contacts", NULL, - NULL); - g_free (string); - } - if (editor->name) g_object_set (card, "name", editor->name, diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index f4b8051fed..8642aecac1 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -25,7 +25,6 @@ #include #include -#include "addressbook/gui/component/select-names/e-select-names-manager.h" #include "addressbook/backend/ebook/e-book.h" #include "addressbook/backend/ebook/e-card.h" #include "addressbook/backend/ebook/e-card-simple.h" @@ -75,8 +74,6 @@ struct _EContactEditor GList *phone_list; GList *address_list; - ESelectNamesManager *select_names_contacts; - ECardName *name; char *company; -- cgit v1.2.3