From 9d8f94804917a0338a08be9f36a8e047ccedd939 Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Tue, 7 Aug 2001 00:46:56 +0000 Subject: added 'different_timezone' fields to EDayViewEvent and EWeekViewEvent, to 2001-08-06 Damon Chaplin * gui/e-week-view.h: * gui/e-day-view.h: added 'different_timezone' fields to EDayViewEvent and EWeekViewEvent, to note that the event is in a different timezone. We now compute this once when we add the event to the array, rather than each time we draw the event. If it is set, we will draw the timezone icon next to the event. * gui/e-day-view-main-item.c: take transparency into account when drawing the blue vertical bars to represent busy time. * gui/tag-calendar.c: take transparency into account when tagging the mini calendar. * gui/e-calendar-table.c (e_calendar_table_init): removed the "None" options for transparency and classification, since these properties have defaults anyway, so we may as well use those to keep it simple. Also use "Free" and "Busy" for transparency, rather than "Transparent" and "Opaque". * gui/calendar-model.c: updated classification & transparency code as above. * gui/e-calendar-table.etspec: changed "Transparency" to "Show Time As" since people have a chance of understanding that. * gui/e-week-view.c: * gui/e-day-view.c: * gui/gnome-cal.c: added functions to get the visible time range. * gui/calendar-commands.c: finished stuff to set the folder bar label to the dates currently displayed. * gui/control-factory.c (control_factory_new_control): connected signal to update the folder title bar label when the dates shown are changed. I had to connect it here since we need the BonoboControl in the callback, and I don't know how to get the control from the widget. * gui/tasks-control.c (tasks_control_activate): clear the folder bar label. We could display something here at some point. * gui/dialogs/recurrence-page.glade: changed "_Add" to "A_dd", since we have an "_Actions" menu. (These also use Alt+key, right?) * gui/dialogs/event-page.glade: * gui/dialogs/event-page.c: added 'Show Time As' field, which is really the TRANSP property but with a better name! Also changed one of the "_Confidential" to "Con_fidential" since we already have "_Contacts" using the same 'C' key. * pcs/cal-backend-file.c (cal_backend_file_get_free_busy): skip events that are TRANSPARENT. Also added comment as this code looks inefficient. * cal-util/cal-component.c: removed stuff for comparing timezones. * gui/comp-util.c (cal_comp_util_compare_event_timezones): moved the above function here, and updated it to compare the UTC offsets of the times as well as the TZIDs. svn path=/trunk/; revision=11717 --- calendar/pcs/cal-backend-file.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'calendar/pcs/cal-backend-file.c') diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c index 58879c8c3c..bda5f5f825 100644 --- a/calendar/pcs/cal-backend-file.c +++ b/calendar/pcs/cal-backend-file.c @@ -1200,10 +1200,15 @@ cal_backend_file_get_free_busy (CalBackend *backend, time_t start, time_t end) for (l = uids; l != NULL; l = l->next) { char *comp_str; icalcomponent *icalcomp; - icalproperty *icalprop; + icalproperty *icalprop, *prop; struct icalperiodtype ipt; char *uid = (char *) l->data; + /* FIXME: This looks quite inefficient. It is converting the + component to a string and then parsing it again. It would + be better to use lookup_component(). It needs to handle + timezones as well, so it is probably easier to use the + CalComponent wrapper functions. - Damon. */ comp_str = cal_backend_get_object (CAL_BACKEND (cbfile), uid); if (!comp_str) continue; @@ -1213,6 +1218,16 @@ cal_backend_file_get_free_busy (CalBackend *backend, time_t start, time_t end) if (!icalcomp) continue; + /* If the event is TRANSPARENT, skip it. */ + prop = icalcomponent_get_first_property (icalcomp, + ICAL_TRANSP_PROPERTY); + if (prop) { + const char *transp_val = icalproperty_get_transp (prop); + if (transp_val + && !strcasecmp (transp_val, "TRANSPARENT")) + continue; + } + ipt.start = icalcomponent_get_dtstart (icalcomp); ipt.end = icalcomponent_get_dtend (icalcomp); ipt.duration = icalcomponent_get_duration (icalcomp); -- cgit v1.2.3