From 6bba9fe3b287e5ff7a2b0a5191ae3c549f9bc6c5 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 8 Nov 2002 09:23:47 +0000 Subject: more porting work. 2002-11-08 Chris Toshok * gui/contact-editor/e-contact-editor.c: more porting work. * e-contact-editor-fullname.[ch]: more porting work. * e-contact-editor.c: more porting work. * e-contact-quick-add.c: more porting work. * e-contact-save-as.c: more porting work. * test-editor.c: more porting work. * e-contact-editor-confirm-delete.glade, file-exists.glade, fulladdr.glade, fullname.glade: run these through libglade-convert. svn path=/trunk/; revision=18663 --- addressbook/ChangeLog | 18 + .../gui/contact-editor/contact-editor.glade | 4908 ++++++++++---------- .../gui/contact-editor/e-contact-editor-address.c | 93 +- .../e-contact-editor-confirm-delete.glade | 136 +- .../gui/contact-editor/e-contact-editor-fullname.c | 92 +- .../gui/contact-editor/e-contact-editor-fullname.h | 6 +- addressbook/gui/contact-editor/e-contact-editor.c | 234 +- .../gui/contact-editor/e-contact-quick-add.c | 52 +- addressbook/gui/contact-editor/e-contact-save-as.c | 15 +- addressbook/gui/contact-editor/file-exists.glade | 159 +- addressbook/gui/contact-editor/fulladdr.glade | 865 ++-- addressbook/gui/contact-editor/fullname.glade | 917 ++-- addressbook/gui/contact-editor/test-editor.c | 2 +- 13 files changed, 3753 insertions(+), 3744 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index d8afb75777..ed7cab9054 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,21 @@ +2002-11-08 Chris Toshok + + * gui/contact-editor/e-contact-editor.c: more porting work. + + * e-contact-editor-fullname.[ch]: more porting work. + + * e-contact-editor.c: more porting work. + + * e-contact-quick-add.c: more porting work. + + * e-contact-save-as.c: more porting work. + + * test-editor.c: more porting work. + + * e-contact-editor-confirm-delete.glade, file-exists.glade, + fulladdr.glade, fullname.glade: run these through + libglade-convert. + 2002-11-07 Chris Toshok * gui/component/Makefile.am (evolution_addressbook_LDADD): add diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade index c8c880fa0c..13616d09d9 100644 --- a/addressbook/gui/contact-editor/contact-editor.glade +++ b/addressbook/gui/contact-editor/contact-editor.glade @@ -1,2537 +1,2389 @@ - - - - - Contact-editor - contact-editor - - src - pixmaps - C - True - True - True - False - False - False - False - - - - GnomeDialog - dialog2 - 2 - False - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox2 - False - 4 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area2 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button28 - True - True - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button29 - True - True - GNOME_STOCK_BUTTON_APPLY - - - - GtkButton - button30 - True - True - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkTable - table2 - 2 - 2 - False - 0 - 2 - - 0 - True - True - - - - GtkEntry - entry2 - True - True - True - 0 - - - 0 - 2 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - - GtkVBox - vbox1 - False - 2 - - 1 - 2 - 0 - 1 - 0 - 0 - False - True - False - False - True - True - - - - GtkButton - button31 - 2 - True - - GTK_RELIEF_NORMAL - - 0 - False - False - - - - - GtkButton - button32 - 2 - True - - GTK_RELIEF_NORMAL - - 0 - False - False - - - - - - GtkScrolledWindow - scrolledwindow1 - 200 - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - 1 - 0 - 1 - 0 - 0 - True - True - False - False - True - True - - - - GtkCList - clist1 - True - 1 - 80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_NONE - - - GtkLabel - CList:title - label20 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - + + + + + + + + + 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 + + - - - - - - GnomeDialog - dialog-add-phone - False - New phone type - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - False - False - False - - - GtkVBox - GnomeDialog:vbox - vbox2 - False - 8 - - 4 - True - True + + 4 + yes + yes + - - - GtkHButtonBox - GnomeDialog:action_area - hbuttonbox1 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button43 - True - True - True - - GNOME_STOCK_PIXMAP_ADD - - - - GtkButton - button44 - True - True - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkFrame - frame-add-phone - 4 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkAlignment - alignment9 - 9 - 0.5 - 0.5 - 1 - 1 - - - GtkEntry - entry-add-phone - True - True - True - True - 0 - - - - - - - - GnomeApp - contact editor - False - Contact Editor - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - True - - - GnomeDock - GnomeApp:dock - dock1 - True - - 0 - True - True - - - - GtkNotebook - GnomeDock:contents - notebook-contact-editor - True - True - True - GTK_POS_TOP - False - 2 - 2 - False - - - GtkTable - table-contact-editor-general - 7 - 14 - 8 - False - 4 - 4 - - - GtkEntry - entry-phone1 - True - True - True - 0 - - - 7 - 8 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-phone2 - True - True - True - 0 - - - 7 - 8 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-phone3 - True - True - True - 0 - - - 7 - 8 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-phone4 - True - True - True - 0 - - - 7 - 8 - 3 - 4 - 0 - 0 - True - False - False - False - True - False - - - - - GtkText - text-address - 1 - 1 - True - True - - - 7 - 8 - 5 - 9 - 0 - 0 - True - False - False - False - True - True - - - - - GtkButton - button-fullname - True - - GTK_RELIEF_NORMAL - - 1 - 3 - 0 - 1 - 0 - 0 - False - False - False - False - True - True - - - - - GtkAlignment - alignment3 - 1 - 0.5 - 0 - 1 - - 2 - 3 - 5 - 6 - 0 - 0 - False - False - False - False - True - True - - - - GtkButton - button-email1 - GTK_RELIEF_NORMAL - - - Placeholder - - - - - - GtkAlignment - alignment5 - 1 - 0.5 - 0 - 0 - - 6 - 7 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - - - - GtkButton - button-phone4 - GTK_RELIEF_NORMAL - - - Placeholder - - - - - - GtkAlignment - alignment7 - 1 - 0.5 - 0 - 0 - - 6 - 7 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - GtkButton - button-phone2 - GTK_RELIEF_NORMAL - - - Placeholder - - - - - - GtkAlignment - alignment8 - 1 - 0.5 - 0 - 0 - - 6 - 7 - 0 - 1 - 0 - 0 - False - False - False - False - True - True - - - - GtkButton - button-phone1 - GTK_RELIEF_NORMAL - - - Placeholder - - - - - - GtkHSeparator - hseparator4 - - 4 - 8 - 4 - 5 - 0 - 2 - True - False - False - False - True - False - - - - - GtkAlignment - alignment6 - 1 - 0.5 - 0 - 0 - - 6 - 7 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - - - GtkButton - button-phone3 - GTK_RELIEF_NORMAL - - - Placeholder - - - - - - GtkEntry - entry-fullname - True - True - True - True - True - True - 0 - - - 3 - 4 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-jobtitle - True - True - True - 0 - - - 3 - 4 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-company - True - True - True - 0 - - - 3 - 4 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-email1 - True - True - True - 0 - - - 3 - 4 - 5 - 6 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-web - True - True - True - 0 - - - 3 - 4 - 8 - 9 - 0 - 0 - True - False - False - False - True - False - - - - - GtkHSeparator - hseparator5 - - 0 - 4 - 4 - 5 - 0 - 2 - True - False - False - False - True - False - - - - - GtkCombo - combo-file-as - False - True - True - True - False - - - 3 - 4 - 3 - 4 - 0 - 0 - True - False - False - False - True - False - - - - GtkEntry - GtkCombo:entry - entry-file-as - True - True - True - 0 - - - - - - GtkHSeparator - hseparator6 - - 0 - 4 - 7 - 8 - 0 - 2 - True - False - False - False - True - True - - - - - GtkAlignment - alignment-htmlmail - 0.5 - 0 - 1 - 1 - - 3 - 4 - 6 - 7 - 0 - 0 - True - False - True - True - True - True - - - - GtkCheckButton - checkbutton-htmlmail - True - - False - True - - - - - GtkAlignment - alignment4 - 1 - 0.5 - 0 - 0 - - 6 - 7 - 5 - 6 - 0 - 0 - False - False - False - False - True - True - - - - GtkButton - button-address - GTK_RELIEF_NORMAL - - - Placeholder - - - - - - GtkEventBox - eventbox1 - - 5 - 6 - 0 - 1 - 0 - 0 - False - False - False - False - True - True - - - - GtkLabel - label-phone1 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-phone1 - - - - - GtkEventBox - eventbox2 - - 5 - 6 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - GtkLabel - label-phone2 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-phone2 - - - - - GtkEventBox - eventbox3 - - 5 - 6 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - - - GtkLabel - label-phone3 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-phone3 - - - - - GtkEventBox - eventbox4 - - 5 - 6 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - - - - GtkLabel - label-phone4 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - entry-phone4 - - - - - GtkEventBox - eventbox5 - - 1 - 2 - 5 - 6 - 0 - 0 - False - False - False - False - True - True - - - - GtkLabel - label-email1 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-email1 - - - - - GtkEventBox - eventbox-business - - 5 - 6 - 5 - 6 - 0 - 0 - False - False - False - False - True - True - - - - GtkLabel - label-address - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - text-address - - - - - GtkAlignment - alignment2 - 0 - 0 - 0 - 0 - - 7 - 8 - 9 - 10 - 0 - 0 - True - False - False - False - True - True - - - - GtkCheckButton - checkbutton-mailingaddress - - False - True - - - - - GtkHSeparator - hseparator9 - - 0 - 4 - 11 - 12 - 0 - 2 - True - False - False - False - True - True - - - - - GtkHSeparator - hseparator10 - - 4 - 8 - 11 - 12 - 0 - 0 - True - False - False - False - True - True - - - - - GtkAlignment - alignment-contacts - 0.5 - 0.5 - 1 - 0 - - 1 - 3 - 12 - 13 - 0 - 0 - False - False - False - False - True - True - - - - GtkButton - button-contacts - True - - GTK_RELIEF_NORMAL - - - - - GtkAlignment - alignment15 - 0.5 - 0.5 - 1 - 0 - - 7 - 8 - 12 - 13 - 0 - 0 - True - False - False - False - True - True - - - - GtkEntry - entry-categories - True - True - True - 0 - - - - - - GtkAlignment - alignment16 - 0.5 - 0.5 - 1 - 0 - - 5 - 7 - 12 - 13 - 0 - 0 - False - False - False - False - True - True - - - - GtkButton - button-categories - True - - GTK_RELIEF_NORMAL - - - - - GtkEventBox - eventbox7 - - 1 - 3 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - GtkLabel - label-jobtitle - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-jobtitle - - - - - Custom - custom1 - e_create_image_widget - malehead.png - - 0 - 0 - Thu, 18 May 2000 12:19:47 GMT - - 0 - 1 - 0 - 4 - 0 - 0 - False - False - False - False - True - True - - - - - Custom - custom2 - e_create_image_widget - cellphone.png - - 0 - 0 - Thu, 18 May 2000 12:20:02 GMT - - 4 - 5 - 0 - 4 - 0 - 0 - False - False - False - False - True - True - - - - - Custom - custom3 - e_create_image_widget - envelope.png - - 0 - 0 - Thu, 18 May 2000 12:19:51 GMT - - 0 - 1 - 5 - 7 - 0 - 0 - False - False - False - False - True - True - - - - - Custom - custom4 - e_create_image_widget - house.png - - 0 - 0 - Thu, 18 May 2000 12:20:06 GMT - - 4 - 5 - 5 - 10 - 0 - 0 - False - False - False - False - True - True - - - - - Custom - custom5 - e_create_image_widget - evolution-contacts-plain.png - - 0 - 0 - Thu, 18 May 2000 12:19:59 GMT - - 0 - 1 - 12 - 14 - 0 - 0 - False - False - False - False - True - True - - - - - Custom - custom6 - e_create_image_widget - briefcase.png - - 0 - 0 - Thu, 18 May 2000 12:20:09 GMT - - 4 - 5 - 12 - 14 - 0 - 0 - False - False - False - False - True - True - - - - - Custom - custom10 - e_create_image_widget - globe.png - - 0 - 0 - Thu, 18 May 2000 12:19:56 GMT - - 0 - 1 - 8 - 10 - 0 - 0 - False - False - False - False - True - True - - - - - GtkLabel - label-company - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-company - - 1 - 3 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - - - - GtkButton - button-fulladdr - True - - GTK_RELIEF_NORMAL - - 5 - 7 - 6 - 7 - 0 - 0 - False - False - False - False - True - True - - - - - GtkAlignment - alignment17 - 0.5 - 0.5 - 1 - 0 - - 3 - 4 - 12 - 13 - 0 - 0 - True - False - False - False - True - True - - - - GtkTable - table-contacts - 1 - 1 - False - 0 - 0 - - - - - GtkLabel - accellabel-fileas - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-file-as - - 1 - 3 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - accellabel-web - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-web - - 1 - 3 - 8 - 9 - 0 - 0 - False - False - False - False - True - False - - - - - - GtkLabel - Notebook:tab - label15 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkTable - table-contact-editor-details - 7 - 9 - 6 - False - 4 - 4 - - - GtkLabel - label-department - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-department - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - True - - - - - GtkLabel - label-office - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-office - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - - GtkLabel - label-profession - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-profession - - 1 - 2 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - - - - GtkLabel - label-nickname - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-nickname - - 1 - 2 - 4 - 5 - 0 - 0 - False - False - False - False - True - True - - - - - GtkLabel - label-spouse - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-spouse - - 1 - 2 - 5 - 6 - 0 - 0 - False - False - False - False - True - True - - - - - GtkLabel - label-birthday - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - dateedit-birthday - - 3 - 4 - 4 - 5 - 0 - 0 - False - False - False - False - True - True - - - - - GtkLabel - label-assistant - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-assistant - - 3 - 4 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - - GtkLabel - label-manager - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-manager - - 3 - 4 - 0 - 1 - 0 - 0 - False - False - False - False - True - True - - - - - GtkLabel - label-anniversary - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - dateedit-anniversary - - 3 - 4 - 5 - 6 - 0 - 0 - False - False - False - False - True - True - - - - - GtkEntry - entry-spouse - True - True - True - 0 - - - 2 - 3 - 5 - 6 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-department - True - True - True - 0 - - - 2 - 3 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-office - True - True - True - 0 - - - 2 - 3 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-profession - True - True - True - 0 - - - 2 - 3 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-nickname - True - True - True - 0 - - - 2 - 3 - 4 - 5 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-assistant - True - True - True - 0 - - - 4 - 6 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-manager - True - True - True - 0 - - - 4 - 6 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkHSeparator - hseparator7 - - 0 - 6 - 3 - 4 - 0 - 2 - False - False - False - False - True - True - - - - - GtkLabel - label-comments - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - text-comments - - 1 - 2 - 7 - 8 - 0 - 0 - False - False - False - False - True - True - - - - - GtkHSeparator - hseparator8 - - 0 - 6 - 6 - 7 - 0 - 0 - True - False - False - False - True - True - - - - - Custom - custom7 - e_create_image_widget - briefcase.png - - 0 - 0 - Thu, 18 May 2000 12:20:13 GMT - - 0 - 1 - 0 - 2 - 0 - 0 - False - False - False - False - True - True - - - - - Custom - custom8 - e_create_image_widget - malehead.png - - 0 - 0 - Thu, 18 May 2000 12:20:16 GMT - - 0 - 1 - 4 - 6 - 0 - 0 - False - False - False - False - True - True - - - - - GtkScrolledWindow - scrolledwindow2 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 1 - 6 - 8 - 9 - 0 - 0 - True - True - False - False - True - True - - - - GtkText - text-comments - True - True - - - - - - Custom - custom9 - e_create_image_widget - globe.png - - 0 - 0 - Thu, 18 May 2000 12:20:19 GMT - - 0 - 1 - 7 - 9 - 0 - 0 - False - False - False - False - True - True - - - - - Custom - dateedit-birthday - True - e_contact_editor_create_date - 0 - 0 - Tue, 05 Jun 2001 02:36:27 GMT - - 4 - 6 - 4 - 5 - 0 - 0 - True - False - False - False - True - True - - - - - Custom - dateedit-anniversary - True - e_contact_editor_create_date - 0 - 0 - Tue, 05 Jun 2001 02:36:32 GMT - - 4 - 6 - 5 - 6 - 0 - 0 - True - False - False - False - True - True - - - - - - GtkLabel - Notebook:tab - label16 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + + 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 + + - - - GtkVBox - vbox3 - False - 0 - - - GtkHBox - hbox1 - 7 - False - 4 - - 0 - False - True - - - - Custom - custom12 - e_create_image_widget - globe.png - - 0 - 0 - Thu, 18 May 2000 12:20:13 GMT - - 0 - False - False - - - - - GtkLabel - label24 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - True - True - - - - - - GtkAlignment - alignment18 - 0.5 - 0.5 - 0.75 - 1 - - 0 - True - True - - - - GtkTable - table-contact-editor-collaboration - 7 - 2 - 2 - False - 4 - 4 - - - GtkLabel - label-caluri - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-caluri - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - True - - - - - GtkLabel - label-fburl - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-fburl - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - - GtkEntry - entry-caluri - True - True - True - 0 - - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - entry-fburl - True - True - True - 0 - - - 1 - 2 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - + + 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 +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 + + - - GtkLabel - Notebook:tab - label21 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + + + yes + yes + yes - - - - - GnomeAppBar - GnomeApp:appbar - appbar1 - True - True - - 0 - True - True + + 0 + yes + yes + - - - + diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 94ff5f0258..01d08df8fb 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -36,20 +36,20 @@ static void e_contact_editor_address_init (EContactEditorAddress *card); static void e_contact_editor_address_class_init (EContactEditorAddressClass *klass); -static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); -static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id); -static void e_contact_editor_address_destroy (GtkObject *object); +static void e_contact_editor_address_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void e_contact_editor_address_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); +static void e_contact_editor_address_dispose (GObject *object); static void fill_in_info(EContactEditorAddress *editor); static void extract_info(EContactEditorAddress *editor); -static GnomeDialogClass *parent_class = NULL; +static GtkDialogClass *parent_class = NULL; /* The arguments we take */ enum { - ARG_0, - ARG_ADDRESS, - ARG_IS_READ_ONLY + PROP_0, + PROP_ADDRESS, + PROP_IS_READ_ONLY }; GtkType @@ -80,22 +80,28 @@ e_contact_editor_address_get_type (void) static void e_contact_editor_address_class_init (EContactEditorAddressClass *klass) { - GtkObjectClass *object_class; - GnomeDialogClass *dialog_class; + GObjectClass *object_class; - object_class = (GtkObjectClass*) klass; - dialog_class = (GnomeDialogClass *) klass; + object_class = G_OBJECT_CLASS (klass); parent_class = gtk_type_class (gtk_dialog_get_type ()); - gtk_object_add_arg_type ("EContactEditorAddress::address", GTK_TYPE_POINTER, - GTK_ARG_READWRITE, ARG_ADDRESS); - gtk_object_add_arg_type ("EContactEditorAddress::editable", GTK_TYPE_BOOL, - GTK_ARG_READWRITE, ARG_IS_READ_ONLY); - - object_class->set_arg = e_contact_editor_address_set_arg; - object_class->get_arg = e_contact_editor_address_get_arg; - object_class->destroy = e_contact_editor_address_destroy; + object_class->set_property = e_contact_editor_address_set_property; + object_class->get_property = e_contact_editor_address_get_property; + object_class->dispose = e_contact_editor_address_dispose; + + g_object_class_install_property (object_class, PROP_ADDRESS, + g_param_spec_pointer ("address", + _("Address"), + /*_( */"XXX blurb" /*)*/, + G_PARAM_READWRITE)); + + g_object_class_install_property (object_class, PROP_IS_READ_ONLY, + g_param_spec_boolean ("editable", + _("Editable"), + /*_( */"XXX blurb" /*)*/, + FALSE, + G_PARAM_READWRITE)); } static GList * @@ -406,11 +412,13 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) GtkWidget *widget; char *icon_path; +#if 0 gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address), GNOME_STOCK_BUTTON_OK); gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address), GNOME_STOCK_BUTTON_CANCEL); +#endif gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE); @@ -427,10 +435,10 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) GTK_WINDOW (widget)->title); widget = glade_xml_get_widget(gui, "table-checkaddress"); - gtk_widget_ref(widget); + g_object_ref(widget); gtk_container_remove(GTK_CONTAINER(widget->parent), widget); gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0); - gtk_widget_unref(widget); + g_object_unref(widget); icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, "evolution-contacts-mini.png"); gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor_address), icon_path); @@ -438,12 +446,12 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) } void -e_contact_editor_address_destroy (GtkObject *object) +e_contact_editor_address_dispose (GObject *object) { EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object); if (e_contact_editor_address->gui) - gtk_object_unref(GTK_OBJECT(e_contact_editor_address->gui)); + g_object_unref(e_contact_editor_address->gui); e_card_delivery_address_unref(e_contact_editor_address->address); } @@ -451,26 +459,27 @@ GtkWidget* e_contact_editor_address_new (const ECardDeliveryAddress *address) { GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ())); - gtk_object_set (GTK_OBJECT(widget), - "address", address, - NULL); + g_object_set (widget, + "address", address, + NULL); return widget; } static void -e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) +e_contact_editor_address_set_property (GObject *object, guint prop_id, + const GValue *value, GParamSpec *pspec) { EContactEditorAddress *e_contact_editor_address; - e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o); + e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object); - switch (arg_id){ - case ARG_ADDRESS: + switch (prop_id){ + case PROP_ADDRESS: e_card_delivery_address_unref(e_contact_editor_address->address); - e_contact_editor_address->address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg)); + e_contact_editor_address->address = e_card_delivery_address_copy(g_value_get_pointer (value)); fill_in_info(e_contact_editor_address); break; - case ARG_IS_READ_ONLY: { + case PROP_IS_READ_ONLY: { int i; char *entry_names[] = { "entry-street", @@ -482,7 +491,7 @@ e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) "entry-code", NULL }; - e_contact_editor_address->editable = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE; + e_contact_editor_address->editable = g_value_get_boolean (value) ? TRUE : FALSE; for (i = 0; entry_names[i] != NULL; i ++) { GtkWidget *w = glade_xml_get_widget(e_contact_editor_address->gui, entry_names[i]); if (GTK_IS_ENTRY (w)) { @@ -497,26 +506,30 @@ e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) } break; } + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; } } static void -e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) +e_contact_editor_address_get_property (GObject *object, guint prop_id, + GValue *value, GParamSpec *pspec) { EContactEditorAddress *e_contact_editor_address; e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object); - switch (arg_id) { - case ARG_ADDRESS: + switch (prop_id) { + case PROP_ADDRESS: extract_info(e_contact_editor_address); - GTK_VALUE_POINTER (*arg) = e_card_delivery_address_ref(e_contact_editor_address->address); + g_value_set_pointer (value, e_card_delivery_address_ref(e_contact_editor_address->address)); break; - case ARG_IS_READ_ONLY: - GTK_VALUE_BOOL (*arg) = e_contact_editor_address->editable ? TRUE : FALSE; + case PROP_IS_READ_ONLY: + g_value_set_boolean (value, e_contact_editor_address->editable ? TRUE : FALSE); break; default: - arg->type = GTK_TYPE_INVALID; + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } diff --git a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade index b91a040d46..66921f4ccc 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade +++ b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade @@ -1,83 +1,69 @@ - - + + - - e-contact-editor-confirm-delete - e-contact-editor-confirm-delete - - src - pixmaps - C - True - True - True - False - False - False - True - + + - - GnomeMessageBox - confirm-dialog - GNOME_MESSAGE_BOX_QUESTION - Are you sure you want -to delete this contact? - Delete Contact? - GTK_WIN_POS_NONE - False - False - False - False - True - False + + Are you sure you want +to delete this contact? + Delete Contact? + no + no + no + yes + no + yes + question + GTK_WIN_POS_NONE - - GtkVBox - GnomeDialog:vbox - dialog-vbox1 - False - 8 - - 4 - True - True - + + + no + 8 + yes - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area1 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - + + + GTK_BUTTONBOX_END + 8 + yes - - GtkButton - button1 - True - True - GNOME_STOCK_BUTTON_OK - + + + yes + yes + yes + gtk-ok + yes + yes + + - - GtkButton - button2 - True - True - GNOME_STOCK_BUTTON_CANCEL + + + yes + yes + yes + gtk-cancel + yes + yes + + + + + 0 + no + yes + GTK_PACK_END + + - + + 4 + yes + yes + + - - - + diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 71aaa2f76c..dbd4b01efd 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -24,24 +24,25 @@ #include "e-contact-editor-fullname.h" #include #include +#include #include static void e_contact_editor_fullname_init (EContactEditorFullname *card); static void e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass); -static void e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); -static void e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id); -static void e_contact_editor_fullname_destroy (GtkObject *object); +static void e_contact_editor_fullname_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void e_contact_editor_fullname_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); +static void e_contact_editor_fullname_dispose (GObject *object); static void fill_in_info(EContactEditorFullname *editor); static void extract_info(EContactEditorFullname *editor); -static GnomeDialogClass *parent_class = NULL; +static GtkDialogClass *parent_class = NULL; /* The arguments we take */ enum { - ARG_0, - ARG_NAME, - ARG_IS_READ_ONLY + PROP_0, + PROP_NAME, + PROP_IS_READ_ONLY }; GtkType @@ -72,23 +73,29 @@ e_contact_editor_fullname_get_type (void) static void e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass) { - GtkObjectClass *object_class; - GnomeDialogClass *dialog_class; + GObjectClass *object_class; - object_class = (GtkObjectClass*) klass; - dialog_class = (GnomeDialogClass *) klass; + object_class = G_OBJECT_CLASS (klass); parent_class = gtk_type_class (gnome_dialog_get_type ()); - gtk_object_add_arg_type ("EContactEditorFullname::name", GTK_TYPE_POINTER, - GTK_ARG_READWRITE, ARG_NAME); - gtk_object_add_arg_type ("EContactEditorFullname::editable", GTK_TYPE_BOOL, - GTK_ARG_READWRITE, ARG_IS_READ_ONLY); - - object_class->set_arg = e_contact_editor_fullname_set_arg; - object_class->get_arg = e_contact_editor_fullname_get_arg; - object_class->destroy = e_contact_editor_fullname_destroy; + object_class->set_property = e_contact_editor_fullname_set_property; + object_class->get_property = e_contact_editor_fullname_get_property; + object_class->dispose = e_contact_editor_fullname_dispose; + + g_object_class_install_property (object_class, PROP_NAME, + g_param_spec_pointer ("name", + _("Name"), + /*_( */"XXX blurb" /*)*/, + G_PARAM_READWRITE)); + + g_object_class_install_property (object_class, PROP_IS_READ_ONLY, + g_param_spec_boolean ("editable", + _("Editable"), + /*_( */"XXX blurb" /*)*/, + FALSE, + G_PARAM_READWRITE)); } static void @@ -98,11 +105,13 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam GtkWidget *widget; char *icon_path; +#if 0 gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname), GNOME_STOCK_BUTTON_OK); gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname), GNOME_STOCK_BUTTON_CANCEL); +#endif gtk_window_set_policy(GTK_WINDOW(e_contact_editor_fullname), TRUE, TRUE, FALSE); @@ -115,10 +124,10 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam GTK_WINDOW (widget)->title); widget = glade_xml_get_widget(gui, "table-checkfullname"); - gtk_widget_ref(widget); + g_object_ref(widget); gtk_container_remove(GTK_CONTAINER(widget->parent), widget); - gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0); - gtk_widget_unref(widget); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0); + g_object_unref(widget); icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, "evolution-contacts-mini.png"); gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor_fullname), icon_path); @@ -126,12 +135,12 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam } void -e_contact_editor_fullname_destroy (GtkObject *object) +e_contact_editor_fullname_dispose (GObject *object) { EContactEditorFullname *e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME(object); if (e_contact_editor_fullname->gui) - gtk_object_unref(GTK_OBJECT(e_contact_editor_fullname->gui)); + g_object_unref(e_contact_editor_fullname->gui); e_card_name_unref(e_contact_editor_fullname->name); } @@ -139,26 +148,27 @@ GtkWidget* e_contact_editor_fullname_new (const ECardName *name) { GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ())); - gtk_object_set (GTK_OBJECT(widget), + g_object_set (widget, "name", name, NULL); return widget; } static void -e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) +e_contact_editor_fullname_set_property (GObject *object, guint prop_id, + const GValue *value, GParamSpec *pspec) { EContactEditorFullname *e_contact_editor_fullname; - e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o); + e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object); - switch (arg_id){ - case ARG_NAME: + switch (prop_id){ + case PROP_NAME: e_card_name_unref(e_contact_editor_fullname->name); - e_contact_editor_fullname->name = e_card_name_copy(GTK_VALUE_POINTER (*arg)); + e_contact_editor_fullname->name = e_card_name_copy(g_value_get_pointer (value)); fill_in_info(e_contact_editor_fullname); break; - case ARG_IS_READ_ONLY: { + case PROP_IS_READ_ONLY: { int i; char *entry_names[] = { "combo-title", @@ -168,7 +178,7 @@ e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) "entry-last", NULL }; - e_contact_editor_fullname->editable = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE; + e_contact_editor_fullname->editable = g_value_get_boolean (value) ? TRUE : FALSE; for (i = 0; entry_names[i] != NULL; i ++) { GtkWidget *w = glade_xml_get_widget(e_contact_editor_fullname->gui, entry_names[i]); if (GTK_IS_ENTRY (w)) { @@ -183,26 +193,30 @@ e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) } break; } + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; } } static void -e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) +e_contact_editor_fullname_get_property (GObject *object, guint prop_id, + GValue *value, GParamSpec *pspec) { EContactEditorFullname *e_contact_editor_fullname; e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object); - switch (arg_id) { - case ARG_NAME: + switch (prop_id) { + case PROP_NAME: extract_info(e_contact_editor_fullname); - GTK_VALUE_POINTER (*arg) = e_card_name_ref(e_contact_editor_fullname->name); + g_value_set_pointer (value, e_card_name_ref(e_contact_editor_fullname->name)); break; - case ARG_IS_READ_ONLY: - GTK_VALUE_BOOL (*arg) = e_contact_editor_fullname->editable ? TRUE : FALSE; + case PROP_IS_READ_ONLY: + g_value_set_boolean (value, e_contact_editor_fullname->editable ? TRUE : FALSE); break; default: - arg->type = GTK_TYPE_INVALID; + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h index 0d09b13700..e1e6f85963 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h @@ -20,7 +20,7 @@ #ifndef __E_CONTACT_EDITOR_FULLNAME_H__ #define __E_CONTACT_EDITOR_FULLNAME_H__ -#include +#include #include #include @@ -50,7 +50,7 @@ typedef struct _EContactEditorFullnameClass EContactEditorFullnameClass; struct _EContactEditorFullname { - GnomeDialog parent; + GtkDialog parent; /* item specific fields */ ECardName *name; @@ -62,7 +62,7 @@ struct _EContactEditorFullname struct _EContactEditorFullnameClass { - GnomeDialogClass parent_class; + GtkDialogClass parent_class; }; diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index eb284f27c9..583a68d5e1 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -31,7 +31,6 @@ #include #undef GTK_ENABLE_BROKEN #include -#include #include #include @@ -73,7 +72,7 @@ static void e_contact_editor_init (EContactEditor *card); static void e_contact_editor_class_init (EContactEditorClass *klass); static void e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void e_contact_editor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void e_contact_editor_destroy (GtkObject *object); +static void e_contact_editor_dispose (GObject *object); #if 0 static GtkWidget *e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info); @@ -146,13 +145,12 @@ static void e_contact_editor_class_init (EContactEditorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkObjectClass *gtkobj_class = GTK_OBJECT_CLASS (klass); parent_class = gtk_type_class (GTK_TYPE_OBJECT); object_class->set_property = e_contact_editor_set_property; object_class->get_property = e_contact_editor_get_property; - gtkobj_class->destroy = e_contact_editor_destroy; + object_class->dispose = e_contact_editor_dispose; g_object_class_install_property (object_class, PROP_BOOK, g_param_spec_object ("book", @@ -270,10 +268,10 @@ static void wants_html_changed (GtkWidget *widget, EContactEditor *editor) { gboolean wants_html; - gtk_object_get(GTK_OBJECT(widget), + g_object_get (widget, "active", &wants_html, NULL); - gtk_object_set(GTK_OBJECT(editor->card), + g_object_set (editor->card, "wants_html", wants_html, NULL); @@ -309,15 +307,13 @@ phone_entry_changed (GtkWidget *widget, EContactEditor *editor) static void email_entry_changed (GtkWidget *widget, EContactEditor *editor) { - gchar *string; + const gchar *string; GtkEntry *entry = GTK_ENTRY(widget); - string = e_utf8_gtk_entry_get_text(entry); + string = gtk_entry_get_text(entry); e_card_simple_set_email(editor->simple, editor->email_choice, string); - g_free (string); - widget_changed (widget, editor); } @@ -339,9 +335,15 @@ address_text_changed (GtkWidget *widget, EContactEditor *editor) check = glade_xml_get_widget(editor->gui, "checkbutton-mailingaddress"); if (check && GTK_IS_CHECK_BUTTON (check)) { - gtk_signal_handler_block_by_data (GTK_OBJECT (check), editor); + g_signal_handlers_block_matched (check, + G_SIGNAL_MATCH_DATA, + 0, 0, + NULL, NULL, editor); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (check), editor); + g_signal_handlers_unblock_matched (check, + G_SIGNAL_MATCH_DATA, + 0, 0, + NULL, NULL, editor); } } @@ -744,21 +746,22 @@ set_entry_changed_signals(EContactEditor *editor) static void full_name_clicked(GtkWidget *button, EContactEditor *editor) { - GnomeDialog *dialog = GNOME_DIALOG(e_contact_editor_fullname_new(editor->name)); + GtkDialog *dialog = GTK_DIALOG(e_contact_editor_fullname_new(editor->name)); int result; - gtk_object_set (GTK_OBJECT (dialog), + g_object_set (dialog, "editable", editor->editable, NULL); gtk_widget_show(GTK_WIDGET(dialog)); - result = gnome_dialog_run (dialog); + result = gtk_dialog_run (dialog); + gtk_widget_hide (GTK_WIDGET (dialog)); - if (result == 0) { + if (result == GTK_RESPONSE_OK) { ECardName *name; GtkWidget *fname_widget; int style = 0; - gtk_object_get(GTK_OBJECT(dialog), + g_object_get (dialog, "name", &name, NULL); @@ -776,30 +779,33 @@ full_name_clicked(GtkWidget *button, EContactEditor *editor) file_as_set_style(editor, style); } - gtk_object_unref(GTK_OBJECT(dialog)); + g_object_unref(dialog); } static void full_addr_clicked(GtkWidget *button, EContactEditor *editor) { - GnomeDialog *dialog; + GtkDialog *dialog; int result; const ECardDeliveryAddress *address; address = e_card_simple_get_delivery_address(editor->simple, editor->address_choice); - dialog = GNOME_DIALOG(e_contact_editor_address_new(address)); - gtk_object_set (GTK_OBJECT (dialog), - "editable", editor->editable, - NULL); + dialog = GTK_DIALOG(e_contact_editor_address_new(address)); + g_object_set (dialog, + "editable", editor->editable, + NULL); gtk_widget_show(GTK_WIDGET(dialog)); - result = gnome_dialog_run (dialog); - if (result == 0) { + result = gtk_dialog_run (dialog); + + gtk_widget_hide (GTK_WIDGET (dialog)); + + if (result == GTK_RESPONSE_OK) { ECardDeliveryAddress *new_address; GtkWidget *address_widget; - gtk_object_get(GTK_OBJECT(dialog), + g_object_get (dialog, "address", &new_address, NULL); @@ -818,7 +824,7 @@ full_addr_clicked(GtkWidget *button, EContactEditor *editor) e_card_delivery_address_unref(new_address); } - gtk_object_unref(GTK_OBJECT(dialog)); + g_object_unref(dialog); } static void @@ -826,46 +832,50 @@ categories_clicked(GtkWidget *button, EContactEditor *editor) { #ifdef PENDING_PORT_WORK char *categories = NULL; - GnomeDialog *dialog; + GtkDialog *dialog; int result; GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories"); ECategoriesMasterList *ecml; if (entry && GTK_IS_ENTRY(entry)) categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry)); else if (editor->card) - gtk_object_get(GTK_OBJECT(editor->card), + g_object_get (editor->card, "categories", &categories, NULL); - dialog = GNOME_DIALOG(e_categories_new(categories)); + dialog = GTK_DIALOG(e_categories_new(categories)); if (dialog == NULL) { - GtkWidget *uh_oh = gnome_error_dialog (_("Category editor not available.")); + GtkWidget *uh_oh = gtk_message_dialog_new (NULL, + 0, GTK_MESSAGE_ERROR, + GTK_RESPONSE_OK + _("Category editor not available."), + NULL); gtk_widget_show (uh_oh); return; } ecml = e_categories_master_list_wombat_new (); - gtk_object_set(GTK_OBJECT(dialog), + g_object_set (dialog, "header", _("This contact belongs to these categories:"), "ecml", ecml, NULL); - gtk_object_unref (GTK_OBJECT (ecml)); + g_object_unref (ecml); gtk_widget_show(GTK_WIDGET(dialog)); result = gnome_dialog_run (dialog); g_free (categories); if (result == 0) { - gtk_object_get(GTK_OBJECT(dialog), + g_object_get (dialog, "categories", &categories, NULL); if (entry && GTK_IS_ENTRY(entry)) e_utf8_gtk_entry_set_text(GTK_ENTRY(entry), categories); else - gtk_object_set(GTK_OBJECT(editor->card), + g_object_set (editor->card, "categories", categories, NULL); g_free(categories); } - gtk_object_destroy(GTK_OBJECT(dialog)); + gtk_widget_destroy(GTK_WIDGET(dialog)); #endif } @@ -925,8 +935,8 @@ card_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruc e_card_set_id (ce->card, id); - gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_ADDED], - status, ce->card); + g_signal_emit (ce, contact_editor_signals[CARD_ADDED], 0, + status, ce->card); if (status == E_BOOK_STATUS_SUCCESS) { ce->is_new_card = FALSE; @@ -940,7 +950,7 @@ card_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruc } } - gtk_object_unref (GTK_OBJECT (ce)); + g_object_unref (ce); g_free (ecs); } @@ -953,8 +963,8 @@ card_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs) gtk_widget_set_sensitive (ce->app, TRUE); ce->in_async_call = FALSE; - gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_MODIFIED], - status, ce->card); + g_signal_emit (ce, contact_editor_signals[CARD_MODIFIED], 0, + status, ce->card); if (status == E_BOOK_STATUS_SUCCESS) { if (should_close) { @@ -966,7 +976,7 @@ card_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs) } } - gtk_object_unref (GTK_OBJECT (ce)); + g_object_unref (ce); g_free (ecs); } @@ -981,7 +991,7 @@ save_card (EContactEditor *ce, gboolean should_close) EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1); ecs->ce = ce; - gtk_object_ref (GTK_OBJECT (ecs->ce)); + g_object_ref (ecs->ce); ecs->should_close = should_close; @@ -1002,7 +1012,7 @@ close_dialog (EContactEditor *ce) if (ce->app != NULL) { gtk_widget_destroy (ce->app); ce->app = NULL; - gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[EDITOR_CLOSED]); + g_signal_emit (ce, contact_editor_signals[EDITOR_CLOSED], 0); } } @@ -1109,7 +1119,7 @@ e_contact_editor_confirm_delete(GtkWindow *parent) result = gnome_dialog_run_and_close(dialog); - gtk_object_unref(GTK_OBJECT(gui)); + g_object_unref(gui); return !result; } @@ -1120,8 +1130,8 @@ card_deleted_cb (EBook *book, EBookStatus status, EContactEditor *ce) gtk_widget_set_sensitive (ce->app, TRUE); ce->in_async_call = FALSE; - gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_DELETED], - status, ce->card); + g_signal_emit (ce, contact_editor_signals[CARD_DELETED], 0, + status, ce->card); /* always close the dialog after we successfully delete a card */ if (status == E_BOOK_STATUS_SUCCESS) @@ -1135,8 +1145,8 @@ delete_cb (GtkWidget *widget, gpointer data) ECard *card = ce->card; ECardSimple *simple = ce->simple; - gtk_object_ref(GTK_OBJECT(card)); - gtk_object_ref(GTK_OBJECT(simple)); + g_object_ref(card); + g_object_ref(simple); if (e_contact_editor_confirm_delete(GTK_WINDOW(ce->app))) { @@ -1151,8 +1161,8 @@ delete_cb (GtkWidget *widget, gpointer data) } } - gtk_object_unref(GTK_OBJECT(card)); - gtk_object_unref(GTK_OBJECT(simple)); + g_object_unref(card); + g_object_unref(simple); } /* Emits the signal to request printing a card */ @@ -1166,9 +1176,7 @@ print_cb (BonoboUIComponent *uih, void *data, const char *path) extract_info (ce); e_card_simple_sync_card (ce->simple); -#ifdef PENDING_PORT_WORK gtk_widget_show(e_contact_print_card_dialog_new(ce->card)); -#endif } #if 0 /* Envelope printing is disabled for Evolution 1.0. */ @@ -1397,7 +1405,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) g_message ("contact_editor_construct(): Could not get contents"); return; } - gtk_widget_ref (contents); + g_object_ref (contents); gtk_container_remove (GTK_CONTAINER (contents->parent), contents); bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents); gtk_widget_destroy (e_contact_editor->app); @@ -1405,9 +1413,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) } /* Build the menu and toolbar */ -#ifdef PENDING_PORT_WORK - container = bonobo_ui_container_new (); - bonobo_ui_container_set_win (container, BONOBO_WINDOW (e_contact_editor->app)); + container = bonobo_window_get_ui_container (BONOBO_WINDOW (e_contact_editor->app)); e_contact_editor->uic = bonobo_ui_component_new_default (); if (!e_contact_editor->uic) { @@ -1417,7 +1423,6 @@ e_contact_editor_init (EContactEditor *e_contact_editor) bonobo_ui_component_set_container (e_contact_editor->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL); -#endif create_ui (e_contact_editor); @@ -1437,11 +1442,11 @@ e_contact_editor_init (EContactEditor *e_contact_editor) } void -e_contact_editor_destroy (GtkObject *object) { +e_contact_editor_dispose (GObject *object) { EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object); if (e_contact_editor->writable_fields) { - gtk_object_unref(GTK_OBJECT(e_contact_editor->writable_fields)); + g_object_unref(e_contact_editor->writable_fields); } if (e_contact_editor->email_list) { g_list_foreach(e_contact_editor->email_list, (GFunc) g_free, NULL); @@ -1451,7 +1456,7 @@ e_contact_editor_destroy (GtkObject *object) { g_free(e_contact_editor->email_info); } if (e_contact_editor->email_popup) { - gtk_widget_unref(e_contact_editor->email_popup); + g_object_unref(e_contact_editor->email_popup); } if (e_contact_editor->phone_list) { @@ -1462,7 +1467,7 @@ e_contact_editor_destroy (GtkObject *object) { g_free(e_contact_editor->phone_info); } if (e_contact_editor->phone_popup) { - gtk_widget_unref(e_contact_editor->phone_popup); + g_object_unref(e_contact_editor->phone_popup); } if (e_contact_editor->address_list) { @@ -1473,19 +1478,19 @@ e_contact_editor_destroy (GtkObject *object) { g_free(e_contact_editor->address_info); } if (e_contact_editor->address_popup) { - gtk_widget_unref(e_contact_editor->address_popup); + g_object_unref(e_contact_editor->address_popup); } if (e_contact_editor->simple) - gtk_object_unref(GTK_OBJECT(e_contact_editor->simple)); + g_object_unref(e_contact_editor->simple); if (e_contact_editor->book) - gtk_object_unref(GTK_OBJECT(e_contact_editor->book)); + g_object_unref(e_contact_editor->book); e_card_name_unref(e_contact_editor->name); g_free (e_contact_editor->company); - gtk_object_unref(GTK_OBJECT(e_contact_editor->gui)); + g_object_unref(e_contact_editor->gui); } static void @@ -1514,7 +1519,7 @@ supported_fields_cb (EBook *book, EBookStatus status, return; } - gtk_object_set (GTK_OBJECT (ce), + g_object_set (ce, "writable_fields", fields, NULL); @@ -1524,7 +1529,8 @@ supported_fields_cb (EBook *book, EBookStatus status, } static void -contact_editor_destroy_notify (void *data) +contact_editor_destroy_notify (void *data, + GObject *where_the_object_was) { EContactEditor *ce = E_CONTACT_EDITOR (data); @@ -1545,9 +1551,9 @@ e_contact_editor_new (EBook *book, ce = E_CONTACT_EDITOR (gtk_type_new (E_CONTACT_EDITOR_TYPE)); all_contact_editors = g_slist_prepend (all_contact_editors, ce); - gtk_object_weakref (GTK_OBJECT (ce), contact_editor_destroy_notify, ce); + g_object_weak_ref (G_OBJECT (ce), contact_editor_destroy_notify, ce); - gtk_object_set (GTK_OBJECT (ce), + g_object_set (ce, "book", book, "card", card, "is_new_card", is_new_card, @@ -1711,7 +1717,9 @@ static gint _arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor, GtkWidget *popup, GList **list, GnomeUIInfo **info, gchar *label, gchar *entry, gchar *dialog_title) { gint menu_item; - gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "button_press_event"); +#if 0 + g_signal_emit_by_name(widget, "button_press_event"); +#endif gtk_widget_realize(popup); menu_item = gnome_popup_menu_do_popup_modal(popup, _popup_position, widget, button, editor, widget); if ( menu_item != -1 ) { @@ -1722,7 +1730,7 @@ _arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *edito #endif GtkWidget *label_widget = glade_xml_get_widget(editor->gui, label); if (label_widget && GTK_IS_LABEL(label_widget)) { - gtk_object_set(GTK_OBJECT(label_widget), + g_object_set (label_widget, "label", _(g_list_nth_data(*list, menu_item)), NULL); } @@ -1794,7 +1802,7 @@ e_contact_editor_build_phone_ui (EContactEditor *editor) e_contact_editor_build_ui_info(editor->phone_list, &editor->phone_info); if ( editor->phone_popup ) - gtk_widget_unref(editor->phone_popup); + g_object_unref(editor->phone_popup); editor->phone_popup = gnome_popup_menu_new(editor->phone_info); } @@ -1820,7 +1828,7 @@ e_contact_editor_build_email_ui (EContactEditor *editor) e_contact_editor_build_ui_info(editor->email_list, &editor->email_info); if ( editor->email_popup ) - gtk_widget_unref(editor->email_popup); + g_object_unref(editor->email_popup); editor->email_popup = gnome_popup_menu_new(editor->email_info); } @@ -1846,7 +1854,7 @@ e_contact_editor_build_address_ui (EContactEditor *editor) e_contact_editor_build_ui_info(editor->address_list, &editor->address_info); if ( editor->address_popup ) - gtk_widget_unref(editor->address_popup); + g_object_unref(editor->address_popup); editor->address_popup = gnome_popup_menu_new(editor->address_info); } @@ -1855,20 +1863,20 @@ e_contact_editor_build_address_ui (EContactEditor *editor) static void _dialog_clicked(GtkWidget *dialog, gint button, EContactEditor *editor) { - GtkWidget *label = gtk_object_get_data(GTK_OBJECT(dialog), - "e_contact_editor_label"); + GtkWidget *label = g_object_get_data(G_OBJECT(dialog), + "e_contact_editor_label"); - GtkWidget *dialog_entry = gtk_object_get_data(GTK_OBJECT(dialog), - "e_contact_editor_dialog_entry"); + GtkWidget *dialog_entry = g_object_get_data(G_OBJECT(dialog), + "e_contact_editor_dialog_entry"); - GList **list = gtk_object_get_data(GTK_OBJECT(dialog), - "e_contact_editor_list"); - GList **info = gtk_object_get_data(GTK_OBJECT(dialog), - "e_contact_editor_info"); + GList **list = g_object_get_data(G_OBJECT(dialog), + "e_contact_editor_list"); + GList **info = g_object_get_data(G_OBJECT(dialog), + "e_contact_editor_info"); switch (button) { case 0: if (label && GTK_IS_LABEL(label)) { - gtk_object_set(GTK_OBJECT(label), + g_object_set (label, "label", gtk_entry_get_text(GTK_ENTRY(dialog_entry)), NULL); *list = g_list_append(*list, e_utf8_gtk_entry_get_text(GTK_ENTRY(dialog_entry))); @@ -1918,19 +1926,21 @@ e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *la g_signal_connect (dialog, "clicked", _dialog_clicked, editor); - g_signal_connect_while_alive(GTK_OBJECT(editor), "destroy", - _dialog_destroy, GTK_OBJECT(dialog), GTK_OBJECT(dialog)); + g_signal_connect_object(editor, "destroy", + _dialog_destroy, + G_OBJECT(dialog), + G_CONNECT_SWAPPED); - gtk_object_set_data(GTK_OBJECT(dialog), - "e_contact_editor_entry", entry); - gtk_object_set_data(GTK_OBJECT(dialog), - "e_contact_editor_label", label); - gtk_object_set_data(GTK_OBJECT(dialog), - "e_contact_editor_dialog_entry", dialog_entry); - gtk_object_set_data(GTK_OBJECT(dialog), - "e_contact_editor_list", list); - gtk_object_set_data(GTK_OBJECT(dialog), - "e_contact_editor_info", info); + g_object_set_data(G_OBJECT(dialog), + "e_contact_editor_entry", entry); + gk_object_set_data(G_OBJECT(dialog), + "e_contact_editor_label", label); + g_object_set_data(G_OBJECT(dialog), + "e_contact_editor_dialog_entry", dialog_entry); + g_object_set_data(G_OBJECT(dialog), + "e_contact_editor_list", list); + g_object_set_data(G_OBJECT(dialog), + "e_contact_editor_info", info); gtk_widget_show_all(dialog); return dialog; @@ -2127,7 +2137,7 @@ set_fields(EContactEditor *editor) label_widget = glade_xml_get_widget(editor->gui, "label-address"); if (label_widget && GTK_IS_LABEL(label_widget)) { - gtk_object_set(GTK_OBJECT(label_widget), + g_object_set (label_widget, "label", _(g_list_nth_data(editor->address_list, i)), NULL); } @@ -2263,7 +2273,7 @@ static void fill_in_card_field(EContactEditor *editor, ECard *card, char *id, char *key) { char *string; - gtk_object_get(GTK_OBJECT(card), + g_object_get (card, key, &string, NULL); fill_in_field(editor, id, string); @@ -2482,8 +2492,8 @@ enable_writable_fields(EContactEditor *editor) g_hash_table_destroy (dropdown_hash); g_hash_table_destroy (supported_hash); - gtk_object_unref (GTK_OBJECT(simple)); - gtk_object_unref (GTK_OBJECT(card)); + g_object_unref (simple); + g_object_unref (card); } static void @@ -2537,7 +2547,7 @@ fill_in_info(EContactEditor *editor) GList *list; gboolean wants_html, wants_html_set; - gtk_object_get(GTK_OBJECT(card), + g_object_get (card, "file_as", &file_as, "related_contacts", &related_contacts, "name", &name, @@ -2560,7 +2570,7 @@ fill_in_info(EContactEditor *editor) if (wants_html_set) { GtkWidget *widget = glade_xml_get_widget(editor->gui, "checkbutton-htmlmail"); if (widget && GTK_IS_CHECK_BUTTON(widget)) { - gtk_object_set(GTK_OBJECT(widget), + g_object_set (widget, "active", wants_html, NULL); } @@ -2617,11 +2627,11 @@ extract_field(EContactEditor *editor, ECard *card, char *editable_id, char *key) char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1); if (string && *string) - gtk_object_set(GTK_OBJECT(card), + g_object_set (card, key, string, NULL); else - gtk_object_set(GTK_OBJECT(card), + g_object_set (card, key, NULL, NULL); @@ -2669,7 +2679,7 @@ extract_info(EContactEditor *editor) char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1); if (string && *string) - gtk_object_set(GTK_OBJECT(card), + g_object_set (card, "file_as", string, NULL); @@ -2689,18 +2699,18 @@ extract_info(EContactEditor *editor) "contacts"); char *string = e_select_names_model_export_destinationv (model); if (string && *string) - gtk_object_set (GTK_OBJECT (card), + g_object_set (card, "related_contacts", string, NULL); else - gtk_object_set (GTK_OBJECT (card), + g_object_set (card, "related_contacts", NULL, NULL); g_free (string); } if (editor->name) - gtk_object_set(GTK_OBJECT(card), + g_object_set (card, "name", editor->name, NULL); @@ -2711,11 +2721,11 @@ extract_info(EContactEditor *editor) &anniversary.month, &anniversary.day)) { /* g_print ("%d %d %d\n", anniversary.year, anniversary.month, anniversary.day); */ - gtk_object_set(GTK_OBJECT(card), + g_object_set (card, "anniversary", &anniversary, NULL); } else - gtk_object_set(GTK_OBJECT(card), + g_object_set (card, "anniversary", NULL, NULL); } @@ -2727,11 +2737,11 @@ extract_info(EContactEditor *editor) &bday.month, &bday.day)) { /* g_print ("%d %d %d\n", bday.year, bday.month, bday.day); */ - gtk_object_set(GTK_OBJECT(card), + g_object_set (card, "birth_date", &bday, NULL); } else - gtk_object_set(GTK_OBJECT(card), + g_object_set (card, "birth_date", NULL, NULL); } diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 1476aecf5f..64336abea2 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -30,9 +30,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -83,7 +83,7 @@ quick_add_unref (QuickAdd *qa) if (qa->refs == 0) { g_free (qa->name); g_free (qa->email); - gtk_object_unref (GTK_OBJECT (qa->card)); + g_object_unref (qa->card); g_free (qa); } } @@ -102,7 +102,7 @@ quick_add_set_name (QuickAdd *qa, const gchar *name) card_name = e_card_name_from_string (name); qa->name = e_card_name_to_string (card_name); - gtk_object_set (GTK_OBJECT (qa->card), + g_object_set (qa->card, "full_name", qa->name, NULL); @@ -123,7 +123,7 @@ quick_add_set_email (QuickAdd *qa, const gchar *email) simple = e_card_simple_new (qa->card); e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_EMAIL, email); e_card_simple_sync_card (simple); - gtk_object_unref (GTK_OBJECT (simple)); + g_object_unref (simple); } static void @@ -135,7 +135,7 @@ merge_cb (EBook *book, EBookStatus status, gpointer closure) e_card_merging_book_add_card (book, qa->card, NULL, NULL); if (qa->cb) qa->cb (qa->card, qa->closure); - gtk_object_unref (GTK_OBJECT (book)); + g_object_unref (book); } else { /* Something went wrong. */ if (qa->cb) @@ -154,7 +154,7 @@ quick_add_merge_card (QuickAdd *qa) book = e_book_new (); if (!addressbook_load_default_book (book, merge_cb, qa)) { - gtk_object_unref (GTK_OBJECT (book)); + g_object_unref (book); merge_cb (book, E_BOOK_STATUS_OTHER_ERROR, qa); } } @@ -167,7 +167,7 @@ quick_add_merge_card (QuickAdd *qa) static void card_added_cb (EContactEditor *ce, EBookStatus status, ECard *card, gpointer closure) { - QuickAdd *qa = (QuickAdd *) gtk_object_get_data (GTK_OBJECT (ce), "quick_add"); + QuickAdd *qa = (QuickAdd *) g_object_get_data (G_OBJECT (ce), "quick_add"); if (qa) { @@ -175,20 +175,20 @@ card_added_cb (EContactEditor *ce, EBookStatus status, ECard *card, gpointer clo qa->cb (qa->card, qa->closure); /* We don't need to unref qa because we set_data_full below */ - gtk_object_set_data (GTK_OBJECT (ce), "quick_add", NULL); + g_object_set_data (G_OBJECT (ce), "quick_add", NULL); } } static void editor_closed_cb (GtkWidget *w, gpointer closure) { - QuickAdd *qa = (QuickAdd *) gtk_object_get_data (GTK_OBJECT (w), "quick_add"); + QuickAdd *qa = (QuickAdd *) g_object_get_data (G_OBJECT (w), "quick_add"); if (qa) /* We don't need to unref qa because we set_data_full below */ - gtk_object_set_data (GTK_OBJECT (w), "quick_add", NULL); + g_object_set_data (G_OBJECT (w), "quick_add", NULL); - gtk_object_unref (GTK_OBJECT (w)); + g_object_unref (w); } static void @@ -203,26 +203,26 @@ ce_have_book (EBook *book, EBookStatus status, gpointer closure) EContactEditor *contact_editor = e_contact_editor_new (book, qa->card, TRUE, TRUE /* XXX */); /* mark it as changed so the Save buttons are enabled when we bring up the dialog. */ - gtk_object_set (GTK_OBJECT(contact_editor), + g_object_set (contact_editor, "changed", TRUE, NULL); /* We pass this via object data, so that we don't get a dangling pointer referenced if both the "card_added" and "editor_closed" get emitted. (Which, based on a backtrace in bugzilla, I think can happen and cause a crash. */ - gtk_object_set_data_full (GTK_OBJECT (contact_editor), "quick_add", qa, - (GtkDestroyNotify) quick_add_unref); - - gtk_signal_connect (GTK_OBJECT (contact_editor), - "card_added", - GTK_SIGNAL_FUNC (card_added_cb), - NULL); - gtk_signal_connect (GTK_OBJECT (contact_editor), - "editor_closed", - GTK_SIGNAL_FUNC (editor_closed_cb), - NULL); - - gtk_object_unref (GTK_OBJECT (book)); + g_object_set_data_full (G_OBJECT (contact_editor), "quick_add", qa, + (GDestroyNotify) quick_add_unref); + + g_signal_connect (contact_editor, + "card_added", + G_CALLBACK (card_added_cb), + NULL); + g_signal_connect (contact_editor, + "editor_closed", + G_CALLBACK (editor_closed_cb), + NULL); + + g_object_unref (book); } } @@ -232,7 +232,7 @@ edit_card (QuickAdd *qa) EBook *book; book = e_book_new (); if (!addressbook_load_default_book (book, ce_have_book, qa)) { - gtk_object_unref (GTK_OBJECT (book)); + g_object_unref (book); ce_have_book (book, E_BOOK_STATUS_OTHER_ERROR, qa); } } diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c index a7fc8b4bed..2713cc6d21 100644 --- a/addressbook/gui/contact-editor/e-contact-save-as.c +++ b/addressbook/gui/contact-editor/e-contact-save-as.c @@ -26,8 +26,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -130,9 +129,9 @@ e_contact_save_as(char *title, ECard *card, GtkWindow *parent_window) filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title)); - gtk_object_get (GTK_OBJECT (card), - "file_as", &name, - NULL); + g_object_get (card, + "file_as", &name, + NULL); locale_name = e_utf8_to_locale_string (name); file = make_safe_filename (g_get_home_dir(), locale_name); gtk_file_selection_set_filename (filesel, file); @@ -169,9 +168,9 @@ e_contact_list_save_as(char *title, GList *list, GtkWindow *parent_window) /* This is a filename. Translators take note. */ if (list && list->data && list->next == NULL) { char *name, *locale_name, *file; - gtk_object_get (GTK_OBJECT (list->data), - "file_as", &name, - NULL); + g_object_get (list->data, + "file_as", &name, + NULL); locale_name = e_utf8_to_locale_string (name); file = make_safe_filename (g_get_home_dir(), locale_name); gtk_file_selection_set_filename (filesel, file); diff --git a/addressbook/gui/contact-editor/file-exists.glade b/addressbook/gui/contact-editor/file-exists.glade index 7c457cb892..aa886f1f80 100644 --- a/addressbook/gui/contact-editor/file-exists.glade +++ b/addressbook/gui/contact-editor/file-exists.glade @@ -1,95 +1,80 @@ - - + + - - File_exists.glade - file_exists.glade - - src - pixmaps - C - True - True - + + + no + Confirm Overwrite + GTK_WINDOW_TOPLEVEL + no + no + no + GTK_WIN_POS_NONE - - GnomeDialog - dialog-exists - False - Confirm Overwrite - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - False - False - False + + + no + 8 + yes - - GtkVBox - GnomeDialog:vbox - dialog-vbox1 - False - 8 - - 4 - True - True - + + + GTK_BUTTONBOX_END + 8 + yes - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area1 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - + + + yes + yes + Overwrite + yes + + - - GtkButton - button1 - True - True - - + + + yes + yes + yes + yes + gtk-cancel + yes + yes + + + + + 0 + no + yes + GTK_PACK_END + + - - GtkButton - button3 - True - True - True - GNOME_STOCK_BUTTON_CANCEL + + + Don't bother translating this string. It's not used. + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + - - - - GtkLabel - label-exists - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - + + 4 + yes + yes + + - - - + diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade index d66b9163e8..d8c43c5742 100644 --- a/addressbook/gui/contact-editor/fulladdr.glade +++ b/addressbook/gui/contact-editor/fulladdr.glade @@ -1,473 +1,440 @@ - - + + - - fulladdr - fulladdr - - src - pixmaps - C - True - True - True - False - False - False - + + + no + Check Address + GTK_WINDOW_TOPLEVEL + yes + no + yes + GTK_WIN_POS_NONE - - GnomeDialog - dialog-checkaddress - False - Check Address - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - False - True - False - False - False + + + no + 8 + yes - - GtkVBox - GnomeDialog:vbox - vbox-container - False - 8 - - 4 - True - True - + + + GTK_BUTTONBOX_END + 8 + yes - - GtkHButtonBox - GnomeDialog:action_area - hbuttonbox1 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - + + + yes + yes + yes + yes + gtk-ok + yes + yes + + - - GtkButton - button1 - True - True - True - GNOME_STOCK_BUTTON_OK - + + + yes + yes + yes + gtk-cancel + yes + yes + + + + + 0 + no + yes + GTK_PACK_END + + - - GtkButton - button2 - True - True - GNOME_STOCK_BUTTON_CANCEL - - + + + 8 + no + 6 + 6 + 4 + 4 + yes - - GtkTable - table-checkaddress - 8 - 4 - 4 - False - 6 - 6 - - 0 - True - True - + + + _Address: + GTK_JUSTIFY_LEFT + no + 1 + 0.5 + 0 + 0 + entry-street + yes + yes + + + 0 + 1 + 0 + 1 + 0 + 0 + fill + fill + + - - GtkLabel - label2 - - GTK_JUSTIFY_LEFT - False - 1 - 0.5 - 0 - 0 - entry-street - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - True - - + + + _City: + GTK_JUSTIFY_CENTER + no + 1 + 0.5 + 0 + 0 + entry-city + yes + yes + + + 0 + 1 + 2 + 3 + 0 + 0 + fill + fill + + - - GtkLabel - label4 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - entry-city - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - + + + yes + yes + + 0 + yes + yes + + + 1 + 2 + 2 + 3 + 0 + 0 + expand|fill + fill + + - - GtkEntry - entry-city - True - True - True - 0 - - - 1 - 2 - 2 - 3 - 0 - 0 - True - False - False - False - True - True - - + + + yes + yes + + 100 + 0 + yes + yes + + + 1 + 2 + 1 + 2 + 0 + 0 + expand|fill + fill + + - - GtkEntry - entry-ext - 100 - True - True - True - 0 - - - 1 - 2 - 1 - 2 - 0 - 0 - True - False - False - False - True - True - - + + + _PO Box: + GTK_JUSTIFY_CENTER + no + 1 + 0.5 + 0 + 0 + entry-po + yes + yes + + + 2 + 3 + 1 + 2 + 0 + 0 + fill + fill + + - - GtkLabel - label8 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - entry-po - - 2 - 3 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - + + + Address _2: + GTK_JUSTIFY_CENTER + no + 1 + 0.5 + 0 + 0 + entry-ext + yes + yes + + + 0 + 1 + 1 + 2 + 0 + 0 + fill + fill + + - - GtkLabel - label3 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - entry-ext - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - + + + yes + yes + + 100 + 0 + yes + yes + + + 3 + 4 + 1 + 2 + 0 + 0 + fill + fill + + - - GtkEntry - entry-po - 100 - True - True - True - 0 - - - 3 - 4 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - + + + yes + yes + yes + + 0 + yes + yes + + + 1 + 4 + 0 + 1 + 0 + 0 + expand|fill + fill + + - - GtkEntry - entry-street - True - True - True - True - 0 - - - 1 - 4 - 0 - 1 - 0 - 0 - True - False - False - False - True - True - - + + + _State/Province: + GTK_JUSTIFY_CENTER + no + 1 + 0.5 + 0 + 0 + entry-region + yes + yes + + + 0 + 1 + 3 + 4 + 0 + 0 + fill + fill + + - - GtkLabel - label5 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - entry-region - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - - + + + yes + yes + + 0 + yes + yes + + + 1 + 2 + 3 + 4 + 0 + 0 + expand|fill + fill + + - - GtkEntry - entry-region - True - True - True - 0 - - - 1 - 2 - 3 - 4 - 0 - 0 - True - False - False - False - True - True - - + + + yes + no + no + 100 + yes + no + yes + yes - - GtkCombo - combo-country - 100 - True - False - True - False - True - False - - - 3 - 4 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - + + + yes + yes + + 0 + yes + yes + + - - GtkEntry - GtkCombo:entry - entry-country - True - True - True - 0 - - - + + + yes - - GtkEntry - entry-code - 100 - True - True - True - 0 - - - 3 - 4 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - + + + yes - - GtkLabel - label6 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - entry-code - - 2 - 3 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - + + + + 0.0 + yes + + + + + + + + + 3 + 4 + 3 + 4 + 0 + 0 + fill + fill + + + + + + yes + yes + + 100 + 0 + yes + yes + + + 3 + 4 + 2 + 3 + 0 + 0 + fill + fill + + + + + + _ZIP Code: + GTK_JUSTIFY_CENTER + no + 1 + 0.5 + 0 + 0 + entry-code + yes + yes + + + 2 + 3 + 2 + 3 + 0 + 0 + fill + fill + + - - GtkLabel - label7 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - entry-country - - 2 - 3 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - + + + Countr_y: + GTK_JUSTIFY_CENTER + no + 1 + 0.5 + 0 + 0 + entry-country + yes + yes + + + 2 + 3 + 3 + 4 + 0 + 0 + fill + fill + + + + + 0 + yes + yes + + - + + 4 + yes + yes + + - - - + diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade index 17be70647c..04501b4bec 100644 --- a/addressbook/gui/contact-editor/fullname.glade +++ b/addressbook/gui/contact-editor/fullname.glade @@ -1,389 +1,554 @@ - - - - - fullname - fullname - - src - pixmaps - C - True - True - True - False - False - False - - - - GnomeDialog - dialog-checkfullname - False - Check Full Name - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - True - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - vbox-container - False - 8 - - 4 - True - True - + + - - GtkHButtonBox - GnomeDialog:action_area - hbuttonbox1 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button1 - True - True - GNOME_STOCK_BUTTON_OK - + + + no + Check Full Name + GTK_WINDOW_TOPLEVEL + yes + yes + yes + GTK_WIN_POS_NONE - - GtkButton - button2 - True - True - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkTable - table-checkfullname - 8 - 5 - 3 - False - 6 - 21 - - 0 - True - True - - - - GtkCombo - combo-title - False - True - False - True - False - -Mr. -Mrs. -Ms. -Miss -Dr. - - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - GtkEntry - GtkCombo:entry - entry-title - True - True - True - 0 - - - + + + no + 8 + yes - - GtkCombo - combo-suffix - False - True - False - True - False - -Sr. -Jr. -I -II -III -Esq. - - - 1 - 2 - 4 - 5 - 0 - 0 - True - False - False - False - True - False - - - - GtkEntry - GtkCombo:entry - entry-suffix - True - True - True - 0 - - - + + + GTK_BUTTONBOX_END + 8 + yes - - GtkEntry - entry-first - True - True - True - 0 - - - 1 - 3 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - + + + yes + yes + yes + gtk-ok + yes + yes + + - - GtkEntry - entry-middle - True - True - True - 0 - - - 1 - 3 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - + + + yes + yes + yes + gtk-cancel + yes + yes + + + + + 0 + no + yes + GTK_PACK_END + + - - GtkEntry - entry-last - True - True - True - 0 - - - 1 - 3 - 3 - 4 - 0 - 0 - True - False - False - False - True - False - - + + + 8 + no + 6 + 21 + 5 + 3 + yes - - GtkLabel - label2 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-first - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - + + + no + no + yes + no + yes + yes - - GtkLabel - label1 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-title - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - True - - + + + yes + yes + + 0 + yes + yes + + - - GtkLabel - label3 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-middle - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - + + + yes - - GtkLabel - label5 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-last - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - - + + + yes + + + + + 0.0 + yes + + + + + + + + yes + + + + Mr. + 0.0 + yes + + + + + + + + yes + + + + Mrs. + 0.0 + yes + + + + + + + + yes + + + + Ms. + 0.0 + yes + + + + + + + + yes + + + + Miss + 0.0 + yes + + + + + + + + yes + + + + Dr. + 0.0 + yes + + + + + + + + yes + + + + + 0.0 + yes + + + + + + + + + 1 + 2 + 0 + 1 + 0 + 0 + expand|fill + + + + + + + no + no + yes + no + yes + yes + + + + yes + yes + + 0 + yes + yes + + - - GtkLabel - label4 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry-suffix - - 0 - 1 - 4 - 5 - 0 - 0 - False - False - False - False - True - True - + + + yes + + + + yes + + + + + 0.0 + yes + + + + + + + + yes + + + + Sr. + 0.0 + yes + + + + + + + + yes + + + + Jr. + 0.0 + yes + + + + + + + + yes + + + + I + 0.0 + yes + + + + + + + + yes + + + + II + 0.0 + yes + + + + + + + + yes + + + + III + 0.0 + yes + + + + + + + + yes + + + + Esq. + 0.0 + yes + + + + + + + + yes + + + + + 0.0 + yes + + + + + + + + + 1 + 2 + 4 + 5 + 0 + 0 + expand|fill + + + + + + + yes + yes + + 0 + yes + yes + + + 1 + 3 + 1 + 2 + 0 + 0 + expand|fill + + + + + + + yes + yes + + 0 + yes + yes + + + 1 + 3 + 2 + 3 + 0 + 0 + expand|fill + + + + + + + yes + yes + + 0 + yes + yes + + + 1 + 3 + 3 + 4 + 0 + 0 + expand|fill + + + + + + + _First: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + entry-first + yes + yes + + + 0 + 1 + 1 + 2 + 0 + 0 + fill + fill + + + + + + _Title: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + entry-title + yes + yes + + + 0 + 1 + 0 + 1 + 0 + 0 + fill + fill + + + + + + _Middle: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + entry-middle + yes + yes + + + 0 + 1 + 2 + 3 + 0 + 0 + fill + fill + + + + + + _Last: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + entry-last + yes + yes + + + 0 + 1 + 3 + 4 + 0 + 0 + fill + fill + + + + + + _Suffix: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + entry-suffix + yes + yes + + + 0 + 1 + 4 + 5 + 0 + 0 + fill + fill + + + + + 0 + yes + yes + + - + + 4 + yes + yes + + - - - + diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index 6e871bdf38..eb7e3d3f68 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -85,7 +85,7 @@ editor_closed_cb (EContactEditor *ce, gpointer data) static int count = 2; count--; - gtk_object_unref (GTK_OBJECT (ce)); + g_object_unref (ce); if (count == 0) exit (0); -- cgit v1.2.3