callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed so it keeps the selection range. It just moves it on one day/week

Browse Source 
2000-06-21  Damon Chaplin  <damon@helixcode.com>

	* gui/gnome-cal.c (gnome_calendar_direction): changed so it keeps the
	selection range. It just moves it on one day/week etc. This makes
	it very handy for the keyboard shortcut code.

	* gui/calendar-commands.c (calendar_control_activate): fixed bug
	setting the radio button active.

	* gui/e-day-view.[hc]: added support for keyboard navigation and
	selection of the time range.

svn path=/trunk/; revision=3665
This commit is contained in:
Damon Chaplin
2000-06-21 04:36:23 +00:00
committed by Damon Chaplin
parent 259ccb8fe5
commit abd592ea8c
6 changed files with 400 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-06-20 Damon Chaplin <damon@helixcode.com>
* widgets/meeting-time-sel/e-meeting-time-sel-item.c:
* widgets/meeting-time-sel/e-meeting-time-sel.c: fixed a few warnings.
2000-06-17 Christopher James Lahey <clahey@helixcode.com>
* widgets/e-text/e-text.c: Made EText use the font from the

19
calendar/ChangeLog
View File

@ -1,3 +1,22 @@
2000-06-21 Damon Chaplin <damon@helixcode.com>
* gui/gnome-cal.c (gnome_calendar_direction): changed so it keeps the
selection range. It just moves it on one day/week etc. This makes
it very handy for the keyboard shortcut code.
* gui/calendar-commands.c (calendar_control_activate): fixed bug
setting the radio button active.
* gui/e-day-view.[hc]: added support for keyboard navigation and
selection of the time range.
2000-06-19 Damon Chaplin <damon@helixcode.com>
* gui/event-editor-dialog.glade: tidied up dialog a bit, adding
space etc.
* gui/e-week-view.c (e_week_view_reshape_events): removed debug msg.
2000-06-18 Ettore Perazzoli <ettore@helixcode.com>
* cal-util/Makefile.am (INCLUDES): Include from

2
calendar/gui/calendar-commands.c
View File

@ -637,7 +637,7 @@ calendar_control_activate (BonoboControl *control,
button = 0;
}
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cal->view_toolbar_buttons[i]), TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cal->view_toolbar_buttons[button]), TRUE);
gtk_widget_show_all (toolbar);

366
calendar/gui/e-day-view.c
View File

@ -91,6 +91,26 @@ static gint e_day_view_focus_out (GtkWidget *widget,
GdkEventFocus *event);
static gint e_day_view_key_press (GtkWidget *widget,
GdkEventKey *event);
static void e_day_view_cursor_key_up_shifted (EDayView *day_view,
GdkEventKey *event);
static void e_day_view_cursor_key_down_shifted (EDayView *day_view,
GdkEventKey *event);
static void e_day_view_cursor_key_left_shifted (EDayView *day_view,
GdkEventKey *event);
static void e_day_view_cursor_key_right_shifted (EDayView *day_view,
GdkEventKey *event);
static void e_day_view_cursor_key_up (EDayView *day_view,
GdkEventKey *event);
static void e_day_view_cursor_key_down (EDayView *day_view,
GdkEventKey *event);
static void e_day_view_cursor_key_left (EDayView *day_view,
GdkEventKey *event);
static void e_day_view_cursor_key_right (EDayView *day_view,
GdkEventKey *event);
static void e_day_view_ensure_rows_visible (EDayView *day_view,
gint start_row,
gint end_row);
static gboolean e_day_view_check_if_new_event_fits (EDayView *day_view);
static void e_day_view_on_canvas_realized (GtkWidget *widget,
@ -347,6 +367,7 @@ static gboolean e_day_view_remove_event_cb (EDayView *day_view,
gint day,
gint event_num,
gpointer data);
static void e_day_view_normalize_selection (EDayView *day_view);
static GtkTableClass *parent_class;
@ -467,7 +488,8 @@ e_day_view_init (EDayView *day_view)
day_view->selection_start_day = -1;
day_view->selection_end_row = -1;
day_view->selection_end_day = -1;
day_view->selection_drag_pos = E_DAY_VIEW_DRAG_NONE;
day_view->selection_is_being_dragged = FALSE;
day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
day_view->selection_in_top_canvas = FALSE;
day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
@ -2447,7 +2469,7 @@ e_day_view_on_top_canvas_button_release (GtkWidget *widget,
GdkEventButton *event,
EDayView *day_view)
{
if (day_view->selection_drag_pos != E_DAY_VIEW_DRAG_NONE) {
if (day_view->selection_is_being_dragged) {
gdk_pointer_ungrab (event->time);
e_day_view_finish_selection (day_view);
} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
@ -2471,7 +2493,7 @@ e_day_view_on_main_canvas_button_release (GtkWidget *widget,
GdkEventButton *event,
EDayView *day_view)
{
if (day_view->selection_drag_pos != E_DAY_VIEW_DRAG_NONE) {
if (day_view->selection_is_being_dragged) {
gdk_pointer_ungrab (event->time);
e_day_view_finish_selection (day_view);
e_day_view_stop_auto_scroll (day_view);
@ -2538,7 +2560,7 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
event = &g_array_index (day_view->long_events, EDayViewEvent,
event_num);
if (day_view->selection_drag_pos != E_DAY_VIEW_DRAG_NONE) {
if (day_view->selection_is_being_dragged) {
e_day_view_update_selection (day_view, day, -1);
return TRUE;
} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
@ -2636,7 +2658,7 @@ e_day_view_on_main_canvas_motion (GtkWidget *widget,
event = &g_array_index (day_view->events[day], EDayViewEvent,
event_num);
if (day_view->selection_drag_pos != E_DAY_VIEW_DRAG_NONE) {
if (day_view->selection_is_being_dragged) {
if (pos != E_DAY_VIEW_POS_OUTSIDE) {
e_day_view_update_selection (day_view, day, row);
e_day_view_check_auto_scroll (day_view,
@ -2727,6 +2749,7 @@ e_day_view_start_selection (EDayView *day_view,
day_view->selection_start_row = row;
day_view->selection_end_row = row;
day_view->selection_is_being_dragged = TRUE;
day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
day_view->selection_in_top_canvas = (row == -1) ? TRUE : FALSE;
@ -2743,7 +2766,6 @@ e_day_view_update_selection (EDayView *day_view,
gint day,
gint row)
{
gint tmp_row, tmp_day;
gboolean need_redraw = FALSE;
#if 0
@ -2773,6 +2795,21 @@ e_day_view_update_selection (EDayView *day_view,
}
}
e_day_view_normalize_selection (day_view);
/* FIXME: Optimise? */
if (need_redraw) {
gtk_widget_queue_draw (day_view->top_canvas);
gtk_widget_queue_draw (day_view->main_canvas);
}
}
static void
e_day_view_normalize_selection (EDayView *day_view)
{
gint tmp_row, tmp_day;
/* Switch the drag position if necessary. */
if (day_view->selection_start_day > day_view->selection_end_day
|| (day_view->selection_start_day == day_view->selection_end_day
@ -2788,19 +2825,13 @@ e_day_view_update_selection (EDayView *day_view,
else
day_view->selection_drag_pos = E_DAY_VIEW_DRAG_START;
}
/* FIXME: Optimise? */
if (need_redraw) {
gtk_widget_queue_draw (day_view->top_canvas);
gtk_widget_queue_draw (day_view->main_canvas);
}
}
void
e_day_view_finish_selection (EDayView *day_view)
{
day_view->selection_drag_pos = E_DAY_VIEW_DRAG_NONE;
day_view->selection_is_being_dragged = FALSE;
e_day_view_update_calendar_selection_time (day_view);
}
@ -3839,21 +3870,66 @@ e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)
iCalObject *ico;
gint day, event_num;
gchar *initial_text;
guint keyval;
gboolean stop_emission;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
day_view = E_DAY_VIEW (widget);
keyval = event->keyval;
/* The Escape key aborts a resize operation. */
if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
if (event->keyval == GDK_Escape) {
if (keyval == GDK_Escape) {
e_day_view_abort_resize (day_view, event->time);
}
return FALSE;
}
/* Handle the cursor keys for moving & extending the selection. */
stop_emission = TRUE;
if (event->state & GDK_SHIFT_MASK) {
switch (keyval) {
case GDK_Up:
e_day_view_cursor_key_up_shifted (day_view, event);
break;
case GDK_Down:
e_day_view_cursor_key_down_shifted (day_view, event);
break;
case GDK_Left:
e_day_view_cursor_key_left_shifted (day_view, event);
break;
case GDK_Right:
e_day_view_cursor_key_right_shifted (day_view, event);
break;
default:
stop_emission = FALSE;
break;
}
} else {
switch (keyval) {
case GDK_Up:
e_day_view_cursor_key_up (day_view, event);
break;
case GDK_Down:
e_day_view_cursor_key_down (day_view, event);
break;
case GDK_Left:
e_day_view_cursor_key_left (day_view, event);
break;
case GDK_Right:
e_day_view_cursor_key_right (day_view, event);
break;
default:
stop_emission = FALSE;
break;
}
}
if (stop_emission)
return TRUE;
if (day_view->selection_start_day == -1)
return FALSE;
@ -3861,16 +3937,15 @@ e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)
isn't we don't want to add an event as we will then add a new
event for every key press. */
if (!e_day_view_check_if_new_event_fits (day_view)) {
g_print ("Skipping new event. No more room\n");
return FALSE;
}
/* We only want to start an edit with a return key or a simple
character. */
if (event->keyval == GDK_Return) {
if (keyval == GDK_Return) {
initial_text = NULL;
} else if ((event->keyval < 0x20)
|| (event->keyval > 0xFF)
} else if ((keyval < 0x20)
|| (keyval > 0xFF)
|| (event->length == 0)
|| (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) {
return FALSE;
@ -3913,6 +3988,232 @@ e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)
}
static void
e_day_view_cursor_key_up_shifted (EDayView *day_view, GdkEventKey *event)
{
gint *row;
g_print ("In e_day_view_cursor_key_up_shifted\n");
if (day_view->selection_in_top_canvas)
return;
if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
row = &day_view->selection_start_row;
else
row = &day_view->selection_end_row;
if (*row == 0)
return;
*row = *row - 1;
e_day_view_ensure_rows_visible (day_view, *row, *row);
e_day_view_normalize_selection (day_view);
e_day_view_update_calendar_selection_time (day_view);
/* FIXME: Optimise? */
gtk_widget_queue_draw (day_view->top_canvas);
gtk_widget_queue_draw (day_view->main_canvas);
}
static void
e_day_view_cursor_key_down_shifted (EDayView *day_view, GdkEventKey *event)
{
gint *row;
g_print ("In e_day_view_cursor_key_down_shifted\n");
if (day_view->selection_in_top_canvas)
return;
if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
row = &day_view->selection_start_row;
else
row = &day_view->selection_end_row;
if (*row >= day_view->rows - 1)
return;
*row = *row + 1;
e_day_view_ensure_rows_visible (day_view, *row, *row);
e_day_view_normalize_selection (day_view);
e_day_view_update_calendar_selection_time (day_view);
/* FIXME: Optimise? */
gtk_widget_queue_draw (day_view->top_canvas);
gtk_widget_queue_draw (day_view->main_canvas);
}
static void
e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event)
{
gint *day;
g_print ("In e_day_view_cursor_key_left_shifted\n");
if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
day = &day_view->selection_start_day;
else
day = &day_view->selection_end_day;
if (*day == 0)
return;
*day = *day - 1;
e_day_view_normalize_selection (day_view);
e_day_view_update_calendar_selection_time (day_view);
/* FIXME: Optimise? */
gtk_widget_queue_draw (day_view->top_canvas);
gtk_widget_queue_draw (day_view->main_canvas);
}
static void
e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event)
{
gint *day;
g_print ("In e_day_view_cursor_key_right_shifted\n");
if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
day = &day_view->selection_start_day;
else
day = &day_view->selection_end_day;
if (*day >= day_view->days_shown - 1)
return;
*day = *day + 1;
e_day_view_normalize_selection (day_view);
e_day_view_update_calendar_selection_time (day_view);
/* FIXME: Optimise? */
gtk_widget_queue_draw (day_view->top_canvas);
gtk_widget_queue_draw (day_view->main_canvas);
}
static void
e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event)
{
g_print ("In e_day_view_cursor_key_up\n");
if (day_view->selection_start_day == -1) {
day_view->selection_start_day = 0;
day_view->selection_start_row = 0;
}
day_view->selection_end_day = day_view->selection_start_day;
if (day_view->selection_in_top_canvas) {
return;
} else if (day_view->selection_start_row == 0) {
day_view->selection_in_top_canvas = TRUE;
day_view->selection_start_row = -1;
} else {
day_view->selection_start_row--;
}
day_view->selection_end_row = day_view->selection_start_row;
if (!day_view->selection_in_top_canvas)
e_day_view_ensure_rows_visible (day_view,
day_view->selection_start_row,
day_view->selection_end_row);
e_day_view_update_calendar_selection_time (day_view);
/* FIXME: Optimise? */
gtk_widget_queue_draw (day_view->top_canvas);
gtk_widget_queue_draw (day_view->main_canvas);
}
static void
e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event)
{
g_print ("In e_day_view_cursor_key_down\n");
if (day_view->selection_start_day == -1) {
day_view->selection_start_day = 0;
day_view->selection_start_row = 0;
}
day_view->selection_end_day = day_view->selection_start_day;
if (day_view->selection_in_top_canvas) {
day_view->selection_in_top_canvas = FALSE;
day_view->selection_start_row = 0;
} else if (day_view->selection_start_row >= day_view->rows - 1) {
return;
} else {
day_view->selection_start_row++;
}
day_view->selection_end_row = day_view->selection_start_row;
if (!day_view->selection_in_top_canvas)
e_day_view_ensure_rows_visible (day_view,
day_view->selection_start_row,
day_view->selection_end_row);
e_day_view_update_calendar_selection_time (day_view);
/* FIXME: Optimise? */
gtk_widget_queue_draw (day_view->top_canvas);
gtk_widget_queue_draw (day_view->main_canvas);
}
static void
e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)
{
g_print ("In e_day_view_cursor_key_left\n");
if (day_view->selection_start_day == 0) {
gnome_calendar_previous (day_view->calendar);
} else {
day_view->selection_start_day--;
day_view->selection_end_day--;
e_day_view_update_calendar_selection_time (day_view);
/* FIXME: Optimise? */
gtk_widget_queue_draw (day_view->top_canvas);
gtk_widget_queue_draw (day_view->main_canvas);
}
}
static void
e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event)
{
g_print ("In e_day_view_cursor_key_right\n");
if (day_view->selection_end_day == day_view->days_shown - 1) {
gnome_calendar_next (day_view->calendar);
} else {
day_view->selection_start_day++;
day_view->selection_end_day++;
e_day_view_update_calendar_selection_time (day_view);
/* FIXME: Optimise? */
gtk_widget_queue_draw (day_view->top_canvas);
gtk_widget_queue_draw (day_view->main_canvas);
}
}
static gboolean
e_day_view_check_if_new_event_fits (EDayView *day_view)
{
@ -3940,6 +4241,33 @@ e_day_view_check_if_new_event_fits (EDayView *day_view)
}
static void
e_day_view_ensure_rows_visible (EDayView *day_view,
gint start_row,
gint end_row)
{
GtkAdjustment *adj;
gfloat value, min_value, max_value;
adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
value = adj->value;
min_value = (end_row + 1) * day_view->row_height - adj->page_size;
if (value < min_value)
value = min_value;
max_value = start_row * day_view->row_height;
if (value > max_value)
value = max_value;
if (value != adj->value) {
adj->value = value;
gtk_adjustment_value_changed (adj);
}
}
static void
e_day_view_start_editing_event (EDayView *day_view,
gint day,
@ -4336,7 +4664,7 @@ e_day_view_auto_scroll_handler (gpointer data)
day = -1;
if (pos != E_DAY_VIEW_POS_OUTSIDE) {
if (day_view->selection_drag_pos != E_DAY_VIEW_DRAG_NONE) {
if (day_view->selection_is_being_dragged) {
e_day_view_update_selection (day_view, day, row);
} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
e_day_view_update_resize (day_view, row);

8
calendar/gui/e-day-view.h
View File

@ -128,7 +128,6 @@ typedef enum
/* These specify which part of the selection we are dragging, if any. */
typedef enum
{
E_DAY_VIEW_DRAG_NONE,
E_DAY_VIEW_DRAG_START,
E_DAY_VIEW_DRAG_END
} EDayViewDragPosition;
@ -338,8 +337,11 @@ struct _EDayView
gint selection_start_row;
gint selection_end_row;
/* This specifies which end of the selection is being dragged, or is
E_DAY_VIEW_DRAG_NONE if the selection isn't being dragged. */
/* This is TRUE if the selection is currently being dragged using the
mouse. */
gboolean selection_is_being_dragged;
/* This specifies which end of the selection is being dragged. */
EDayViewDragPosition selection_drag_pos;
/* This is TRUE if the selection is in the top canvas only (i.e. if the

36
calendar/gui/gnome-cal.c
View File

@ -319,25 +319,35 @@ static void
gnome_calendar_direction (GnomeCalendar *gcal, int direction)
{
GtkWidget *cp = get_current_page (gcal);
time_t current_time, new_time;
time_t start_time, end_time;
current_time = gcal->selection_start_time;
start_time = gcal->selection_start_time;
end_time = gcal->selection_end_time;
if (cp == gcal->day_view)
new_time = time_add_day (current_time, direction);
else if (cp == gcal->work_week_view)
new_time = time_add_week (current_time, direction);
else if (cp == gcal->week_view)
new_time = time_add_week (current_time, direction);
else if (cp == gcal->month_view)
new_time = time_add_month (current_time, direction);
else {
if (cp == gcal->day_view) {
start_time = time_add_day (start_time, direction);
end_time = time_add_day (end_time, direction);
} else if (cp == gcal->work_week_view) {
start_time = time_add_week (start_time, direction);
end_time = time_add_week (end_time, direction);
} else if (cp == gcal->week_view) {
start_time = time_add_week (start_time, direction);
end_time = time_add_week (end_time, direction);
} else if (cp == gcal->month_view) {
start_time = time_add_month (start_time, direction);
end_time = time_add_month (end_time, direction);
} else {
g_warning ("Weee! Where did the penguin go?");
g_assert_not_reached ();
new_time = 0;
start_time = 0;
end_time = 0;
}
gnome_calendar_goto (gcal, new_time);
gcal->selection_start_time = start_time;
gcal->selection_end_time = end_time;
gnome_calendar_update_view_times (gcal, NULL);
gnome_calendar_update_gtk_calendar (gcal);
}
void