diff options
| -rw-r--r-- | addressbook/ChangeLog | 12 | ||||
| -rw-r--r-- | addressbook/contact-editor/e-contact-editor-address.c | 4 | ||||
| -rw-r--r-- | addressbook/contact-editor/e-contact-editor-categories.c | 2 | ||||
| -rw-r--r-- | addressbook/contact-editor/fulladdr.glade | 274 | ||||
| -rw-r--r-- | addressbook/contact-editor/fulladdr.glade.h | 14 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-address.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-categories.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/fulladdr.glade | 274 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/fulladdr.glade.h | 14 | ||||
| -rw-r--r-- | 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 <clahey@helixcode.com> + + * 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 <clahey@helixcode.com> * 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, <ETableState> \ <column source=\"0\"/> \ <column source=\"1\"/> \ - <grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping> \ + <grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping> \ </ETableState> \ </ETableSpecification>" 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 @@ <class>GtkTable</class> <name>table-checkaddress</name> <border_width>8</border_width> - <rows>5</rows> + <rows>4</rows> <columns>4</columns> <homogeneous>False</homogeneous> <row_spacing>6</row_spacing> @@ -94,30 +94,6 @@ </child> <widget> - <class>GtkEntry</class> - <name>entry-city</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> - <child> - <left_attach>1</left_attach> - <right_attach>4</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>True</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> - </child> - </widget> - - <widget> <class>GtkLabel</class> <name>label2</name> <label>_Street Address:</label> @@ -127,6 +103,7 @@ <yalign>0</yalign> <xpad>0</xpad> <ypad>0</ypad> + <focus_target>entry-address</focus_target> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -153,6 +130,7 @@ <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <focus_target>entry-city</focus_target> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -171,17 +149,18 @@ <widget> <class>GtkLabel</class> - <name>label5</name> - <label>State/Province:</label> + <name>label6</name> + <label>ZIP/Postal Code:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <focus_target>entry-code</focus_target> <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> + <left_attach>2</left_attach> + <right_attach>3</right_attach> <top_attach>3</top_attach> <bottom_attach>4</bottom_attach> <xpad>0</xpad> @@ -196,20 +175,19 @@ </widget> <widget> - <class>GtkLabel</class> - <name>label7</name> - <label>Country:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> + <class>GtkEntry</class> + <name>entry-code</name> + <width>100</width> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>4</top_attach> - <bottom_attach>5</bottom_attach> + <left_attach>3</left_attach> + <right_attach>4</right_attach> + <top_attach>3</top_attach> + <bottom_attach>4</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -223,7 +201,7 @@ <widget> <class>GtkEntry</class> - <name>entry-region</name> + <name>entry-city</name> <can_focus>True</can_focus> <editable>True</editable> <text_visible>True</text_visible> @@ -232,8 +210,8 @@ <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>3</top_attach> - <bottom_attach>4</bottom_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> @@ -241,25 +219,78 @@ <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>False</yfill> + <yfill>True</yfill> + </child> + </widget> + + <widget> + <class>GtkEntry</class> + <name>entry-ext</name> + <width>100</width> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> + <child> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>True</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> </child> </widget> <widget> <class>GtkLabel</class> - <name>label6</name> - <label>ZIP/Postal Code:</label> + <name>label8</name> + <label>PO Box:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <focus_target>entry-po</focus_target> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> - <top_attach>3</top_attach> - <bottom_attach>4</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label3</name> + <label>Address _2:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <focus_target>entry-ext</focus_target> + <child> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -273,7 +304,7 @@ <widget> <class>GtkEntry</class> - <name>entry-code</name> + <name>entry-po</name> <width>100</width> <can_focus>True</can_focus> <editable>True</editable> @@ -283,8 +314,8 @@ <child> <left_attach>3</left_attach> <right_attach>4</right_attach> - <top_attach>3</top_attach> - <bottom_attach>4</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -292,29 +323,26 @@ <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>False</yfill> + <yfill>True</yfill> </child> </widget> <widget> - <class>GtkLabel</class> - <name>label3</name> - <label>E_xt:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0</xalign> - <yalign>0</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <focus_target>entry-ext</focus_target> + <class>GtkEntry</class> + <name>entry-address</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> - <left_attach>2</left_attach> - <right_attach>3</right_attach> + <left_attach>1</left_attach> + <right_attach>4</right_attach> <top_attach>0</top_attach> <bottom_attach>1</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>False</xexpand> + <xexpand>True</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> @@ -324,17 +352,21 @@ </widget> <widget> - <class>GtkAlignment</class> - <name>alignment1</name> - <xalign>0.5</xalign> - <yalign>0</yalign> - <xscale>1</xscale> - <yscale>0</yscale> + <class>GtkLabel</class> + <name>label5</name> + <label>State/Province:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <focus_target>entry-region</focus_target> <child> - <left_attach>3</left_attach> - <right_attach>4</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>3</top_attach> + <bottom_attach>4</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -344,53 +376,36 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - - <widget> - <class>GtkEntry</class> - <name>entry-ext</name> - <width>100</width> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> - </widget> </widget> <widget> - <class>GtkScrolledWindow</class> - <name>scrolledwindow1</name> - <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> - <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy> - <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy> - <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy> + <class>GtkEntry</class> + <name>entry-region</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <top_attach>3</top_attach> + <bottom_attach>4</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> - <yexpand>True</yexpand> + <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> <yfill>True</yfill> </child> - - <widget> - <class>GtkText</class> - <name>text-street</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text></text> - </widget> </widget> <widget> <class>GtkCombo</class> <name>combo-country</name> + <width>100</width> <value_in_list>False</value_in_list> <ok_if_empty>True</ok_if_empty> <case_sensitive>False</case_sensitive> @@ -401,18 +416,18 @@ Canada Finland </items> <child> - <left_attach>1</left_attach> + <left_attach>3</left_attach> <right_attach>4</right_attach> - <top_attach>4</top_attach> - <bottom_attach>5</bottom_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>True</xexpand> + <xexpand>False</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>False</yfill> + <yfill>True</yfill> </child> <widget> @@ -423,25 +438,26 @@ Finland <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> - <text></text> + <text>USA</text> </widget> </widget> <widget> <class>GtkLabel</class> - <name>label8</name> - <label>PO Box:</label> + <name>label7</name> + <label>Country:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <focus_target>entry-country</focus_target> <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> + <left_attach>2</left_attach> + <right_attach>3</right_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -452,30 +468,6 @@ Finland <yfill>True</yfill> </child> </widget> - - <widget> - <class>GtkEntry</class> - <name>entry-po</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> - <child> - <left_attach>1</left_attach> - <right_attach>4</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>True</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> - </child> - </widget> </widget> </widget> </widget> 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) <ETableColumn model_col= \"34\" _title=\"Name\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \ <ETableState> \ <column source=\"0\"/> \ - <grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping> \ + <grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \ </ETableState> \ </ETableSpecification>" 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, <ETableState> \ <column source=\"0\"/> \ <column source=\"1\"/> \ - <grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping> \ + <grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping> \ </ETableState> \ </ETableSpecification>" 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 @@ <class>GtkTable</class> <name>table-checkaddress</name> <border_width>8</border_width> - <rows>5</rows> + <rows>4</rows> <columns>4</columns> <homogeneous>False</homogeneous> <row_spacing>6</row_spacing> @@ -94,30 +94,6 @@ </child> <widget> - <class>GtkEntry</class> - <name>entry-city</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> - <child> - <left_attach>1</left_attach> - <right_attach>4</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>True</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> - </child> - </widget> - - <widget> <class>GtkLabel</class> <name>label2</name> <label>_Street Address:</label> @@ -127,6 +103,7 @@ <yalign>0</yalign> <xpad>0</xpad> <ypad>0</ypad> + <focus_target>entry-address</focus_target> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -153,6 +130,7 @@ <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <focus_target>entry-city</focus_target> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -171,17 +149,18 @@ <widget> <class>GtkLabel</class> - <name>label5</name> - <label>State/Province:</label> + <name>label6</name> + <label>ZIP/Postal Code:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <focus_target>entry-code</focus_target> <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> + <left_attach>2</left_attach> + <right_attach>3</right_attach> <top_attach>3</top_attach> <bottom_attach>4</bottom_attach> <xpad>0</xpad> @@ -196,20 +175,19 @@ </widget> <widget> - <class>GtkLabel</class> - <name>label7</name> - <label>Country:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> + <class>GtkEntry</class> + <name>entry-code</name> + <width>100</width> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>4</top_attach> - <bottom_attach>5</bottom_attach> + <left_attach>3</left_attach> + <right_attach>4</right_attach> + <top_attach>3</top_attach> + <bottom_attach>4</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -223,7 +201,7 @@ <widget> <class>GtkEntry</class> - <name>entry-region</name> + <name>entry-city</name> <can_focus>True</can_focus> <editable>True</editable> <text_visible>True</text_visible> @@ -232,8 +210,8 @@ <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>3</top_attach> - <bottom_attach>4</bottom_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> @@ -241,25 +219,78 @@ <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>False</yfill> + <yfill>True</yfill> + </child> + </widget> + + <widget> + <class>GtkEntry</class> + <name>entry-ext</name> + <width>100</width> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> + <child> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>True</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> </child> </widget> <widget> <class>GtkLabel</class> - <name>label6</name> - <label>ZIP/Postal Code:</label> + <name>label8</name> + <label>PO Box:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <focus_target>entry-po</focus_target> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> - <top_attach>3</top_attach> - <bottom_attach>4</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label3</name> + <label>Address _2:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <focus_target>entry-ext</focus_target> + <child> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -273,7 +304,7 @@ <widget> <class>GtkEntry</class> - <name>entry-code</name> + <name>entry-po</name> <width>100</width> <can_focus>True</can_focus> <editable>True</editable> @@ -283,8 +314,8 @@ <child> <left_attach>3</left_attach> <right_attach>4</right_attach> - <top_attach>3</top_attach> - <bottom_attach>4</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -292,29 +323,26 @@ <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>False</yfill> + <yfill>True</yfill> </child> </widget> <widget> - <class>GtkLabel</class> - <name>label3</name> - <label>E_xt:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0</xalign> - <yalign>0</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <focus_target>entry-ext</focus_target> + <class>GtkEntry</class> + <name>entry-address</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> - <left_attach>2</left_attach> - <right_attach>3</right_attach> + <left_attach>1</left_attach> + <right_attach>4</right_attach> <top_attach>0</top_attach> <bottom_attach>1</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>False</xexpand> + <xexpand>True</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> @@ -324,17 +352,21 @@ </widget> <widget> - <class>GtkAlignment</class> - <name>alignment1</name> - <xalign>0.5</xalign> - <yalign>0</yalign> - <xscale>1</xscale> - <yscale>0</yscale> + <class>GtkLabel</class> + <name>label5</name> + <label>State/Province:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <focus_target>entry-region</focus_target> <child> - <left_attach>3</left_attach> - <right_attach>4</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>3</top_attach> + <bottom_attach>4</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -344,53 +376,36 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - - <widget> - <class>GtkEntry</class> - <name>entry-ext</name> - <width>100</width> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> - </widget> </widget> <widget> - <class>GtkScrolledWindow</class> - <name>scrolledwindow1</name> - <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> - <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy> - <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy> - <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy> + <class>GtkEntry</class> + <name>entry-region</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <top_attach>3</top_attach> + <bottom_attach>4</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> - <yexpand>True</yexpand> + <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> <yfill>True</yfill> </child> - - <widget> - <class>GtkText</class> - <name>text-street</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text></text> - </widget> </widget> <widget> <class>GtkCombo</class> <name>combo-country</name> + <width>100</width> <value_in_list>False</value_in_list> <ok_if_empty>True</ok_if_empty> <case_sensitive>False</case_sensitive> @@ -401,18 +416,18 @@ Canada Finland </items> <child> - <left_attach>1</left_attach> + <left_attach>3</left_attach> <right_attach>4</right_attach> - <top_attach>4</top_attach> - <bottom_attach>5</bottom_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>True</xexpand> + <xexpand>False</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>False</yfill> + <yfill>True</yfill> </child> <widget> @@ -423,25 +438,26 @@ Finland <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> - <text></text> + <text>USA</text> </widget> </widget> <widget> <class>GtkLabel</class> - <name>label8</name> - <label>PO Box:</label> + <name>label7</name> + <label>Country:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <focus_target>entry-country</focus_target> <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> + <left_attach>2</left_attach> + <right_attach>3</right_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -452,30 +468,6 @@ Finland <yfill>True</yfill> </child> </widget> - - <widget> - <class>GtkEntry</class> - <name>entry-po</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> - <child> - <left_attach>1</left_attach> - <right_attach>4</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>True</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> - </child> - </widget> </widget> </widget> </widget> 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 <column source=\"3\"/> \ <column source=\"4\"/> \ <grouping> \ - <leaf column=\"0\" ascending=\"1\"/> \ + <leaf column=\"0\" ascending=\"true\"/> \ </grouping> \ </ETableState> \ </ETableSpecification>" |