diff options
Diffstat (limited to 'calendar/gui/dialogs')
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.c | 21 | ||||
| -rw-r--r-- | calendar/gui/dialogs/delete-comp.c | 14 |
2 files changed, 30 insertions, 5 deletions
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 9372236d56..fc8d7b0c91 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -83,10 +83,15 @@ static const int time_division_map[] = { 60, 30, 15, 10, 5, -1 }; +/* The following two are kept separate in case we need to re-order each menu individually */ static const int hide_completed_units_map[] = { CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1 }; +static const int default_reminder_units_map[] = { + CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1 +}; + static void cal_prefs_dialog_class_init (CalPrefsDialogClass *class); static void cal_prefs_dialog_init (CalPrefsDialog *prefs); @@ -562,6 +567,14 @@ cal_prefs_dialog_show_config (CalPrefsDialog *prefs) /* Other page */ e_dialog_toggle_set (priv->confirm_delete, calendar_config_get_confirm_delete ()); + + e_dialog_toggle_set (priv->default_reminder, + calendar_config_get_use_default_reminder ()); + e_dialog_spin_set (priv->default_reminder_interval, + calendar_config_get_default_reminder_interval ()); + e_dialog_option_menu_set (priv->default_reminder_units, + calendar_config_get_default_reminder_units (), + default_reminder_units_map); } /* Returns a pointer to a static string with an X color spec for the current @@ -657,6 +670,14 @@ cal_prefs_dialog_update_config (CalPrefsDialog *prefs) calendar_config_set_confirm_delete (e_dialog_toggle_get (priv->confirm_delete)); + calendar_config_set_use_default_reminder (e_dialog_toggle_get (priv->default_reminder)); + + calendar_config_set_default_reminder_interval ( + e_dialog_spin_get_int (priv->default_reminder_interval)); + + calendar_config_set_default_reminder_units ( + e_dialog_option_menu_get (priv->default_reminder_units, default_reminder_units_map)); + /* Done */ calendar_config_write (); diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index 1fc757c38c..405a9445b4 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -25,10 +25,9 @@ #include <glib.h> #include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> -#include <libgnomeui/gnome-dialog.h> -#include <libgnomeui/gnome-dialog-util.h> -#include <libgnomeui/gnome-uidefs.h> +#include <libgnomeui/gnome-stock.h> #include <gal/widgets/e-unicode.h> +#include "widgets/misc/e-messagebox.h" #include "../calendar-config.h" #include "delete-comp.h" @@ -151,10 +150,15 @@ delete_component_dialog (CalComponent *comp, } } - dialog = gnome_question_dialog_modal (str, NULL, NULL); + dialog = e_message_box_new (str, E_MESSAGE_BOX_QUESTION, + GNOME_STOCK_BUTTON_YES, + GNOME_STOCK_BUTTON_NO, + NULL); g_free (str); - if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES) + gtk_widget_hide (e_message_box_get_checkbox (E_MESSAGE_BOX (dialog))); + + if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == 0) return TRUE; else return FALSE; |