soylent r135 - in trunk: . data glade



Author: treitter
Date: Wed Apr 16 07:00:32 2008
New Revision: 135
URL: http://svn.gnome.org/viewvc/soylent?rev=135&view=rev

Log:
move the glade file to a more common location

Added:
   trunk/data/soylent.glade
      - copied, changed from r132, /trunk/glade/soylent.glade
Removed:
   trunk/glade/
Modified:
   trunk/Makefile.am
   trunk/configure.ac
   trunk/data/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Apr 16 07:00:32 2008
@@ -1,4 +1,4 @@
-SUBDIRS = src data glade
+SUBDIRS = src data
 EXTRA_DIST =
 
 # Generate Changelog, copied from dbus-glib

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Apr 16 07:00:32 2008
@@ -102,10 +102,10 @@
 privdatadir='${datadir}'/soylent/$SOYLENT_MAJOR_MINOR
 AC_SUBST(privdatadir)
 
-SOYLENT_GLADEDIR_UNINSTALLED='$(abs_top_srcdir)'/glade
+SOYLENT_GLADEDIR_UNINSTALLED='$(abs_top_srcdir)'/data
 AC_SUBST(SOYLENT_GLADEDIR_UNINSTALLED)
 
-SOYLENT_GLADEDIR="$privdatadir/glade"
+SOYLENT_GLADEDIR="$privdatadir/data"
 AC_SUBST(SOYLENT_GLADEDIR)
 
 dnl this is a workaround for automake 1.9 not quoting this by standard
@@ -129,7 +129,6 @@
   data/icons/48x48/apps/Makefile
   data/icons/scalable/Makefile
   data/icons/scalable/apps/Makefile
-  glade/Makefile
   src/Makefile
 )
 AC_OUTPUT

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Apr 16 07:00:32 2008
@@ -9,7 +9,11 @@
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
+gladedir = $(pkgdatadir)
+glade_DATA = soylent.glade
+
 # TODO: uncomment the following line once we handle translations
 #EXTRA_DIST = $(DESKTOP_IN_FILES)
+EXTRA_DIST = $(glade_DATA)
 
 DISTCLEANFILES = $(DESKTOP_FILES)

Copied: trunk/data/soylent.glade (from r132, /trunk/glade/soylent.glade)
==============================================================================
--- /trunk/glade/soylent.glade	(original)
+++ trunk/data/soylent.glade	Wed Apr 16 07:00:32 2008
@@ -1686,32 +1686,43 @@
                                                         <property name="n_rows">3</property>
                                                         <property name="n_columns">2</property>
                                                         <child>
-                                                          <widget class="GtkEntry" id="entry_person_mail_home_locality">
+                                                          <widget class="GtkLabel" id="label13">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                            <property name="label" translatable="yes">Street</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="left_attach">1</property>
-                                                            <property name="right_attach">2</property>
-                                                            <property name="top_attach">2</property>
-                                                            <property name="bottom_attach">3</property>
+                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
-                                                            <property name="y_padding">1</property>
+                                                            <property name="y_padding">2</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkEntry" id="entry_person_mail_home_po">
+                                                          <widget class="GtkLabel" id="label12">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                            <property name="label" translatable="yes">PO Box</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="left_attach">1</property>
-                                                            <property name="right_attach">2</property>
                                                             <property name="top_attach">1</property>
                                                             <property name="bottom_attach">2</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options">GTK_FILL</property>
+                                                            <property name="x_padding">2</property>
+                                                            <property name="y_padding">1</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <widget class="GtkLabel" id="label11">
+                                                            <property name="visible">True</property>
+                                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                            <property name="label" translatable="yes">City</property>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="top_attach">2</property>
+                                                            <property name="bottom_attach">3</property>
+                                                            <property name="x_options">GTK_FILL</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
@@ -1743,46 +1754,35 @@
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="label11">
+                                                          <widget class="GtkEntry" id="entry_person_mail_home_po">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                            <property name="label" translatable="yes">City</property>
-                                                          </widget>
-                                                          <packing>
-                                                            <property name="top_attach">2</property>
-                                                            <property name="bottom_attach">3</property>
-                                                            <property name="x_options">GTK_FILL</property>
-                                                            <property name="y_options">GTK_FILL</property>
-                                                            <property name="x_padding">2</property>
-                                                            <property name="y_padding">1</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <widget class="GtkLabel" id="label12">
-                                                            <property name="visible">True</property>
-                                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                            <property name="label" translatable="yes">PO Box</property>
                                                           </widget>
                                                           <packing>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="right_attach">2</property>
                                                             <property name="top_attach">1</property>
                                                             <property name="bottom_attach">2</property>
-                                                            <property name="x_options">GTK_FILL</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="label13">
+                                                          <widget class="GtkEntry" id="entry_person_mail_home_locality">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                            <property name="label" translatable="yes">Street</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="right_attach">2</property>
+                                                            <property name="top_attach">2</property>
+                                                            <property name="bottom_attach">3</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
-                                                            <property name="y_padding">2</property>
+                                                            <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                       </widget>
@@ -1797,46 +1797,50 @@
                                                         <property name="n_rows">4</property>
                                                         <property name="n_columns">2</property>
                                                         <child>
-                                                          <widget class="GtkFixed" id="fixed12">
+                                                          <widget class="GtkLabel" id="label16">
                                                             <property name="visible">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                            <property name="label" translatable="yes">Zip/Postal Code</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="left_attach">1</property>
-                                                            <property name="right_attach">2</property>
-                                                            <property name="top_attach">3</property>
-                                                            <property name="bottom_attach">4</property>
+                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                            <property name="y_options">GTK_FILL</property>
+                                                            <property name="x_padding">2</property>
+                                                            <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkFixed" id="fixed13">
+                                                          <widget class="GtkLabel" id="label15">
                                                             <property name="visible">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                            <property name="label" translatable="yes">State/Province</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="top_attach">3</property>
-                                                            <property name="bottom_attach">4</property>
+                                                            <property name="top_attach">1</property>
+                                                            <property name="bottom_attach">2</property>
                                                             <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                            <property name="y_options">GTK_FILL</property>
+                                                            <property name="x_padding">2</property>
+                                                            <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkEntry" id="entry_person_mail_home_country">
+                                                          <widget class="GtkLabel" id="label14">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                            <property name="label" translatable="yes">Country</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="left_attach">1</property>
-                                                            <property name="right_attach">2</property>
                                                             <property name="top_attach">2</property>
                                                             <property name="bottom_attach">3</property>
+                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkEntry" id="entry_person_mail_home_region">
+                                                          <widget class="GtkEntry" id="entry_person_mail_home_code">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1844,15 +1848,13 @@
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
-                                                            <property name="top_attach">1</property>
-                                                            <property name="bottom_attach">2</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkEntry" id="entry_person_mail_home_code">
+                                                          <widget class="GtkEntry" id="entry_person_mail_home_region">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1860,52 +1862,50 @@
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
+                                                            <property name="top_attach">1</property>
+                                                            <property name="bottom_attach">2</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="label14">
+                                                          <widget class="GtkEntry" id="entry_person_mail_home_country">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                            <property name="label" translatable="yes">Country</property>
                                                           </widget>
                                                           <packing>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="right_attach">2</property>
                                                             <property name="top_attach">2</property>
                                                             <property name="bottom_attach">3</property>
-                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="label15">
+                                                          <widget class="GtkFixed" id="fixed13">
                                                             <property name="visible">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                            <property name="label" translatable="yes">State/Province</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="top_attach">1</property>
-                                                            <property name="bottom_attach">2</property>
+                                                            <property name="top_attach">3</property>
+                                                            <property name="bottom_attach">4</property>
                                                             <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                            <property name="y_options">GTK_FILL</property>
-                                                            <property name="x_padding">2</property>
-                                                            <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="label16">
+                                                          <widget class="GtkFixed" id="fixed12">
                                                             <property name="visible">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                            <property name="label" translatable="yes">Zip/Postal Code</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                            <property name="y_options">GTK_FILL</property>
-                                                            <property name="x_padding">2</property>
-                                                            <property name="y_padding">1</property>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="right_attach">2</property>
+                                                            <property name="top_attach">3</property>
+                                                            <property name="bottom_attach">4</property>
                                                           </packing>
                                                         </child>
                                                       </widget>
@@ -1957,32 +1957,43 @@
                                                     <property name="n_rows">3</property>
                                                     <property name="n_columns">2</property>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_work_locality">
+                                                      <widget class="GtkLabel" id="label20">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">Street</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="top_attach">2</property>
-                                                        <property name="bottom_attach">3</property>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
+                                                        <property name="y_padding">2</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_work_po">
+                                                      <widget class="GtkLabel" id="label19">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">PO Box</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">1</property>
                                                         <property name="bottom_attach">2</property>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <widget class="GtkLabel" id="label18">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">City</property>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
+                                                        <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
@@ -2014,46 +2025,35 @@
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label18">
-                                                        <property name="visible">True</property>
-                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">City</property>
-                                                      </widget>
-                                                      <packing>
-                                                        <property name="top_attach">2</property>
-                                                        <property name="bottom_attach">3</property>
-                                                        <property name="x_options">GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <widget class="GtkLabel" id="label19">
+                                                      <widget class="GtkEntry" id="entry_person_mail_work_po">
                                                         <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">PO Box</property>
                                                       </widget>
                                                       <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">1</property>
                                                         <property name="bottom_attach">2</property>
-                                                        <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label20">
+                                                      <widget class="GtkEntry" id="entry_person_mail_work_locality">
                                                         <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">Street</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
-                                                        <property name="y_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                   </widget>
@@ -2068,46 +2068,50 @@
                                                     <property name="n_rows">4</property>
                                                     <property name="n_columns">2</property>
                                                     <child>
-                                                      <widget class="GtkFixed" id="fixed14">
+                                                      <widget class="GtkLabel" id="label23">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">Zip/Postal Code</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="top_attach">3</property>
-                                                        <property name="bottom_attach">4</property>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkFixed" id="fixed15">
+                                                      <widget class="GtkLabel" id="label22">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">State/Province</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="top_attach">3</property>
-                                                        <property name="bottom_attach">4</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
                                                         <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_work_country">
+                                                      <widget class="GtkLabel" id="label21">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">Country</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">2</property>
                                                         <property name="bottom_attach">3</property>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_work_region">
+                                                      <widget class="GtkEntry" id="entry_person_mail_work_code">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2115,15 +2119,13 @@
                                                       <packing>
                                                         <property name="left_attach">1</property>
                                                         <property name="right_attach">2</property>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_work_code">
+                                                      <widget class="GtkEntry" id="entry_person_mail_work_region">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2131,52 +2133,50 @@
                                                       <packing>
                                                         <property name="left_attach">1</property>
                                                         <property name="right_attach">2</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label21">
+                                                      <widget class="GtkEntry" id="entry_person_mail_work_country">
                                                         <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">Country</property>
                                                       </widget>
                                                       <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">2</property>
                                                         <property name="bottom_attach">3</property>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label22">
+                                                      <widget class="GtkFixed" id="fixed15">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">State/Province</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</property>
+                                                        <property name="top_attach">3</property>
+                                                        <property name="bottom_attach">4</property>
                                                         <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label23">
+                                                      <widget class="GtkFixed" id="fixed14">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">Zip/Postal Code</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="top_attach">3</property>
+                                                        <property name="bottom_attach">4</property>
                                                       </packing>
                                                     </child>
                                                   </widget>
@@ -2224,32 +2224,43 @@
                                                     <property name="n_rows">3</property>
                                                     <property name="n_columns">2</property>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_other_locality">
+                                                      <widget class="GtkLabel" id="label27">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">Street</property>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <widget class="GtkLabel" id="label26">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">PO Box</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="top_attach">2</property>
-                                                        <property name="bottom_attach">3</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
+                                                        <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_other_po">
+                                                      <widget class="GtkLabel" id="label25">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">City</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</property>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
+                                                        <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
@@ -2281,46 +2292,35 @@
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label25">
-                                                        <property name="visible">True</property>
-                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">City</property>
-                                                      </widget>
-                                                      <packing>
-                                                        <property name="top_attach">2</property>
-                                                        <property name="bottom_attach">3</property>
-                                                        <property name="x_options">GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <widget class="GtkLabel" id="label26">
+                                                      <widget class="GtkEntry" id="entry_person_mail_other_po">
                                                         <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">PO Box</property>
                                                       </widget>
                                                       <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">1</property>
                                                         <property name="bottom_attach">2</property>
-                                                        <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label27">
+                                                      <widget class="GtkEntry" id="entry_person_mail_other_locality">
                                                         <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">Street</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
-                                                        <property name="y_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                   </widget>
@@ -2335,46 +2335,50 @@
                                                     <property name="n_rows">4</property>
                                                     <property name="n_columns">2</property>
                                                     <child>
-                                                      <widget class="GtkFixed" id="fixed16">
+                                                      <widget class="GtkLabel" id="label30">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">Zip/Postal Code</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="top_attach">3</property>
-                                                        <property name="bottom_attach">4</property>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkFixed" id="fixed17">
+                                                      <widget class="GtkLabel" id="label29">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">State/Province</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="top_attach">3</property>
-                                                        <property name="bottom_attach">4</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
                                                         <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_other_country">
+                                                      <widget class="GtkLabel" id="label28">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">Country</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">2</property>
                                                         <property name="bottom_attach">3</property>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_other_region">
+                                                      <widget class="GtkEntry" id="entry_person_mail_other_code">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2382,15 +2386,13 @@
                                                       <packing>
                                                         <property name="left_attach">1</property>
                                                         <property name="right_attach">2</property>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_other_code">
+                                                      <widget class="GtkEntry" id="entry_person_mail_other_region">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2398,52 +2400,50 @@
                                                       <packing>
                                                         <property name="left_attach">1</property>
                                                         <property name="right_attach">2</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label28">
+                                                      <widget class="GtkEntry" id="entry_person_mail_other_country">
                                                         <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">Country</property>
                                                       </widget>
                                                       <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">2</property>
                                                         <property name="bottom_attach">3</property>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label29">
+                                                      <widget class="GtkFixed" id="fixed17">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">State/Province</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</property>
+                                                        <property name="top_attach">3</property>
+                                                        <property name="bottom_attach">4</property>
                                                         <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label30">
+                                                      <widget class="GtkFixed" id="fixed16">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">Zip/Postal Code</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="top_attach">3</property>
+                                                        <property name="bottom_attach">4</property>
                                                       </packing>
                                                     </child>
                                                   </widget>
@@ -2697,32 +2697,43 @@
                                         <property name="n_rows">3</property>
                                         <property name="n_columns">2</property>
                                         <child>
-                                          <widget class="GtkEntry" id="entry_person_mail_add_locality">
+                                          <widget class="GtkLabel" id="label33">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">Street</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
-                                            <property name="y_padding">1</property>
+                                            <property name="y_padding">2</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkEntry" id="entry_person_mail_add_po">
+                                          <widget class="GtkLabel" id="label34">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">PO Box</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
                                             <property name="top_attach">1</property>
                                             <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                            <property name="x_padding">2</property>
+                                            <property name="y_padding">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="label35">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">City</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
@@ -2754,46 +2765,35 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label35">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">City</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="x_options">GTK_FILL</property>
-                                            <property name="y_options">GTK_FILL</property>
-                                            <property name="x_padding">2</property>
-                                            <property name="y_padding">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkLabel" id="label34">
+                                          <widget class="GtkEntry" id="entry_person_mail_add_po">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">PO Box</property>
                                           </widget>
                                           <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
                                             <property name="top_attach">1</property>
                                             <property name="bottom_attach">2</property>
-                                            <property name="x_options">GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label33">
+                                          <widget class="GtkEntry" id="entry_person_mail_add_locality">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">Street</property>
                                           </widget>
                                           <packing>
-                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
-                                            <property name="y_padding">2</property>
+                                            <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                       </widget>
@@ -2808,46 +2808,50 @@
                                         <property name="n_rows">4</property>
                                         <property name="n_columns">2</property>
                                         <child>
-                                          <widget class="GtkFixed" id="fixed24">
+                                          <widget class="GtkLabel" id="label36">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">Zip/Postal Code</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="bottom_attach">4</property>
+                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                            <property name="x_padding">2</property>
+                                            <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkFixed" id="fixed23">
+                                          <widget class="GtkLabel" id="label37">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">State/Province</property>
                                           </widget>
                                           <packing>
-                                            <property name="top_attach">3</property>
-                                            <property name="bottom_attach">4</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                             <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                            <property name="x_padding">2</property>
+                                            <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkEntry" id="entry_person_mail_add_country">
+                                          <widget class="GtkLabel" id="label38">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">Country</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
                                             <property name="top_attach">2</property>
                                             <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkEntry" id="entry_person_mail_add_region">
+                                          <widget class="GtkEntry" id="entry_person_mail_add_code">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2855,15 +2859,13 @@
                                           <packing>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkEntry" id="entry_person_mail_add_code">
+                                          <widget class="GtkEntry" id="entry_person_mail_add_region">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2871,52 +2873,50 @@
                                           <packing>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label38">
+                                          <widget class="GtkEntry" id="entry_person_mail_add_country">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">Country</property>
                                           </widget>
                                           <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
                                             <property name="top_attach">2</property>
                                             <property name="bottom_attach">3</property>
-                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label37">
+                                          <widget class="GtkFixed" id="fixed23">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">State/Province</property>
                                           </widget>
                                           <packing>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
                                             <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                            <property name="y_options">GTK_FILL</property>
-                                            <property name="x_padding">2</property>
-                                            <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label36">
+                                          <widget class="GtkFixed" id="fixed24">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">Zip/Postal Code</property>
                                           </widget>
                                           <packing>
-                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                            <property name="y_options">GTK_FILL</property>
-                                            <property name="x_padding">2</property>
-                                            <property name="y_padding">1</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
                                           </packing>
                                         </child>
                                       </widget>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]