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/calendar-config.c | 2 +- calendar/gui/e-calendar-table.c | 5 +---- calendar/gui/e-day-view-main-item.c | 5 +---- calendar/gui/e-day-view-top-item.c | 5 +---- calendar/gui/e-day-view.c | 21 ++++++++++++--------- calendar/gui/e-week-view-event-item.c | 5 +---- calendar/gui/e-week-view.c | 7 ++----- calendar/gui/gnome-cal.c | 2 ++ 8 files changed, 21 insertions(+), 31 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index 6664ca775d..dc726191be 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -96,7 +96,7 @@ config_read (void) config->hpane_pos = gnome_config_get_float ("HPanePosition=1"); config->vpane_pos = gnome_config_get_float ("VPanePosition=1"); config->month_hpane_pos = gnome_config_get_float ("MonthHPanePosition=0"); - config->month_vpane_pos = gnome_config_get_float ("MonthVPanePosition=0"); + config->month_vpane_pos = gnome_config_get_float ("MonthVPanePosition=1"); config->compress_weekend = gnome_config_get_bool ("CompressWeekend=1"); config->show_event_end = gnome_config_get_bool ("ShowEventEndTime=1"); diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index b372a1c03b..b771b338e6 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -134,7 +134,7 @@ e_calendar_table_class_init (ECalendarTableClass *class) #define E_CALENDAR_TABLE_SPEC \ - " draw-grid=\"true\"" \ + "" \ "" \ "" \ "" \ @@ -221,9 +221,6 @@ e_calendar_table_init (ECalendarTable *cal_table) /* Create the table */ table = e_table_scrolled_new (model, extras, E_CALENDAR_TABLE_SPEC, NULL); - gtk_object_set (GTK_OBJECT (table), - "click_to_add_message", "Click here to add a new Task", - NULL); gtk_table_attach (GTK_TABLE (cal_table), table, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_widget_show (table); diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 304a07854e..edcb0b4b82 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -563,13 +563,10 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, + E_DAY_VIEW_ICON_Y_PAD; comp = event->comp; -#if 0 - if (ico->dalarm.enabled || ico->malarm.enabled - || ico->palarm.enabled || ico->aalarm.enabled) { + if (cal_component_has_alarms (comp)) { draw_reminder_icon = TRUE; num_icons++; } -#endif if (cal_component_has_recurrences (comp)) { draw_recurrence_icon = TRUE; diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index 6b00f34a60..8a85983592 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -451,9 +451,7 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem, icon_x -= icon_x_inc; } -#if 0 - if (ico->dalarm.enabled || ico->malarm.enabled - || ico->palarm.enabled || ico->aalarm.enabled) { + if (cal_component_has_alarms (comp)) { gdk_gc_set_clip_origin (gc, icon_x, icon_y); gdk_gc_set_clip_mask (gc, day_view->reminder_mask); gdk_draw_pixmap (drawable, gc, @@ -464,7 +462,6 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem, icon_x -= icon_x_inc; } gdk_gc_set_clip_mask (gc, NULL); -#endif /* Draw the start & end times, if necessary. Note that GtkLabel adds 1 to the ascent so we must do that to be 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++; } diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 8f221bd17f..074aebe486 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -507,13 +507,10 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem, gc = week_view->main_gc; -#if 0 - if (ico->dalarm.enabled || ico->malarm.enabled - || ico->palarm.enabled || ico->aalarm.enabled) { + if (cal_component_has_alarms (comp)) { draw_reminder_icon = TRUE; num_icons++; } -#endif if (cal_component_has_recurrences (comp)) { draw_recurrence_icon = TRUE; diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index ab38f92c1a..eadc3c9bd3 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -2235,15 +2235,12 @@ e_week_view_reshape_event_span (EWeekView *week_view, } num_icons = 0; -#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 /* Create the background canvas item if necessary. */ if (!span->background_item) { diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 6b80823dfa..46eb66e58e 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -522,6 +522,8 @@ gnome_calendar_dayjump (GnomeCalendar *gcal, time_t time) priv->selection_end_time = time_add_day (priv->selection_start_time, 1); if (priv->day_button) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->day_button), TRUE); + else + gnome_calendar_set_view (gcal, "dayview", FALSE, TRUE); } void -- cgit