From 0fbbec2153df8664d0b94a65d9e9df465fa8432c Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Fri, 26 Mar 2010 13:04:18 -0600
Subject: Move the day start / day end widgets to the same line

This saves us one whole row of widgets.

We put both labels in a size group so that they attain the same amount of space
between the label and their date-edit widget, hopefully.

Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
 calendar/gui/dialogs/cal-prefs-dialog.ui | 104 ++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 45 deletions(-)

(limited to 'calendar')

diff --git a/calendar/gui/dialogs/cal-prefs-dialog.ui b/calendar/gui/dialogs/cal-prefs-dialog.ui
index 72524b2596..d4caf1b356 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.ui
+++ b/calendar/gui/dialogs/cal-prefs-dialog.ui
@@ -386,7 +386,7 @@
             <child>
               <object class="GtkTable" id="workWeek">
                 <property name="visible">True</property>
-                <property name="n_rows">4</property>
+                <property name="n_rows">3</property>
                 <property name="n_columns">2</property>
                 <property name="column_spacing">6</property>
                 <property name="row_spacing">6</property>
@@ -417,12 +417,11 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label14">
+                  <object class="GtkLabel" id="day_start_label">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Day begins:</property>
                     <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">start_of_day</property>
                   </object>
                   <packing>
                     <property name="top_attach">2</property>
@@ -431,48 +430,6 @@
                     <property name="y_options"></property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="label15">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Day _ends:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">end_of_day</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="EDateEdit" id="start_of_day">
-                    <property name="visible">True</property>
-                    <property name="show_date">False</property>
-                  </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="EDateEdit" id="end_of_day">
-                    <property name="visible">True</property>
-                    <property name="show_date">False</property>
-                  </object>
-                  <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_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkHBox" id="hbox5">
                     <property name="visible">True</property>
@@ -645,6 +602,57 @@
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkHBox" id="hbox13">
+                    <property name="visible">True</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="EDateEdit" id="start_of_day">
+                        <property name="visible">True</property>
+                        <property name="show_date">False</property>
+                        <property name="show_week_numbers">False</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="day_end_label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Day _ends:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="EDateEdit" id="end_of_day">
+                        <property name="visible">True</property>
+                        <property name="show_date">False</property>
+                        <property name="show_week_numbers">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </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>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -1431,4 +1439,10 @@
       </packing>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="day_begins_ends_sizegroup">
+    <widgets>
+      <widget name="day_end_label"/>
+      <widget name="day_start_label"/>
+    </widgets>
+  </object>
 </interface>
-- 
cgit v1.2.3