From fa9c9db0a6b3281b62b2fd38c536872df4206c60 Mon Sep 17 00:00:00 2001 From: Kidd Wang Date: Mon, 29 Mar 2004 06:16:47 +0000 Subject: remove the EVENT_MOVE signal which was binded to Alt + Arrows. ditto. * gui/e-calendar-view.c: (e_calendar_view_class_init): remove the EVENT_MOVE signal which was binded to Alt + Arrows. * gui/e-calendar-view.h: ditto. * gui/e-day-view.c: (e_day_view_class_init), (e_day_view_do_key_press), (e_day_view_event_move): handle Alt + Arrows in the more general place e_day_view_do_key_press so that we can avoid the conflicting accessible key. When an appointment is selected, pressing Alt + Arrows causes it to be moved around. Otherwise, pressing Alt + LEFT/RIGHT will move the focus to the same day in the previous/next week. * gui/e-week-view.c: (e_week_view_class_init), (e_week_view_event_move), (e_week_view_do_key_press): ditto. svn path=/trunk/; revision=25219 --- calendar/gui/e-calendar-view.c | 56 +----------------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) (limited to 'calendar/gui/e-calendar-view.c') diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 51bd3ee2cc..68bbfc88f4 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -100,7 +100,6 @@ enum { EVENT_CHANGED, EVENT_ADDED, OPEN_EVENT, - EVENT_MOVE, LAST_SIGNAL }; @@ -170,7 +169,6 @@ e_calendar_view_class_init (ECalendarViewClass *klass) klass->get_visible_time_range = NULL; klass->update_query = NULL; klass->open_event = e_calendar_view_open_event; - klass->event_move = NULL; g_object_class_install_property (gobject_class, PROP_MODEL, g_param_spec_object ("model", NULL, NULL, E_TYPE_CAL_MODEL, @@ -231,16 +229,6 @@ e_calendar_view_class_init (ECalendarViewClass *klass) G_TYPE_NONE, 1, G_TYPE_POINTER); - e_calendar_view_signals [EVENT_MOVE] = - g_signal_new ("event_move", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (ECalendarViewClass, event_move), - NULL, NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, 1, - G_TYPE_INT); - /* clipboard atom */ if (!clipboard_atom) clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE); @@ -255,49 +243,7 @@ e_calendar_view_class_init (ECalendarViewClass *klass) gtk_binding_entry_add_signal (binding_set, GDK_o, GDK_CONTROL_MASK, "open_event", 0); - - /* Alt+Arrow, move the editing event*/ - gtk_binding_entry_add_signal (binding_set, GDK_Up, - GDK_MOD1_MASK, - "event_move", 1, - G_TYPE_ENUM, - E_CAL_VIEW_MOVE_UP); - gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, - GDK_MOD1_MASK, - "event_move", 1, - G_TYPE_ENUM, - E_CAL_VIEW_MOVE_UP); - gtk_binding_entry_add_signal (binding_set, GDK_Down, - GDK_MOD1_MASK, - "event_move", 1, - G_TYPE_ENUM, - E_CAL_VIEW_MOVE_DOWN); - gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, - GDK_MOD1_MASK, - "event_move", 1, - G_TYPE_ENUM, - E_CAL_VIEW_MOVE_DOWN); - gtk_binding_entry_add_signal (binding_set, GDK_Left, - GDK_MOD1_MASK, - "event_move", 1, - G_TYPE_ENUM, - E_CAL_VIEW_MOVE_LEFT); - gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, - GDK_MOD1_MASK, - "event_move", 1, - G_TYPE_ENUM, - E_CAL_VIEW_MOVE_LEFT); - gtk_binding_entry_add_signal (binding_set, GDK_Right, - GDK_MOD1_MASK, - "event_move", 1, - G_TYPE_ENUM, - E_CAL_VIEW_MOVE_RIGHT); - gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, - GDK_MOD1_MASK, - "event_move", 1, - G_TYPE_ENUM, - E_CAL_VIEW_MOVE_RIGHT); - + /* init the accessibility support for e_day_view */ e_cal_view_a11y_init (); } -- cgit v1.2.3