changed to use EDateEdit.

2000-09-11  Damon Chaplin  <damon@helixcode.com>

	* gui/dialogs/task-editor.c: changed to use EDateEdit.

	* gui/dialogs/task-editor-dialog.glade: added "None" option to
	Classification option menu, and used custom widgets for the date
	entries so we can use EDateEdit widgets.

	* gui/event-editor.c: changed to use EDateEdit. Note that this needs
	to be fixed at some point to handle invalid dates, i.e. when
	e_date_edit_get_time returns -1.

	* gui/calendar-model.c (ensure_task_complete):
	(ensure_task_not_complete): new functions to set the related properties
	to make sure a task is marked as complete on not, i.e. "Date Completed"
	"Status" and "Percent" properties.

2000-09-08  Damon Chaplin  <damon@helixcode.com>

	* gui/calendar-model.c (get_is_complete): use the status field rather
	than the completed date, as it is more reliable.
	(get_is_overdue): use get_is_complete().
	(calendar_model_mark_task_complete): check if it is already complete,
	and if so don't update it.

	* cal-util/cal-component.c (cal_component_get_status):
	(cal_component_set_status): added functions to support the STATUS
	property. Also added the property to CalComponentPrivate and set it
	to NULL in free_icalcomponent(). Someone should check my code as I've
	mainly done a Cut & Paste job.

svn path=/trunk/; revision=5305

4 files changed, 288 insertions, 242 deletions

diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade
index 8a8ca800d6..7f5bff8e6f 100644
--- a/calendar/gui/dialogs/task-editor-dialog.glade
+++ b/calendar/gui/dialogs/task-editor-dialog.glade
@@ -162,54 +162,6 @@
 	    </child>
 
 	    <widget>
-	      <class>GnomeDateEdit</class>
-	      <name>due-date</name>
-	      <show_time>True</show_time>
-	      <use_24_format>True</use_24_format>
-	      <week_start_monday>False</week_start_monday>
-	      <lower_hour>7</lower_hour>
-	      <upper_hour>19</upper_hour>
-	      <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>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeDateEdit</class>
-	      <name>start-date</name>
-	      <show_time>True</show_time>
-	      <use_24_format>True</use_24_format>
-	      <week_start_monday>False</week_start_monday>
-	      <lower_hour>7</lower_hour>
-	      <upper_hour>19</upper_hour>
-	      <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>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label6</name>
 	      <label>Sta_rt Date:</label>
@@ -320,6 +272,52 @@
 		<yfill>False</yfill>
 	      </child>
 	    </widget>
+
+	    <widget>
+	      <class>Custom</class>
+	      <name>due-date</name>
+	      <creation_function>task_editor_create_date_edit</creation_function>
+	      <int1>0</int1>
+	      <int2>0</int2>
+	      <last_modification_time>Sun, 10 Sep 2000 17:32:18 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>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>Custom</class>
+	      <name>start-date</name>
+	      <creation_function>task_editor_create_date_edit</creation_function>
+	      <int1>0</int1>
+	      <int2>0</int2>
+	      <last_modification_time>Sun, 10 Sep 2000 17:33:31 GMT</last_modification_time>
+	      <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>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
 	  </widget>
 	</widget>
 
@@ -435,7 +433,8 @@ Low
 	    <class>GtkOptionMenu</class>
 	    <name>classification</name>
 	    <can_focus>True</can_focus>
-	    <items>Public
+	    <items>None
+Public
 Private
 Confidential
 </items>
@@ -587,30 +586,6 @@ Confidential
 	<column_spacing>4</column_spacing>
 
 	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>completed-date</name>
-	  <show_time>True</show_time>
-	  <use_24_format>True</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
 	  <class>GtkLabel</class>
 	  <name>label12</name>
 	  <label>Date Completed:</label>
@@ -685,6 +660,29 @@ Confidential
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
+
+	<widget>
+	  <class>Custom</class>
+	  <name>completed-date</name>
+	  <creation_function>task_editor_create_date_edit</creation_function>
+	  <int1>0</int1>
+	  <int2>0</int2>
+	  <last_modification_time>Sun, 10 Sep 2000 17:34:07 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>False</yfill>
+	  </child>
+	</widget>
       </widget>
 
       <widget>
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade.h b/calendar/gui/dialogs/task-editor-dialog.glade.h
index 9c20880b51..20f7db3014 100644
--- a/calendar/gui/dialogs/task-editor-dialog.glade.h
+++ b/calendar/gui/dialogs/task-editor-dialog.glade.h
@@ -21,7 +21,8 @@ gchar *s = N_("High\n"
               "Low\n"
               "");
 gchar *s = N_("C_lassification:");
-gchar *s = N_("Public\n"
+gchar *s = N_("None\n"
+              "Public\n"
               "Private\n"
               "Confidential\n"
               "");
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 743a575179..240d1a5010 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -32,6 +32,7 @@
 #include <glade/glade.h>
 #include <e-util/e-util.h>
 #include <e-util/e-dialog-widgets.h>
+#include <widgets/misc/e-dateedit.h>
 #include <cal-util/timeutil.h>
 #include <cal-client/cal-client.h>
 #include "task-editor.h"
@@ -81,22 +82,25 @@ typedef struct {
 	GtkWidget *url;
 } TaskEditorPrivate;
 
-/* CalComponent doesn't support status yet, so we use this temporarily. */
-typedef enum {
-	STATUS_NOT_STARTED,
-	STATUS_IN_PROGRESS,
-	STATUS_COMPLETED,
-	STATUS_CANCELLED
-} TaskEditorStatus;
 
+/* Note that these two arrays must match. */
 static const int status_map[] = {
-	STATUS_NOT_STARTED,
-	STATUS_IN_PROGRESS,
-	STATUS_COMPLETED,
-	STATUS_CANCELLED,
+	ICAL_STATUS_NEEDSACTION,
+	ICAL_STATUS_INPROCESS,
+	ICAL_STATUS_COMPLETED,
+	ICAL_STATUS_CANCELLED,
 	-1
 };
 
+static const char* status_string_map[] = {
+	"NEEDS-ACTION",
+	"IN-PROCESS",
+	"COMPLETED",
+	"CANCELLED",
+	NULL
+};
+
+
 typedef enum {
 	PRIORITY_HIGH,
 	PRIORITY_NORMAL,
@@ -113,6 +117,7 @@ static const int priority_map[] = {
 };
 
 static const int classification_map[] = {
+	CAL_COMPONENT_CLASS_NONE,
 	CAL_COMPONENT_CLASS_PUBLIC,
 	CAL_COMPONENT_CLASS_PRIVATE,
 	CAL_COMPONENT_CLASS_CONFIDENTIAL,
@@ -150,13 +155,18 @@ static void raise_and_focus (GtkWidget *widget);
 static TaskEditorPriority priority_value_to_index (int priority_value);
 static int priority_index_to_value (TaskEditorPriority priority);
 
-static void completed_date_changed	(GnomeDateEdit	*dedit,
+static int status_string_to_value	(const char *status_string);
+static const char* status_value_to_string	(int status);
+
+static void completed_date_changed	(EDateEdit	*dedit,
 					 TaskEditor	*tedit);
 static void status_changed		(GtkMenu	*menu,
 					 TaskEditor	*tedit);
 static void percent_complete_changed	(GtkAdjustment	*adj,
 					 TaskEditor	*tedit);
 
+GtkWidget * task_editor_create_date_edit (void);
+
 static GtkObjectClass *parent_class;
 
 E_MAKE_TYPE(task_editor, "TaskEditor", TaskEditor,
@@ -270,6 +280,20 @@ task_editor_construct (TaskEditor *tedit)
 }
 
 
+/* Called by libglade to create our custom EDateEdit widgets. */
+GtkWidget *
+task_editor_create_date_edit (void)
+{
+	GtkWidget *dedit;
+
+	dedit = e_date_edit_new ();
+	/* FIXME: Set other options. */
+	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 8, 18);
+	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE);
+	return dedit;
+}
+
+
 /* Callback used when the dialog box is destroyed */
 static gint
 app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
@@ -356,12 +380,9 @@ static void
 init_widgets (TaskEditor *tedit)
 {
 	TaskEditorPrivate *priv;
-	GnomeDateEdit *gde;
-	GtkWidget *widget;
 
 	priv = tedit->priv;
 
-
 	/* Connect signals. The Status, Percent Complete & Date Completed
 	   properties are closely related so whenever one changes we may need
 	   to update the other 2. */
@@ -377,38 +398,6 @@ init_widgets (TaskEditor *tedit)
 	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (priv->percent_complete)->adjustment),
 			    "value_changed",
 			    GTK_SIGNAL_FUNC (percent_complete_changed), tedit);
-
-
-	/* Hide the stupid 'Calendar' labels. */
-	gde = GNOME_DATE_EDIT (priv->due_date);
-	gtk_widget_hide (gde->cal_label);
-	widget = gde->date_entry;
-	gtk_box_set_child_packing (GTK_BOX (widget->parent), widget,
-				   FALSE, FALSE, 0, GTK_PACK_START);
-	widget = gde->time_entry;
-	gtk_box_set_child_packing (GTK_BOX (widget->parent), widget,
-				   FALSE, FALSE, 0, GTK_PACK_START);
-	gtk_box_set_spacing (GTK_BOX (widget->parent), 2);
-
-	gde = GNOME_DATE_EDIT (priv->start_date);
-	gtk_widget_hide (gde->cal_label);
-	widget = gde->date_entry;
-	gtk_box_set_child_packing (GTK_BOX (widget->parent), widget,
-				   FALSE, FALSE, 0, GTK_PACK_START);
-	widget = gde->time_entry;
-	gtk_box_set_child_packing (GTK_BOX (widget->parent), widget,
-				   FALSE, FALSE, 0, GTK_PACK_START);
-	gtk_box_set_spacing (GTK_BOX (widget->parent), 2);
-
-	gde = GNOME_DATE_EDIT (priv->completed_date);
-	gtk_widget_hide (gde->cal_label);
-	widget = gde->date_entry;
-	gtk_box_set_child_packing (GTK_BOX (widget->parent), widget,
-				   FALSE, FALSE, 0, GTK_PACK_START);
-	widget = gde->time_entry;
-	gtk_box_set_child_packing (GTK_BOX (widget->parent), widget,
-				   FALSE, FALSE, 0, GTK_PACK_START);
-	gtk_box_set_spacing (GTK_BOX (widget->parent), 2);
 }
 
 
@@ -949,8 +938,9 @@ fill_widgets (TaskEditor *tedit)
 	GSList *l;
 	time_t t;
 	int *priority_value, *percent;
+	icalproperty_status status;
 	TaskEditorPriority priority;
-	const char *url;
+	const char *url, *status_string;
 
 	priv = tedit->priv;
 
@@ -980,20 +970,18 @@ fill_widgets (TaskEditor *tedit)
 	if (d.value) {
 		t = icaltime_as_timet (*d.value);
 	} else {
-		/* FIXME: Can't set GnomeDateEdit to a date of 'None'. */
-		t = time (NULL);
+		t = -1;
 	}
-	e_dialog_dateedit_set (priv->due_date, t);
+	e_date_edit_set_time (E_DATE_EDIT (priv->due_date), t);
 
 	/* Start Date. */
 	cal_component_get_dtstart (priv->comp, &d);
 	if (d.value) {
 		t = icaltime_as_timet (*d.value);
 	} else {
-		/* FIXME: Can't set GnomeDateEdit to a date of 'None'. */
-		t = time (NULL);
+		t = -1;
 	}
-	e_dialog_dateedit_set (priv->start_date, t);
+	e_date_edit_set_time (E_DATE_EDIT (priv->start_date), t);
 
 	/* Completed Date. */
 	cal_component_get_completed (priv->comp, &completed);
@@ -1001,10 +989,9 @@ fill_widgets (TaskEditor *tedit)
 		t = icaltime_as_timet (*completed);
 		cal_component_free_icaltimetype (completed);
 	} else {
-		/* FIXME: Can't set GnomeDateEdit to a date of 'None'. */
-		t = time (NULL);
+		t = -1;
 	}
-	e_dialog_dateedit_set (priv->completed_date, t);
+	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), t);
 
 	/* Percent Complete. */
 	cal_component_get_percent (priv->comp, &percent);
@@ -1016,9 +1003,25 @@ fill_widgets (TaskEditor *tedit)
 		e_dialog_spin_set (priv->percent_complete, 0);
 	}
 
-	/* Status. FIXME: CalComponent doesn't support this yet. */
-	e_dialog_option_menu_set (priv->status, STATUS_IN_PROGRESS,
-				  status_map);
+	/* Status. */
+	cal_component_get_status (priv->comp, &status_string);
+	if (status_string) {
+		status = status_string_to_value (status_string);
+	} else {
+		/* Try to user the percent value. */
+		if (percent) {
+			if (*percent == 0)
+				status = ICAL_STATUS_NEEDSACTION;
+			else if (*percent == 100)
+				status = ICAL_STATUS_COMPLETED;
+			else
+				status = ICAL_STATUS_INPROCESS;
+		} else {
+			status = ICAL_STATUS_NEEDSACTION;
+		}
+	}
+	g_print ("Setting status\n");
+	e_dialog_option_menu_set (priv->status, status, status_map);
 
 	/* Priority. */
 	cal_component_get_priority (priv->comp, &priority_value);
@@ -1028,11 +1031,13 @@ fill_widgets (TaskEditor *tedit)
 	} else {
 		priority = PRIORITY_UNDEFINED;
 	}
+	g_print ("Setting priority\n");
 	e_dialog_option_menu_set (priv->priority, priority, priority_map);
 
 
 	/* Classification. */
 	cal_component_get_classification (priv->comp, &classification);
+	g_print ("Setting classification\n");
 	e_dialog_option_menu_set (priv->classification, classification,
 				  classification_map);
 
@@ -1079,11 +1084,12 @@ dialog_to_comp_object (TaskEditor *tedit)
 	CalComponentDateTime date;
 	time_t t;
 	GSList *list;
-	TaskEditorStatus status;
+	icalproperty_status status;
 	TaskEditorPriority priority;
 	int priority_value, percent;
 	CalComponentClassification classification;
 	char *url;
+	const char *status_string;
 	
 	priv = tedit->priv;
 	comp = priv->comp;
@@ -1106,19 +1112,31 @@ dialog_to_comp_object (TaskEditor *tedit)
 	date.tzid = NULL;
 
 	/* Due Date. */
-	t = e_dialog_dateedit_get (priv->due_date);
-	*date.value = icaltime_from_timet (t, FALSE, FALSE);
-	cal_component_set_due (comp, &date);
+	t = e_date_edit_get_time (E_DATE_EDIT (priv->due_date));
+	if (t != -1) {
+		*date.value = icaltime_from_timet (t, FALSE, FALSE);
+		cal_component_set_due (comp, &date);
+	} else {
+		cal_component_set_due (comp, NULL);
+	}
 
 	/* Start Date. */
-	t = e_dialog_dateedit_get (priv->start_date);
-	*date.value = icaltime_from_timet (t, FALSE, FALSE);
-	cal_component_set_dtstart (comp, &date);
+	t = e_date_edit_get_time (E_DATE_EDIT (priv->start_date));
+	if (t != -1) {
+		*date.value = icaltime_from_timet (t, FALSE, FALSE);
+		cal_component_set_dtstart (comp, &date);
+	} else {
+		cal_component_set_dtstart (comp, NULL);
+	}
 
 	/* Completed Date. */
-	t = e_dialog_dateedit_get (priv->completed_date);
-	*date.value = icaltime_from_timet (t, FALSE, FALSE);
-	cal_component_set_completed (comp, date.value);
+	t = e_date_edit_get_time (E_DATE_EDIT (priv->completed_date));
+	if (t != -1) {
+		*date.value = icaltime_from_timet (t, FALSE, FALSE);
+		cal_component_set_completed (comp, date.value);
+	} else {
+		cal_component_set_completed (comp, NULL);
+	}
 
 	g_free (date.value);
 
@@ -1126,11 +1144,10 @@ dialog_to_comp_object (TaskEditor *tedit)
 	percent = e_dialog_spin_get_int (priv->percent_complete);
 	cal_component_set_percent (comp, &percent);
 
-	/* Status. FIXME: CalComponent doesn't support it. */
+	/* Status. */
 	status = e_dialog_option_menu_get (priv->status, status_map);
-#if 0
-	cal_component_set_status (comp, status);
-#endif
+	status_string = status_value_to_string (status);
+	cal_component_set_status (comp, status_string);
 
 	/* Priority. */
 	priority = e_dialog_option_menu_get (priv->priority, priority_map);
@@ -1262,8 +1279,38 @@ priority_index_to_value (TaskEditorPriority priority)
 }
 
 
+static int
+status_string_to_value	(const char *status_string)
+{
+	int i;
+
+	for (i = 0; status_map[i] != -1; i++) {
+		if (!strcmp (status_string_map[i], status_string))
+			return status_map[i];
+	}
+
+	g_warning ("Invalid todo status string");
+	return ICAL_STATUS_NEEDSACTION;
+}
+
+
+static const char*
+status_value_to_string	(int status)
+{
+	int i;
+
+	for (i = 0; status_map[i] != -1; i++) {
+		if (status_map[i] == status)
+			return status_string_map[i];
+	}
+
+	g_warning ("Invalid todo status value");
+	return NULL;
+}
+
+
 static void
-completed_date_changed	(GnomeDateEdit	*dedit,
+completed_date_changed	(EDateEdit	*dedit,
 			 TaskEditor	*tedit)
 {
 	TaskEditorPrivate *priv;
@@ -1276,17 +1323,18 @@ completed_date_changed	(GnomeDateEdit	*dedit,
 	if (priv->ignore_callbacks)
 		return;
 
-	t = e_dialog_dateedit_get (priv->completed_date);
-	/* FIXME: We want to check for 'None' here. */
+	t = e_date_edit_get_time (E_DATE_EDIT (priv->completed_date));
 	priv->ignore_callbacks = TRUE;
-	if (0) {
-		/* What do we do if the 'Date Completed' property is set to
-		   'None' ? The status should not be 'Completed' and the
-		   percent-complete should not be 100%, but what do we set
-		   them to? */
-
+	if (t == -1) {
+		/* If the 'Completed Date' is set to 'None', we set the
+		   status to 'Not Started' and the percent-complete to 0.
+		   The task may actually be partially-complete, but we leave
+		   it to the user to set those fields. */
+		e_dialog_option_menu_set (priv->status, ICAL_STATUS_NEEDSACTION,
+					  status_map);
+		e_dialog_spin_set (priv->percent_complete, 0);
 	} else {
-		e_dialog_option_menu_set (priv->status, STATUS_COMPLETED,
+		e_dialog_option_menu_set (priv->status, ICAL_STATUS_COMPLETED,
 					  status_map);
 		e_dialog_spin_set (priv->percent_complete, 100);
 	}
@@ -1299,7 +1347,7 @@ status_changed		(GtkMenu	*menu,
 			 TaskEditor	*tedit)
 {
 	TaskEditorPrivate *priv;
-	TaskEditorStatus status;
+	icalproperty_status status;
 
 	g_return_if_fail (IS_TASK_EDITOR (tedit));
 
@@ -1310,13 +1358,13 @@ status_changed		(GtkMenu	*menu,
 
 	status = e_dialog_option_menu_get (priv->status, status_map);
 	priv->ignore_callbacks = TRUE;
-	if (status == STATUS_NOT_STARTED) {
+	if (status == ICAL_STATUS_NEEDSACTION) {
 		e_dialog_spin_set (priv->percent_complete, 0);
-		/* FIXME: Set to 'None'. */
-		e_dialog_dateedit_set (priv->completed_date, time (NULL));
-	} else if (status == STATUS_COMPLETED) {
+		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), -1);
+	} else if (status == ICAL_STATUS_COMPLETED) {
 		e_dialog_spin_set (priv->percent_complete, 100);
-		e_dialog_dateedit_set (priv->completed_date, time (NULL));
+		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date),
+				      time (NULL));
 	}
 	priv->ignore_callbacks = FALSE;
 }
@@ -1328,7 +1376,7 @@ percent_complete_changed	(GtkAdjustment	*adj,
 {
 	TaskEditorPrivate *priv;
 	gint percent;
-	TaskEditorStatus status;
+	icalproperty_status status;
 	time_t date_completed;
 
 	g_return_if_fail (IS_TASK_EDITOR (tedit));
@@ -1343,18 +1391,19 @@ percent_complete_changed	(GtkAdjustment	*adj,
 
 	if (percent == 100) {
 		date_completed = time (NULL);
-		status = STATUS_COMPLETED;
+		status = ICAL_STATUS_COMPLETED;
 	} else {
 		/* FIXME: Set to 'None'. */
 		date_completed = time (NULL);
 
 		if (percent == 0)
-			status = STATUS_NOT_STARTED;
+			status = ICAL_STATUS_NEEDSACTION;
 		else
-			status = STATUS_IN_PROGRESS;
+			status = ICAL_STATUS_INPROCESS;
 	}
 
-	e_dialog_dateedit_set (priv->completed_date, date_completed);
+	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date),
+			      date_completed);
 	e_dialog_option_menu_set (priv->status, status, status_map);
 
 	priv->ignore_callbacks = FALSE;
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
index 8a8ca800d6..7f5bff8e6f 100644
--- a/calendar/gui/dialogs/task-page.glade
+++ b/calendar/gui/dialogs/task-page.glade
@@ -162,54 +162,6 @@
 	    </child>
 
 	    <widget>
-	      <class>GnomeDateEdit</class>
-	      <name>due-date</name>
-	      <show_time>True</show_time>
-	      <use_24_format>True</use_24_format>
-	      <week_start_monday>False</week_start_monday>
-	      <lower_hour>7</lower_hour>
-	      <upper_hour>19</upper_hour>
-	      <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>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeDateEdit</class>
-	      <name>start-date</name>
-	      <show_time>True</show_time>
-	      <use_24_format>True</use_24_format>
-	      <week_start_monday>False</week_start_monday>
-	      <lower_hour>7</lower_hour>
-	      <upper_hour>19</upper_hour>
-	      <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>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label6</name>
 	      <label>Sta_rt Date:</label>
@@ -320,6 +272,52 @@
 		<yfill>False</yfill>
 	      </child>
 	    </widget>
+
+	    <widget>
+	      <class>Custom</class>
+	      <name>due-date</name>
+	      <creation_function>task_editor_create_date_edit</creation_function>
+	      <int1>0</int1>
+	      <int2>0</int2>
+	      <last_modification_time>Sun, 10 Sep 2000 17:32:18 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>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>Custom</class>
+	      <name>start-date</name>
+	      <creation_function>task_editor_create_date_edit</creation_function>
+	      <int1>0</int1>
+	      <int2>0</int2>
+	      <last_modification_time>Sun, 10 Sep 2000 17:33:31 GMT</last_modification_time>
+	      <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>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
 	  </widget>
 	</widget>
 
@@ -435,7 +433,8 @@ Low
 	    <class>GtkOptionMenu</class>
 	    <name>classification</name>
 	    <can_focus>True</can_focus>
-	    <items>Public
+	    <items>None
+Public
 Private
 Confidential
 </items>
@@ -587,30 +586,6 @@ Confidential
 	<column_spacing>4</column_spacing>
 
 	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>completed-date</name>
-	  <show_time>True</show_time>
-	  <use_24_format>True</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
 	  <class>GtkLabel</class>
 	  <name>label12</name>
 	  <label>Date Completed:</label>
@@ -685,6 +660,29 @@ Confidential
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
+
+	<widget>
+	  <class>Custom</class>
+	  <name>completed-date</name>
+	  <creation_function>task_editor_create_date_edit</creation_function>
+	  <int1>0</int1>
+	  <int2>0</int2>
+	  <last_modification_time>Sun, 10 Sep 2000 17:34:07 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>False</yfill>
+	  </child>
+	</widget>
       </widget>
 
       <widget>