From c6658ca9c11447bf932b6b3fb777442d2e1521a9 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Wed, 5 Dec 2001 21:35:55 +0000 Subject: Merging changes: 2001-12-04 Christopher James Lahey * gui/contact-editor/contact-editor.glade: Fixed up the accelerators and such here. * gui/contact-editor/e-contact-editor.c (file_save_as_cb): Translate this string. (pixmaps): Added a pixmap for the ContactEditorSaveClose command. (setup_tab_order): Fixed up the tab order here. * gui/contact-editor/fulladdr.glade: Made the country combo focusable here. svn path=/trunk/; revision=14895 --- addressbook/ChangeLog | 26 +++++++++++++----- .../gui/contact-editor/contact-editor.glade | 31 +++++++++++----------- addressbook/gui/contact-editor/e-contact-editor.c | 12 ++++----- addressbook/gui/contact-editor/fulladdr.glade | 1 + 4 files changed, 42 insertions(+), 28 deletions(-) (limited to 'addressbook') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 5411d1fbc1..eb833dc75f 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,17 +1,29 @@ +2001-12-04 Christopher James Lahey + + * gui/contact-editor/contact-editor.glade: Fixed up the + accelerators and such here. + + * gui/contact-editor/e-contact-editor.c (file_save_as_cb): + Translate this string. + (pixmaps): Added a pixmap for the ContactEditorSaveClose command. + (setup_tab_order): Fixed up the tab order here. + + * gui/contact-editor/fulladdr.glade: Made the country combo + focusable here. + 2001-12-03 Jon Trowbridge - * backend/ebook/e-destination.c (e_destination_equal): Make address - comparisons case-insensitive. (Fixes 11776) + * backend/ebook/e-destination.c (e_destination_equal): Make address + comparisons case-insensitive. (Fixes 11776) * backend/ebook/e-card.c (e_card_email_match_single_string): Make address host comparisons case-insensitive. (Fixes 11776) - - * gui/component/select-names/e-select-names-manager.c (focus_out_cb): Clean - ESelectNamesModel on focus-out. (Half of a fix for 15656) + * gui/component/select-names/e-select-names-manager.c (focus_out_cb): Clean + ESelectNamesModel on focus-out. (Half of a fix for 15656) - * backend/ebook/e-destination.c (nonempty): Fix this function - and make it utf8-safe. (The other half of the fix for 15656) + * backend/ebook/e-destination.c (nonempty): Fix this function + and make it utf8-safe. (The other half of the fix for 15656) 2001-11-28 Christopher James Lahey diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade index 54fea0864a..7d9e7b1f7d 100644 --- a/addressbook/gui/contact-editor/contact-editor.glade +++ b/addressbook/gui/contact-editor/contact-editor.glade @@ -493,7 +493,7 @@ GtkButton button-fullname True - + GTK_RELIEF_NORMAL 1 @@ -894,7 +894,7 @@ GtkAlignment - alignment10 + alignment-htmlmail 0.5 0 1 @@ -917,6 +917,7 @@ GtkCheckButton checkbutton-htmlmail + True False True @@ -977,7 +978,7 @@ GtkLabel label-phone1 - + GTK_JUSTIFY_CENTER False 0 @@ -1009,7 +1010,7 @@ GtkLabel label-phone2 - + GTK_JUSTIFY_CENTER False 0 @@ -1041,7 +1042,7 @@ GtkLabel label-phone3 - + GTK_JUSTIFY_CENTER False 0 @@ -1073,7 +1074,7 @@ GtkLabel label-phone4 - + GTK_JUSTIFY_LEFT False 0 @@ -1137,7 +1138,7 @@ GtkLabel label-address - + GTK_JUSTIFY_CENTER False 0 @@ -1174,7 +1175,7 @@ GtkCheckButton checkbutton-mailingaddress False - + False True @@ -1244,7 +1245,7 @@ GtkButton button-contacts True - + GTK_RELIEF_NORMAL @@ -1551,7 +1552,7 @@ GtkButton button-fulladdr True - + GTK_RELIEF_NORMAL 5 @@ -1683,7 +1684,7 @@ GtkLabel label-department - + GTK_JUSTIFY_CENTER False 0 @@ -1737,7 +1738,7 @@ GtkLabel label-profession - + GTK_JUSTIFY_CENTER False 0 @@ -1791,7 +1792,7 @@ GtkLabel label-spouse - + GTK_JUSTIFY_CENTER False 0 @@ -1818,7 +1819,7 @@ GtkLabel label-birthday - + GTK_JUSTIFY_CENTER False 0 @@ -1845,7 +1846,7 @@ GtkLabel label-assistant - + GTK_JUSTIFY_CENTER False 0 diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 5abc4af8f7..90c81edef5 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -21,6 +21,8 @@ #include +#include "e-contact-editor.h" + #include #include #include @@ -51,7 +53,6 @@ #include "e-card-merging.h" -#include "e-contact-editor.h" #include "e-contact-editor-address.h" #include "e-contact-editor-fullname.h" #include "e-contact-save-as.h" @@ -974,7 +975,7 @@ file_save_as_cb (GtkWidget *widget, gpointer data) e_card_simple_sync_card (ce->simple); card = ce->card; - e_contact_save_as("Save as VCard", card); + e_contact_save_as(_("Save Contact as VCard"), card); } static void @@ -1128,6 +1129,7 @@ BonoboUIVerb verbs [] = { EPixmap pixmaps[] = { E_PIXMAP ("/commands/ContactEditorSave", "save-16.png"), + E_PIXMAP ("/commands/ContactEditorSaveClose", "save-16.png"), E_PIXMAP ("/commands/ContactEditorSaveAs", "save-as-16.png"), E_PIXMAP ("/commands/ContactEditorDelete", "evolution-trash-mini.png"), E_PIXMAP ("/commands/ContactEditorPrint", "print.xpm"), @@ -1196,13 +1198,11 @@ setup_tab_order(GladeXML *gui) list = add_to_tab_order(list, gui, "entry-phone2"); list = add_to_tab_order(list, gui, "entry-phone3"); list = add_to_tab_order(list, gui, "entry-phone4"); - list = g_list_reverse(list); - e_container_change_tab_order(GTK_CONTAINER(container), list); - g_list_free(list); - list = NULL; list = add_to_tab_order(list, gui, "entry-email1"); + list = add_to_tab_order(list, gui, "alignment-htmlmail"); list = add_to_tab_order(list, gui, "entry-web"); + list = add_to_tab_order(list, gui, "button-fulladdr"); list = add_to_tab_order(list, gui, "text-address"); list = add_to_tab_order(list, gui, "alignment-contacts"); list = g_list_reverse(list); diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade index 68b715a1cc..432e081c60 100644 --- a/addressbook/gui/contact-editor/fulladdr.glade +++ b/addressbook/gui/contact-editor/fulladdr.glade @@ -354,6 +354,7 @@ GtkCombo combo-country 100 + True False True False -- cgit v1.2.3