From a730e63617f6d6848d48a59e5a8607b906b72668 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sat, 7 Jul 2007 11:31:00 +0000 Subject: ** Fix for bug #448568 2007-07-07 Gilles Dartiguelongue ** Fix for bug #448568 * gui/contact-editor/contact-editor.glade: * gui/contact-editor/e-contact-editor.c: (setup_tab_order): cleanup alignement mess and set correct tabbing order. Thanks to vinod for the initial glade patch. svn path=/trunk/; revision=33766 --- .../gui/contact-editor/contact-editor.glade | 2395 ++++++++------------ addressbook/gui/contact-editor/e-contact-editor.c | 45 +- 2 files changed, 1017 insertions(+), 1423 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade index 57cf9ee41a..afc6f114c8 100644 --- a/addressbook/gui/contact-editor/contact-editor.glade +++ b/addressbook/gui/contact-editor/contact-editor.glade @@ -6,7 +6,7 @@ Contact Editor GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER False True False @@ -2773,557 +2773,400 @@ 0 - + + 6 True - False - 1 + 0 + 0.5 + GTK_SHADOW_NONE - + 6 True - 0 - 0.5 - GTK_SHADOW_NONE + 0.5 + 0.15 + 1 + 0.70 + 0 + 0 + 19 + 10 - - 6 + + 50 True - 0.5 - 0.15000000596 - 1 - 0.709999978542 - 0 - 0 - 19 - 10 + False + 0 - - 50 + True + 4 + 4 False - 0 + 6 + 6 - + + 193 + 69 True - False - 6 + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - + + 25 True - False - 6 + True + True + False + False + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + 1 + 2 + 0 + 3 + fill + fill + + - - - True - False - 0 + + + True + True + True + True + 0 + + True + ● + False + + + 3 + 4 + 0 + 1 + + + - - - True - _Address: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.0500000007451 - 0 - 0 - scrolledwindow48 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + _City: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + entry-home-city + PANGO_ELLIPSIZE_NONE + -1 + True + 0 + + + 2 + 3 + 0 + 1 + fill + + + - - - 193 - 69 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - 25 - True - True - True - False - False - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - 0 - True - True - - + + + True + True + True + True + 0 + + True + ● + False + + + 3 + 4 + 1 + 2 + + + - - - True - False - 0 + + + True + _Zip/Postal Code: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + entry-home-zip + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 1 + 2 + fill + + + - - - True - 3 - 2 - False - 6 - 6 - - - - True - _Zip/Postal Code: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - entry-home-zip - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - _State/Province: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - entry-home-state - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 1 - 2 - - - - - - - 259 - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 2 - 3 - - - - - - - True - _City: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - entry-home-city - PANGO_ELLIPSIZE_NONE - -1 - True - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 8 - True - False - - + + + 256 + True + True + True + True + 0 + + True + ● + False + + + 3 + 4 + 2 + 3 + + + - - - True - False - 0 + + + True + _State/Province: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + entry-home-state + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 2 + 3 + fill + + + - - - True - False - 0 + + + 163 + True + True + True + True + 0 + + True + ● + False + + + 3 + 4 + 3 + 4 + + + - - - True - False - 0 - - - - True - _PO Box: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 2 - 0 - entry-home-pobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 100 - True - True - True - True - 0 - - True - ● - False - - - 0 - True - True - - - - - 0 - False - True - - - - - 0 - True - True - - + + + True + _Country: + True + False + GTK_JUSTIFY_LEFT + False + False + 1.0 + 0.5 + 0 + 4 + entry-home-country + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 3 + 4 + fill + + + - - - True - False - 0 + + + 100 + True + True + True + True + 0 + + True + ● + False + + + 1 + 2 + 3 + 4 + + + - - - True - 1 - 2 - False - 0 - 6 - - - - 163 - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 0 - 1 - fill - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - _Country: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.519999980927 - 0 - 4 - entry-home-country - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - 1 - 0 - 1 - fill - fill - - - - - 0 - False - True - - - - - 0 - True - True - - - - - 0 - False - False - - + + + True + _PO Box: + True + False + GTK_JUSTIFY_LEFT + False + False + 1.0 + 0.5 + 0 + 0 + entry-home-pobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - True - True + 0 + 1 + 3 + 4 + fill + + + + + True + _Address: + True + False + GTK_JUSTIFY_LEFT + False + False + 1.0 + 0.5 + 0 + 0 + textview-home-address + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + + + + + + + - - - True - <b>Home</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.439999997616 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - + + + True + <b>Home</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.42 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - True - True + label_item @@ -3347,9 +3190,9 @@ 6 True 0.5 - 0.15000000596 + 0.15 1 - 0.709999978542 + 0.70 0 0 19 @@ -3363,495 +3206,347 @@ 0 - + True + 4 + 4 False - 6 + 6 + 6 - + + 193 + 69 True - False - 6 - + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - + + 25 True - False - 0 - - - - True - _Address: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.0500000007451 - 0 - 0 - scrolledwindow53 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 193 - 69 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - 25 - True - True - True - False - False - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - + True + True + False + False + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + - - 0 - True - True - + + + 1 + 2 + 0 + 3 + fill + fill + + - - - True - False - 0 - - - - True - 3 - 2 - False - 6 - 6 - - - - True - _Zip/Postal Code: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - entry-work-zip - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - _State/Province: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - entry-work-state - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 1 - 2 - - - - - - - 259 - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 2 - 3 - - - + + + True + True + True + True + 0 + + True + ● + False + + + 3 + 4 + 0 + 1 + + + - - - True - _City: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 4 - 0 - entry-work-city - PANGO_ELLIPSIZE_NONE - -1 - True - 0 - - - 0 - 1 - 0 - 1 - 1 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - + + + True + _City: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + entry-work-city + PANGO_ELLIPSIZE_NONE + -1 + True + 0 - 8 - True - False + 2 + 3 + 0 + 1 + fill + - + True - False - 0 + _Address: + True + False + GTK_JUSTIFY_LEFT + False + False + 1.0 + 0.5 + 0 + 0 + textview-work-address + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - True - False - 0 + + + True + True + True + True + 0 + + True + ● + False + + + 3 + 4 + 1 + 2 + + + - - - True - False - 0 + + + True + _Zip/Postal Code: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + entry-work-zip + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 1 + 2 + fill + + + - - - True - _PO Box: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 2 - 0 - entry-work-pobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + 256 + True + True + True + True + 0 + + True + ● + False + + + 3 + 4 + 2 + 3 + + + - - - 100 - True - True - True - True - 0 - - True - ● - False - - - 0 - True - True - - - - - 0 - False - True - - - - - 0 - True - True - - + + + True + _State/Province: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + entry-work-state + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 2 + 3 + fill + + + - - - True - False - 0 + + + 163 + True + True + True + True + 0 + + True + ● + False + + + 3 + 4 + 3 + 4 + + + - - - True - 1 - 2 - False - 0 - 6 + + + True + _Country: + True + False + GTK_JUSTIFY_LEFT + False + False + 1.0 + 0.5 + 0 + 4 + entry-home-country + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 3 + 4 + fill + + + - - - 163 - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 0 - 1 - fill - - + + + 100 + True + True + True + True + 0 + + True + ● + False + + + 1 + 2 + 3 + 4 + + + - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - _Country: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.519999980927 - 0 - 4 - entry-home-country - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - 1 - 0 - 1 - fill - fill - - - - - 0 - False - True - - - - - 0 - True - True - - + + + True + _PO Box: + True + False + GTK_JUSTIFY_LEFT + False + False + 1.0 + 0.5 + 0 + 0 + entry-work-pobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - False - False + 0 + 1 + 3 + 4 + fill + + - - 0 - True - True - + + 8 + True + False + @@ -3863,7 +3558,7 @@ GTK_JUSTIFY_LEFT False False - 0.439999997616 + 0.42 0.5 0 0 @@ -3897,9 +3592,9 @@ 6 True 0.5 - 0.15000000596 + 0.15 1 - 0.709999978542 + 0.70 0 0 19 @@ -3913,483 +3608,334 @@ 0 - + True + 4 + 4 False - 6 + 6 + 6 - + True - False - 6 - - - - True - False - 0 - - - - True - _Address: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.0500000007451 - 0 - 0 - scrolledwindow54 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 193 - 69 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - 25 - True - True - True - False - False - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - 3 - 2 - False - 6 - 6 - - - - True - _Zip/Postal Code: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - entry-other-zip - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - + True + True + True + 0 + + True + ● + False + + + 3 + 4 + 0 + 1 + + + - - - True - _State/Province: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - entry-other-state - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - + + + True + _City: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + entry-other-city + PANGO_ELLIPSIZE_NONE + -1 + True + 0 + + + 2 + 3 + 0 + 1 + fill + + + - - - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 0 - 1 - - - + + + True + _Address: + True + False + GTK_JUSTIFY_LEFT + False + False + 1.0 + 0.5 + 0 + 0 + textview-other-address + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 1 - 2 - - - + + + True + True + True + True + 0 + + True + ● + False + + + 3 + 4 + 1 + 2 + + + - - - 259 - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 2 - 3 - - - + + + True + _Zip/Postal Code: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + entry-other-zip + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 1 + 2 + fill + + + - - - True - _City: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 4 - 0 - entry-other-city - PANGO_ELLIPSIZE_NONE - -1 - True - 0 - - - 0 - 1 - 0 - 1 - 1 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - + + + 256 + True + True + True + True + 0 + + True + ● + False - 8 - True - False + 3 + 4 + 2 + 3 + - + True - False - 0 + _State/Province: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + entry-other-state + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 2 + 3 + fill + + + - - - True - False - 0 + + + 163 + True + True + True + True + 0 + + True + ● + False + + + 3 + 4 + 3 + 4 + + + - - - True - False - 0 + + + True + _Country: + True + False + GTK_JUSTIFY_LEFT + False + False + 1.0 + 0.5 + 0 + 4 + entry-other-country + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 3 + 4 + fill + + + - - - True - _PO Box: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 2 - 0 - entry-other-pobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + 100 + True + True + True + True + 0 + + True + ● + False + + + 1 + 2 + 3 + 4 + + + - - - 100 - True - True - True - True - 0 - - True - ● - False - - - 0 - True - True - - - - - 0 - False - True - - - - - 0 - True - True - - + + + True + _PO Box: + True + False + GTK_JUSTIFY_LEFT + False + False + 1.0 + 0.5 + 0 + 0 + entry-other-pobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + 193 + 69 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - + + 25 True - False - 0 - - - - True - 1 - 2 - False - 0 - 6 - - - - 163 - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 0 - 1 - fill - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - _Country: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.519999980927 - 0 - 4 - entry-other-country - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - 1 - 0 - 1 - fill - fill - - - - - 0 - False - True - - + True + True + False + False + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + - - 0 - True - True - - 0 - False - False + 1 + 2 + 0 + 3 + fill + fill @@ -4402,6 +3948,11 @@ + + 8 + True + False + @@ -4413,7 +3964,7 @@ GTK_JUSTIFY_LEFT False False - 0.439999997616 + 0.42 0.5 0 0 diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index ab1978f627..babd645b81 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -3248,7 +3248,7 @@ setup_tab_order(GladeXML *gui) { GtkWidget *container; GList *list = NULL; - +/* container = glade_xml_get_widget(gui, "table-contact-editor-general"); if (container) { @@ -3271,6 +3271,49 @@ setup_tab_order(GladeXML *gui) e_container_change_tab_order(GTK_CONTAINER(container), list); g_list_free(list); } +*/ + + container = glade_xml_get_widget (gui, "table-home-address"); + gtk_container_get_focus_chain (GTK_CONTAINER (container), &list); + + list = add_to_tab_order (list, gui, "scrolledwindow-home-address"); + list = add_to_tab_order (list, gui, "entry-home-city"); + list = add_to_tab_order (list, gui, "entry-home-zip"); + list = add_to_tab_order (list, gui, "entry-home-state"); + list = add_to_tab_order (list, gui, "entry-home-pobox"); + list = add_to_tab_order (list, gui, "entry-home-country"); + list = g_list_reverse (list); + + gtk_container_set_focus_chain (GTK_CONTAINER (container), list); + g_list_free (list); + + container = glade_xml_get_widget (gui, "table-work-address"); + gtk_container_get_focus_chain (GTK_CONTAINER (container), &list); + + list = add_to_tab_order (list, gui, "scrolledwindow-work-address"); + list = add_to_tab_order (list, gui, "entry-work-city"); + list = add_to_tab_order (list, gui, "entry-work-zip"); + list = add_to_tab_order (list, gui, "entry-work-state"); + list = add_to_tab_order (list, gui, "entry-work-pobox"); + list = add_to_tab_order (list, gui, "entry-work-country"); + list = g_list_reverse (list); + + gtk_container_set_focus_chain (GTK_CONTAINER (container), list); + g_list_free (list); + + container = glade_xml_get_widget (gui, "table-other-address"); + gtk_container_get_focus_chain (GTK_CONTAINER (container), &list); + + list = add_to_tab_order (list, gui, "scrolledwindow-other-address"); + list = add_to_tab_order (list, gui, "entry-other-city"); + list = add_to_tab_order (list, gui, "entry-other-zip"); + list = add_to_tab_order (list, gui, "entry-other-state"); + list = add_to_tab_order (list, gui, "entry-other-pobox"); + list = add_to_tab_order (list, gui, "entry-other-country"); + list = g_list_reverse (list); + + gtk_container_set_focus_chain (GTK_CONTAINER (container), list); + g_list_free (list); } static void -- cgit v1.2.3