In an attempt to clean up the config dialog (and to reduce its overall

2002-06-03  Anna Marie Dirks  <anna@ximian.com>

	* gui/dialogs/cal-prefs-dialog.glade: In an attempt to clean up the
	config dialog (and to reduce its overall girth), I have re-laid-out the
	calendar preferences dialog. It now conforms to standard Evolution
	spacing and padding guidelines, and exhibits proper alignment, etc.

svn path=/trunk/; revision=17087

2 files changed, 288 insertions, 179 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 91803e672f..d2c1bd8a7b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-03  Anna Marie Dirks  <anna@ximian.com>
+
+	* gui/dialogs/cal-prefs-dialog.glade: In an attempt to clean up the 
+	config dialog (and to reduce its overall girth), I have re-laid-out the
+	calendar preferences dialog. It now conforms to standard Evolution 
+	spacing and padding guidelines, and exhibits proper alignment, etc.
+
 2002-06-03  Rodrigo Moya <rodrigo@ximian.com>
 
 	* pcs/query.c: keep a reference to the Query object, to avoid
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index 311e378826..e69163110a 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -253,7 +253,7 @@
 		<bottom_attach>1</bottom_attach>
 		<xpad>0</xpad>
 		<ypad>0</ypad>
-		<xexpand>True</xexpand>
+		<xexpand>False</xexpand>
 		<yexpand>False</yexpand>
 		<xshrink>False</xshrink>
 		<yshrink>False</yshrink>
@@ -278,21 +278,125 @@
 	  </child>
 
 	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox9</name>
+	    <class>GtkTable</class>
+	    <name>table8</name>
 	    <border_width>4</border_width>
+	    <rows>3</rows>
+	    <columns>4</columns>
 	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
+	    <row_spacing>4</row_spacing>
+	    <column_spacing>4</column_spacing>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label33</name>
+	      <label>_Day begins:</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>2</top_attach>
+		<bottom_attach>3</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
 
 	    <widget>
 	      <class>GtkHBox</class>
-	      <name>hbox8</name>
-	      <homogeneous>True</homogeneous>
-	      <spacing>0</spacing>
+	      <name>hbox18</name>
+	      <homogeneous>False</homogeneous>
+	      <spacing>3</spacing>
 	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
+		<left_attach>1</left_attach>
+		<right_attach>4</right_attach>
+		<top_attach>2</top_attach>
+		<bottom_attach>3</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>True</yfill>
+	      </child>
+
+	      <widget>
+		<class>Custom</class>
+		<name>start_of_day</name>
+		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
+		<int1>0</int1>
+		<int2>0</int2>
+		<last_modification_time>Thu, 30 May 2002 19:26:53 GMT</last_modification_time>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label34</name>
+		<label>Day _ends:</label>
+		<justify>GTK_JUSTIFY_RIGHT</justify>
+		<wrap>False</wrap>
+		<xalign>1</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>Custom</class>
+		<name>end_of_day</name>
+		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
+		<int1>0</int1>
+		<int2>0</int2>
+		<last_modification_time>Thu, 30 May 2002 19:27:35 GMT</last_modification_time>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+	    </widget>
+
+	    <widget>
+	      <class>GtkHBox</class>
+	      <name>hbox17</name>
+	      <homogeneous>False</homogeneous>
+	      <spacing>6</spacing>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>4</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>True</yfill>
 	      </child>
 
 	      <widget>
@@ -305,7 +409,7 @@
 		<child>
 		  <padding>0</padding>
 		  <expand>False</expand>
-		  <fill>True</fill>
+		  <fill>False</fill>
 		</child>
 	      </widget>
 
@@ -313,13 +417,13 @@
 		<class>GtkCheckButton</class>
 		<name>tue_button</name>
 		<can_focus>True</can_focus>
-		<label>T_ue</label>
+		<label>_Tue</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<child>
 		  <padding>0</padding>
 		  <expand>False</expand>
-		  <fill>True</fill>
+		  <fill>False</fill>
 		</child>
 	      </widget>
 
@@ -333,7 +437,7 @@
 		<child>
 		  <padding>0</padding>
 		  <expand>False</expand>
-		  <fill>True</fill>
+		  <fill>False</fill>
 		</child>
 	      </widget>
 
@@ -347,7 +451,7 @@
 		<child>
 		  <padding>0</padding>
 		  <expand>False</expand>
-		  <fill>True</fill>
+		  <fill>False</fill>
 		</child>
 	      </widget>
 
@@ -361,7 +465,7 @@
 		<child>
 		  <padding>0</padding>
 		  <expand>False</expand>
-		  <fill>True</fill>
+		  <fill>False</fill>
 		</child>
 	      </widget>
 
@@ -383,44 +487,38 @@
 		<class>GtkCheckButton</class>
 		<name>sun_button</name>
 		<can_focus>True</can_focus>
-		<label>Su_n</label>
+		<label>S_un</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<child>
 		  <padding>0</padding>
 		  <expand>False</expand>
-		  <fill>True</fill>
+		  <fill>False</fill>
 		</child>
 	      </widget>
 	    </widget>
 
 	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox9</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
+	      <class>GtkAlignment</class>
+	      <name>alignment3</name>
+	      <xalign>7.45058e-09</xalign>
+	      <yalign>0.5</yalign>
+	      <xscale>0</xscale>
+	      <yscale>1</yscale>
 	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label16</name>
-		<label></label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
 		<xpad>0</xpad>
 		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
 
 	      <widget>
 		<class>GtkOptionMenu</class>
@@ -428,42 +526,147 @@
 		<can_focus>True</can_focus>
 		<items>Monday
 Tuesday
-Wednesday
+Wenesday
 Thursday
 Friday
 Saturday
 Sunday
 </items>
 		<initial_choice>0</initial_choice>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
 	      </widget>
 	    </widget>
 
 	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label32</name>
+	      <label>W_eek starts:</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <focus_target>first_day_of_week</focus_target>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label31</name>
+	      <label>Work days:</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkFrame</class>
+	  <name>frame14</name>
+	  <border_width>3</border_width>
+	  <label>Alerts</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox13</name>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>confirm-delete</name>
+	      <border_width>3</border_width>
+	      <can_focus>True</can_focus>
+	      <label>_Ask for confirmation when deleting items</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
 	      <class>GtkHBox</class>
-	      <name>hbox11</name>
+	      <name>hbox19</name>
+	      <border_width>3</border_width>
 	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
+	      <spacing>3</spacing>
 	      <child>
 		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
+		<expand>False</expand>
+		<fill>False</fill>
 	      </child>
 
 	      <widget>
-		<class>GtkLabel</class>
-		<name>label17</name>
-		<label>Sta_rt of day:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
+		<class>GtkCheckButton</class>
+		<name>default-reminder</name>
+		<can_focus>True</can_focus>
+		<label>Sh_ow a reminder</label>
+		<active>False</active>
+		<draw_indicator>True</draw_indicator>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkSpinButton</class>
+		<name>default-reminder-interval</name>
+		<can_focus>True</can_focus>
+		<climb_rate>1</climb_rate>
+		<digits>0</digits>
+		<numeric>False</numeric>
+		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
+		<snap>False</snap>
 		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
+		<value>0</value>
+		<lower>0</lower>
+		<upper>9999</upper>
+		<step>1</step>
+		<page>10</page>
+		<page_size>10</page_size>
 		<child>
 		  <padding>0</padding>
 		  <expand>False</expand>
@@ -472,23 +675,34 @@ Sunday
 	      </widget>
 
 	      <widget>
-		<class>Custom</class>
-		<name>start_of_day</name>
-		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Tue, 10 Oct 2000 15:12:12 GMT</last_modification_time>
+		<class>GtkAlignment</class>
+		<name>alignment4</name>
+		<xalign>7.45058e-09</xalign>
+		<yalign>0.5</yalign>
+		<xscale>0</xscale>
+		<yscale>0</yscale>
 		<child>
 		  <padding>0</padding>
 		  <expand>False</expand>
 		  <fill>True</fill>
 		</child>
+
+		<widget>
+		  <class>GtkOptionMenu</class>
+		  <name>default-reminder-units</name>
+		  <can_focus>True</can_focus>
+		  <items>Minutes
+Hours
+Days
+</items>
+		  <initial_choice>0</initial_choice>
+		</widget>
 	      </widget>
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>label18</name>
-		<label>_End of day:</label>
+		<name>label35</name>
+		<label>before every appointment</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0.5</xalign>
@@ -501,121 +715,9 @@ Sunday
 		  <fill>False</fill>
 		</child>
 	      </widget>
-
-	      <widget>
-		<class>Custom</class>
-		<name>end_of_day</name>
-		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Tue, 10 Oct 2000 15:12:21 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
 	    </widget>
 	  </widget>
 	</widget>
-
-	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>confirm-delete</name>
-	  <border_width>3</border_width>
-	  <can_focus>True</can_focus>
-	  <label>_Ask for confirmation when deleting items</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox16</name>
-	  <border_width>3</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>3</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>default-reminder</name>
-	    <can_focus>True</can_focus>
-	    <label>Sh_ow a default reminder</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkSpinButton</class>
-	    <name>default-reminder-interval</name>
-	    <can_focus>True</can_focus>
-	    <climb_rate>1</climb_rate>
-	    <digits>0</digits>
-	    <numeric>False</numeric>
-	    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	    <snap>False</snap>
-	    <wrap>False</wrap>
-	    <value>0</value>
-	    <lower>0</lower>
-	    <upper>9999</upper>
-	    <step>1</step>
-	    <page>10</page>
-	    <page_size>10</page_size>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>default-reminder-units</name>
-	    <can_focus>True</can_focus>
-	    <items>Minutes
-Hours
-Days
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label30</name>
-	    <label>before the start of the appointment</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
       </widget>
 
       <widget>