added new e-sexp operator. We don't currently use it though.

2001-08-21  Damon Chaplin  <damon@ximian.com>

	* pcs/query.c (func_is_completed): added new e-sexp operator. We
	don't currently use it though.

	* gui/dialogs/cal-prefs-dialog.glade: Changed '_Overdue' to 'O_verdue'
	since we have an '_Other' notebook tab. Added '_Hide' accel.

	* gui/dialogs/cal-prefs-dialog.c: hooked up config options to dialog.

	* gui/calendar-config.c: added config options for hiding completed
	tasks.

	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):
	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
	* gui/e-day-view.c (e_day_view_reshape_long_event): added 2 pixels
	extra space between icons and text for long events, and 1 pixel space
	between icons in all events.
	(e_day_view_realize): changed the background color to match the
	EGrayBar in the shell.

svn path=/trunk/; revision=12347

1 files changed, 11 insertions, 1 deletions

diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index b7aca002ce..141d8e96c4 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -1807,6 +1807,7 @@ adjust_query_sexp (CalendarModel *model, const char *sexp)
 	CalendarModelPrivate *priv;
 	CalObjType type;
 	char *type_sexp;
+	char *completed_sexp = "";
 	char *new_sexp;
 
 	priv = model->priv;
@@ -1822,9 +1823,18 @@ adjust_query_sexp (CalendarModel *model, const char *sexp)
 			(type & CALOBJ_TYPE_TODO) ? "(= (get-vtype) \"VTODO\")" : "",
 			(type & CALOBJ_TYPE_JOURNAL) ? "(= (get-vtype) \"VJOURNAL\")" : "");
 
-	new_sexp = g_strdup_printf ("(and %s %s)", type_sexp, sexp);
+	/* FIXME: Use config setting eventually. */
+#if 0
+	if (1)
+		completed_sexp = "(not is-completed?)";
+#endif
+
+	new_sexp = g_strdup_printf ("(and %s %s %s)", type_sexp,
+				    completed_sexp, sexp);
 	g_free (type_sexp);
 
+	g_print ("Calendar mode sexp:\n%s\n", new_sexp);
+
 	return new_sexp;
 }