From 7aac092a0a515927c16a583bf736882bbda4901a Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Wed, 20 Jun 2001 16:59:31 +0000 Subject: print menu command (print_preview_cmd): ditto for print preview 2001-06-20 JP Rosevear * gui/dialogs/comp-editor.c (print_cmd): print menu command (print_preview_cmd): ditto for print preview (print_setup_cmd): ditto for print setup (comp_editor_set_cal_client): listen for updated and removed signals (obj_updated_cb): if the item changes else where, query the user for the course of action (obj_removed_cb): ditto for removal * gui/print.c (print_setup): rudimentary page setup support (print_comp): rudimentary individual event/task printing support * gui/print.h: new protos * gui/dialogs/changed-comp.[hc]: dialog to query the user about what to do when a item is changed elsewhere * gui/dialogs/Makefile.am: build new files * gui/dialogs/send-comp.c (send_component_dialog): remove useless assignment svn path=/trunk/; revision=10338 --- calendar/gui/dialogs/Makefile.am | 2 + calendar/gui/dialogs/changed-comp.c | 112 ++++++++++++++++++++++++++++++++++++ calendar/gui/dialogs/changed-comp.h | 30 ++++++++++ calendar/gui/dialogs/comp-editor.c | 109 ++++++++++++++++++++++++++++++++++- calendar/gui/dialogs/send-comp.c | 2 - 5 files changed, 252 insertions(+), 3 deletions(-) create mode 100644 calendar/gui/dialogs/changed-comp.c create mode 100644 calendar/gui/dialogs/changed-comp.h (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 1bd4b5034e..e9d21d726a 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -26,6 +26,8 @@ libcal_dialogs_a_SOURCES = \ cal-prefs-dialog.h \ cancel-comp.c \ cancel-comp.h \ + changed-comp.c \ + changed-comp.h \ comp-editor.c \ comp-editor.h \ comp-editor-page.c \ diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c new file mode 100644 index 0000000000..a9be39c008 --- /dev/null +++ b/calendar/gui/dialogs/changed-comp.c @@ -0,0 +1,112 @@ +/* Evolution calendar - Send calendar component dialog + * + * Copyright (C) 2001 Ximian, Inc. + * + * Author: JP Rosevear + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include "changed-comp.h" + + + +/** + * changed_component_dialog: + * @comp: A calendar component + * @deleted: Whether the object is being deleted or updated + * @changed: Whether or not the user has made changes + * + * Pops up a dialog box asking the user whether changes made (if any) + * should be thrown away because the item has been updated elsewhere + * + * Return value: TRUE if the user clicked Yes, FALSE otherwise. + **/ +gboolean +changed_component_dialog (CalComponent *comp, gboolean deleted, gboolean changed) +{ + GtkWidget *dialog; + CalComponentVType vtype; + char *str; + + vtype = cal_component_get_vtype (comp); + + if (deleted) { + switch (vtype) { + case CAL_COMPONENT_EVENT: + str = _("This event has been deleted."); + break; + + case CAL_COMPONENT_TODO: + str = _("This task has been deleted."); + break; + + case CAL_COMPONENT_JOURNAL: + str = _("This journal entry has been deleted."); + break; + + default: + g_message ("changed_component_dialog(): " + "Cannot handle object of type %d", vtype); + return FALSE; + } + if (changed) + str = g_strdup_printf (_("%s You have made changes. Forget those changes and close the editor?"), str); + else + str = g_strdup_printf (_("%s You have made no changes, close the editor?"), str); + + } else { + switch (vtype) { + case CAL_COMPONENT_EVENT: + str = _("This event has been changed."); + break; + + case CAL_COMPONENT_TODO: + str = _("This task has been changed."); + break; + + case CAL_COMPONENT_JOURNAL: + str = _("This journal entry has been changed."); + break; + + default: + g_message ("changed_component_dialog(): " + "Cannot handle object of type %d", vtype); + return FALSE; + } + if (changed) + str = g_strdup_printf (_("%s You have made changes. Forget those changes and update the editor?"), str); + else + str = g_strdup_printf (_("%s You have made no changes, update the editor?"), str); + } + + dialog = gnome_question_dialog_modal (str, NULL, NULL); + + if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES) + return TRUE; + else + return FALSE; +} diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h new file mode 100644 index 0000000000..7a1cb3e151 --- /dev/null +++ b/calendar/gui/dialogs/changed-comp.h @@ -0,0 +1,30 @@ +/* Evolution calendar - Changed calendar component dialog + * + * Copyright (C) 2001 Ximian, Inc. + * + * Author: JP Rosevear + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 CHANGED_COMP_H +#define CHANGED_COMP_H + +#include +#include + +gboolean changed_component_dialog (CalComponent *comp, gboolean deleted, gboolean changed); + +#endif diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index bdf5c39737..f0fdf837a5 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -33,9 +33,13 @@ #include #include #include +#include +#include +#include "../print.h" #include "save-comp.h" #include "delete-comp.h" #include "send-comp.h" +#include "changed-comp.h" #include "comp-editor.h" @@ -62,6 +66,7 @@ struct _CompEditorPrivate { gboolean changed; gboolean needs_send; + gboolean updating; }; @@ -80,9 +85,15 @@ static void page_needs_send_cb (GtkWidget *widget, gpointer data); static void page_summary_changed_cb (GtkWidget *widget, const char *summary, gpointer data); static void page_dates_changed_cb (GtkWidget *widget, CompEditorPageDates *dates, gpointer data); +static void obj_updated_cb (CalClient *client, const char *uid, gpointer data); +static void obj_removed_cb (CalClient *client, const char *uid, gpointer data); + static void save_close_cmd (GtkWidget *widget, gpointer data); static void save_as_cmd (GtkWidget *widget, gpointer data); static void delete_cmd (GtkWidget *widget, gpointer data); +static void print_cmd (GtkWidget *widget, gpointer data); +static void print_preview_cmd (GtkWidget *widget, gpointer data); +static void print_setup_cmd (GtkWidget *widget, gpointer data); static void close_cmd (GtkWidget *widget, gpointer data); static void save_clicked_cb (GtkWidget *widget, gpointer data); @@ -94,6 +105,9 @@ static BonoboUIVerb verbs [] = { BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", save_close_cmd), BONOBO_UI_UNSAFE_VERB ("FileSaveAs", save_as_cmd), BONOBO_UI_UNSAFE_VERB ("FileDelete", delete_cmd), + BONOBO_UI_UNSAFE_VERB ("FilePrint", print_cmd), + BONOBO_UI_UNSAFE_VERB ("FilePrintPreview", print_preview_cmd), + BONOBO_UI_UNSAFE_VERB ("FilePrintSetup", print_setup_cmd), BONOBO_UI_UNSAFE_VERB ("FileClose", close_cmd), BONOBO_UI_VERB_END @@ -233,9 +247,11 @@ comp_editor_destroy (GtkObject *object) priv->window = NULL; } + gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), editor); + g_free (priv); editor->priv = NULL; - + if (GTK_OBJECT_CLASS (parent_class)->destroy) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } @@ -382,6 +398,12 @@ comp_editor_set_cal_client (CompEditor *editor, CalClient *client) } priv->client = client; + + gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated", + GTK_SIGNAL_FUNC (obj_updated_cb), editor); + + gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed", + GTK_SIGNAL_FUNC (obj_removed_cb), editor); } /** @@ -653,10 +675,14 @@ save_comp (CompEditor *editor) itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, priv->comp); } + priv->updating = TRUE; + if (!cal_client_update_object (priv->client, priv->comp)) g_message ("save_comp (): Could not update the object!"); else priv->changed = FALSE; + + priv->updating = FALSE; } static void @@ -668,7 +694,9 @@ delete_comp (CompEditor *editor) priv = editor->priv; cal_component_get_uid (priv->comp, &uid); + priv->updating = TRUE; cal_client_remove_object (priv->client, uid); + priv->updating = FALSE; close_dialog (editor); } @@ -837,6 +865,39 @@ delete_cmd (GtkWidget *widget, gpointer data) delete_comp (editor); } +static void +print_cmd (GtkWidget *widget, gpointer data) +{ + CompEditor *editor = COMP_EDITOR (data); + CalComponent *comp; + + comp = comp_editor_get_current_comp (editor); + print_comp (comp, FALSE); + gtk_object_unref (GTK_OBJECT (comp)); +} + +static void +print_preview_cmd (GtkWidget *widget, gpointer data) +{ + CompEditor *editor = COMP_EDITOR (data); + CalComponent *comp; + + comp = comp_editor_get_current_comp (editor); + print_comp (comp, TRUE); + gtk_object_unref (GTK_OBJECT (comp)); +} + +static void +print_setup_cmd (GtkWidget *widget, gpointer data) +{ + CompEditor *editor = COMP_EDITOR (data); + CompEditorPrivate *priv; + + priv = editor->priv; + + print_setup (); +} + static void close_cmd (GtkWidget *widget, gpointer data) { @@ -925,6 +986,52 @@ page_dates_changed_cb (GtkWidget *widget, priv->changed = TRUE; } +static void +obj_updated_cb (CalClient *client, const char *uid, gpointer data) +{ + CompEditor *editor = COMP_EDITOR (data); + CompEditorPrivate *priv; + CalComponent *comp = NULL; + CalClientGetStatus status; + const char *edit_uid; + + priv = editor->priv; + + cal_component_get_uid (priv->comp, &edit_uid); + + if (!strcmp (uid, edit_uid) && !priv->updating) { + if (changed_component_dialog (priv->comp, FALSE, priv->changed)) { + status = cal_client_get_object (priv->client, uid, &comp); + if (status == CAL_CLIENT_GET_SUCCESS) { + comp_editor_edit_comp (editor, comp); + gtk_object_unref (GTK_OBJECT (comp)); + } else { + GtkWidget *dlg; + + dlg = gnome_error_dialog (_("Unable to obtain current version!")); + gnome_dialog_run_and_close (GNOME_DIALOG (dlg)); + } + } + } +} + +static void +obj_removed_cb (CalClient *client, const char *uid, gpointer data) +{ + CompEditor *editor = COMP_EDITOR (data); + CompEditorPrivate *priv; + const char *edit_uid; + + priv = editor->priv; + + cal_component_get_uid (priv->comp, &edit_uid); + + if (!strcmp (uid, edit_uid) && !priv->updating) { + if (changed_component_dialog (priv->comp, TRUE, priv->changed)) + close_dialog (editor); + } +} + static gint delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data) { diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 8b1824866c..7f7874fa41 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -49,8 +49,6 @@ send_component_dialog (CalComponent *comp) CalComponentVType vtype; char *str; - str = _("The meeting status has changed. Send an updated version?"); - vtype = cal_component_get_vtype (comp); switch (vtype) { -- cgit v1.2.3