Collapsed notebook into two pages and added accelerators for everything,

2002-04-19  Anna Marie Dirks  <anna@ximian.com>

	* gui/dialogs/cal-prefs-dialog.glade: Collapsed notebook into two pages
	and added accelerators for everything, as part of my config dialog
	polishing project

svn path=/trunk/; revision=16540

2 files changed, 332 insertions, 354 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e4e6e8c6c8..d5a73eaedc 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-19  Anna Marie Dirks  <anna@ximian.com>
+
+	* gui/dialogs/cal-prefs-dialog.glade: Collapsed notebook into two pages
+	and added accelerators for everything, as part of my config dialog
+	polishing project
+
 2002-04-18  JP Rosevear  <jpr@ximian.com>
 
 	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): properly
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index 20b2c5e363..311e378826 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -21,7 +21,7 @@
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
   <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
+  <allow_grow>True</allow_grow>
   <auto_shrink>False</auto_shrink>
   <auto_close>False</auto_close>
   <hide_on_close>True</hide_on_close>
@@ -107,6 +107,7 @@
 	<widget>
 	  <class>GtkFrame</class>
 	  <name>frame12</name>
+	  <border_width>3</border_width>
 	  <label>Time</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
@@ -121,7 +122,7 @@
 	    <name>table5</name>
 	    <border_width>4</border_width>
 	    <rows>2</rows>
-	    <columns>2</columns>
+	    <columns>3</columns>
 	    <homogeneous>False</homogeneous>
 	    <row_spacing>4</row_spacing>
 	    <column_spacing>4</column_spacing>
@@ -153,29 +154,6 @@
 	    </widget>
 
 	    <widget>
-	      <class>Custom</class>
-	      <name>timezone</name>
-	      <creation_function>make_timezone_entry</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Wed, 20 Jun 2001 02:22:46 GMT</last_modification_time>
-	      <child>
-		<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>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label20</name>
 	      <label>Time format:</label>
@@ -222,18 +200,27 @@
 	      </child>
 
 	      <widget>
-		<class>GtkRadioButton</class>
-		<name>use_12_hour</name>
-		<can_focus>True</can_focus>
-		<label>_12 hour (AM/PM)</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>time_format_group</group>
+		<class>GtkAlignment</class>
+		<name>alignment2</name>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xscale>3.35276e-08</xscale>
+		<yscale>1</yscale>
 		<child>
 		  <padding>0</padding>
-		  <expand>False</expand>
+		  <expand>True</expand>
 		  <fill>True</fill>
 		</child>
+
+		<widget>
+		  <class>GtkRadioButton</class>
+		  <name>use_12_hour</name>
+		  <can_focus>True</can_focus>
+		  <label>_12 hour (AM/PM)</label>
+		  <active>False</active>
+		  <draw_indicator>True</draw_indicator>
+		  <group>time_format_group</group>
+		</widget>
 	      </widget>
 
 	      <widget>
@@ -246,17 +233,41 @@
 		<group>time_format_group</group>
 		<child>
 		  <padding>0</padding>
-		  <expand>False</expand>
+		  <expand>True</expand>
 		  <fill>True</fill>
 		</child>
 	      </widget>
 	    </widget>
+
+	    <widget>
+	      <class>Custom</class>
+	      <name>timezone</name>
+	      <creation_function>make_timezone_entry</creation_function>
+	      <int1>0</int1>
+	      <int2>0</int2>
+	      <last_modification_time>Wed, 20 Jun 2001 02:22:46 GMT</last_modification_time>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>3</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</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>
 	  </widget>
 	</widget>
 
 	<widget>
 	  <class>GtkFrame</class>
 	  <name>frame9</name>
+	  <border_width>3</border_width>
 	  <label>Work Week</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
@@ -397,14 +408,13 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label16</name>
-		<label>First day of wee_k:</label>
+		<label></label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0.5</xalign>
 		<yalign>0.5</yalign>
 		<xpad>0</xpad>
 		<ypad>0</ypad>
-		<default_focus_target>first_day_of_week</default_focus_target>
 		<child>
 		  <padding>0</padding>
 		  <expand>False</expand>
@@ -508,6 +518,104 @@ Sunday
 	    </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>
@@ -544,7 +652,7 @@ Sunday
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label25</name>
-	    <label>Time di_visions:</label>
+	    <label>_Time divisions:</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>0.5</xalign>
@@ -582,7 +690,7 @@ Sunday
 	  <class>GtkCheckButton</class>
 	  <name>show_end_times</name>
 	  <can_focus>True</can_focus>
-	  <label>Show appointment _end times in week and month views</label>
+	  <label>_Show appointment end times in week and month views</label>
 	  <active>False</active>
 	  <draw_indicator>True</draw_indicator>
 	  <child>
@@ -619,148 +727,13 @@ Sunday
 	    <fill>False</fill>
 	  </child>
 	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label7</name>
-	<label>_Display</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox3</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>8</spacing>
 
 	<widget>
-	  <class>GtkTable</class>
-	  <name>table6</name>
-	  <rows>2</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>4</row_spacing>
-	  <column_spacing>4</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label23</name>
-	    <label>Tas_ks due today:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>tasks_due_today_color</default_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>label24</name>
-	    <label>O_verdue tasks:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>tasks_overdue_color</default_focus_target>
-	    <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>
-	    <class>GnomeColorPicker</class>
-	    <name>tasks_due_today_color</name>
-	    <can_focus>True</can_focus>
-	    <dither>True</dither>
-	    <use_alpha>False</use_alpha>
-	    <title>Color for tasks due today</title>
-	    <child>
-	      <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>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GnomeColorPicker</class>
-	    <name>tasks_overdue_color</name>
-	    <can_focus>True</can_focus>
-	    <dither>True</dither>
-	    <use_alpha>False</use_alpha>
-	    <title>Color for overdue tasks</title>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</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>
-	  <class>GtkHBox</class>
-	  <name>hbox14</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
+	  <class>GtkFrame</class>
+	  <name>frame13</name>
+	  <label>Task List</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
@@ -768,192 +741,191 @@ Sunday
 	  </child>
 
 	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>tasks-hide-completed-checkbutton</name>
-	    <can_focus>True</can_focus>
-	    <label>_Hide completed tasks after</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>tasks-hide-completed-spinbutton</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>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>tasks-hide-completed-optionmenu</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>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label11</name>
-	<label>_Task List</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
+	    <class>GtkVBox</class>
+	    <name>vbox12</name>
+	    <border_width>4</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>3</spacing>
 
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox11</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
+	    <widget>
+	      <class>GtkTable</class>
+	      <name>table7</name>
+	      <rows>2</rows>
+	      <columns>2</columns>
+	      <homogeneous>False</homogeneous>
+	      <row_spacing>4</row_spacing>
+	      <column_spacing>4</column_spacing>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
 
-	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>confirm-delete</name>
-	  <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>GtkLabel</class>
+		<name>label28</name>
+		<label>T_asks due today:</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<default_focus_target>tasks_due_today_color</default_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>GtkCheckButton</class>
-	  <name>default-reminder</name>
-	  <can_focus>True</can_focus>
-	  <label>Create new appointments with 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>GtkLabel</class>
+		<name>label29</name>
+		<label>_Overdue tasks:</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<default_focus_target>tasks_overdue_color</default_focus_target>
+		<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>
-	  <class>GtkHBox</class>
-	  <name>hbox13</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
+	      <widget>
+		<class>GnomeColorPicker</class>
+		<name>tasks_overdue_color</name>
+		<can_focus>True</can_focus>
+		<dither>True</dither>
+		<use_alpha>False</use_alpha>
+		<title>Color for overdue tasks</title>
+		<child>
+		  <left_attach>1</left_attach>
+		  <right_attach>2</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>
-	    <class>GtkAlignment</class>
-	    <name>alignment1</name>
-	    <width>17</width>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>1</xscale>
-	    <yscale>1</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
+	      <widget>
+		<class>GnomeColorPicker</class>
+		<name>tasks_due_today_color</name>
+		<can_focus>True</can_focus>
+		<dither>True</dither>
+		<use_alpha>False</use_alpha>
+		<title>Color for tasks due today</title>
+		<child>
+		  <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>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+	    </widget>
 
 	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
+	      <class>GtkHBox</class>
+	      <name>hbox15</name>
+	      <homogeneous>False</homogeneous>
+	      <spacing>4</spacing>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
 
-	  <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>GtkCheckButton</class>
+		<name>tasks-hide-completed-checkbutton</name>
+		<can_focus>True</can_focus>
+		<label>_Hide completed tasks after</label>
+		<active>False</active>
+		<draw_indicator>True</draw_indicator>
+		<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
+	      <widget>
+		<class>GtkSpinButton</class>
+		<name>tasks-hide-completed-spinbutton</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>1</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>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkOptionMenu</class>
+		<name>tasks-hide-completed-optionmenu</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>label27</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>
+		<initial_choice>0</initial_choice>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+	    </widget>
 	  </widget>
 	</widget>
       </widget>
@@ -961,8 +933,8 @@ Days
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
-	<name>label26</name>
-	<label>_Other</label>
+	<name>label7</name>
+	<label>_Display</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>