diff options
author | Christopher James Lahey <clahey@ximian.com> | 2001-12-01 10:05:56 +0800 |
---|---|---|
committer | Chris Lahey <clahey@src.gnome.org> | 2001-12-01 10:05:56 +0800 |
commit | f12b94f40d70f09ce3007c4f7188d3d799e054bf (patch) | |
tree | 18db1dbb956db592f8dcf71d98482c469b87d2e9 | |
parent | 7094e925a6b2c7556a395e120d5514c0abef8d0b (diff) | |
download | gsoc2013-evolution-f12b94f40d70f09ce3007c4f7188d3d799e054bf.tar.gz gsoc2013-evolution-f12b94f40d70f09ce3007c4f7188d3d799e054bf.tar.zst gsoc2013-evolution-f12b94f40d70f09ce3007c4f7188d3d799e054bf.zip |
Merged changes:
2001-11-28 Christopher James Lahey <clahey@ximian.com>
* gui/contact-editor/e-contact-editor-address.c (setup_tab_order):
Setup the tab order here. Fixes Ximian bug #13751.
svn path=/trunk/; revision=14840
-rw-r--r-- | addressbook/ChangeLog | 5 | ||||
-rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-address.c | 29 |
2 files changed, 34 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index f1bb09dffb..821a9e0362 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,10 @@ 2001-11-28 Christopher James Lahey <clahey@ximian.com> + * gui/contact-editor/e-contact-editor-address.c (setup_tab_order): + Setup the tab order here. Fixes Ximian bug #13751. + +2001-11-28 Christopher James Lahey <clahey@ximian.com> + * gui/component/addressbook.c (connect_master_list_changed, make_suboptions): Changed how this list of categories gets computed. Fixes Ximian bugs #7707 and #7708. diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 431f041a23..a826849f2f 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -22,6 +22,7 @@ #include <config.h> #include <libgnomeui/gnome-stock.h> #include <gal/widgets/e-unicode.h> +#include <gal/widgets/e-gui-utils.h> #include <e-contact-editor-address.h> #include <gtk/gtkcombo.h> @@ -89,6 +90,32 @@ e_contact_editor_address_class_init (EContactEditorAddressClass *klass) object_class->destroy = e_contact_editor_address_destroy; } +static GList * +add_to_tab_order(GList *list, GladeXML *gui, char *name) +{ + GtkWidget *widget = glade_xml_get_widget(gui, name); + return g_list_prepend(list, widget); +} + +static void +setup_tab_order(GladeXML *gui) +{ + GtkWidget *container; + GList *list = NULL; + + container = glade_xml_get_widget(gui, "table-checkaddress"); + + if (container) { + list = add_to_tab_order(list, gui, "entry-city"); + list = add_to_tab_order(list, gui, "entry-region"); + list = add_to_tab_order(list, gui, "entry-code"); + list = add_to_tab_order(list, gui, "combo-country"); + list = g_list_reverse(list); + e_container_change_tab_order(GTK_CONTAINER(container), list); + g_list_free(list); + } +} + static void e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) { @@ -108,6 +135,8 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL); e_contact_editor_address->gui = gui; + setup_tab_order (gui); + widget = glade_xml_get_widget(gui, "table-checkaddress"); gtk_widget_ref(widget); gtk_container_remove(GTK_CONTAINER(widget->parent), widget); |