aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorMarcel Stimberg <marcelcoding@googlemail.com>2009-05-14 05:05:36 +0800
committerTobias Mueller <tobiasmue@gnome.org>2009-05-14 05:05:36 +0800
commit6d6c1171ec57818c96e9f1f00fb0502791cbeab8 (patch)
tree0e3dd9e562321abfe3c044107b4b951ef147ad01 /calendar/gui
parent00cf33a815541bc2e4a2d96e29900241bf58c379 (diff)
downloadgsoc2013-evolution-6d6c1171ec57818c96e9f1f00fb0502791cbeab8.tar
gsoc2013-evolution-6d6c1171ec57818c96e9f1f00fb0502791cbeab8.tar.gz
gsoc2013-evolution-6d6c1171ec57818c96e9f1f00fb0502791cbeab8.tar.bz2
gsoc2013-evolution-6d6c1171ec57818c96e9f1f00fb0502791cbeab8.tar.lz
gsoc2013-evolution-6d6c1171ec57818c96e9f1f00fb0502791cbeab8.tar.xz
gsoc2013-evolution-6d6c1171ec57818c96e9f1f00fb0502791cbeab8.tar.zst
gsoc2013-evolution-6d6c1171ec57818c96e9f1f00fb0502791cbeab8.zip
Make the Calendar view scroll using the arrow keys
This fixes bug 559366.
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/e-week-view.c91
1 files changed, 74 insertions, 17 deletions
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 264e30271d..eaa6a3a47c 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -3812,10 +3812,16 @@ static gint map_right[] = {3, 4, 5, 3, 4, 5, 6};
static void
e_week_view_do_cursor_key_up (EWeekView *week_view)
{
- if (week_view->selection_start_day <= 0)
+ if (week_view->selection_start_day == -1)
return;
week_view->selection_start_day--;
+
+ if (week_view->selection_start_day < 0) {
+ e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_UP);
+ week_view->selection_start_day = 6;
+ }
+
week_view->selection_end_day = week_view->selection_start_day;
g_signal_emit_by_name (week_view, "selected_time_changed");
gtk_widget_queue_draw (week_view->main_canvas);
@@ -3824,11 +3830,16 @@ e_week_view_do_cursor_key_up (EWeekView *week_view)
static void
e_week_view_do_cursor_key_down (EWeekView *week_view)
{
- if (week_view->selection_start_day == -1 ||
- week_view->selection_start_day >= 6)
+ if (week_view->selection_start_day == -1)
return;
week_view->selection_start_day++;
+
+ if (week_view->selection_start_day > 6) {
+ e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_DOWN);
+ week_view->selection_start_day = 0;
+ }
+
week_view->selection_end_day = week_view->selection_start_day;
g_signal_emit_by_name (week_view, "selected_time_changed");
gtk_widget_queue_draw (week_view->main_canvas);
@@ -3861,11 +3872,23 @@ e_week_view_do_cursor_key_right (EWeekView *week_view)
static void
e_month_view_do_cursor_key_up (EWeekView *week_view)
{
- if (week_view->selection_start_day < 7)
+ if (week_view->selection_start_day == -1)
return;
- week_view->selection_start_day -= 7;
- week_view->selection_end_day = week_view->selection_start_day;
+ if (week_view->selection_start_day < 7) {
+ /* no easy way to calculate new selection_start_day, therefore
+ * calculate a time_t value and set_selected_time_range */
+ time_t current;
+ if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
+ current = time_add_week(current,-1);
+ e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP);
+ e_week_view_set_selected_time_range_visible(week_view,current,current);
+ }
+ } else {
+ week_view->selection_start_day -= 7;
+ week_view->selection_end_day = week_view->selection_start_day;
+ }
+
g_signal_emit_by_name (week_view, "selected_time_changed");
gtk_widget_queue_draw (week_view->main_canvas);
}
@@ -3875,12 +3898,23 @@ e_month_view_do_cursor_key_down (EWeekView *week_view)
{
gint weeks_shown = e_week_view_get_weeks_shown (week_view);
- if (week_view->selection_start_day == -1 ||
- week_view->selection_start_day >= (weeks_shown - 1) * 7)
+ if (week_view->selection_start_day == -1)
return;
- week_view->selection_start_day += 7;
- week_view->selection_end_day = week_view->selection_start_day;
+ if (week_view->selection_start_day >= (weeks_shown - 1) * 7) {
+ /* no easy way to calculate new selection_start_day, therefore
+ * calculate a time_t value and set_selected_time_range */
+ time_t current;
+ if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
+ current = time_add_week(current,1);
+ e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN);
+ e_week_view_set_selected_time_range_visible(week_view,current,current);
+ }
+ } else {
+ week_view->selection_start_day += 7;
+ week_view->selection_end_day = week_view->selection_start_day;
+ }
+
g_signal_emit_by_name (week_view, "selected_time_changed");
gtk_widget_queue_draw (week_view->main_canvas);
}
@@ -3888,11 +3922,23 @@ e_month_view_do_cursor_key_down (EWeekView *week_view)
static void
e_month_view_do_cursor_key_left (EWeekView *week_view)
{
- if (week_view->selection_start_day <= 0)
+ if (week_view->selection_start_day == -1)
return;
- week_view->selection_start_day--;
- week_view->selection_end_day = week_view->selection_start_day;
+ if (week_view->selection_start_day == 0) {
+ /* no easy way to calculate new selection_start_day, therefore
+ * calculate a time_t value and set_selected_time_range */
+ time_t current;
+ if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
+ current = time_add_day(current,-1);
+ e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP);
+ e_week_view_set_selected_time_range_visible(week_view,current,current);
+ }
+ } else {
+ week_view->selection_start_day--;
+ week_view->selection_end_day = week_view->selection_start_day;
+ }
+
g_signal_emit_by_name (week_view, "selected_time_changed");
gtk_widget_queue_draw (week_view->main_canvas);
}
@@ -3902,12 +3948,23 @@ e_month_view_do_cursor_key_right (EWeekView *week_view)
{
gint weeks_shown = e_week_view_get_weeks_shown (week_view);
- if (week_view->selection_start_day == -1 ||
- week_view->selection_start_day >= weeks_shown * 7 - 1)
+ if (week_view->selection_start_day == -1)
return;
- week_view->selection_start_day++;
- week_view->selection_end_day = week_view->selection_start_day;
+ if (week_view->selection_start_day == weeks_shown * 7 - 1) {
+ /* no easy way to calculate new selection_start_day, therefore
+ * calculate a time_t value and set_selected_time_range */
+ time_t current;
+ if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
+ current = time_add_day(current,1);
+ e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN);
+ e_week_view_set_selected_time_range_visible(week_view,current,current);
+ }
+ } else {
+ week_view->selection_start_day++;
+ week_view->selection_end_day = week_view->selection_start_day;
+ }
+
g_signal_emit_by_name (week_view, "selected_time_changed");
gtk_widget_queue_draw (week_view->main_canvas);
}