From 1ea6884e825cb2e30787f6f6d0c7911647473945 Mon Sep 17 00:00:00 2001 From: 7 Date: Wed, 17 Jul 2002 17:23:49 +0000 Subject: use util function to see if the user is the organizer 2002-07-17 * gui/calendar-model.c (calendar_model_value_at): use util function to see if the user is the organizer * gui/dialogs/cancel-comp.c (cancel_component_dialog): add deleting proto to indicate whether cancelling or deleting is the primary operation * gui/dialogs/cancel-comp.h: update proto * gui/dialogs/comp-editor.c (delete_cmd): offer to cancel * gui/dialogs/task-editor.c (cancel_task_cmd): call cancel_component_dialog with new param * gui/dialogs/event-editor.c (cancel_meeting_cmd): ditto * gui/e-week-view.c (e_week_view_on_editing_stopped): only update request if user is organizer (e_week_view_show_popup_menu): disable the meeting and meeting organizer mask if appropriate (e_week_view_delete_event_internal): offer to cancel the meeting (e_week_view_on_cut): ditto (selection_received): send request if its a meeting * gui/e-day-view.h: add meeting icon/mask * gui/e-day-view.c (e_day_view_on_event_right_click): disable the meeting and meeting organizer mask if appropriate (e_day_view_delete_event_internal): offer to cancel meeting (e_day_view_on_cut): ditto (e_day_view_finish_long_event_resize): only update request if user is organizer (e_day_view_reshape_long_event): add meeting icon to count (e_day_view_reshape_day_event): ditto (e_day_view_on_top_canvas_drag_data_received): only update request if user is organizer (e_day_view_on_main_canvas_drag_data_received): ditto (selection_received): offer to send meeting info * gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event): draw meeting icon if appropriate (using dummy icon atm) svn path=/trunk/; revision=17491 --- calendar/gui/dialogs/cancel-comp.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'calendar/gui/dialogs/cancel-comp.c') diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index 92590cfa40..9156877016 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -42,30 +42,40 @@ * Return value: TRUE if the user clicked Yes, FALSE otherwise. **/ gboolean -cancel_component_dialog (CalComponent *comp) +cancel_component_dialog (CalComponent *comp, gboolean deleting) { GtkWidget *dialog; CalComponentVType vtype; char *str; - str = _("The meeting status has changed. Send an updated version?"); - vtype = cal_component_get_vtype (comp); switch (vtype) { case CAL_COMPONENT_EVENT: - str = g_strdup_printf (_("Are you sure you want to cancel " - "and delete this meeting?")); + if (deleting) + str = g_strdup_printf (_("The event being deleted is a meeting, " + "would you like to send a cancellation notice?")); + else + str = g_strdup_printf (_("Are you sure you want to cancel " + "and delete this meeting?")); break; case CAL_COMPONENT_TODO: - str = g_strdup_printf (_("Are you sure you want to cancel " - "and delete this task?")); + if (deleting) + str = g_strdup_printf (_("The task being deleted is assigned, " + "would you like to send a cancellation notice?")); + else + str = g_strdup_printf (_("Are you sure you want to cancel " + "and delete this task?")); break; case CAL_COMPONENT_JOURNAL: - str = g_strdup_printf (_("Are you sure you want to cancel " - "and delete this journal entry?")); + if (deleting) + str = g_strdup_printf (_("The journal entry being deleted is published, " + "would you like to send a cancellation notice?")); + else + str = g_strdup_printf (_("Are you sure you want to cancel " + "and delete this journal entry?")); break; default: -- cgit v1.2.3