From bbda4d56c31cd0b21edd5c198ac6da6bea2988ad Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Tue, 23 Jan 2001 01:54:42 +0000 Subject: compile new stuff 2001-01-22 JP Rosevear * gui/dialogs/Makefile.am: compile new stuff * gui/dialogs/task-editor.c (prompt_to_save_changes): use new standard dialog * gui/event-editor.c (prompt_to_save_changes): ditto * gui/dialogs/save-comp.h: new header * gui/dialogs/save-comp.c (save_component_dialog): shows the save dialog svn path=/trunk/; revision=7733 --- calendar/ChangeLog | 14 ++++++++++ calendar/gui/dialogs/Makefile.am | 2 ++ calendar/gui/dialogs/save-comp.c | 57 ++++++++++++++++++++++++++++++++++++++ calendar/gui/dialogs/save-comp.h | 28 +++++++++++++++++++ calendar/gui/dialogs/task-editor.c | 13 ++------- calendar/gui/event-editor.c | 13 ++------- 6 files changed, 105 insertions(+), 22 deletions(-) create mode 100644 calendar/gui/dialogs/save-comp.c create mode 100644 calendar/gui/dialogs/save-comp.h (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 2aa9d54505..76f1f01b9c 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,17 @@ +2001-01-22 JP Rosevear + + * gui/dialogs/Makefile.am: compile new stuff + + * gui/dialogs/task-editor.c (prompt_to_save_changes): use new + standard dialog + + * gui/event-editor.c (prompt_to_save_changes): ditto + + * gui/dialogs/save-comp.h: new header + + * gui/dialogs/save-comp.c (save_component_dialog): shows the save + dialog + 2001-01-22 JP Rosevear * conduits/todo/todo-conduit.c (for_each_modified): remove duplicate diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 91720b596b..39ae32d758 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -21,6 +21,8 @@ libcal_dialogs_a_SOURCES = \ cal-prefs-dialog.h \ delete-comp.c \ delete-comp.h \ + save-comp.c \ + save-comp.h \ task-editor.c \ task-editor.h diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c new file mode 100644 index 0000000000..b904e13ccf --- /dev/null +++ b/calendar/gui/dialogs/save-comp.c @@ -0,0 +1,57 @@ +/* Evolution calendar - Delete calendar component dialog + * + * Copyright (C) 2000 Helix Code, Inc. + * Copyright (C) 2000 Ximian, Inc. + * + * Author: Federico Mena-Quintero + * + * 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 "save-comp.h" + + + +/** + * save_component_dialog: + * @widget: + * + * + * + * Return value: + **/ +gint +save_component_dialog (GtkWindow *parent) +{ + GtkWidget *dialog; + + dialog = gnome_message_box_new (_("Do you want to save changes?"), + GNOME_MESSAGE_BOX_QUESTION, + GNOME_STOCK_BUTTON_YES, + GNOME_STOCK_BUTTON_NO, + GNOME_STOCK_BUTTON_CANCEL, + NULL); + + gnome_dialog_set_default (GNOME_DIALOG (dialog), 0); + gnome_dialog_set_parent (GNOME_DIALOG (dialog), parent); + + return gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); +} diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h new file mode 100644 index 0000000000..2fb8e2c2a8 --- /dev/null +++ b/calendar/gui/dialogs/save-comp.h @@ -0,0 +1,28 @@ +/* Evolution calendar - Delete calendar component dialog + * + * Copyright (C) 2000 Helix Code, Inc. + * Copyright (C) 2000 Ximian, Inc. + * + * Author: Federico Mena-Quintero + * + * 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 SAVE_COMP_H +#define SAVE_COMP_H + +gint save_component_dialog (GtkWindow *parent); + +#endif diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 74849a66d4..f58a9fbdb6 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -38,6 +38,7 @@ #include #include #include "delete-comp.h" +#include "save-comp.h" #include "task-editor.h" #include "../calendar-config.h" #include "../widget-util.h" @@ -1294,17 +1295,7 @@ prompt_to_save_changes (TaskEditor *tedit) if (!priv->changed) return TRUE; - dialog = gnome_message_box_new (_("Do you want to save changes?"), - GNOME_MESSAGE_BOX_QUESTION, - GNOME_STOCK_BUTTON_YES, - GNOME_STOCK_BUTTON_NO, - GNOME_STOCK_BUTTON_CANCEL, - NULL); - - gnome_dialog_set_parent (GNOME_DIALOG (dialog), - GTK_WINDOW (priv->app)); - - switch (gnome_dialog_run_and_close (GNOME_DIALOG (dialog))) { + switch (save_component_dialog (GTK_WINDOW (priv->app))) { case 0: /* Save */ /* FIXME: If an error occurs here, we should popup a dialog and then return FALSE. */ diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c index 8b7e04c1c7..46ed3d0051 100644 --- a/calendar/gui/event-editor.c +++ b/calendar/gui/event-editor.c @@ -33,6 +33,7 @@ #include #include #include "dialogs/delete-comp.h" +#include "dialogs/save-comp.h" #include "calendar-config.h" #include "event-editor.h" #include "e-meeting-edit.h" @@ -3265,17 +3266,7 @@ prompt_to_save_changes (EventEditor *ee) if (!priv->changed) return TRUE; - dialog = gnome_message_box_new (_("Do you want to save changes?"), - GNOME_MESSAGE_BOX_QUESTION, - GNOME_STOCK_BUTTON_YES, - GNOME_STOCK_BUTTON_NO, - GNOME_STOCK_BUTTON_CANCEL, - NULL); - - gnome_dialog_set_parent (GNOME_DIALOG (dialog), - GTK_WINDOW (priv->app)); - - switch (gnome_dialog_run_and_close (GNOME_DIALOG (dialog))) { + switch (save_component_dialog (GTK_WINDOW (priv->app))) { case 0: /* Save */ /* FIXME: If an error occurs here, we should popup a dialog and then return FALSE. */ -- cgit v1.2.3