From f0024cb0b037033d9e2ce78a2d009c51e5d91317 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Fri, 13 Oct 2000 22:25:23 +0000 Subject: Changed these for boolean ascending attribute instead of int ascending 2000-10-13 Christopher James Lahey * contact-editor/e-contact-editor-categories.c, gui/component/select-names/e-select-names.c, gui/widgets/e-addressbook-view.c: Changed these for boolean ascending attribute instead of int ascending attribute. Fixed e-select-names to not use a column past the end of its array. * contact-editor/e-contact-editor-address.c, contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h: Rearranged the address editor dialog. svn path=/trunk/; revision=5904 --- addressbook/ChangeLog | 12 + .../contact-editor/e-contact-editor-address.c | 4 +- .../contact-editor/e-contact-editor-categories.c | 2 +- addressbook/contact-editor/fulladdr.glade | 274 ++++++++++----------- addressbook/contact-editor/fulladdr.glade.h | 14 +- .../gui/component/select-names/e-select-names.c | 2 +- .../gui/contact-editor/e-contact-editor-address.c | 4 +- .../contact-editor/e-contact-editor-categories.c | 2 +- addressbook/gui/contact-editor/fulladdr.glade | 274 ++++++++++----------- addressbook/gui/contact-editor/fulladdr.glade.h | 14 +- addressbook/gui/widgets/e-addressbook-view.c | 2 +- 11 files changed, 300 insertions(+), 304 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 30d0a634d5..703f9ca84f 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,15 @@ +2000-10-13 Christopher James Lahey + + * contact-editor/e-contact-editor-categories.c, + gui/component/select-names/e-select-names.c, + gui/widgets/e-addressbook-view.c: Changed these for boolean + ascending attribute instead of int ascending attribute. Fixed + e-select-names to not use a column past the end of its array. + + * contact-editor/e-contact-editor-address.c, + contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h: + Rearranged the address editor dialog. + 2000-10-11 Christopher James Lahey * contact-editor/e-contact-editor-categories.c: Fixed the column diff --git a/addressbook/contact-editor/e-contact-editor-address.c b/addressbook/contact-editor/e-contact-editor-address.c index 10160facae..fbba8c9454 100644 --- a/addressbook/contact-editor/e-contact-editor-address.c +++ b/addressbook/contact-editor/e-contact-editor-address.c @@ -181,7 +181,7 @@ fill_in_info(EContactEditorAddress *editor) { ECardDeliveryAddress *address = editor->address; if (address) { - fill_in_field(editor, "text-street" , address->street ); + fill_in_field(editor, "entry-street" , address->street ); fill_in_field(editor, "entry-po" , address->po ); fill_in_field(editor, "entry-ext" , address->ext ); fill_in_field(editor, "entry-city" , address->city ); @@ -207,7 +207,7 @@ extract_info(EContactEditorAddress *editor) ECardDeliveryAddress *address = editor->address; if (!address) address = e_card_delivery_address_new(); - address->street = extract_field(editor, "text-street" ); + address->street = extract_field(editor, "entry-street" ); address->po = extract_field(editor, "entry-po" ); address->ext = extract_field(editor, "entry-ext" ); address->city = extract_field(editor, "entry-city" ); diff --git a/addressbook/contact-editor/e-contact-editor-categories.c b/addressbook/contact-editor/e-contact-editor-categories.c index ff58678031..045f128b48 100644 --- a/addressbook/contact-editor/e-contact-editor-categories.c +++ b/addressbook/contact-editor/e-contact-editor-categories.c @@ -227,7 +227,7 @@ e_contact_editor_categories_entry_change (GtkWidget *entry, \ \ \ - \ + \ \ " diff --git a/addressbook/contact-editor/fulladdr.glade b/addressbook/contact-editor/fulladdr.glade index 46a3db23ca..bb955b44c0 100644 --- a/addressbook/contact-editor/fulladdr.glade +++ b/addressbook/contact-editor/fulladdr.glade @@ -82,7 +82,7 @@ GtkTable table-checkaddress 8 - 5 + 4 4 False 6 @@ -93,30 +93,6 @@ True - - GtkEntry - entry-city - True - True - True - 0 - - - 1 - 4 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - GtkLabel label2 @@ -127,6 +103,7 @@ 0 0 0 + entry-address 0 1 @@ -153,6 +130,7 @@ 0.5 0 0 + entry-city 0 1 @@ -171,17 +149,18 @@ GtkLabel - label5 - + label6 + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-code - 0 - 1 + 2 + 3 3 4 0 @@ -196,20 +175,19 @@ - GtkLabel - label7 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 + GtkEntry + entry-code + 100 + True + True + True + 0 + - 0 - 1 - 4 - 5 + 3 + 4 + 3 + 4 0 0 False @@ -223,7 +201,7 @@ GtkEntry - entry-region + entry-city True True True @@ -232,8 +210,8 @@ 1 2 - 3 - 4 + 2 + 3 0 0 True @@ -241,25 +219,78 @@ False False True - False + True + + + + + GtkEntry + entry-ext + 100 + True + True + True + 0 + + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + True + True GtkLabel - label6 - + label8 + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-po 2 3 - 3 - 4 + 1 + 2 + 0 + 0 + False + False + False + False + True + True + + + + + GtkLabel + label3 + + GTK_JUSTIFY_CENTER + False + 0 + 0 + 0 + 0 + entry-ext + + 0 + 1 + 1 + 2 0 0 False @@ -273,7 +304,7 @@ GtkEntry - entry-code + entry-po 100 True True @@ -283,8 +314,8 @@ 3 4 - 3 - 4 + 1 + 2 0 0 False @@ -292,29 +323,26 @@ False False True - False + True - GtkLabel - label3 - - GTK_JUSTIFY_CENTER - False - 0 - 0 - 0 - 0 - entry-ext + GtkEntry + entry-address + True + True + True + 0 + - 2 - 3 + 1 + 4 0 1 0 0 - False + True False False False @@ -324,17 +352,21 @@ - GtkAlignment - alignment1 - 0.5 - 0 - 1 - 0 + GtkLabel + label5 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + entry-region - 3 - 4 - 0 - 1 + 0 + 1 + 3 + 4 0 0 False @@ -344,53 +376,36 @@ True True - - - GtkEntry - entry-ext - 100 - True - True - True - 0 - - - GtkScrolledWindow - scrolledwindow1 - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS + GtkEntry + entry-region + True + True + True + 0 + 1 2 - 0 - 1 + 3 + 4 0 0 True - True + False False False True True - - - GtkText - text-street - True - True - - GtkCombo combo-country + 100 False True False @@ -401,18 +416,18 @@ Canada Finland - 1 + 3 4 - 4 - 5 + 2 + 3 0 0 - True + False False False False True - False + True @@ -423,25 +438,26 @@ Finland True True 0 - + USA GtkLabel - label8 - + label7 + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-country - 0 - 1 - 1 - 2 + 2 + 3 + 2 + 3 0 0 False @@ -452,30 +468,6 @@ Finland True - - - GtkEntry - entry-po - True - True - True - 0 - - - 1 - 4 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - diff --git a/addressbook/contact-editor/fulladdr.glade.h b/addressbook/contact-editor/fulladdr.glade.h index 2a76706d6e..6502ad796c 100644 --- a/addressbook/contact-editor/fulladdr.glade.h +++ b/addressbook/contact-editor/fulladdr.glade.h @@ -7,12 +7,12 @@ gchar *s = N_("Check Address"); gchar *s = N_("_Street Address:"); gchar *s = N_("City:"); -gchar *s = N_("State/Province:"); -gchar *s = N_("Country:"); gchar *s = N_("ZIP/Postal Code:"); -gchar *s = N_("E_xt:"); -gchar *s = N_("USA\n" - "Canada\n" - "Finland\n" - ""); gchar *s = N_("PO Box:"); +gchar *s = N_("Address _2:"); +gchar *s = N_("State/Province:"); +gchar *s = N_("USA"); +gchar *s = N_("Canada"); +gchar *s = N_("Finland"); +gchar *s = N_("USA"); +gchar *s = N_("Country:"); diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index a1286566bc..611f6a76ff 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -91,7 +91,7 @@ e_select_names_class_init (ESelectNamesClass *klass) \ \ \ - \ + \ \ " diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 10160facae..fbba8c9454 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -181,7 +181,7 @@ fill_in_info(EContactEditorAddress *editor) { ECardDeliveryAddress *address = editor->address; if (address) { - fill_in_field(editor, "text-street" , address->street ); + fill_in_field(editor, "entry-street" , address->street ); fill_in_field(editor, "entry-po" , address->po ); fill_in_field(editor, "entry-ext" , address->ext ); fill_in_field(editor, "entry-city" , address->city ); @@ -207,7 +207,7 @@ extract_info(EContactEditorAddress *editor) ECardDeliveryAddress *address = editor->address; if (!address) address = e_card_delivery_address_new(); - address->street = extract_field(editor, "text-street" ); + address->street = extract_field(editor, "entry-street" ); address->po = extract_field(editor, "entry-po" ); address->ext = extract_field(editor, "entry-ext" ); address->city = extract_field(editor, "entry-city" ); diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.c b/addressbook/gui/contact-editor/e-contact-editor-categories.c index ff58678031..045f128b48 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-categories.c +++ b/addressbook/gui/contact-editor/e-contact-editor-categories.c @@ -227,7 +227,7 @@ e_contact_editor_categories_entry_change (GtkWidget *entry, \ \ \ - \ + \ \ " diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade index 46a3db23ca..bb955b44c0 100644 --- a/addressbook/gui/contact-editor/fulladdr.glade +++ b/addressbook/gui/contact-editor/fulladdr.glade @@ -82,7 +82,7 @@ GtkTable table-checkaddress 8 - 5 + 4 4 False 6 @@ -93,30 +93,6 @@ True - - GtkEntry - entry-city - True - True - True - 0 - - - 1 - 4 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - GtkLabel label2 @@ -127,6 +103,7 @@ 0 0 0 + entry-address 0 1 @@ -153,6 +130,7 @@ 0.5 0 0 + entry-city 0 1 @@ -171,17 +149,18 @@ GtkLabel - label5 - + label6 + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-code - 0 - 1 + 2 + 3 3 4 0 @@ -196,20 +175,19 @@ - GtkLabel - label7 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 + GtkEntry + entry-code + 100 + True + True + True + 0 + - 0 - 1 - 4 - 5 + 3 + 4 + 3 + 4 0 0 False @@ -223,7 +201,7 @@ GtkEntry - entry-region + entry-city True True True @@ -232,8 +210,8 @@ 1 2 - 3 - 4 + 2 + 3 0 0 True @@ -241,25 +219,78 @@ False False True - False + True + + + + + GtkEntry + entry-ext + 100 + True + True + True + 0 + + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + True + True GtkLabel - label6 - + label8 + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-po 2 3 - 3 - 4 + 1 + 2 + 0 + 0 + False + False + False + False + True + True + + + + + GtkLabel + label3 + + GTK_JUSTIFY_CENTER + False + 0 + 0 + 0 + 0 + entry-ext + + 0 + 1 + 1 + 2 0 0 False @@ -273,7 +304,7 @@ GtkEntry - entry-code + entry-po 100 True True @@ -283,8 +314,8 @@ 3 4 - 3 - 4 + 1 + 2 0 0 False @@ -292,29 +323,26 @@ False False True - False + True - GtkLabel - label3 - - GTK_JUSTIFY_CENTER - False - 0 - 0 - 0 - 0 - entry-ext + GtkEntry + entry-address + True + True + True + 0 + - 2 - 3 + 1 + 4 0 1 0 0 - False + True False False False @@ -324,17 +352,21 @@ - GtkAlignment - alignment1 - 0.5 - 0 - 1 - 0 + GtkLabel + label5 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + entry-region - 3 - 4 - 0 - 1 + 0 + 1 + 3 + 4 0 0 False @@ -344,53 +376,36 @@ True True - - - GtkEntry - entry-ext - 100 - True - True - True - 0 - - - GtkScrolledWindow - scrolledwindow1 - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS + GtkEntry + entry-region + True + True + True + 0 + 1 2 - 0 - 1 + 3 + 4 0 0 True - True + False False False True True - - - GtkText - text-street - True - True - - GtkCombo combo-country + 100 False True False @@ -401,18 +416,18 @@ Canada Finland - 1 + 3 4 - 4 - 5 + 2 + 3 0 0 - True + False False False False True - False + True @@ -423,25 +438,26 @@ Finland True True 0 - + USA GtkLabel - label8 - + label7 + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-country - 0 - 1 - 1 - 2 + 2 + 3 + 2 + 3 0 0 False @@ -452,30 +468,6 @@ Finland True - - - GtkEntry - entry-po - True - True - True - 0 - - - 1 - 4 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - diff --git a/addressbook/gui/contact-editor/fulladdr.glade.h b/addressbook/gui/contact-editor/fulladdr.glade.h index 2a76706d6e..6502ad796c 100644 --- a/addressbook/gui/contact-editor/fulladdr.glade.h +++ b/addressbook/gui/contact-editor/fulladdr.glade.h @@ -7,12 +7,12 @@ gchar *s = N_("Check Address"); gchar *s = N_("_Street Address:"); gchar *s = N_("City:"); -gchar *s = N_("State/Province:"); -gchar *s = N_("Country:"); gchar *s = N_("ZIP/Postal Code:"); -gchar *s = N_("E_xt:"); -gchar *s = N_("USA\n" - "Canada\n" - "Finland\n" - ""); gchar *s = N_("PO Box:"); +gchar *s = N_("Address _2:"); +gchar *s = N_("State/Province:"); +gchar *s = N_("USA"); +gchar *s = N_("Canada"); +gchar *s = N_("Finland"); +gchar *s = N_("USA"); +gchar *s = N_("Country:"); diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index c2a46409b7..27d5d3c5cd 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -504,7 +504,7 @@ table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EA \ \ \ - \ + \ \ \ " -- cgit v1.2.3