added comparison functions for these special cell types. But the date and

2001-09-26  Damon Chaplin  <damon@ximian.com>

	* gui/e-calendar-table.c (date_compare_cb):
	(percent_compare_cb):
	(priority_compare_cb): added comparison functions for these special
	cell types. But the date and percent ones don't work yet due to the
	use of static text buffers for return cell values.
	(e_calendar_table_init): added the comparison functions to the
	ETableExtras. NOTE: task_compare_cb() never seems to be called.
	I'm not sure why it is there.

	* gui/e-calendar-table.etspec: set the comparison function names for
	the date/percent/priority fields.

	* cal-util/cal-util.c (cal_util_priority_to_string):
	(cal_util_priority_from_string): new utility functions.

	* gui/calendar-model.c (get_priority):
	(set_priority): used above utility functions, and removed the warning
	dialog which isn't useful now that the field isn't editable.

	* gui/dialogs/event-page.c (times_updated): handle timezones and for
	all-day events make sure it stays an all-day event after adjusting.
	Fixes bugs #5945 and #10222.

	* gui/calendar-commands.c (pixmaps): fixed the E_PIXMAP paths - the
	edit items were moved beneath 'EditPlaceholder'. This gets rid of
	those long Bonobo warnings! (and we get the icons back)

	* gui/dialogs/comp-editor.c (pixmaps): removed the PrintPreview toolbar
	icon, since it doesn't appear in the xml file. Gets rid of warning.

	* gui/dialogs/event-page.c (notify_dates_changed): new function to
	emit the notification signal when the dates are changed. It also
	handles timezones now.

	* gui/dialogs/comp-editor-page.h (CompEditorPageDates): used
	CalComponentDateTime for start/end/due so we have the timezone as well
	as the time.

	* gui/dialogs/comp-editor-util.c (comp_editor_dates): updated to get
	the timezones as well as the times.
	(comp_editor_free_dates): new function needed to free all the structs.

	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): added call
	to preview_recur() to make sure the preview gets updated.

	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): free the
	CompEditorPageDates struct after use.

	* gui/tag-calendar.c (tag_calendar_by_comp): added 'comp_is_on_server'
	argument. If FALSE, we try to use builtin timezones first. This is
	needed for the recurrence page of the event editor, because the
	timezones may not have been added to the server yet. This and the
	changes to the notification stuff should fix bug #5034.

	* gui/gnome-cal.c (dn_query_obj_updated_cb): call above
	tag_calendar_by_comp() with TRUE since the events will be on the
	server in this case.

	* gui/e-day-view-layout.c:
	* gui/e-day-view.c: made sure an event always takes up at least one
	row, even when the start & end times are the same. Fixes bug #5944.
	I don't know if we should try to also handle events with the end time
	before the start time.

	* gui/e-week-view.c (e_week_view_style_set): check that the small font
	is actually smaller than the normal font. If it isn't, don't use it.
	Hopefully fixes bug #6876.
	(e_week_view_on_new_appointment): if only one day is selected, then
	we set the initial time of the event to 1/2-hour from the start of the
	working day, to differentiate 'New Appointment' from 'New All Day
	Event'. Fixes bug #8892.

	* gui/e-day-view.c (e_day_view_on_new_appointment): do the same as the
	above.

svn path=/trunk/; revision=13186

1 files changed, 12 insertions, 37 deletions

diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index 8a26af5faf..c83d29d04d 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -528,21 +528,14 @@ static char *
 get_priority (CalComponent *comp)
 {
 	int *priority;
-	char *retval;
+	char *retval = "";
 
 	cal_component_get_priority (comp, &priority);
 
-	if (!priority || *priority == 0)
-		retval = "";
-	else if (*priority <= 4)
-		retval = _("High");
-	else if (*priority == 5)
-		retval = _("Normal");
-	else
-		retval = _("Low");
-
-	if (priority)
+	if (priority) {
+		retval = cal_util_priority_to_string (*priority);
 		cal_component_free_priority (priority);
+	}
 
 	return retval;
 }
@@ -1157,38 +1150,18 @@ set_percent (CalComponent *comp, const char *value)
 		ensure_task_not_complete (comp);
 }
 
-/* FIXME: We won't need this eventually, since the user won't be allowed to
- * edit the field.
- */
-static void
-show_priority_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The priority must be 'High', 'Normal', 'Low' or 'Undefined'."),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
 /* Sets the priority of a calendar component */
 static void
 set_priority (CalComponent *comp, const char *value)
 {
 	int priority;
 
-	/* An empty string is the same as 'None'. */
-	if (!value[0] || !g_strcasecmp (value, _("Undefined")))
+	priority = cal_util_priority_from_string (value);
+	/* If the priority is invalid (which should never happen) output a
+	   warning and set it to undefined. */
+	if (priority == -1) {
+		g_warning ("Invalid priority");
 		priority = 0;
-	else if (!g_strcasecmp (value, _("High")))
-		priority = 3;
-	else if (!g_strcasecmp (value, _("Normal")))
-		priority = 5;
-	else if (!g_strcasecmp (value, _("Low")))
-		priority = 7;
-	else {
-		show_priority_warning ();
-		return;
 	}
 
 	cal_component_set_priority (comp, &priority);
@@ -1956,7 +1929,9 @@ adjust_query_sexp (CalendarModel *model, const char *sexp)
 	if (free_completed_sexp)
 		g_free (completed_sexp);
 
-	g_print ("Calendar mode sexp:\n%s\n", new_sexp);
+#if 0
+	g_print ("Calendar model sexp:\n%s\n", new_sexp);
+#endif
 
 	return new_sexp;
 }