diff options
| -rw-r--r-- | calendar/ChangeLog | 13 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 4 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 2 | ||||
| -rw-r--r-- | calendar/gui/comp-util.c | 1 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor-page.c | 5 | ||||
| -rw-r--r-- | calendar/gui/e-cal-list-view.h | 2 | ||||
| -rw-r--r-- | calendar/gui/e-cal-model.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-cal-view.c | 1581 | ||||
| -rw-r--r-- | calendar/gui/e-cal-view.h | 156 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.h | 2 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.h | 2 |
12 files changed, 23 insertions, 1749 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 36d40ef3b1..b1704500a9 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,14 @@ +2004-03-15 JP Rosevear <jpr@ximian.com> + + * Rename e-cal-view to e-calendar-view and fix includes + + * gui/dialogs/comp-editor-page.c (comp_editor_page_fill_widgets): + pre-conditions should return FALS + + * gui/e-cal-model.c (copy_ecdv): return the new struct + + * gui/Makefile.am: build renamed files + 2004-03-15 JP Rosevear <jpr@ximian.com> Fixes #52253 @@ -16,7 +27,7 @@ update_view_times handle it (gnome_calendar_goto): ditto (gnome_calendar_direction): ditto -o (gnome_calendar_set_selected_time_range): ditto + (gnome_calendar_set_selected_time_range): ditto (gnome_calendar_dayjump): ditto (update_view_times): set the time ranges on the models (set_view): use the new preserve day setting diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 9f46f77399..18a66c7716 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -119,8 +119,8 @@ libevolution_calendar_la_SOURCES = \ e-cal-model-tasks.h \ e-cal-model.c \ e-cal-model.h \ - e-cal-view.c \ - e-cal-view.h \ + e-calendar-view.c \ + e-calendar-view.h \ e-cal-list-view.c \ e-cal-list-view.h \ e-cal-list-view-config.c \ diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index a71f82917b..c75e96c440 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -32,7 +32,7 @@ #include <bonobo/bonobo-exception.h> #include <libical/icalvcal.h> #include "e-pub-utils.h" -#include "e-cal-view.h" +#include "e-calendar-view.h" #include "calendar-config-keys.h" #include "calendar-config.h" #include "calendar-component.h" diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index efe9c99aa1..9da6b1bb30 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -25,7 +25,6 @@ #include <string.h> #include <time.h> -#include "e-cal-view.h" #include "calendar-config.h" #include "comp-util.h" #include "dialogs/delete-comp.h" diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c index 40cff1b0f2..e2187af06c 100644 --- a/calendar/gui/dialogs/comp-editor-page.c +++ b/calendar/gui/dialogs/comp-editor-page.c @@ -237,9 +237,8 @@ comp_editor_page_focus_main_widget (CompEditorPage *page) gboolean comp_editor_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) { - g_return_if_fail (page != NULL); - g_return_if_fail (IS_COMP_EDITOR_PAGE (page)); - g_return_if_fail (comp != NULL); + g_return_val_if_fail (COMP_IS_EDITOR_PAGE (page), FALSE); + g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE); g_assert (CLASS (page)->fill_widgets != NULL); return (* CLASS (page)->fill_widgets) (page, comp); diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h index 08d5b7c0e8..55eb79f94d 100644 --- a/calendar/gui/e-cal-list-view.h +++ b/calendar/gui/e-cal-list-view.h @@ -28,7 +28,7 @@ #include <gtk/gtktooltips.h> #include <gal/widgets/e-popup-menu.h> -#include "e-cal-view.h" +#include "e-calendar-view.h" #include "gnome-cal.h" #ifdef __cplusplus diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index adb386b79c..2cf8638f9f 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -1736,6 +1736,8 @@ copy_ecdv (ECellDateEditValue *ecdv) new_ecdv = g_new0 (ECellDateEditValue, 1); new_ecdv->tt = ecdv->tt; new_ecdv->zone = ecdv->zone; + + return new_ecdv; } /** diff --git a/calendar/gui/e-cal-view.c b/calendar/gui/e-cal-view.c deleted file mode 100644 index 8a360bc921..0000000000 --- a/calendar/gui/e-cal-view.c +++ /dev/null @@ -1,1581 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * Author : - * Rodrigo Moya <rodrigo@ximian.com> - * - * Copyright 2003, Ximian, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#include <config.h> -#include <string.h> -#include <time.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkstock.h> -#include <gdk/gdkkeysyms.h> -#include <gtk/gtkbindings.h> -#include <libgnome/gnome-i18n.h> -#include <gal/util/e-util.h> -#include "e-util/e-dialog-utils.h" -#include "e-calendar-marshal.h" -#include <libecal/e-cal-time-util.h> - -#include "calendar-commands.h" -#include "calendar-component.h" -#include "calendar-config.h" -#include "comp-util.h" -#include "e-cal-model-calendar.h" -#include "e-cal-view.h" -#include "e-comp-editor-registry.h" -#include "itip-utils.h" -#include "e-pub-utils.h" -#include "dialogs/delete-comp.h" -#include "dialogs/delete-error.h" -#include "dialogs/event-editor.h" -#include "dialogs/send-comp.h" -#include "dialogs/cancel-comp.h" -#include "dialogs/recur-comp.h" -#include "print.h" -#include "goto.h" -#include "ea-calendar.h" - -/* Used for the status bar messages */ -#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "evolution-calendar-mini.png" -static GdkPixbuf *progress_icon = NULL; - -struct _ECalendarViewPrivate { - /* The GnomeCalendar we are associated to */ - GnomeCalendar *calendar; - - /* The calendar model we are monitoring */ - ECalModel *model; - - /* Current activity (for the EActivityHandler, i.e. the status bar). */ - guint activity_id; - - /* The popup menu */ - EPopupMenu *view_menu; - - /* The default category */ - char *default_category; -}; - -static void e_calendar_view_class_init (ECalendarViewClass *klass); -static void e_calendar_view_init (ECalendarView *cal_view, ECalendarViewClass *klass); -static void e_calendar_view_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); -static void e_calendar_view_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); -static void e_calendar_view_destroy (GtkObject *object); - -static GObjectClass *parent_class = NULL; -static GdkAtom clipboard_atom = GDK_NONE; -extern ECompEditorRegistry *comp_editor_registry; - -/* Property IDs */ -enum props { - PROP_0, - PROP_MODEL, -}; - -/* FIXME Why are we emitting these event signals here? Can't the model just be listened to? */ -/* Signal IDs */ -enum { - SELECTION_CHANGED, - SELECTED_TIME_CHANGED, - TIMEZONE_CHANGED, - EVENT_CHANGED, - EVENT_ADDED, - OPEN_EVENT, - EVENT_MOVE, - LAST_SIGNAL -}; - -static guint e_calendar_view_signals[LAST_SIGNAL] = { 0 }; - -static void -e_calendar_view_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) -{ - ECalendarView *cal_view; - ECalendarViewPrivate *priv; - - cal_view = E_CALENDAR_VIEW (object); - priv = cal_view->priv; - - switch (property_id) { - case PROP_MODEL: - e_calendar_view_set_model (cal_view, E_CAL_MODEL (g_value_get_object (value))); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static void -e_calendar_view_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) -{ - ECalendarView *cal_view; - ECalendarViewPrivate *priv; - - cal_view = E_CALENDAR_VIEW (object); - priv = cal_view->priv; - - switch (property_id) { - case PROP_MODEL: - g_value_set_object (value, e_calendar_view_get_model (cal_view)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static void -e_calendar_view_class_init (ECalendarViewClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass); - - GtkBindingSet *binding_set; - - parent_class = g_type_class_peek_parent (klass); - - /* Method override */ - gobject_class->set_property = e_calendar_view_set_property; - gobject_class->get_property = e_calendar_view_get_property; - object_class->destroy = e_calendar_view_destroy; - - klass->selection_changed = NULL; - klass->selected_time_changed = NULL; - klass->event_changed = NULL; - klass->event_added = NULL; - - klass->get_selected_events = NULL; - klass->get_selected_time_range = NULL; - klass->set_selected_time_range = NULL; - 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, - G_PARAM_READABLE | G_PARAM_WRITABLE)); - - /* Create class' signals */ - e_calendar_view_signals[SELECTION_CHANGED] = - g_signal_new ("selection_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ECalendarViewClass, selection_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - e_calendar_view_signals[SELECTED_TIME_CHANGED] = - g_signal_new ("selected_time_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ECalendarViewClass, selected_time_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - e_calendar_view_signals[TIMEZONE_CHANGED] = - g_signal_new ("timezone_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ECalendarViewClass, timezone_changed), - NULL, NULL, - e_calendar_marshal_VOID__POINTER_POINTER, - G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); - - e_calendar_view_signals[EVENT_CHANGED] = - g_signal_new ("event_changed", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (ECalendarViewClass, event_changed), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, - G_TYPE_POINTER); - - e_calendar_view_signals[OPEN_EVENT] = - g_signal_new ("open_event", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (ECalendarViewClass, open_event), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - - e_calendar_view_signals[EVENT_ADDED] = - g_signal_new ("event_added", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (ECalendarViewClass, event_added), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - 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); - - - /* - * Key bindings - */ - - binding_set = gtk_binding_set_by_class (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 (); -} - - -void -e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart, - icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas) -{ - ECalComponent *comp; - struct icaltimetype itime, old_dtstart, old_dtend; - time_t tt_start, tt_end, new_dtstart; - struct icaldurationtype ic_dur, ic_oneday; - char *uid; - gint start_offset, end_offset; - gboolean all_day_event = FALSE; - GnomeCalendarViewType view_type; - ECalComponentDateTime dt; - - start_offset = 0; - end_offset = 0; - - old_dtstart = icalcomponent_get_dtstart (icalcomp); - tt_start = icaltime_as_timet (old_dtstart); - old_dtend = icalcomponent_get_dtend (icalcomp); - tt_end = icaltime_as_timet (old_dtend); - ic_dur = icaldurationtype_from_int (tt_end - tt_start); - - if (icaldurationtype_as_int (ic_dur) > 60*60*24) { - /* This is a long event */ - start_offset = old_dtstart.hour * 60 + old_dtstart.minute; - end_offset = old_dtstart.hour * 60 + old_dtend.minute; - } - - ic_oneday = icaldurationtype_null_duration (); - ic_oneday.days = 1; - - view_type = gnome_calendar_get_view (cal_view->priv->calendar); - - switch (view_type) { - case GNOME_CAL_DAY_VIEW: - case GNOME_CAL_WORK_WEEK_VIEW: - if (start_offset == 0 && end_offset == 0 && in_top_canvas) - all_day_event = TRUE; - - if (all_day_event) { - ic_dur = ic_oneday; - } else if (icaldurationtype_as_int (ic_dur) >= 60*60*24 - && !in_top_canvas) { - /* copy & paste from top canvas to main canvas */ - int time_divisions; - - time_divisions = calendar_config_get_time_divisions (); - ic_dur = icaldurationtype_from_int (time_divisions * 60); - } - break; - case GNOME_CAL_WEEK_VIEW: - case GNOME_CAL_MONTH_VIEW: - case GNOME_CAL_LIST_VIEW: - if (old_dtstart.is_date && old_dtend.is_date - && memcmp (&ic_dur, &ic_oneday, sizeof(ic_dur)) == 0) - all_day_event = TRUE; - break; - } - - if (in_top_canvas) - new_dtstart = dtstart + start_offset * 60; - else - new_dtstart = dtstart; - - itime = icaltime_from_timet_with_zone (new_dtstart, FALSE, default_zone); - if (all_day_event) - itime.is_date = TRUE; - icalcomponent_set_dtstart (icalcomp, itime); - - itime.is_date = FALSE; - itime = icaltime_add (itime, ic_dur); - if (all_day_event) - itime.is_date = TRUE; - icalcomponent_set_dtend (icalcomp, itime); - - /* FIXME The new uid stuff can go away once we actually set it in the backend */ - uid = e_cal_component_gen_uid (); - comp = e_cal_component_new (); - e_cal_component_set_icalcomponent ( - comp, icalcomponent_new_clone (icalcomp)); - e_cal_component_set_uid (comp, uid); - - /* set the timezone properly */ - dt.value = &itime; - e_cal_component_get_dtstart (comp, &dt); - dt.tzid = icaltimezone_get_tzid (default_zone); - e_cal_component_set_dtstart (comp, &dt); - e_cal_component_get_dtend (comp, &dt); - dt.tzid = icaltimezone_get_tzid (default_zone); - e_cal_component_set_dtend (comp, &dt); - e_cal_component_commit_sequence (comp); - - /* FIXME Error handling */ - if (e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), NULL, NULL)) { - if (itip_organizer_is_user (comp, client) && - send_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)), - client, comp, TRUE)) { - itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, - client, NULL); - } - } else { - g_message (G_STRLOC ": Could not create the object!"); - } - - free (uid); - g_object_unref (comp); -} - -static void -e_calendar_view_init (ECalendarView *cal_view, ECalendarViewClass *klass) -{ - cal_view->priv = g_new0 (ECalendarViewPrivate, 1); - - cal_view->priv->model = (ECalModel *) e_cal_model_calendar_new (); -} - -static void -e_calendar_view_destroy (GtkObject *object) -{ - ECalendarView *cal_view = (ECalendarView *) object; - - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - if (cal_view->priv) { - if (cal_view->priv->model) { - g_signal_handlers_disconnect_matched (cal_view->priv->model, - G_SIGNAL_MATCH_DATA, - 0, 0, NULL, NULL, cal_view); - g_object_unref (cal_view->priv->model); - cal_view->priv->model = NULL; - } - - if (cal_view->priv->default_category) { - g_free (cal_view->priv->default_category); - cal_view->priv->default_category = NULL; - } - - g_free (cal_view->priv); - cal_view->priv = NULL; - } - - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); -} - -E_MAKE_TYPE (e_calendar_view, "ECalendarView", ECalendarView, e_calendar_view_class_init, - e_calendar_view_init, GTK_TYPE_TABLE); - -GnomeCalendar * -e_calendar_view_get_calendar (ECalendarView *cal_view) -{ - g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL); - - return cal_view->priv->calendar; -} - -void -e_calendar_view_set_calendar (ECalendarView *cal_view, GnomeCalendar *calendar) -{ - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - cal_view->priv->calendar = calendar; -} - -ECalModel * -e_calendar_view_get_model (ECalendarView *cal_view) -{ - g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL); - - return cal_view->priv->model; -} - -void -e_calendar_view_set_model (ECalendarView *cal_view, ECalModel *model) -{ - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - g_return_if_fail (E_IS_CAL_MODEL (model)); - - if (cal_view->priv->model) { - g_signal_handlers_disconnect_matched (cal_view->priv->model, G_SIGNAL_MATCH_DATA, - 0, 0, 0, NULL, cal_view); - g_object_unref (cal_view->priv->model); - } - - cal_view->priv->model = g_object_ref (model); - e_calendar_view_update_query (cal_view); -} - -icaltimezone * -e_calendar_view_get_timezone (ECalendarView *cal_view) -{ - g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL); - return e_cal_model_get_timezone (cal_view->priv->model); -} - -void -e_calendar_view_set_timezone (ECalendarView *cal_view, icaltimezone *zone) -{ - icaltimezone *old_zone; - - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - old_zone = e_cal_model_get_timezone (cal_view->priv->model); - if (old_zone == zone) - return; - - e_cal_model_set_timezone (cal_view->priv->model, zone); - g_signal_emit (G_OBJECT (cal_view), e_calendar_view_signals[TIMEZONE_CHANGED], 0, - old_zone, zone); -} - -const char * -e_calendar_view_get_default_category (ECalendarView *cal_view) -{ - g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL); - return (const char *) cal_view->priv->default_category; -} - -/** - * e_calendar_view_set_default_category - * @cal_view: A calendar view. - * @category: Default category name or NULL for no category. - * - * Sets the default category that will be used when creating new calendar - * components from the given calendar view. - */ -void -e_calendar_view_set_default_category (ECalendarView *cal_view, const char *category) -{ - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - if (cal_view->priv->default_category) - g_free (cal_view->priv->default_category); - - cal_view->priv->default_category = g_strdup (category); -} - -/** - * e_calendar_view_get_use_24_hour_format: - * @cal_view: A calendar view. - * - * Gets whether the view is using 24 hour times or not. - * - * Returns: the 24 hour setting. - */ -gboolean -e_calendar_view_get_use_24_hour_format (ECalendarView *cal_view) -{ - g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), FALSE); - - return e_cal_model_get_use_24_hour_format (cal_view->priv->model); -} - -/** - * e_calendar_view_set_use_24_hour_format - * @cal_view: A calendar view. - * @use_24_hour: Whether to use 24 hour times or not. - * - * Sets the 12/24 hour times setting for the given view. - */ -void -e_calendar_view_set_use_24_hour_format (ECalendarView *cal_view, gboolean use_24_hour) -{ - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - e_cal_model_set_use_24_hour_format (cal_view->priv->model, use_24_hour); -} - -void -e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message) -{ - EActivityHandler *activity_handler = calendar_component_peek_activity_handler (calendar_component_peek ()); - - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - if (!message || !*message) { - if (cal_view->priv->activity_id != 0) { - e_activity_handler_operation_finished (activity_handler, cal_view->priv->activity_id); - cal_view->priv->activity_id = 0; - } - } else if (cal_view->priv->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", cal_view); - - if (progress_icon == NULL) - progress_icon = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_CALENDAR_PROGRESS_IMAGE, NULL); - - cal_view->priv->activity_id = e_activity_handler_operation_started (activity_handler, client_id, progress_icon, message, TRUE); - - g_free (client_id); - } else { - e_activity_handler_operation_progressing (activity_handler, cal_view->priv->activity_id, message, -1.0); - } -} - -GList * -e_calendar_view_get_selected_events (ECalendarView *cal_view) -{ - g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL); - - if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_selected_events) - return E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_selected_events (cal_view); - - return NULL; -} - -gboolean -e_calendar_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time) -{ - g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), FALSE); - - if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_selected_time_range) { - return E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_selected_time_range ( - cal_view, start_time, end_time); - } - - return FALSE; -} - -void -e_calendar_view_set_selected_time_range (ECalendarView *cal_view, time_t start_time, time_t end_time) -{ - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->set_selected_time_range) { - E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->set_selected_time_range ( - cal_view, start_time, end_time); - } -} - -gboolean -e_calendar_view_get_visible_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time) -{ - g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), FALSE); - - if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_visible_time_range) { - return E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_visible_time_range ( - cal_view, start_time, end_time); - } - - return FALSE; -} - -void -e_calendar_view_update_query (ECalendarView *cal_view) -{ - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->update_query) { - E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->update_query (cal_view); - } -} - -void -e_calendar_view_cut_clipboard (ECalendarView *cal_view) -{ - GList *selected, *l; - const char *uid; - - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - selected = e_calendar_view_get_selected_events (cal_view); - if (!selected) - return; - - e_calendar_view_set_status_message (cal_view, _("Deleting selected objects")); - - e_calendar_view_copy_clipboard (cal_view); - for (l = selected; l != NULL; l = l->next) { - ECalComponent *comp; - ECalendarViewEvent *event = (ECalendarViewEvent *) l->data; - GError *error = NULL; - - if (!event) - continue; - - comp = e_cal_component_new (); - e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); - - if (itip_organizer_is_user (comp, event->comp_data->client) - && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)), - event->comp_data->client, comp, TRUE)) - itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp, - event->comp_data->client, NULL); - - e_cal_component_get_uid (comp, &uid); - e_cal_remove_object (event->comp_data->client, uid, &error); - delete_error_dialog (error, E_CAL_COMPONENT_EVENT); - - g_clear_error (&error); - - g_object_unref (comp); - } - - e_calendar_view_set_status_message (cal_view, NULL); - - g_list_free (selected); -} - -void -e_calendar_view_copy_clipboard (ECalendarView *cal_view) -{ - GList *selected, *l; - gchar *comp_str; - icalcomponent *vcal_comp; - icalcomponent *new_icalcomp; - ECalendarViewEvent *event; - - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - selected = e_calendar_view_get_selected_events (cal_view); - if (!selected) - return; - - /* create top-level VCALENDAR component and add VTIMEZONE's */ - vcal_comp = e_cal_util_new_top_level (); - for (l = selected; l != NULL; l = l->next) { - event = (ECalendarViewEvent *) l->data; - - if (event) - e_cal_util_add_timezones_from_component (vcal_comp, event->comp_data->icalcomp); - } - - for (l = selected; l != NULL; l = l->next) { - event = (ECalendarViewEvent *) l->data; - - new_icalcomp = icalcomponent_new_clone (event->comp_data->icalcomp); - icalcomponent_add_component (vcal_comp, new_icalcomp); - } - - /* copy the VCALENDAR to the clipboard */ - comp_str = icalcomponent_as_ical_string (vcal_comp); - gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (cal_view), clipboard_atom), - (const gchar *) comp_str, - g_utf8_strlen (comp_str, -1)); - - /* free memory */ - icalcomponent_free (vcal_comp); - g_list_free (selected); -} - -static void -clipboard_get_text_cb (GtkClipboard *clipboard, const gchar *text, ECalendarView *cal_view) -{ - icalcomponent *icalcomp; - icalcomponent_kind kind; - time_t selected_time_start, selected_time_end; - icaltimezone *default_zone; - ECal *client; - gboolean in_top_canvas; - - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - icalcomp = icalparser_parse_string ((const char *) text); - if (!icalcomp) - return; - - default_zone = calendar_config_get_icaltimezone (); - client = e_cal_model_get_default_client (cal_view->priv->model); - - /* check the type of the component */ - /* FIXME An error dialog if we return? */ - kind = icalcomponent_isa (icalcomp); - if (kind != ICAL_VCALENDAR_COMPONENT && kind != ICAL_VEVENT_COMPONENT) - return; - - e_calendar_view_set_status_message (cal_view, _("Updating objects")); - e_calendar_view_get_selected_time_range (cal_view, &selected_time_start, &selected_time_end); - - if ((selected_time_end - selected_time_start) == 60 * 60 * 24) - in_top_canvas = TRUE; - else - in_top_canvas = FALSE; - - /* FIXME Timezone handling */ - if (kind == ICAL_VCALENDAR_COMPONENT) { - icalcomponent_kind child_kind; - icalcomponent *subcomp; - - subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT); - while (subcomp) { - child_kind = icalcomponent_isa (subcomp); - if (child_kind == ICAL_VEVENT_COMPONENT) - e_calendar_view_add_event (cal_view, client, selected_time_start, - default_zone, subcomp, in_top_canvas); - else if (child_kind == ICAL_VTIMEZONE_COMPONENT) { - icaltimezone *zone; - - zone = icaltimezone_new (); - icaltimezone_set_component (zone, subcomp); - e_cal_add_timezone (client, zone, NULL); - - icaltimezone_free (zone, 1); - } - - subcomp = icalcomponent_get_next_component ( - icalcomp, ICAL_ANY_COMPONENT); - } - - icalcomponent_free (icalcomp); - - } else { - e_calendar_view_add_event (cal_view, client, selected_time_start, default_zone, icalcomp, in_top_canvas); - } - - e_calendar_view_set_status_message (cal_view, NULL); -} - -void -e_calendar_view_paste_clipboard (ECalendarView *cal_view) -{ - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - gtk_clipboard_request_text (gtk_widget_get_clipboard (GTK_WIDGET (cal_view), clipboard_atom), - (GtkClipboardTextReceivedFunc) clipboard_get_text_cb, cal_view); -} - -static void -delete_event (ECalendarView *cal_view, ECalendarViewEvent *event) -{ - ECalComponent *comp; - ECalComponentVType vtype; - - comp = e_cal_component_new (); - e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); - vtype = e_cal_component_get_vtype (comp); - - if (delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view))) { - const char *uid; - GError *error = NULL; - - if (itip_organizer_is_user (comp, event->comp_data->client) - && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)), - event->comp_data->client, - comp, TRUE)) - itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp, - event->comp_data->client, NULL); - - e_cal_component_get_uid (comp, &uid); - if (!uid || !*uid) { - g_object_unref (comp); - return; - } - - e_cal_remove_object (event->comp_data->client, uid, &error); - delete_error_dialog (error, E_CAL_COMPONENT_EVENT); - g_clear_error (&error); - } - - g_object_unref (comp); -} - -void -e_calendar_view_delete_selected_event (ECalendarView *cal_view) -{ - GList *selected; - ECalendarViewEvent *event; - - selected = e_calendar_view_get_selected_events (cal_view); - if (!selected) - return; - - event = (ECalendarViewEvent *) selected->data; - if (event) - delete_event (cal_view, event); - - g_list_free (selected); -} - -void -e_calendar_view_delete_selected_events (ECalendarView *cal_view) -{ - GList *selected, *l; - ECalendarViewEvent *event; - - selected = e_calendar_view_get_selected_events (cal_view); - if (!selected) - return; - - for (l = selected; l != NULL; l = l->next) { - event = (ECalendarViewEvent *) l->data; - if (event) - delete_event (cal_view, event); - } - - g_list_free (selected); -} - -void -e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view) -{ - ECalendarViewEvent *event; - GList *selected; - const char *uid, *rid; - GError *error = NULL; - ECalComponent *comp; - - selected = e_calendar_view_get_selected_events (cal_view); - if (!selected) - return; - - event = (ECalendarViewEvent *) selected->data; - - comp = e_cal_component_new (); - e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); - e_cal_component_get_uid (comp, &uid); - if (e_cal_component_is_instance (comp)) - rid = e_cal_component_get_recur_id_as_string (comp); - else - rid = ""; - - if (delete_component_dialog (comp, FALSE, 1, e_cal_component_get_vtype (comp), GTK_WIDGET (cal_view))) { - - if (itip_organizer_is_user (comp, event->comp_data->client) - && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)), - event->comp_data->client, - comp, TRUE)) - itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp, event->comp_data->client, NULL); - - e_cal_remove_object_with_mod (event->comp_data->client, uid, rid, CALOBJ_MOD_THIS, &error); - delete_error_dialog (error, E_CAL_COMPONENT_EVENT); - g_clear_error (&error); - } - - /* free memory */ - g_list_free (selected); - g_object_unref (comp); -} - -static void -on_new_appointment (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view = (ECalendarView *) user_data; - - e_calendar_view_new_appointment (cal_view); -} - -static void -on_new_event (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view = (ECalendarView *) user_data; - - e_calendar_view_new_appointment_full (cal_view, TRUE, FALSE); -} - -static void -on_new_meeting (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view = (ECalendarView *) user_data; - - e_calendar_view_new_appointment_full (cal_view, FALSE, TRUE); -} - -static void -on_new_task (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view = (ECalendarView *) user_data; - gnome_calendar_new_task (cal_view->priv->calendar); -} - -static void -on_goto_date (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view = E_CALENDAR_VIEW (user_data); - - goto_dialog (cal_view->priv->calendar); -} - -static void -on_goto_today (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view = E_CALENDAR_VIEW (user_data); - - calendar_goto_today (cal_view->priv->calendar); -} - -static void -on_edit_appointment (GtkWidget *widget, gpointer user_data) -{ - GList *selected; - ECalendarView *cal_view = E_CALENDAR_VIEW (user_data); - - selected = e_calendar_view_get_selected_events (cal_view); - if (selected) { - ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data; - - if (event) - e_calendar_view_edit_appointment (cal_view, event->comp_data->client, - event->comp_data->icalcomp, FALSE); - - g_list_free (selected); - } -} - -static void -on_print (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view; - time_t start, end; - GnomeCalendarViewType view_type; - PrintView print_view; - - cal_view = E_CALENDAR_VIEW (user_data); - - e_calendar_view_get_visible_time_range (cal_view, &start, &end); - view_type = gnome_calendar_get_view (cal_view->priv->calendar); - - switch (view_type) { - case GNOME_CAL_DAY_VIEW : - print_view = PRINT_VIEW_DAY; - break; - - case GNOME_CAL_WORK_WEEK_VIEW : - case GNOME_CAL_WEEK_VIEW: - print_view = PRINT_VIEW_WEEK; - break; - - case GNOME_CAL_MONTH_VIEW: - print_view = PRINT_VIEW_MONTH; - break; - - default: - g_assert_not_reached (); - return; - } - - print_calendar (cal_view->priv->calendar, FALSE, start, print_view); -} - -static void -on_save_as (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view; - GList *selected; - char *filename; - char *ical_string; - FILE *file; - ECalendarViewEvent *event; - - cal_view = E_CALENDAR_VIEW (user_data); - - selected = e_calendar_view_get_selected_events (cal_view); - if (!selected) - return; - - filename = e_file_dialog_save (_("Save as...")); - if (filename == NULL) - return; - - event = (ECalendarViewEvent *) selected->data; - ical_string = e_cal_get_component_as_string (event->comp_data->client, event->comp_data->icalcomp); - if (ical_string == NULL) { - g_warning ("Couldn't convert item to a string"); - return; - } - - file = fopen (filename, "w"); - if (file == NULL) { - g_warning ("Couldn't save item"); - return; - } - - fprintf (file, ical_string); - g_free (ical_string); - fclose (file); - - g_list_free (selected); -} - -static void -on_print_event (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view; - GList *selected; - ECalendarViewEvent *event; - ECalComponent *comp; - - cal_view = E_CALENDAR_VIEW (user_data); - selected = e_calendar_view_get_selected_events (cal_view); - if (!selected) - return; - - event = (ECalendarViewEvent *) selected->data; - - comp = e_cal_component_new (); - e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); - print_comp (comp, event->comp_data->client, FALSE); - - g_object_unref (comp); -} - -static void -on_meeting (GtkWidget *widget, gpointer user_data) -{ - GList *selected; - ECalendarView *cal_view = E_CALENDAR_VIEW (user_data); - - selected = e_calendar_view_get_selected_events (cal_view); - if (selected) { - ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data; - e_calendar_view_edit_appointment (cal_view, event->comp_data->client, event->comp_data->icalcomp, TRUE); - - g_list_free (selected); - } -} - -static void -on_forward (GtkWidget *widget, gpointer user_data) -{ - GList *selected; - ECalendarView *cal_view = E_CALENDAR_VIEW (user_data); - - selected = e_calendar_view_get_selected_events (cal_view); - if (selected) { - ECalComponent *comp; - ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data; - - comp = e_cal_component_new (); - e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); - itip_send_comp (E_CAL_COMPONENT_METHOD_PUBLISH, comp, event->comp_data->client, NULL); - - g_list_free (selected); - g_object_unref (comp); - } -} - -static void -on_publish (GtkWidget *widget, gpointer user_data) -{ - e_pub_publish (TRUE); -} - -static void -on_delete_appointment (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view; - - cal_view = E_CALENDAR_VIEW (user_data); - e_calendar_view_delete_selected_event (cal_view); -} - -static void -on_delete_occurrence (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view; - - cal_view = E_CALENDAR_VIEW (user_data); - e_calendar_view_delete_selected_occurrence (cal_view); -} - -static void -on_cut (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view = E_CALENDAR_VIEW (user_data); - - e_calendar_view_cut_clipboard (cal_view); -} - -static void -on_copy (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view = E_CALENDAR_VIEW (user_data); - - e_calendar_view_copy_clipboard (cal_view); -} - -static void -on_paste (GtkWidget *widget, gpointer user_data) -{ - ECalendarView *cal_view = E_CALENDAR_VIEW (user_data); - - e_calendar_view_paste_clipboard (cal_view); -} - -enum { - /* - * This is used to "flag" events that can not be editted - */ - MASK_EDITABLE = 1, - - /* - * To disable recurring actions to be displayed - */ - MASK_RECURRING = 2, - - /* - * To disable actions for non-recurring items to be displayed - */ - MASK_SINGLE = 4, - - /* - * This is used to when an event is currently being edited - * in another window and we want to disable the event - * from being edited twice - */ - MASK_EDITING = 8, - - /* - * This is used to when an event is already a meeting and - * we want to disable the schedule meeting command - */ - MASK_MEETING = 16, - - /* - * To disable cut and copy for meetings the user is not the - * organizer of - */ - MASK_MEETING_ORGANIZER = 32, - - /* - * To disable things not valid for instances - */ - MASK_INSTANCE = 64 -}; - -static EPopupMenu main_items [] = { - E_POPUP_ITEM (N_("New _Appointment..."), GTK_SIGNAL_FUNC (on_new_appointment), MASK_EDITABLE), - E_POPUP_ITEM (N_("New All Day _Event"), GTK_SIGNAL_FUNC (on_new_event), MASK_EDITABLE), - E_POPUP_ITEM (N_("New Meeting"), GTK_SIGNAL_FUNC (on_new_meeting), MASK_EDITABLE), - E_POPUP_ITEM (N_("New Task"), GTK_SIGNAL_FUNC (on_new_task), MASK_EDITABLE), - - E_POPUP_SEPARATOR, - - E_POPUP_ITEM (N_("_Print..."), GTK_SIGNAL_FUNC (on_print), 0), - - E_POPUP_SEPARATOR, - - E_POPUP_ITEM (N_("_Paste"), GTK_SIGNAL_FUNC (on_paste), MASK_EDITABLE), - - E_POPUP_SEPARATOR, - - E_POPUP_SUBMENU (N_("Current View"), NULL, 0), - - E_POPUP_ITEM (N_("Go to _Today"), GTK_SIGNAL_FUNC (on_goto_today), 0), - E_POPUP_ITEM (N_("_Go to Date..."), GTK_SIGNAL_FUNC (on_goto_date), 0), - - E_POPUP_SEPARATOR, - - E_POPUP_ITEM (N_("_Publish Free/Busy Information"), GTK_SIGNAL_FUNC (on_publish), 0), - - E_POPUP_TERMINATOR -}; - -static EPopupMenu child_items [] = { - E_POPUP_ITEM (N_("_Open"), GTK_SIGNAL_FUNC (on_edit_appointment), MASK_EDITING), - E_POPUP_ITEM (N_("_Save As..."), GTK_SIGNAL_FUNC (on_save_as), MASK_EDITING), - E_POPUP_ITEM (N_("_Print..."), GTK_SIGNAL_FUNC (on_print_event), MASK_EDITING), - - /* Only show this separator if one of the above is shown. */ - E_POPUP_SEPARATOR, - - E_POPUP_ITEM (N_("C_ut"), GTK_SIGNAL_FUNC (on_cut), MASK_EDITING | MASK_EDITABLE | MASK_MEETING_ORGANIZER), - E_POPUP_ITEM (N_("_Copy"), GTK_SIGNAL_FUNC (on_copy), MASK_EDITING | MASK_MEETING_ORGANIZER), - E_POPUP_ITEM (N_("_Paste"), GTK_SIGNAL_FUNC (on_paste), MASK_EDITABLE), - - E_POPUP_SEPARATOR, - - E_POPUP_ITEM (N_("_Schedule Meeting..."), GTK_SIGNAL_FUNC (on_meeting), MASK_EDITABLE | MASK_EDITING | MASK_MEETING), - E_POPUP_ITEM (N_("_Forward as iCalendar..."), GTK_SIGNAL_FUNC (on_forward), MASK_EDITING), - - E_POPUP_SEPARATOR, - - E_POPUP_ITEM (N_("_Delete"), GTK_SIGNAL_FUNC (on_delete_appointment), MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), - E_POPUP_ITEM (N_("Delete this _Occurrence"), GTK_SIGNAL_FUNC (on_delete_occurrence), MASK_RECURRING | MASK_EDITING | MASK_EDITABLE), - E_POPUP_ITEM (N_("Delete _All Occurrences"), GTK_SIGNAL_FUNC (on_delete_appointment), MASK_RECURRING | MASK_EDITING | MASK_EDITABLE), - - E_POPUP_TERMINATOR -}; - -static void -free_view_popup (GtkWidget *widget, gpointer data) -{ - ECalendarView *cal_view = E_CALENDAR_VIEW (data); - - if (cal_view->priv->view_menu == NULL) - return; - - gnome_calendar_discard_view_popup (cal_view->priv->calendar, cal_view->priv->view_menu); - cal_view->priv->view_menu = NULL; -} - -static void -setup_popup_icons (EPopupMenu *context_menu) -{ - gint i; - - for (i = 0; context_menu[i].name; i++) { - GtkWidget *pixmap_widget = NULL; - - if (!strcmp (context_menu[i].name, _("_Copy"))) - pixmap_widget = gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_MENU); - else if (!strcmp (context_menu[i].name, _("C_ut"))) - pixmap_widget = gtk_image_new_from_stock (GTK_STOCK_CUT, GTK_ICON_SIZE_MENU); - else if (!strcmp (context_menu[i].name, _("_Delete")) || - !strcmp (context_menu[i].name, _("Delete this _Occurrence")) || - !strcmp (context_menu[i].name, _("Delete _All Occurrences"))) - pixmap_widget = gtk_image_new_from_stock (GTK_STOCK_DELETE, GTK_ICON_SIZE_MENU); - else if (!strcmp (context_menu[i].name, _("Go to _Today"))) - pixmap_widget = gtk_image_new_from_stock (GTK_STOCK_HOME, GTK_ICON_SIZE_MENU); - else if (!strcmp (context_menu[i].name, _("_Go to Date..."))) - pixmap_widget = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_MENU); - else if (!strcmp (context_menu[i].name, _("New _Appointment..."))) - pixmap_widget = gtk_image_new_from_file (EVOLUTION_IMAGESDIR "/new_appointment.xpm"); - else if (!strcmp (context_menu[i].name, _("New All Day _Event"))) - pixmap_widget = gtk_image_new_from_file (EVOLUTION_IMAGESDIR "/new_all_day_event.png"); - else if (!strcmp (context_menu[i].name, _("New Meeting"))) - pixmap_widget = gtk_image_new_from_file (EVOLUTION_IMAGESDIR "/meeting-request-16.png"); - else if (!strcmp (context_menu[i].name, _("New Task"))) - pixmap_widget = gtk_image_new_from_file (EVOLUTION_IMAGESDIR "/new_task-16.png"); - else if (!strcmp (context_menu[i].name, _("_Open"))) - pixmap_widget = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); - else if (!strcmp (context_menu[i].name, _("_Paste"))) - pixmap_widget = gtk_image_new_from_stock (GTK_STOCK_PASTE, GTK_ICON_SIZE_MENU); - else if (!strcmp (context_menu[i].name, _("_Print..."))) - pixmap_widget = gtk_image_new_from_stock (GTK_STOCK_PRINT, GTK_ICON_SIZE_MENU); - else if (!strcmp (context_menu[i].name, _("_Save As..."))) - pixmap_widget = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_MENU); - else if (!strcmp (context_menu[i].name, _("_Settings..."))) - pixmap_widget = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU); - - if (pixmap_widget) - gtk_widget_show (pixmap_widget); - context_menu[i].pixmap_widget = pixmap_widget; - } -} - -GtkMenu * -e_calendar_view_create_popup_menu (ECalendarView *cal_view) -{ - GList *selected; - EPopupMenu *context_menu; - guint32 disable_mask = 0, hide_mask = 0; - GtkMenu *popup; - ECal *client = NULL; - gboolean read_only = TRUE; - - g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL); - - /* get the selection */ - selected = e_calendar_view_get_selected_events (cal_view); - - if (selected == NULL) { - cal_view->priv->view_menu = gnome_calendar_setup_view_popup (cal_view->priv->calendar); - main_items[9].submenu = cal_view->priv->view_menu; - context_menu = main_items; - - client = e_cal_model_get_default_client (cal_view->priv->model); - } else { - ECalendarViewEvent *event; - - context_menu = child_items; - - event = (ECalendarViewEvent *) selected->data; - if (e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) - hide_mask |= MASK_SINGLE; - else - hide_mask |= MASK_RECURRING; - - if (e_cal_util_component_is_instance (event->comp_data->icalcomp)) - hide_mask |= MASK_INSTANCE; - - if (e_cal_util_component_has_organizer (event->comp_data->icalcomp)) { - ECalComponent *comp; - - disable_mask |= MASK_MEETING; - - comp = e_cal_component_new (); - e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); - if (!itip_organizer_is_user (comp, event->comp_data->client)) - disable_mask |= MASK_MEETING_ORGANIZER; - - g_object_unref (comp); - } - - client = event->comp_data->client; - } - - e_cal_is_read_only (client, &read_only, NULL); - if (read_only) - disable_mask |= MASK_EDITABLE; - - setup_popup_icons (context_menu); - popup = e_popup_menu_create (context_menu, disable_mask, hide_mask, cal_view); - g_signal_connect (popup, "selection-done", G_CALLBACK (free_view_popup), cal_view); - - return popup; -} - -void -e_calendar_view_open_event (ECalendarView *cal_view) -{ - GList *selected; - - selected = e_calendar_view_get_selected_events (cal_view); - if (selected) { - ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data; - - if (event) - e_calendar_view_edit_appointment (cal_view, event->comp_data->client, - event->comp_data->icalcomp, FALSE); - - g_list_free (selected); - } -} - -/** - * e_calendar_view_new_appointment_for - * @cal_view: A calendar view. - * @dtstart: A Unix time_t that marks the beginning of the appointment. - * @dtend: A Unix time_t that marks the end of the appointment. - * @all_day: If TRUE, the dtstart and dtend are expanded to cover - * the entire day, and the event is set to TRANSPARENT. - * @meeting: Whether the appointment is a meeting or not. - * - * Opens an event editor dialog for a new appointment. - */ -void -e_calendar_view_new_appointment_for (ECalendarView *cal_view, - time_t dtstart, time_t dtend, - gboolean all_day, - gboolean meeting) -{ - ECalendarViewPrivate *priv; - struct icaltimetype itt; - ECalComponentDateTime dt; - ECalComponent *comp; - icalcomponent *icalcomp; - ECalComponentTransparency transparency; - - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - priv = cal_view->priv; - - dt.value = &itt; - if (all_day) - dt.tzid = NULL; - else - dt.tzid = icaltimezone_get_tzid (e_cal_model_get_timezone (cal_view->priv->model)); - - icalcomp = e_cal_model_create_component_with_defaults (priv->model); - comp = e_cal_component_new (); - e_cal_component_set_icalcomponent (comp, icalcomp); - - /* DTSTART, DTEND */ - itt = icaltime_from_timet_with_zone (dtstart, FALSE, e_cal_model_get_timezone (cal_view->priv->model)); - if (all_day) { - itt.hour = itt.minute = itt.second = 0; - itt.is_date = TRUE; - } - e_cal_component_set_dtstart (comp, &dt); - - itt = icaltime_from_timet_with_zone (dtend, FALSE, e_cal_model_get_timezone (cal_view->priv->model)); - if (all_day) { - /* We round it up to the end of the day, unless it is - already set to midnight */ - if (itt.hour != 0 || itt.minute != 0 || itt.second != 0) { - icaltime_adjust (&itt, 1, 0, 0, 0); - } - itt.hour = itt.minute = itt.second = 0; - itt.is_date = TRUE; - } - e_cal_component_set_dtend (comp, &dt); - - /* TRANSPARENCY */ - transparency = all_day ? E_CAL_COMPONENT_TRANSP_TRANSPARENT - : E_CAL_COMPONENT_TRANSP_OPAQUE; - e_cal_component_set_transparency (comp, transparency); - - /* CATEGORY */ - e_cal_component_set_categories (comp, priv->default_category); - - /* edit the object */ - e_cal_component_commit_sequence (comp); - - e_calendar_view_edit_appointment (cal_view, - e_cal_model_get_default_client (priv->model), - icalcomp, meeting); - - g_object_unref (comp); -} - -/** - * e_calendar_view_new_appointment - * @cal_view: A calendar view. - * - * Opens an event editor dialog for a new appointment. The appointment's - * start and end times are set to the currently selected time range in - * the calendar view. - */ -void -e_calendar_view_new_appointment_full (ECalendarView *cal_view, gboolean all_day, gboolean meeting) -{ - time_t dtstart, dtend; - - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - if (!e_calendar_view_get_selected_time_range (cal_view, &dtstart, &dtend)) { - dtstart = time (NULL); - dtend = dtstart + 3600; - } - e_calendar_view_new_appointment_for (cal_view, dtstart, dtend, all_day, meeting); -} - -void -e_calendar_view_new_appointment (ECalendarView *cal_view) -{ - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - e_calendar_view_new_appointment_full (cal_view, FALSE, FALSE); -} - -/** - * e_calendar_view_edit_appointment - * @cal_view: A calendar view. - * @client: Calendar client. - * @icalcomp: The object to be edited. - * @meeting: Whether the appointment is a meeting or not. - * - * Opens an editor window to allow the user to edit the selected - * object. - */ -void -e_calendar_view_edit_appointment (ECalendarView *cal_view, - ECal *client, - icalcomponent *icalcomp, - gboolean meeting) -{ - ECalendarViewPrivate *priv; - CompEditor *ce; - const char *uid; - ECalComponent *comp; - - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - g_return_if_fail (E_IS_CAL (client)); - g_return_if_fail (icalcomp != NULL); - - priv = cal_view->priv; - - uid = icalcomponent_get_uid (icalcomp); - - ce = e_comp_editor_registry_find (comp_editor_registry, uid); - if (!ce) { - EventEditor *ee; - - ee = event_editor_new (client); - ce = COMP_EDITOR (ee); - - comp = e_cal_component_new (); - e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (icalcomp)); - comp_editor_edit_comp (ce, comp); - if (meeting) - event_editor_show_meeting (ee); - - e_comp_editor_registry_add (comp_editor_registry, ce, FALSE); - - g_object_unref (comp); - } - - comp_editor_focus (ce); -} - -void -e_calendar_view_modify_and_send (ECalComponent *comp, - ECal *client, - CalObjModType mod, - GtkWindow *toplevel, - gboolean new) -{ - if (e_cal_modify_object (client, e_cal_component_get_icalcomponent (comp), mod, NULL)) { - if (itip_organizer_is_user (comp, client) && - send_component_dialog (toplevel, client, comp, new)) { - itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, client, NULL); - } else { - g_message (G_STRLOC ": Could not update the object!"); - } - } -} diff --git a/calendar/gui/e-cal-view.h b/calendar/gui/e-cal-view.h deleted file mode 100644 index 4d72f1a0c4..0000000000 --- a/calendar/gui/e-cal-view.h +++ /dev/null @@ -1,156 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * Author : - * Rodrigo Moya <rodrigo@ximian.com> - * - * Copyright 2003, Ximian, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ -#ifndef _E_CALENDAR_VIEW_H_ -#define _E_CALENDAR_VIEW_H_ - -#include <libecal/e-cal.h> -#include <gtk/gtktable.h> -#include <gtk/gtkwindow.h> -#include "e-cal-model.h" -#include "gnome-cal.h" - -G_BEGIN_DECLS - -/* - * EView - base widget class for the calendar views. - */ - -#define E_CALENDAR_VIEW(obj) GTK_CHECK_CAST (obj, e_calendar_view_get_type (), ECalendarView) -#define E_CALENDAR_VIEW_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_calendar_view_get_type (), ECalendarViewClass) -#define E_IS_CALENDAR_VIEW(obj) GTK_CHECK_TYPE (obj, e_calendar_view_get_type ()) - -typedef enum { - E_CALENDAR_VIEW_POS_OUTSIDE, - E_CALENDAR_VIEW_POS_NONE, - E_CALENDAR_VIEW_POS_EVENT, - E_CALENDAR_VIEW_POS_LEFT_EDGE, - E_CALENDAR_VIEW_POS_RIGHT_EDGE, - E_CALENDAR_VIEW_POS_TOP_EDGE, - E_CALENDAR_VIEW_POS_BOTTOM_EDGE -} ECalendarViewPosition; - -typedef enum { - E_CAL_VIEW_MOVE_UP, - E_CAL_VIEW_MOVE_DOWN, - E_CAL_VIEW_MOVE_LEFT, - E_CAL_VIEW_MOVE_RIGHT -} ECalViewMoveDirection; - -#define E_CALENDAR_VIEW_EVENT_FIELDS \ - GnomeCanvasItem *canvas_item; \ - ECalModelComponent *comp_data; \ - time_t start; \ - time_t end; \ - guint16 start_minute; \ - guint16 end_minute; \ - guint different_timezone : 1; - -typedef struct { - E_CALENDAR_VIEW_EVENT_FIELDS -} ECalendarViewEvent; - -typedef struct _ECalendarView ECalendarView; -typedef struct _ECalendarViewClass ECalendarViewClass; -typedef struct _ECalendarViewPrivate ECalendarViewPrivate; - -struct _ECalendarView { - GtkTable table; - ECalendarViewPrivate *priv; -}; - -struct _ECalendarViewClass { - GtkTableClass parent_class; - - /* Notification signals */ - void (* selection_changed) (ECalendarView *cal_view); - void (* selected_time_changed) (ECalendarView *cal_view); - void (* timezone_changed) (ECalendarView *cal_view, icaltimezone *old_zone, icaltimezone *new_zone); - void (* event_changed) (ECalendarView *day_view, ECalendarViewEvent *event); - void (* event_added) (ECalendarView *day_view, ECalendarViewEvent *event); - - /* Virtual methods */ - GList * (* get_selected_events) (ECalendarView *cal_view); /* a GList of ECalendarViewEvent's */ - gboolean (* get_selected_time_range) (ECalendarView *cal_view, time_t *start_time, time_t *end_time); - void (* set_selected_time_range) (ECalendarView *cal_view, time_t start_time, time_t end_time); - gboolean (* get_visible_time_range) (ECalendarView *cal_view, time_t *start_time, time_t *end_time); - void (* update_query) (ECalendarView *cal_view); - void (* open_event) (ECalendarView *cal_view); - void (* event_move) (ECalendarView *cal_view, ECalViewMoveDirection direction); -}; - -GType e_calendar_view_get_type (void); - -GnomeCalendar *e_calendar_view_get_calendar (ECalendarView *cal_view); -void e_calendar_view_set_calendar (ECalendarView *cal_view, GnomeCalendar *calendar); -ECalModel *e_calendar_view_get_model (ECalendarView *cal_view); -void e_calendar_view_set_model (ECalendarView *cal_view, ECalModel *model); -icaltimezone *e_calendar_view_get_timezone (ECalendarView *cal_view); -void e_calendar_view_set_timezone (ECalendarView *cal_view, icaltimezone *zone); -const char *e_calendar_view_get_default_category (ECalendarView *cal_view); -void e_calendar_view_set_default_category (ECalendarView *cal_view, const char *category); -gboolean e_calendar_view_get_use_24_hour_format (ECalendarView *view); -void e_calendar_view_set_use_24_hour_format (ECalendarView *view, gboolean use_24_hour); - -void e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message); - -GList *e_calendar_view_get_selected_events (ECalendarView *cal_view); -gboolean e_calendar_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time); -void e_calendar_view_set_selected_time_range (ECalendarView *cal_view, time_t start_time, time_t end_time); -gboolean e_calendar_view_get_visible_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time); -void e_calendar_view_update_query (ECalendarView *cal_view); - -void e_calendar_view_cut_clipboard (ECalendarView *cal_view); -void e_calendar_view_copy_clipboard (ECalendarView *cal_view); -void e_calendar_view_paste_clipboard (ECalendarView *cal_view); -void e_calendar_view_delete_selected_event (ECalendarView *cal_view); -void e_calendar_view_delete_selected_events (ECalendarView *cal_view); -void e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view); - -GtkMenu *e_calendar_view_create_popup_menu (ECalendarView *cal_view); - -void e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart, - icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas); -void e_calendar_view_new_appointment_for (ECalendarView *cal_view, - time_t dtstart, - time_t dtend, - gboolean all_day, - gboolean meeting); -void e_calendar_view_new_appointment_full (ECalendarView *cal_view, - gboolean all_day, - gboolean meeting); -void e_calendar_view_new_appointment (ECalendarView *cal_view); -void e_calendar_view_edit_appointment (ECalendarView *cal_view, - ECal *client, - icalcomponent *icalcomp, - gboolean meeting); -void e_calendar_view_open_event (ECalendarView *cal_view); -void e_calendar_view_modify_and_send (ECalComponent *comp, - ECal *client, - CalObjModType mod, - GtkWindow *toplevel, - gboolean new); - - -G_END_DECLS - -#endif diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 8a360bc921..9b20565bcc 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -39,7 +39,7 @@ #include "calendar-config.h" #include "comp-util.h" #include "e-cal-model-calendar.h" -#include "e-cal-view.h" +#include "e-calendar-view.h" #include "e-comp-editor-registry.h" #include "itip-utils.h" #include "e-pub-utils.h" diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index 77721866ec..c1a9290206 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -30,7 +30,7 @@ #include <libgnomecanvas/gnome-canvas.h> #include <gal/widgets/e-popup-menu.h> -#include "e-cal-view.h" +#include "e-calendar-view.h" #include "gnome-cal.h" G_BEGIN_DECLS diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h index b5734fa35a..9db268b30b 100644 --- a/calendar/gui/e-week-view.h +++ b/calendar/gui/e-week-view.h @@ -28,7 +28,7 @@ #include <libgnomecanvas/gnome-canvas.h> #include <gal/widgets/e-popup-menu.h> -#include "e-cal-view.h" +#include "e-calendar-view.h" #include "gnome-cal.h" #ifdef __cplusplus |