From f86754c329d9411893abd98bfe98b45d5ccfc943 Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Wed, 13 Aug 2008 09:09:33 +0000 Subject: Fixes #347287 2008-08-15 Chenthill Palanisamy Fixes #347287 * gui/e-cal-list-view-config.c: * (e_cal_list_view_config_set_view): * gui/e-cal-list-view.c: (e_cal_list_view_new): * gui/e-cal-list-view.h: * gui/e-cal-model.c: (e_cal_model_set_timezone), * (add_instance_cb), (e_cal_view_objects_added_cb), (e_cal_view_done_cb), (update_e_cal_view_for_client), (cal_opened_cb), (add_new_client), (e_cal_model_component_class_init), (e_cal_model_component_finalize), (e_cal_model_component_init), (e_cal_model_component_get_type), (e_cal_model_copy_component_data), (e_cal_model_free_component_data): * gui/e-cal-model.h: * gui/e-calendar-view.c: (e_calendar_view_init), (e_calendar_view_set_model): * gui/e-calendar-view.h: * gui/e-day-view-config.c: (e_day_view_config_set_view): * gui/e-day-view.c: (time_range_changed_cb), (model_row_changed_cb), (model_cell_changed_cb), (model_rows_inserted_cb), (model_rows_deleted_cb), (timezone_changed_cb), (e_day_view_init), (init_model), (e_day_view_new), (e_day_view_set_mins_per_row), (e_day_view_add_event), (e_day_view_check_layout): * gui/e-day-view.h: * gui/e-week-view-config.c: (e_week_view_config_set_view): * gui/e-week-view.c: (time_range_changed_cb), (model_row_changed_cb), (model_cell_changed_cb), (model_rows_inserted_cb), (model_rows_deleted_cb), (timezone_changed_cb), (e_week_view_init), (init_model), (e_week_view_new), (e_week_view_add_event), (e_week_view_check_layout): * gui/e-week-view.h: * gui/gnome-cal.c: (message_proxy), (create_thread_pool), (message_push), (update_query_async), (update_query), (set_search_query), (set_timezone), (setup_widgets), (update_view_times), (display_view), (display_view_cb), (add_mclient_async), (add_mclient), (client_cal_opened_cb), (default_client_cal_opened_cb), (gnome_calendar_remove_source_by_uid), (gnome_calendar_on_date_navigator_selection_changed): Use a single model for all the views. svn path=/trunk/; revision=35977 --- calendar/gui/e-week-view.c | 47 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) (limited to 'calendar/gui/e-week-view.c') diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index bbc9404498..aa459f817d 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -242,6 +242,11 @@ time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpo g_return_if_fail (E_IS_WEEK_VIEW (week_view)); + if (!E_CALENDAR_VIEW (week_view)->in_focus) { + e_week_view_free_events (week_view); + return; + } + time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view))); /* Calculate the weekday of the given date, 0 = Mon. */ @@ -346,6 +351,11 @@ static void model_row_changed_cb (ETableModel *etm, int row, gpointer user_data) { EWeekView *week_view = E_WEEK_VIEW (user_data); + + if (!E_CALENDAR_VIEW (week_view)->in_focus) { + return; + } + update_row (week_view, row); } @@ -355,6 +365,10 @@ model_cell_changed_cb (ETableModel *etm, int col, int row, gpointer user_data) { EWeekView *week_view = E_WEEK_VIEW (user_data); + if (!E_CALENDAR_VIEW (week_view)->in_focus) { + return; + } + update_row (week_view, row); } @@ -365,6 +379,10 @@ model_rows_inserted_cb (ETableModel *etm, int row, int count, gpointer user_data ECalModel *model; int i; + if (!E_CALENDAR_VIEW (week_view)->in_focus) { + return; + } + model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)); for (i = 0; i < count; i++) { @@ -389,6 +407,9 @@ model_rows_deleted_cb (ETableModel *etm, int row, int count, gpointer user_data) int i; /* FIXME Stop editing? */ + if (!E_CALENDAR_VIEW (week_view)->in_focus) { + return; + } for (i = row + count; i > row; i--) { gint event_num; @@ -428,6 +449,9 @@ timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone, g_return_if_fail (E_IS_WEEK_VIEW (week_view)); + if (!cal_view->in_focus) + return; + /* If we don't have a valid date set yet, just return. */ if (!g_date_valid (&week_view->first_day_shown)) return; @@ -450,7 +474,6 @@ e_week_view_init (EWeekView *week_view) GnomeCanvasGroup *canvas_group; GtkObject *adjustment; GdkPixbuf *pixbuf; - ECalModel *model; gint i; GTK_WIDGET_SET_FLAGS (week_view, GTK_CAN_FOCUS); @@ -586,9 +609,14 @@ e_week_view_init (EWeekView *week_view) week_view->resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW); week_view->last_cursor_set = NULL; - /* Get the model */ - model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)); + /* connect to ECalendarView's signals */ + g_signal_connect (G_OBJECT (week_view), "timezone_changed", + G_CALLBACK (timezone_changed_cb), NULL); +} +static void +init_model (EWeekView *week_view, ECalModel *model) +{ /* connect to ECalModel's signals */ g_signal_connect (G_OBJECT (model), "time_range_changed", G_CALLBACK (time_range_changed_cb), week_view); @@ -601,12 +629,8 @@ e_week_view_init (EWeekView *week_view) g_signal_connect (G_OBJECT (model), "model_rows_deleted", G_CALLBACK (model_rows_deleted_cb), week_view); - /* connect to ECalendarView's signals */ - g_signal_connect (G_OBJECT (week_view), "timezone_changed", - G_CALLBACK (timezone_changed_cb), NULL); } - /** * e_week_view_new: * @Returns: a new #EWeekView. @@ -614,12 +638,13 @@ e_week_view_init (EWeekView *week_view) * Creates a new #EWeekView. **/ GtkWidget * -e_week_view_new (void) +e_week_view_new (ECalModel *model) { GtkWidget *week_view; week_view = GTK_WIDGET (g_object_new (e_week_view_get_type (), NULL)); - e_cal_model_set_flags (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)), E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES); + e_calendar_view_set_model ((ECalendarView *) week_view, model); + init_model ((EWeekView *) week_view, model); return week_view; } @@ -2403,7 +2428,7 @@ e_week_view_add_event (ECalComponent *comp, if (add_event_data->comp_data) { event.comp_data = e_cal_model_copy_component_data (add_event_data->comp_data); } else { - event.comp_data = g_new0 (ECalModelComponent, 1); + event.comp_data = g_object_new (E_TYPE_CAL_MODEL_COMPONENT, NULL); event.comp_data->client = g_object_ref (e_cal_model_get_default_client (e_calendar_view_get_model (E_CALENDAR_VIEW (add_event_data->week_view)))); e_cal_component_abort_sequence (comp); @@ -2447,7 +2472,7 @@ static void e_week_view_check_layout (EWeekView *week_view) { /* Don't bother if we aren't visible. */ - if (!GTK_WIDGET_VISIBLE (week_view)) + if (!E_CALENDAR_VIEW (week_view)->in_focus) return; /* Make sure the events are sorted (by start and size). */ -- cgit v1.2.3