From b274ab5c91aab08729c6b504ee7cd10631e3a42d Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Fri, 20 Oct 2000 00:42:20 +0000 Subject: added _click-to-add-message, though I'm not sure if i18n will work. 2000-10-20 Damon Chaplin * gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): added _click-to-add-message, though I'm not sure if i18n will work. * cal-util/cal-recur.c (cal_obj_time_add_hours): (cal_obj_time_add_minutes): (cal_obj_time_add_seconds): updated to handle -ve args. * cal-util/timeutil.c (time_add_day): set tm_isdst to -1 before calling mktime(). * cal-util/cal-recur.c (generate_instances_for_chunk): don't call the callback if the event ends exactly on the interval start time. * gui/e-week-view.c (e_week_view_reshape_event_span): * gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons): * gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): * gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event): * gui/e-day-view.c (e_day_view_reshape_long_event): (e_day_view_reshape_day_event): use cal_component_has_alarms(). * cal-util/cal-component.[hc]: added cal_component_has_alarms(). 2000-10-16 Damon Chaplin * gui/calendar-config.c (config_read): set default MonthVPanePosition to 1 rather than 0, so if you move the hpane you'll see the date navigator. svn path=/trunk/; revision=6063 --- calendar/gui/e-day-view.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'calendar/gui/e-day-view.c') diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index f8a3002e2c..50f6639f58 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1342,7 +1342,9 @@ obj_updated_cb (CalClient *client, const char *uid, gpointer data) #endif /* The dates have changed, so we need to remove the old occurrrences before adding the new ones. */ +#if 0 g_print ("dates changed - removing occurrences\n"); +#endif e_day_view_foreach_event_with_uid (day_view, uid, e_day_view_remove_event_cb, NULL); @@ -3586,6 +3588,13 @@ e_day_view_add_event (CalComponent *comp, day_view = E_DAY_VIEW (data); +#if 0 + g_print ("Day view lower: %s", ctime (&day_view->lower)); + g_print ("Day view upper: %s", ctime (&day_view->upper)); + g_print ("Event start: %s", ctime (&start)); + g_print ("Event end : %s\n", ctime (&end)); +#endif + /* Check that the event times are valid. */ g_return_val_if_fail (start <= end, TRUE); g_return_val_if_fail (start < day_view->upper, TRUE); @@ -3841,15 +3850,12 @@ e_day_view_reshape_long_event (EDayView *day_view, use_max_width = TRUE; } -#if 0 if (show_icons) { - if (ico->dalarm.enabled || ico->malarm.enabled - || ico->palarm.enabled || ico->aalarm.enabled) + if (cal_component_has_alarms (comp)) num_icons++; - if (ico->recur) + if (cal_component_has_recurrences (comp)) num_icons++; } -#endif if (!event->canvas_item) { event->canvas_item = @@ -4192,11 +4198,8 @@ e_day_view_reshape_day_event (EDayView *day_view, if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE || day_view->resize_event_day != day || day_view->resize_event_num != event_num) { -#if 0 - if (ico->dalarm.enabled || ico->malarm.enabled - || ico->palarm.enabled || ico->aalarm.enabled) + if (cal_component_has_alarms (comp)) num_icons++; -#endif if (cal_component_has_recurrences (comp)) num_icons++; } -- cgit v1.2.3