diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/e-day-view-main-item.c | 14 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 12 |
3 files changed, 21 insertions, 13 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 525de944c1..9a5ee1d6ec 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2006-07-24 Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in> + + * gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event): + Free the gconf client after use. + * gui/e-day-view.c (e_day_view_update_event_label) + (e_day_view_on_text_item_event): Fix the gal tooltip and show the appt + header if the event spans over minutes per row. + 2006-07-22 Chenthill Palanisamy <pchenthill@novell.com> * calendar.error.xml: diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 6af0ef2fcd..d85f930085 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -1269,6 +1269,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, gint end_hour, end_display_hour, end_minute, end_suffix_width; int scroll_flag = 0; gint row_y; + GConfClient *gconf; day_view = dvmitem->day_view; @@ -1278,14 +1279,18 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, gc = day_view->main_gc; - alpha = gconf_client_get_float (gconf_client_get_default (), + gconf = gconf_client_get_default (); + + alpha = gconf_client_get_float (gconf, "/apps/evolution/calendar/display/events_transparency", NULL); - gradient = gconf_client_get_bool (gconf_client_get_default (), + gradient = gconf_client_get_bool (gconf, "/apps/evolution/calendar/display/events_gradient", NULL); + g_object_unref (gconf); + /* If the event is currently being dragged, don't draw it. It will be drawn in the special drag items. */ if (day_view->drag_event_day == day @@ -1512,8 +1517,9 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, draw_curved_rectangle (cr, x0, y0, rect_width, rect_height, radius); date_fraction = rect_height / day_view->row_height; - short_event = (((event->end_minute - event->start_minute)/day_view->mins_per_row) >= 2) ? FALSE : TRUE ; - + short_event = ((((event->end_minute - event->start_minute)/day_view->mins_per_row) >= 2) + || (((event->end_minute - event->start_minute)%day_view->mins_per_row) <= day_view->mins_per_row))? FALSE : TRUE ; + if (day_view->editing_event_day == day && day_view->editing_event_num == event_num) short_event = TRUE; diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 3740b2c7b2..18e4e25454 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1797,14 +1797,14 @@ e_day_view_update_event_label (EDayView *day_view, } } } else { - if (day_view->show_event_end_times && offset != 0) { + if (day_view->show_event_end_times && show_span) { /* 12 hour format with end time. */ text = g_strdup_printf ("%2i:%02i%s-%2i:%02i%s %s %s", start_display_hour, start_minute, start_suffix, - end_display_hour, end_minute, mode, - end_suffix, + end_display_hour, end_minute, end_suffix, + mode, text); } else { /* 12 hour format without end time. */ @@ -5771,9 +5771,6 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item, ECalendarViewPosition pos; gboolean main_canvas = TRUE; - if (day_view->editing_event_num != -1) - return FALSE; - /* Convert the coords to the main canvas window, or return if the window is not found. */ if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) event, @@ -5804,9 +5801,6 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item, if (pos == E_CALENDAR_VIEW_POS_OUTSIDE) return FALSE; - if (day_view->resize_event_num == event_num) - return FALSE; - pevent = tooltip_get_view_event (day_view, day, event_num); g_object_set_data (G_OBJECT (item), "event-num", GINT_TO_POINTER (event_num)); g_object_set_data (G_OBJECT (item), "event-day", GINT_TO_POINTER (day)); |