diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 24 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 70 | ||||
| -rw-r--r-- | calendar/gui/e-week-view-event-item.c | 3 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 10 |
4 files changed, 106 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 1eae95f183..77a0474d9d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,27 @@ +2002-08-29 JP Rosevear <jpr@ximian.com> + + * gui/e-day-view.c (e_day_view_on_top_canvas_button_press): select + the top canvas if the user right-clicks on it + (e_day_view_on_main_canvas_button_press): select the row the user + is right-clicking on + (e_day_view_on_long_event_button_press): select the top canvas if + the user right-clicks on an event there + (e_day_view_on_event_button_press): select the relevant rows if + the user right-clicks on an event + (e_day_view_set_selected_time_range_in_top): select a number of + days in the top canvas + + * gui/e-week-view.c (e_week_view_on_button_press): select the day + the user is right-clicking on + (e_week_view_on_text_item_event): select the corresponding time + range when showing the contextual menu for an event + + * gui/e-week-view-event-item.c + (e_week_view_event_item_button_press): select the corresponding + time range when showing the contextual menu for an event + + Fixes #14660 + 2002-08-28 Rodrigo Moya <rodrigo@ximian.com> * gui/e-day-view.c: diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 4c17693293..27ae4eee4e 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -2269,6 +2269,65 @@ e_day_view_set_selected_time_range (EDayView *day_view, } } +static void +e_day_view_set_selected_time_range_in_top (EDayView *day_view, + time_t start_time, + time_t end_time) +{ + time_t lower; + gint start_row, start_col, end_row, end_col; + gboolean need_redraw = FALSE, start_in_grid, end_in_grid; + + g_return_if_fail (E_IS_DAY_VIEW (day_view)); + + /* Calculate the first day that should be shown, based on start_time + and the days_shown setting. If we are showing 1 day it is just the + start of the day given by start_time, otherwise it is the previous + work-week start day. */ + if (!day_view->work_week_view) { + lower = time_day_begin_with_zone (start_time, day_view->zone); + } else { + lower = e_day_view_find_work_week_start (day_view, start_time); + } + + /* See if we need to change the days shown. */ + if (lower != day_view->lower) { + e_day_view_recalc_day_starts (day_view, lower); + update_query (day_view); + } + + /* Set the selection. */ + start_in_grid = e_day_view_convert_time_to_grid_position (day_view, + start_time, + &start_col, + &start_row); + end_in_grid = e_day_view_convert_time_to_grid_position (day_view, + end_time - 60, + &end_col, + &end_row); + + if (start_row != day_view->selection_start_row + || start_col != day_view->selection_start_day) { + need_redraw = TRUE; + day_view->selection_in_top_canvas = TRUE; + day_view->selection_start_row = -1; + day_view->selection_start_day = start_col; + } + + if (end_row != day_view->selection_end_row + || end_col != day_view->selection_end_day) { + need_redraw = TRUE; + day_view->selection_in_top_canvas = TRUE; + day_view->selection_end_row = -1; + day_view->selection_end_day = end_col; + } + + if (need_redraw) { + gtk_widget_queue_draw (day_view->top_canvas); + gtk_widget_queue_draw (day_view->main_canvas); + } +} + /* Finds the start of the working week which includes the given time. */ static time_t @@ -2988,6 +3047,9 @@ e_day_view_on_top_canvas_button_press (GtkWidget *widget, if (!GTK_WIDGET_HAS_FOCUS (day_view)) gtk_widget_grab_focus (GTK_WIDGET (day_view)); + e_day_view_start_selection (day_view, day, -1); + e_day_view_finish_selection (day_view); + e_day_view_on_event_right_click (day_view, event, -1, -1); } @@ -3122,6 +3184,9 @@ e_day_view_on_main_canvas_button_press (GtkWidget *widget, if (!GTK_WIDGET_HAS_FOCUS (day_view)) gtk_widget_grab_focus (GTK_WIDGET (day_view)); + e_day_view_start_selection (day_view, day, row); + e_day_view_finish_selection (day_view); + e_day_view_on_event_right_click (day_view, event, -1, -1); } @@ -3202,6 +3267,8 @@ e_day_view_on_long_event_button_press (EDayView *day_view, if (!destroyed) { gtk_signal_disconnect (GTK_OBJECT (e->comp), id); + e_day_view_set_selected_time_range_in_top (day_view, e->start, e->end); + e_day_view_on_event_right_click (day_view, event, E_DAY_VIEW_LONG_EVENT, event_num); @@ -3252,6 +3319,8 @@ e_day_view_on_event_button_press (EDayView *day_view, if (!destroyed) { gtk_signal_disconnect (GTK_OBJECT (e->comp), id); + e_day_view_set_selected_time_range (day_view, e->start, e->end); + e_day_view_on_event_right_click (day_view, event, day, event_num); } @@ -4652,7 +4721,6 @@ e_day_view_finish_selection (EDayView *day_view) e_day_view_update_calendar_selection_time (day_view); } - static void e_day_view_update_long_event_resize (EDayView *day_view, gint day) diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index f680be8f0d..eb102a9b97 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -797,6 +797,9 @@ e_week_view_event_item_button_press (EWeekViewEventItem *wveitem, } else if (bevent->button.button == 3) { if (!GTK_WIDGET_HAS_FOCUS (week_view)) gtk_widget_grab_focus (GTK_WIDGET (week_view)); + + e_week_view_set_selected_time_range (week_view, event->start, event->end); + e_week_view_show_popup_menu (week_view, (GdkEventButton*) bevent, wveitem->event_num); diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 2bf9805a24..dee9b03540 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -2199,6 +2199,14 @@ e_week_view_on_button_press (GtkWidget *widget, } else if (event->button == 3) { if (!GTK_WIDGET_HAS_FOCUS (week_view)) gtk_widget_grab_focus (GTK_WIDGET (week_view)); + + week_view->selection_start_day = day; + week_view->selection_end_day = day; + week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_NONE; + + /* FIXME: Optimise? */ + gtk_widget_queue_draw (week_view->main_canvas); + e_week_view_show_popup_menu (week_view, event, -1); } @@ -3047,6 +3055,8 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item, if (!destroyed) { gtk_signal_disconnect (GTK_OBJECT (e->comp), id); + + e_week_view_set_selected_time_range (week_view, e->start, e->end); e_week_view_show_popup_menu (week_view, (GdkEventButton*) gdkevent, |