Rearranged these fields a bit more.

2000-10-13  Christopher James Lahey  <clahey@helixcode.com>

	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
	Rearranged these fields a bit more.

svn path=/trunk/; revision=5907

5 files changed, 145 insertions, 138 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 703f9ca84f..9036e82510 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,10 @@
 2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
 
+	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
+	Rearranged these fields a bit more.
+
+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
diff --git a/addressbook/contact-editor/fulladdr.glade b/addressbook/contact-editor/fulladdr.glade
index bb955b44c0..756be9b173 100644
--- a/addressbook/contact-editor/fulladdr.glade
+++ b/addressbook/contact-editor/fulladdr.glade
@@ -65,6 +65,7 @@
 	<class>GtkButton</class>
 	<name>button1</name>
 	<can_default>True</can_default>
+	<has_default>True</has_default>
 	<can_focus>True</can_focus>
 	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
       </widget>
@@ -96,7 +97,7 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label2</name>
-	<label>_Street Address:</label>
+	<label>_Address:</label>
 	<justify>GTK_JUSTIFY_LEFT</justify>
 	<wrap>False</wrap>
 	<xalign>0</xalign>
@@ -123,7 +124,7 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label4</name>
-	<label>City:</label>
+	<label>_City:</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0</xalign>
@@ -148,58 +149,6 @@
       </widget>
 
       <widget>
-	<class>GtkLabel</class>
-	<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>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</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>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>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>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
 	<class>GtkEntry</class>
 	<name>entry-city</name>
 	<can_focus>True</can_focus>
@@ -251,7 +200,7 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label8</name>
-	<label>PO Box:</label>
+	<label>_PO Box:</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0</xalign>
@@ -331,6 +280,7 @@
 	<class>GtkEntry</class>
 	<name>entry-address</name>
 	<can_focus>True</can_focus>
+	<has_focus>True</has_focus>
 	<editable>True</editable>
 	<text_visible>True</text_visible>
 	<text_max_length>0</text_max_length>
@@ -354,7 +304,7 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label5</name>
-	<label>State/Province:</label>
+	<label>_State/Province:</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0</xalign>
@@ -418,8 +368,8 @@ Finland
 	<child>
 	  <left_attach>3</left_attach>
 	  <right_attach>4</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
+	  <top_attach>3</top_attach>
+	  <bottom_attach>4</bottom_attach>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
 	  <xexpand>False</xexpand>
@@ -438,21 +388,46 @@ Finland
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
 	  <text_max_length>0</text_max_length>
-	  <text>USA</text>
+	  <text></text>
 	</widget>
       </widget>
 
       <widget>
+	<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>3</left_attach>
+	  <right_attach>4</right_attach>
+	  <top_attach>2</top_attach>
+	  <bottom_attach>3</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>label7</name>
-	<label>Country:</label>
+	<name>label6</name>
+	<label>_ZIP 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-country</focus_target>
+	<focus_target>entry-code</focus_target>
 	<child>
 	  <left_attach>2</left_attach>
 	  <right_attach>3</right_attach>
@@ -468,6 +443,33 @@ Finland
 	  <yfill>True</yfill>
 	</child>
       </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<name>label7</name>
+	<label>Countr_y:</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>2</left_attach>
+	  <right_attach>3</right_attach>
+	  <top_attach>3</top_attach>
+	  <bottom_attach>4</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>
   </widget>
 </widget>
diff --git a/addressbook/contact-editor/fulladdr.glade.h b/addressbook/contact-editor/fulladdr.glade.h
index 6502ad796c..7db13fcf4d 100644
--- a/addressbook/contact-editor/fulladdr.glade.h
+++ b/addressbook/contact-editor/fulladdr.glade.h
@@ -5,14 +5,13 @@
  */
 
 gchar *s = N_("Check Address");
-gchar *s = N_("_Street Address:");
-gchar *s = N_("City:");
-gchar *s = N_("ZIP/Postal Code:");
-gchar *s = N_("PO Box:");
+gchar *s = N_("_Address:");
+gchar *s = N_("_City:");
+gchar *s = N_("_PO Box:");
 gchar *s = N_("Address _2:");
-gchar *s = N_("State/Province:");
+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:");
+gchar *s = N_("_ZIP Code:");
+gchar *s = N_("Countr_y:");
diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade
index bb955b44c0..756be9b173 100644
--- a/addressbook/gui/contact-editor/fulladdr.glade
+++ b/addressbook/gui/contact-editor/fulladdr.glade
@@ -65,6 +65,7 @@
 	<class>GtkButton</class>
 	<name>button1</name>
 	<can_default>True</can_default>
+	<has_default>True</has_default>
 	<can_focus>True</can_focus>
 	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
       </widget>
@@ -96,7 +97,7 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label2</name>
-	<label>_Street Address:</label>
+	<label>_Address:</label>
 	<justify>GTK_JUSTIFY_LEFT</justify>
 	<wrap>False</wrap>
 	<xalign>0</xalign>
@@ -123,7 +124,7 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label4</name>
-	<label>City:</label>
+	<label>_City:</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0</xalign>
@@ -148,58 +149,6 @@
       </widget>
 
       <widget>
-	<class>GtkLabel</class>
-	<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>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</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>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>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>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
 	<class>GtkEntry</class>
 	<name>entry-city</name>
 	<can_focus>True</can_focus>
@@ -251,7 +200,7 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label8</name>
-	<label>PO Box:</label>
+	<label>_PO Box:</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0</xalign>
@@ -331,6 +280,7 @@
 	<class>GtkEntry</class>
 	<name>entry-address</name>
 	<can_focus>True</can_focus>
+	<has_focus>True</has_focus>
 	<editable>True</editable>
 	<text_visible>True</text_visible>
 	<text_max_length>0</text_max_length>
@@ -354,7 +304,7 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label5</name>
-	<label>State/Province:</label>
+	<label>_State/Province:</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0</xalign>
@@ -418,8 +368,8 @@ Finland
 	<child>
 	  <left_attach>3</left_attach>
 	  <right_attach>4</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
+	  <top_attach>3</top_attach>
+	  <bottom_attach>4</bottom_attach>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
 	  <xexpand>False</xexpand>
@@ -438,21 +388,46 @@ Finland
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
 	  <text_max_length>0</text_max_length>
-	  <text>USA</text>
+	  <text></text>
 	</widget>
       </widget>
 
       <widget>
+	<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>3</left_attach>
+	  <right_attach>4</right_attach>
+	  <top_attach>2</top_attach>
+	  <bottom_attach>3</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>label7</name>
-	<label>Country:</label>
+	<name>label6</name>
+	<label>_ZIP 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-country</focus_target>
+	<focus_target>entry-code</focus_target>
 	<child>
 	  <left_attach>2</left_attach>
 	  <right_attach>3</right_attach>
@@ -468,6 +443,33 @@ Finland
 	  <yfill>True</yfill>
 	</child>
       </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<name>label7</name>
+	<label>Countr_y:</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>2</left_attach>
+	  <right_attach>3</right_attach>
+	  <top_attach>3</top_attach>
+	  <bottom_attach>4</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>
   </widget>
 </widget>
diff --git a/addressbook/gui/contact-editor/fulladdr.glade.h b/addressbook/gui/contact-editor/fulladdr.glade.h
index 6502ad796c..7db13fcf4d 100644
--- a/addressbook/gui/contact-editor/fulladdr.glade.h
+++ b/addressbook/gui/contact-editor/fulladdr.glade.h
@@ -5,14 +5,13 @@
  */
 
 gchar *s = N_("Check Address");
-gchar *s = N_("_Street Address:");
-gchar *s = N_("City:");
-gchar *s = N_("ZIP/Postal Code:");
-gchar *s = N_("PO Box:");
+gchar *s = N_("_Address:");
+gchar *s = N_("_City:");
+gchar *s = N_("_PO Box:");
 gchar *s = N_("Address _2:");
-gchar *s = N_("State/Province:");
+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:");
+gchar *s = N_("_ZIP Code:");
+gchar *s = N_("Countr_y:");