Move the 12/24 hour widgets to the top of their section

It doesn't make sense for them to be between the options
for the first and second timezones.

Signed-off-by: Federico Mena Quintero <federico@novell.com>

1 files changed, 44 insertions, 43 deletions

diff --git a/calendar/gui/dialogs/cal-prefs-dialog.ui b/calendar/gui/dialogs/cal-prefs-dialog.ui
index 2ffefb8730..469006a5eb 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.ui
+++ b/calendar/gui/dialogs/cal-prefs-dialog.ui
@@ -219,25 +219,41 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label_time_format">
+                  <object class="ETimezoneEntry" id="timezone">
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Time format:</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="timezone_label"/>
+                    </accessibility>
                   </object>
                   <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="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="timezone_label">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Time _zone:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">timezone</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox_time_format">
+                  <object class="GtkHBox" id="hbox_use_system_timezone">
                     <property name="visible">True</property>
-                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkRadioButton" id="use_12_hour">
-                        <property name="label" translatable="yes">_12 hour (AM/PM)</property>
+                      <object class="GtkCheckButton" id="use-system-tz-check">
+                        <property name="label" translatable="yes">Use s_ystem time zone</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -246,19 +262,14 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="use_24_hour">
-                        <property name="label" translatable="yes">_24 hour</property>
+                      <object class="GtkLabel" id="system-tz-label">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">use_12_hour</property>
+                        <property name="xpad">5</property>
+                        <property name="label">(system/tz)</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -270,34 +281,16 @@
                   <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_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="ETimezoneEntry" id="timezone">
-                    <property name="visible">True</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="timezone_label"/>
-                    </accessibility>
-                  </object>
-                  <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_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="timezone_label">
+                  <object class="GtkLabel" id="label_time_format">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Time _zone:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">timezone</property>
+                    <property name="label" translatable="yes">Time format:</property>
                   </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
@@ -305,27 +298,34 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox_use_system_timezone">
+                  <object class="GtkHBox" id="hbox_time_format">
                     <property name="visible">True</property>
+                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkCheckButton" id="use-system-tz-check">
-                        <property name="label" translatable="yes">Use s_ystem time zone</property>
+                      <object class="GtkRadioButton" id="use_12_hour">
+                        <property name="label" translatable="yes">_12 hour (AM/PM)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
+                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="system-tz-label">
+                      <object class="GtkRadioButton" id="use_24_hour">
+                        <property name="label" translatable="yes">_24 hour</property>
                         <property name="visible">True</property>
-                        <property name="xpad">5</property>
-                        <property name="label">(system/tz)</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">use_12_hour</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -338,6 +338,7 @@
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
+                    <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
@@ -1440,8 +1441,8 @@
   </object>
   <object class="GtkSizeGroup" id="day_begins_ends_sizegroup">
     <widgets>
-      <widget name="day_start_label"/>
       <widget name="day_end_label"/>
+      <widget name="day_start_label"/>
     </widgets>
   </object>
 </interface>