From 7dfee05355fb0086563434285ac1a524e78cd2bd Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 25 May 2004 20:41:32 +0000 Subject: Make calendar-errors.xml.h and install the xml file. 2004-05-25 Jeffrey Stedfast * Makefile.am: Make calendar-errors.xml.h and install the xml file. * calendar-errors.xml: New error definitions file. * gui/gnome-cal.c (backend_died_cb): Use e-error * gui/e-tasks.c (backend_died_cb): Use e-error * gui/dialogs/send-comp.c (send_component_dialog): Use e-error * gui/dialogs/save-comp.c (save_component_dialog): Use e-error * gui/dialogs/delete-comp.c (delete_component_dialog): Use e-error * gui/dialogs/cancel-comp.c (cancel_component_dialog): Use e-error svn path=/trunk/; revision=26084 --- calendar/gui/dialogs/cancel-comp.c | 40 +++++------------ calendar/gui/dialogs/delete-comp.c | 92 +++++++++++++++++--------------------- calendar/gui/dialogs/save-comp.c | 32 +------------ calendar/gui/dialogs/send-comp.c | 39 ++++------------ 4 files changed, 62 insertions(+), 141 deletions(-) (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index 3b72e5b31e..008f70e39e 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -27,6 +27,7 @@ #include #include #include +#include "widgets/misc/e-error.h" #include "cancel-comp.h" @@ -42,42 +43,34 @@ gboolean cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean deleting) { - GtkWidget *dialog; ECalComponentVType vtype; - char *str; - gint response; - + const char *id; + if (deleting && e_cal_get_save_schedules (client)) return TRUE; - + vtype = e_cal_component_get_vtype (comp); - + switch (vtype) { case E_CAL_COMPONENT_EVENT: if (deleting) - str = g_strdup_printf (_("The event being deleted is a meeting, " - "would you like to send a cancellation notice?")); + id = "calendar:prompt-delete-meeting"; else - str = g_strdup_printf (_("Are you sure you want to cancel " - "and delete this meeting?")); + id = "calendar:prompt-cancel-meeting"; break; case E_CAL_COMPONENT_TODO: if (deleting) - str = g_strdup_printf (_("The task being deleted is assigned, " - "would you like to send a cancellation notice?")); + id = "calendar:prompt-delete-task"; else - str = g_strdup_printf (_("Are you sure you want to cancel " - "and delete this task?")); + id = "calendar:prompt-cancel-task"; break; case E_CAL_COMPONENT_JOURNAL: if (deleting) - str = g_strdup_printf (_("The journal entry being deleted is published, " - "would you like to send a cancellation notice?")); + id = "calendar:prompt-delete-journal"; else - str = g_strdup_printf (_("Are you sure you want to cancel " - "and delete this journal entry?")); + id = "calendar:prompt-cancel-journal"; break; default: @@ -86,16 +79,7 @@ cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, g return FALSE; } - dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, str); - - gtk_window_set_icon (GTK_WINDOW (dialog), e_icon_factory_get_icon("stock_calendar", 32)); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - if (response == GTK_RESPONSE_YES) + if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES) return TRUE; else return FALSE; diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index 33e755193c..ed60def95e 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -27,6 +27,7 @@ #include #include #include +#include "widgets/misc/e-error.h" #include "../calendar-config.h" #include "delete-comp.h" @@ -60,11 +61,10 @@ delete_component_dialog (ECalComponent *comp, int n_comps, ECalComponentVType vtype, GtkWidget *widget) { - char *str; - GtkWidget *dialog; - const char *stock_icon; - int ret; - + const char *stock_icon, *id; + char *arg0 = NULL; + int response; + if (comp) { g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE); g_return_val_if_fail (n_comps == 1, FALSE); @@ -81,76 +81,66 @@ delete_component_dialog (ECalComponent *comp, if (comp) { ECalComponentText summary; - char *tmp; - + vtype = e_cal_component_get_vtype (comp); - + if (!consider_as_untitled) { e_cal_component_get_summary (comp, &summary); - tmp = g_strdup (summary.value); - } else - tmp = NULL; - + arg0 = g_strdup (summary.value); + } + switch (vtype) { case E_CAL_COMPONENT_EVENT: stock_icon = "stock_calendar"; - if (tmp) - str = g_strdup_printf (_("Are you sure you want to delete " - "the appointment `%s'?"), tmp); + if (arg0) + id = "calendar:prompt-delete-titled-appointment"; else - str = g_strdup (_("Are you sure you want to delete this " - "untitled appointment?")); + id = "calendar:prompt-delete-appointment"; break; case E_CAL_COMPONENT_TODO: stock_icon = "stock_todo"; - if (tmp) - str = g_strdup_printf (_("Are you sure you want to delete " - "the task `%s'?"), tmp); + if (arg0) + id = "calendar:prompt-delete-named-task"; else - str = g_strdup (_("Are you sure you want to delete this " - "untitled task?")); + id = "calendar:prompt-delete-task"; break; case E_CAL_COMPONENT_JOURNAL: stock_icon = "stock_calendar"; - if (tmp) - str = g_strdup_printf (_("Are you sure you want to delete " - "the journal entry `%s'?"), tmp); + if (arg0) + id = "calendar:prompt-delete-named-journal"; else - str = g_strdup (_("Are you sure want to delete this " - "untitled journal entry?")); + id = "calendar:prompt-delete-journal"; break; default: g_message ("delete_component_dialog(): Cannot handle object of type %d", vtype); - g_free (tmp); + g_free (arg0); return FALSE; } - - g_free (tmp); } else { switch (vtype) { case E_CAL_COMPONENT_EVENT: - str = g_strdup_printf (ngettext("Are you sure you want to delete " - "%d appointment?", - "Are you sure you want to delete " - "%d appointments?", n_comps), n_comps); + if (n_comps == 1) + id = "calendar:prompt-delete-appointment"; + else + id = "calendar:prompt-delete-appointments"; break; case E_CAL_COMPONENT_TODO: - str = g_strdup_printf (ngettext("Are you sure you want to delete " - "%d task?", - "Are you sure you want to delete " - "%d tasks?", n_comps), n_comps); + if (n_comps == 1) + id = "calendar:prompt-delete-task"; + else + id = "calendar:prompt-delete-tasks"; break; case E_CAL_COMPONENT_JOURNAL: - str = g_strdup_printf (ngettext("Are you sure you want to delete " - "%d journal entry?", - "Are you sure you want to delete " - "%d journal entries?", n_comps), n_comps); + if (n_comps == 1) + id = "calendar:prompt-delete-journal"; + else + id = "calendar:prompt-delete-journals"; break; default: @@ -158,15 +148,13 @@ delete_component_dialog (ECalComponent *comp, vtype); return FALSE; } + + if (n_comps > 1) + arg0 = g_strdup_printf ("%d", n_comps); } - - dialog = gtk_message_dialog_new ((GtkWindow *)gtk_widget_get_toplevel (widget), - 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", str); - gtk_dialog_add_buttons ((GtkDialog *) dialog, GTK_STOCK_NO, GTK_RESPONSE_CANCEL, GTK_STOCK_YES, GTK_RESPONSE_OK, NULL); - gtk_window_set_icon (GTK_WINDOW (dialog), e_icon_factory_get_icon (stock_icon, 32)); - g_free (str); - ret = gtk_dialog_run ((GtkDialog *) dialog) == GTK_RESPONSE_OK; - gtk_widget_destroy (dialog); - - return ret; + + response = e_error_run ((GtkWindow *) gtk_widget_get_toplevel (widget), id, arg0, NULL); + g_free (arg0); + + return response == GTK_RESPONSE_YES; } diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c index e0e8ebb0be..47a4b7221c 100644 --- a/calendar/gui/dialogs/save-comp.c +++ b/calendar/gui/dialogs/save-comp.c @@ -23,14 +23,9 @@ #include #endif -#include -#include -#include -#include -#include +#include "widgets/misc/e-error.h" #include "save-comp.h" - /** * save_component_dialog: @@ -45,28 +40,5 @@ GtkResponseType save_component_dialog (GtkWindow *parent) { - GtkWidget *dialog; - gint r; - - dialog = gtk_message_dialog_new (GTK_WINDOW (parent), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, - _("This event has been changed, but has not been saved.\n\n" - "Do you wish to save your changes?")); - - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - _("_Discard Changes"),GTK_RESPONSE_NO, - GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_YES, - NULL); - - gtk_window_set_icon (GTK_WINDOW (dialog), e_icon_factory_get_icon("stock_calendar", 32)); - gtk_window_set_title (GTK_WINDOW (dialog), _("Save Event")); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); - - r = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - return r; - + return e_error_run (parent, "calendar:prompt-save-appointment", NULL); } diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 64343f113e..882368a4d6 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -22,11 +22,8 @@ #include #endif -#include #include -#include -#include -#include +#include "widgets/misc/e-error.h" #include "send-comp.h" @@ -42,11 +39,9 @@ gboolean send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean new) { - GtkWidget *dialog; ECalComponentVType vtype; - char *str; - gint response; - + const char *id; + if (e_cal_get_save_schedules (client)) return FALSE; @@ -55,23 +50,16 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo switch (vtype) { case E_CAL_COMPONENT_EVENT: if (new) - str = g_strdup_printf (_("The meeting information has " - "been created. Send it?")); + id = "calendar:prompt-meeting-invite"; else - str = g_strdup_printf (_("The meeting information has " - "changed. Send an updated " - "version?")); + id = "calendar:prompt-send-updated-meeting-info"; break; case E_CAL_COMPONENT_TODO: if (new) - str = g_strdup_printf (_("The task assignment " - "information has been " - "created. Send it?")); + id = "calendar:prompt-send-task"; else - str = g_strdup_printf (_("The task information has " - "changed. Send an updated " - "version?")); + id = "calendar:prompt-send-updated-task-info"; break; default: @@ -80,18 +68,7 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo return FALSE; } - dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, str); - if (vtype == E_CAL_COMPONENT_EVENT) - gtk_window_set_icon (GTK_WINDOW (dialog), e_icon_factory_get_icon ("stock_calendar", 32)); - else if (vtype == E_CAL_COMPONENT_TODO) - gtk_window_set_icon (GTK_WINDOW (dialog), e_icon_factory_get_icon ("stock_todo", 32)); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - if (response == GTK_RESPONSE_YES) + if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES) return TRUE; else return FALSE; -- cgit v1.2.3