From f4b4da4fcb6a59f56c1fff88ba08a6c9995b807c Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Sun, 18 Mar 2001 08:16:40 +0000 Subject: Added ShowWeekView, ShowMonthView, ShowDay, ShowWorkWeek to the View menu. 2001-03-17 Miguel de Icaza * evolution-calendar.xml: Added ShowWeekView, ShowMonthView, ShowDay, ShowWorkWeek to the View menu. * evolution.xml, evolution-mail.xml: Provide "Actions" in the toplevel evolution. Fill in Actions/Component in Evolution-mail (no visual changes, just internal changes). * evolution-calendar.xml: Added Actions menu. Added New Verb EditNewEvent. 2001-03-17 Miguel de Icaza * gui/e-day-view.c (e_day_view_on_new_event, e_day_view_on_new_appointment): Simplifed this function to use the shared code. * gui/e-week-view.c (e_week_view_on_new_event, e_week_view_on_new_appointment): ditto. * gui/gnome-cal.c (gnome_calendar_new_appointment_for): New function used to launch editor components with a time range. A bunch of functions use this code now instead of duplicating code all over the place svn path=/trunk/; revision=8794 --- calendar/gui/e-week-view.c | 55 +++++++++++----------------------------------- 1 file changed, 13 insertions(+), 42 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 8b05b113c8..b2d5001ab0 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -162,7 +162,7 @@ static gboolean e_week_view_on_jump_button_event (GnomeCanvasItem *item, static gint e_week_view_key_press (GtkWidget *widget, GdkEventKey *event); static void e_week_view_on_new_appointment (GtkWidget *widget, gpointer data); -static void e_week_view_on_new_full_day (GtkWidget *widget, +static void e_week_view_on_new_event (GtkWidget *widget, gpointer data); static void e_week_view_on_goto_today (GtkWidget *widget, gpointer data); @@ -3235,7 +3235,7 @@ static EPopupMenu main_items [] = { { N_("New Appointment..."), NULL, e_week_view_on_new_appointment, NULL, 0 }, { N_("New All Day Event"), NULL, - e_week_view_on_new_full_day, NULL, 0 }, + e_week_view_on_new_event, NULL, 0 }, { "", NULL, NULL, NULL, 0 }, @@ -3314,57 +3314,28 @@ e_week_view_show_popup_menu (EWeekView *week_view, e_popup_menu_run (context_menu, (GdkEvent *) bevent, disable_mask, hide_mask, week_view); } - -static void -e_week_view_new_event (EWeekView *week_view, gboolean all_day) -{ - CalComponent *comp; - CalComponentDateTime date; - struct icaltimetype itt; - time_t dt; - - comp = cal_component_new (); - cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT); - - date.value = &itt; - date.tzid = NULL; - - dt = week_view->day_starts[week_view->selection_start_day]; - if (all_day) - dt = time_day_begin (dt); - *date.value = icaltime_from_timet (dt, TRUE); - cal_component_set_dtstart (comp, &date); - - dt = week_view->day_starts[week_view->selection_end_day + 1]; - if (all_day) - dt = time_day_end (dt); - *date.value = icaltime_from_timet (dt, TRUE); - cal_component_set_dtend (comp, &date); - - cal_component_commit_sequence (comp); - - if (week_view->calendar) - gnome_calendar_edit_object (week_view->calendar, comp); - else - g_warning ("Calendar not set"); - - gtk_object_unref (GTK_OBJECT (comp)); -} - static void e_week_view_on_new_appointment (GtkWidget *widget, gpointer data) { EWeekView *week_view = E_WEEK_VIEW (data); + time_t dtstart, dtend; - e_week_view_new_event (week_view, FALSE); + dtstart = week_view->day_starts[week_view->selection_start_day]; + dtend = week_view->day_starts[week_view->selection_end_day + 1]; + gnome_calendar_new_appointment_for ( + week_view->calendar, dtstart, dtend, FALSE); } static void -e_week_view_on_new_full_day (GtkWidget *widget, gpointer data) +e_week_view_on_new_event (GtkWidget *widget, gpointer data) { EWeekView *week_view = E_WEEK_VIEW (data); + time_t dtstart, dtend; - e_week_view_new_event (week_view, TRUE); + dtstart = week_view->day_starts[week_view->selection_start_day]; + dtend = week_view->day_starts[week_view->selection_end_day + 1]; + gnome_calendar_new_appointment_for ( + week_view->calendar, dtstart, dtend, TRUE); } static void -- cgit v1.2.3