From fb0dddb43d9b8a502c6c32dc10e6e485f35bec74 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Mon, 12 Jan 2004 21:19:09 +0000 Subject: Revert William McCann's patch of 2003-12-19 until we can get consistent 2004-01-12 JP Rosevear * Revert William McCann's patch of 2003-12-19 until we can get consistent across all of evolution svn path=/trunk/; revision=24177 --- calendar/ChangeLog | 5 + calendar/gui/calendar-commands.c | 1 - calendar/gui/calendar-component.c | 3 - calendar/gui/comp-editor-factory.c | 1 - calendar/gui/dialogs/alarm-options.glade | 795 +++++-------- calendar/gui/dialogs/alarm-page.glade | 726 ++++++------ calendar/gui/dialogs/cal-prefs-dialog.glade | 1563 ++++++++++++-------------- calendar/gui/dialogs/cancel-comp.c | 1 - calendar/gui/dialogs/changed-comp.c | 1 - calendar/gui/dialogs/delete-comp.c | 1 - calendar/gui/dialogs/delete-error.c | 1 - calendar/gui/dialogs/e-delegate-dialog.glade | 3 +- calendar/gui/dialogs/event-page.c | 1 - calendar/gui/dialogs/event-page.glade | 819 +++++--------- calendar/gui/dialogs/new-calendar.glade | 2 +- calendar/gui/dialogs/new-task-list.glade | 3 +- calendar/gui/dialogs/recur-comp.c | 1 - calendar/gui/dialogs/recurrence-page.glade | 909 +++++++-------- calendar/gui/dialogs/save-comp.c | 1 - calendar/gui/dialogs/send-comp.c | 1 - calendar/gui/dialogs/task-details-page.glade | 576 +++++----- calendar/gui/dialogs/task-page.c | 1 - calendar/gui/dialogs/task-page.glade | 654 +++++------ calendar/gui/e-cal-model-tasks.c | 1 - calendar/gui/goto-dialog.glade | 2 +- calendar/gui/tasks-component.c | 3 - calendar/gui/tasks-control.c | 1 - 27 files changed, 2494 insertions(+), 3582 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d5a1b61eb3..60d689693e 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2004-01-12 JP Rosevear + + * Revert William McCann's patch of 2003-12-19 until we can get + consistent across all of evolution + 2004-01-12 Hans Petter Jansson * gui/dialogs/calendar-setup.c (source_to_dialog): Only update dialog diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 4039e7ec81..6defec9819 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -368,7 +368,6 @@ purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path) GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, _("This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events.")); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); box = gtk_hbox_new (FALSE, 6); diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 611ddce664..bca72bea9c 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -357,7 +357,6 @@ delete_calendar_cb (GtkWidget *widget, CalendarComponent *comp) GTK_BUTTONS_YES_NO, _("Calendar '%s' will be removed. Are you sure you want to continue?"), e_source_peek_name (selected_source)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES) { if (e_source_selector_source_is_selected (E_SOURCE_SELECTOR (priv->source_selector), selected_source)) @@ -766,7 +765,6 @@ setup_create_ecal (CalendarComponent *calendar_component) GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("Unable to open the calendar '%s' for creating events and meetings"), e_source_peek_name (source)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -778,7 +776,6 @@ setup_create_ecal (CalendarComponent *calendar_component) dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("There is no calendar available for creating events and meetings")); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c index 05a36f62f8..04a53b30b3 100644 --- a/calendar/gui/comp-editor-factory.c +++ b/calendar/gui/comp-editor-factory.c @@ -473,7 +473,6 @@ cal_opened_cb (ECal *client, ECalendarStatus status, gpointer data) g_assert_not_reached (); return; } - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/calendar/gui/dialogs/alarm-options.glade b/calendar/gui/dialogs/alarm-options.glade index d5f82c450e..d58e817ba3 100644 --- a/calendar/gui/dialogs/alarm-options.glade +++ b/calendar/gui/dialogs/alarm-options.glade @@ -13,7 +13,7 @@ True True True - False + True @@ -66,51 +66,30 @@ 6 - + True - False - 0 - - - - True - <b>Alarm Repeat</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + 6 True False - 0 + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + True + True + Repeat the alarm + True + GTK_RELIEF_NORMAL + False + False + True 0 @@ -120,23 +99,43 @@ - - 6 + True False - 6 + 4 - + True True - True - Repeat the alarm - True - GTK_RELIEF_NORMAL - False - False - True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 1 999 1 10 10 + + + 0 + True + True + + + + + + True + extra times every + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -146,111 +145,58 @@ - + True - False - 4 - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 999 1 10 10 - - - 0 - True - True - - + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 0 999 1 10 10 + + + 0 + True + True + + - - - True - extra times every - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + + + True + True + 0 - - + + True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 0 999 1 10 10 - - - 0 - True - True - - - - - True - True - 0 + + + True + minutes + True + + - - + + True + hours + True + + - - - True - minutes - True - - - - - - True - hours - True - - - - - - True - days - True - - + + + True + days + True - - 0 - False - False - @@ -262,15 +208,29 @@ 0 - True - True + False + False + + + + + True + Alarm Repeat + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + - 0 - True - True + label_item @@ -289,9 +249,9 @@ True - <b>Message to Display</b> + Message to Display: False - True + False GTK_JUSTIFY_CENTER False False @@ -308,63 +268,29 @@ - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - + True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - + True + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + - - 0 - True - True - @@ -382,20 +308,20 @@ - + False 6 - + True - <b>Alarm Sound</b> + Play sound: False - True - GTK_JUSTIFY_LEFT + False + GTK_JUSTIFY_CENTER False False - 0 + 0.5 0.5 0 0 @@ -408,92 +334,24 @@ - + True - False - 0 + 10 + False + True - - + + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + True + True + True + 0 + + True + * + False - - 0 - False - False - - - - - - True - False - 6 - - - - True - Play sound: - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - 10 - False - True - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - True - True - - - - - 0 - True - True - @@ -504,7 +362,7 @@ - 3 + 0 False False @@ -512,16 +370,49 @@ + True False 6 - + + True + False + 6 + + + + True + True + Send To: + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + + + + + 0 + True + True + + + + + True - <b>Alarm Email</b> + Message to Send False - True - GTK_JUSTIFY_LEFT + False + GTK_JUSTIFY_CENTER False False 0 @@ -537,130 +428,30 @@ - + True - False - 0 + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + True + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - 6 - - - - True - True - Send To: - True - GTK_RELIEF_NORMAL - - - 0 - False - False - - - - - - - - - 0 - True - True - - - - - - True - Message to Send - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - 0 - True - True - @@ -671,27 +462,27 @@ - 3 + 0 False False - + False 6 - + True - <b>Alarm Action</b> + Run program: False - True - GTK_JUSTIFY_LEFT + False + GTK_JUSTIFY_CENTER False False - 0 + 0.5 0.5 0 0 @@ -704,124 +495,56 @@ - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - Run program: - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - + True + True + True + 0 + + True + * + False + + + 0 + True + True + + - - - True - With these arguments: - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + + + True + With these arguments: + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - True - True - - + + + True + True + True + True + 0 + + True + * + False 0 @@ -831,7 +554,7 @@ - 3 + 0 False False diff --git a/calendar/gui/dialogs/alarm-page.glade b/calendar/gui/dialogs/alarm-page.glade index 6de3afb8da..7c2f06bae3 100644 --- a/calendar/gui/dialogs/alarm-page.glade +++ b/calendar/gui/dialogs/alarm-page.glade @@ -19,525 +19,433 @@ 6 - + True - False - 6 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - - True - <b>Basics</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - + + 6 True + 2 + 2 False - 0 + 6 + 6 - + True - + Summary: False False - GTK_JUSTIFY_LEFT + GTK_JUSTIFY_CENTER False False - 0.5 + 0 0.5 0 0 - 0 - False - False + 0 + 1 + 0 + 1 + fill + - + True - 2 - 2 - False - 6 - 6 - - - - True - Summary: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Date/Time: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - fill - - + Date/Time: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + fill + + - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - - - 1 - 2 - 0 - 1 - - - + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + + + 1 + 2 + 0 + 1 + + + - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 7.45058e-09 - 0.5 - 4 - 0 - - - 1 - 2 - 1 - 2 - fill - - + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 7.45058e-09 + 0.5 + 4 + 0 - 0 - True - True + 1 + 2 + 1 + 2 + fill - - 0 - True - True - - - - 3 - False - True - - - - - - True - False - 6 - + True - <b>Reminders</b> + Basics False - True + False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - 0 - False - False + label_item + + + 0 + False + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + + 6 True False - 0 + 6 - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - + True False 6 - + True - False - 6 + True + 0 - - + + True - True - 0 - - + + True + Display a message + True + + - - - True - Display a message - True - - - - - - True - Play a sound - True - - - - - - True - Run a program - True - - - - - - True - Send an Email - True - - + + + True + Play a sound + True - - - 0 - False - False - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 0 999 1 10 10 + + + True + Run a program + True + + + + + + True + Send an Email + True + + - - 0 - False - True - + + + 0 + False + False + + - - + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 0 999 1 10 10 + + + 0 + False + True + + + + + + True + True + 0 + + + True - True - 0 - - + + True + minute(s) + True + + - - - True - minute(s) - True - - - - - - True - hour(s) - True - - - - - - True - day(s) - True - - + + + True + hour(s) + True + + + + + + True + day(s) + True - - 0 - False - False - + + + 0 + False + False + + - - + + + True + True + 0 + + + True - True - 0 - - + + True + before + True + + - - - True - before - True - - - - - - True - after - True - - + + + True + after + True - - 0 - False - False - + + + 0 + False + False + + - - + + + True + True + 0 + + + True - True - 0 - - + + True + start of appointment + True + + - - - True - start of appointment - True - - - - - - True - end of appointment - True - - + + + True + end of appointment + True - - 0 - False - False - + + + 0 + False + False + + + + + + True + True + _Options... + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + 0 + False + True + + + + + + True + False + 6 + + + + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - + True True - _Options... - True - GTK_RELIEF_NORMAL + True + False + False + True - - 0 - False - False - 0 - False + True True - + True - False - 8 + GTK_BUTTONBOX_START + 6 - + True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - - + True + True + gtk-add + True + GTK_RELIEF_NORMAL - - 0 - True - True - - + True - GTK_BUTTONBOX_START - 6 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - - - - - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - - + True + True + gtk-remove + True + GTK_RELIEF_NORMAL - - 0 - False - False - 0 - True - True + False + False @@ -548,15 +456,29 @@ + + + + + True + Reminders + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + - 0 - True - True + label_item - 3 + 0 True True diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade index 194d198e27..d566368611 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.glade +++ b/calendar/gui/dialogs/cal-prefs-dialog.glade @@ -11,7 +11,7 @@ False True False - False + True @@ -86,719 +86,623 @@ 6 - + + 3 True - False - 6 - - - - True - <b>Time</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + + 6 True + 2 + 3 False - 0 + 6 + 6 - + True - - False + Time _zone: + True False - GTK_JUSTIFY_LEFT + GTK_JUSTIFY_CENTER False False - 0.5 + 0 0.5 0 0 + timezone - 0 - False - False + 0 + 1 + 0 + 1 + fill + - + True - 2 - 3 - False - 6 - 6 + Time format: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + - - - True - Time _zone: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - timezone - - - 0 - 1 - 0 - 1 - fill - - - + + + True + True + 4 - + True - Time format: - False - False - GTK_JUSTIFY_CENTER - False - False 0 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - 4 - - - - True - 0 - 0.5 - 3.35276e-08 - 1 - - - - True - True - _12 hour (AM/PM) - True - GTK_RELIEF_NORMAL - False - False - True - - - - - 0 - True - True - - + 3.35276e-08 + 1 - + True True - _24 hour + _12 hour (AM/PM) True GTK_RELIEF_NORMAL False False True - use_12_hour - - 0 - True - True - - 1 - 2 - 1 - 2 - fill - fill + 0 + True + True - + True True - make_timezone_entry - 0 - 0 - Wed, 20 Jun 2001 02:22:46 GMT + _24 hour + True + GTK_RELIEF_NORMAL + False + False + True + use_12_hour - 1 - 3 - 0 - 1 - fill - fill + 0 + True + True - 0 - True - True + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + True + make_timezone_entry + 0 + 0 + Wed, 20 Jun 2001 02:22:46 GMT + + + 1 + 3 + 0 + 1 + fill + fill - - 0 - True - True - - - - 3 - False - True - - - - - - True - False - 6 - + True - <b>Work Week</b> + Time False - True + False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - 0 - False - False + label_item + + + 0 + False + True + + + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + + 6 True + 3 + 4 False - 0 + 6 + 6 - + True - - False + _Day begins: + True False - GTK_JUSTIFY_LEFT + GTK_JUSTIFY_CENTER False False - 0.5 + 0 0.5 0 0 - 0 - False - False + 0 + 1 + 2 + 3 + fill + - + True - 3 - 4 False - 6 - 6 + 3 + + + + True + cal_prefs_dialog_create_time_edit + 0 + 0 + Thu, 30 May 2002 19:26:53 GMT + + + 0 + False + False + + - + True - _Day begins: + Day _ends: True False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_RIGHT False False - 0 + 1 0.5 0 0 - 0 - 1 - 2 - 3 - fill - + 0 + False + True - + True - False - 3 - - - - True - cal_prefs_dialog_create_time_edit - 0 - 0 - Thu, 30 May 2002 19:26:53 GMT - - - 0 - False - False - - + cal_prefs_dialog_create_time_edit + 0 + 0 + Thu, 30 May 2002 19:27:35 GMT + + + 0 + False + False + + + + + 1 + 4 + 2 + 3 + fill + fill + + - - - True - Day _ends: - True - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - False - True - - + + + True + False + 6 - - - True - cal_prefs_dialog_create_time_edit - 0 - 0 - Thu, 30 May 2002 19:27:35 GMT - - - 0 - False - False - - + + + True + True + _Mon + True + GTK_RELIEF_NORMAL + False + False + True - 1 - 4 - 2 - 3 - fill - fill + 0 + False + False - + True - False - 6 + True + _Tue + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + - - - True - True - _Mon - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + + + True + True + _Wed + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + - - - True - True - _Tue - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - - True - True - _Wed - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - - True - True - T_hu - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + + + True + True + T_hu + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + - - - True - True - _Fri - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + + + True + True + _Fri + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + - - - True - True - _Sat - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - True - - + + + True + True + _Sat + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + True + + - - - True - True - S_un - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + + + True + True + S_un + True + GTK_RELIEF_NORMAL + False + False + True - 1 - 4 - 1 - 2 - fill + 0 + False + False + + + 1 + 4 + 1 + 2 + fill + + + + + + True + 7.45058e-09 + 0.5 + 0 + 1 - + True - 7.45058e-09 - 0.5 - 0 - 1 + True + 0 - - + + True - True - 0 - - + + True + Monday + True + + - - - True - Monday - True - - - - - - True - Tuesday - True - - + + + True + Tuesday + True + + - - - True - Wednesday - True - - + + + True + Wednesday + True + + - - - True - Thursday - True - - + + + True + Thursday + True + + - - - True - Friday - True - - + + + True + Friday + True + + - - - True - Saturday - True - - + + + True + Saturday + True + + - - - True - Sunday - True - - + + + True + Sunday + True - - 1 - 2 - 0 - 1 - fill - - + + + 1 + 2 + 0 + 1 + fill + + + - - - True - W_eek starts: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - first_day_of_week - - - 0 - 1 - 0 - 1 - fill - - - + + + True + W_eek starts: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + first_day_of_week + + + 0 + 1 + 0 + 1 + fill + + + - - - True - Work days: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - + + + True + Work days: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 - 0 - True - True + 0 + 1 + 1 + 2 + fill + - - 0 - True - True - - - - 3 - False - True - - - - - - True - False - 6 - + True - <b>Alerts</b> + Work Week False - True + False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - 0 - False - False + label_item + + + 0 + False + True + + + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + + 6 True False - 0 + 6 - + + 3 True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + True + _Ask for confirmation when deleting items + True + GTK_RELIEF_NORMAL + False + False + True 0 @@ -808,17 +712,17 @@ - + + 3 True False - 6 + 3 - - 3 + True True - _Ask for confirmation when deleting items + Sh_ow a reminder True GTK_RELIEF_NORMAL False @@ -833,122 +737,90 @@ - - 3 + True - False - 3 + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 9999 1 10 10 + + + 0 + False + False + + - - - True - True - Sh_ow a reminder - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + + + True + 7.45058e-09 + 0.5 + 0 + 0 - + True True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 9999 1 10 10 - - - 0 - False - False - - - - - - True - 7.45058e-09 - 0.5 - 0 - 0 + 0 - - + + True - True - 0 - - + + + True + Minutes + True + + + + + + True + Hours + True + + + + + True - - - - True - Minutes - True - - - - - - True - Hours - True - - - - - - True - Days - True - - + Days + True - - 0 - False - True - + + + 0 + False + True + + - - - True - before every appointment - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + + + True + before every appointment + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -959,20 +831,34 @@ 0 - True - True + False + False + + + + + True + Alerts + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + - 0 - True - True + label_item - 3 + 0 False False @@ -1159,51 +1045,113 @@ - + True - False - 6 - - - - True - <b>Task List</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + + 6 True False - 0 + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + 2 + 2 + False + 6 + 6 + + + + True + T_asks due today: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + tasks_due_today_color + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + _Overdue tasks: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + tasks_overdue_color + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + True + False + Color for overdue tasks + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + True + True + False + Color for tasks due today + + + 1 + 2 + 0 + 1 + fill + + + 0 @@ -1213,105 +1161,21 @@ - + True False 6 - + True - 2 - 2 - False - 6 - 6 - - - - True - T_asks due today: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - tasks_due_today_color - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - _Overdue tasks: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - tasks_overdue_color - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - False - Color for overdue tasks - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - True - True - False - Color for tasks due today - - - 1 - 2 - 0 - 1 - fill - - - + True + _Hide completed tasks after + True + GTK_RELIEF_NORMAL + False + False + True 0 @@ -1321,89 +1185,58 @@ - + True - False - 6 - - - - True - True - _Hide completed tasks after - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 9999 1 10 10 + + + 0 + False + True + + - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 9999 1 10 10 - - - 0 - False - True - - + + + True + True + 0 - - + + True - True - 0 - - + + True + Minutes + True + + - - - True - Minutes - True - - - - - - True - Hours - True - - + + + True + Hours + True + + - - - True - Days - True - - + + + True + Days + True - - 0 - False - False - @@ -1415,20 +1248,34 @@ 0 - True - True + False + False + + + + + True + Task List + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + - 0 - True - True + label_item - 3 + 0 False False diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index a19f4f526d..27f9b9b91e 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -88,7 +88,6 @@ cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, g dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, str); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c index 6ca498f721..af595fe1df 100644 --- a/calendar/gui/dialogs/changed-comp.c +++ b/calendar/gui/dialogs/changed-comp.c @@ -104,7 +104,6 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, str); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index 4cfd5d09e6..c4f9e5dc3d 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -152,7 +152,6 @@ delete_component_dialog (ECalComponent *comp, dialog = gtk_message_dialog_new ((GtkWindow *)gtk_widget_get_toplevel (widget), 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", str); g_free (str); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); ret = gtk_dialog_run ((GtkDialog *)dialog) == GTK_RESPONSE_YES; gtk_widget_destroy (dialog); diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c index d99a9482f5..cb076885c1 100644 --- a/calendar/gui/dialogs/delete-error.c +++ b/calendar/gui/dialogs/delete-error.c @@ -104,7 +104,6 @@ delete_error_dialog (GError *error, ECalComponentVType vtype) dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, str); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } diff --git a/calendar/gui/dialogs/e-delegate-dialog.glade b/calendar/gui/dialogs/e-delegate-dialog.glade index 65491e5918..f08c03ad1d 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.glade +++ b/calendar/gui/dialogs/e-delegate-dialog.glade @@ -2,6 +2,7 @@ + Enter Delegate @@ -10,7 +11,7 @@ False True False - False + True diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index c4adf1e7fe..5b04b9694a 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -1227,7 +1227,6 @@ source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("Unable to open the calendar '%s'."), e_source_peek_name (source)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } else { diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade index 40161a8f9a..46e1cc0bb0 100644 --- a/calendar/gui/dialogs/event-page.glade +++ b/calendar/gui/dialogs/event-page.glade @@ -19,17 +19,20 @@ 6 - + True + 2 + 2 False - 6 + 6 + 6 True - <b>Su_mmary</b> + Su_mmary: True - True + False GTK_JUSTIFY_CENTER False False @@ -40,84 +43,42 @@ general-summary - 0 - False - False + 0 + 1 + 0 + 1 + fill + - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - + True + True + True + 0 + + True + * + False - 0 - True - True + 1 + 2 + 0 + 1 + - - - 3 - True - True - - - - - - True - False - 6 True - <b>L_ocation</b> + L_ocation: True - True + False GTK_JUSTIFY_CENTER False False @@ -128,406 +89,270 @@ location - 0 - False - False + 0 + 1 + 1 + 2 + fill + - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - + True + True + True + 0 + + True + * + False - 0 - True - True + 1 + 2 + 1 + 2 + - 3 - True + 0 + False True - + True - False - 6 - - - - True - <b>Date &amp; Time</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + + 6 True + 2 + 4 False - 0 + 6 + 6 - + True - - False + _Start time: + True False - GTK_JUSTIFY_LEFT + GTK_JUSTIFY_CENTER False False - 0.5 + 0 0.5 0 0 + start-time - 0 - False - False + 0 + 1 + 0 + 1 + fill + - + True - 2 - 4 - False - 6 - 6 - - - - True - _Start time: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - start-time - - - 0 - 1 - 0 - 1 - fill - - - + _End time: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + end-time + + + 0 + 1 + 1 + 2 + fill + + + - - - True - _End time: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - end-time - - - 0 - 1 - 1 - 2 - fill - - - + + + True + True + make_date_edit + + + 0 + 0 + Tue, 16 May 2000 19:11:05 GMT + + + 1 + 2 + 0 + 1 + + + - - - True - True - make_date_edit - - - 0 - 0 - Tue, 16 May 2000 19:11:05 GMT - - - 1 - 2 - 0 - 1 - - - + + + True + True + make_date_edit + 0 + 0 + Tue, 16 May 2000 19:11:10 GMT + + + 1 + 2 + 1 + 2 + + + - - - True - True - make_date_edit - 0 - 0 - Tue, 16 May 2000 19:11:10 GMT - - - 1 - 2 - 1 - 2 - - - + + + True + make_timezone_entry + 0 + 0 + Mon, 18 Jun 2001 23:51:40 GMT + + + 2 + 3 + 1 + 2 + + fill + + - - - True - make_timezone_entry - 0 - 0 - Mon, 18 Jun 2001 23:51:40 GMT - - - 2 - 3 - 1 - 2 - - fill - - + + + True + make_timezone_entry + 0 + 0 + Mon, 18 Jun 2001 23:51:34 GMT + + + 2 + 3 + 0 + 1 + fill + fill + + - - - True - make_timezone_entry - 0 - 0 - Mon, 18 Jun 2001 23:51:34 GMT - - - 2 - 3 - 0 - 1 - fill - fill - - + + + True + 1 + 7.45058e-09 + 0 + 0 - + True - 1 - 7.45058e-09 - 0 - 0 - - - - True - True - A_ll day event - True - GTK_RELIEF_NORMAL - False - False - True - - + True + A_ll day event + True + GTK_RELIEF_NORMAL + False + False + True - - 3 - 4 - 0 - 2 - fill - - 0 - True - True + 3 + 4 + 0 + 2 + fill - - 0 - True - True - - - - 3 - False - False - - - - - - True - False - 6 - + True - <b>Description</b> + Date & Time False - True + False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - 0 - False - False + label_item + + + 0 + False + False + + + + + + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - + True + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + - - 0 - True - True - - 3 + 0 True True @@ -544,97 +369,63 @@ True 0 0.5 - GTK_SHADOW_NONE + GTK_SHADOW_ETCHED_IN - + + 6 True False - 0 + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + True + Pu_blic + True + GTK_RELIEF_NORMAL + True + False + True 0 - False - False + True + True - - 6 + True - False - 6 - - - - True - True - Pu_blic - True - GTK_RELIEF_NORMAL - True - False - True - - - 0 - True - True - - - - - - True - True - Pri_vate - True - GTK_RELIEF_NORMAL - False - False - True - classification-public - - - 0 - True - True - - - - - - True - True - Co_nfidential - True - GTK_RELIEF_NORMAL - False - False - True - classification-public - - - 0 - True - True - - + True + Pri_vate + True + GTK_RELIEF_NORMAL + False + False + True + classification-public + + + 0 + True + True + + + + + + True + True + Co_nfidential + True + GTK_RELIEF_NORMAL + False + False + True + classification-public 0 @@ -648,9 +439,9 @@ True - <b>Classification</b> + Classification False - True + False GTK_JUSTIFY_LEFT False False @@ -676,78 +467,44 @@ True 0 0.5 - GTK_SHADOW_NONE + GTK_SHADOW_ETCHED_IN - + + 6 True False - 0 + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + True + F_ree + True + GTK_RELIEF_NORMAL + False + False + True 0 - False - False + True + True - - 6 + True - False - 6 - - - - True - True - F_ree - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - True - True - - - - - - True - True - B_usy - True - GTK_RELIEF_NORMAL - False - False - True - show-time-as-free - - - 0 - True - True - - + True + B_usy + True + GTK_RELIEF_NORMAL + False + False + True + show-time-as-free 0 @@ -761,9 +518,9 @@ True - <b>Show Time As</b> + Show Time As False - True + False GTK_JUSTIFY_LEFT False False diff --git a/calendar/gui/dialogs/new-calendar.glade b/calendar/gui/dialogs/new-calendar.glade index 391215134c..0a136ed7c8 100644 --- a/calendar/gui/dialogs/new-calendar.glade +++ b/calendar/gui/dialogs/new-calendar.glade @@ -12,7 +12,7 @@ False False False - False + True diff --git a/calendar/gui/dialogs/new-task-list.glade b/calendar/gui/dialogs/new-task-list.glade index 0c27e735e1..ffc38582c8 100644 --- a/calendar/gui/dialogs/new-task-list.glade +++ b/calendar/gui/dialogs/new-task-list.glade @@ -2,6 +2,7 @@ + 12 @@ -12,7 +13,7 @@ False False False - False + True diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c index 682ac43a1a..f097d542f7 100644 --- a/calendar/gui/dialogs/recur-comp.c +++ b/calendar/gui/dialogs/recur-comp.c @@ -66,7 +66,6 @@ recur_component_dialog (ECal *client, dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, "%s", str); g_free (str); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); hbox = gtk_hbox_new (FALSE, 2); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); diff --git a/calendar/gui/dialogs/recurrence-page.glade b/calendar/gui/dialogs/recurrence-page.glade index bbe3d488ba..c5c2158979 100644 --- a/calendar/gui/dialogs/recurrence-page.glade +++ b/calendar/gui/dialogs/recurrence-page.glade @@ -19,178 +19,139 @@ 6 - + True - False - 6 - - - - True - <b>Basics</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + + 6 True + 2 + 2 False - 0 + 6 + 6 - + True - + Summary: False False - GTK_JUSTIFY_LEFT + GTK_JUSTIFY_CENTER False False - 0.5 + 0 0.5 0 0 - 0 - False - False + 0 + 1 + 0 + 1 + fill + - + True - 2 - 2 - False - 6 - 6 - - - - True - Summary: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Date/Time: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - + Date/Time: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 4 - 0 - - - 1 - 2 - 0 - 1 - - - + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 4 + 0 + + + 1 + 2 + 0 + 1 + + + - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 4 - 0 - - - 1 - 2 - 1 - 2 - - - + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 4 + 0 - 0 - True - True + 1 + 2 + 1 + 2 + + + + + + True + Basics + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + - 0 - True - True + label_item - 3 + 0 False False @@ -200,54 +161,83 @@ True False - 6 + 0 - + True - False - 6 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - - True - <b>Recurrence Rule</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - + + 6 True False - 0 + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + False + 6 + + + + True + True + _No recurrence + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + _Simple recurrence + True + GTK_RELIEF_NORMAL + False + False + True + none + + + 0 + False + False + + + + + + True + True + _Custom recurrence + True + GTK_RELIEF_NORMAL + False + False + True + none + + + 0 + False + False + + 0 @@ -257,27 +247,30 @@ - + True False 6 - + True False - 6 + 2 - + True - True - _No recurrence - True - GTK_RELIEF_NORMAL - False - False - True + Every + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 0 @@ -287,16 +280,16 @@ - + True True - _Simple recurrence - True - GTK_RELIEF_NORMAL - False - False - True - none + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 1 10000 1 10 10 0 @@ -306,16 +299,48 @@ - + True True - _Custom recurrence - True - GTK_RELIEF_NORMAL - False - False - True - none + 0 + + + + True + + + + True + day(s) + True + + + + + + True + week(s) + True + + + + + + True + month(s) + True + + + + + + True + year(s) + True + + + + 0 @@ -323,196 +348,60 @@ False - - - 0 - False - False - - - - - - True - False - 6 - + True - False - 2 + 0.5 + 0.5 + 0 + 0 - - True - Every - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - + + + + 0 + False + False + + - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 10000 1 10 10 - - - 0 - False - False - - + + + True + True + 0 - - + + True - True - 0 - - + + True - - - - True - day(s) - True - - - - - - True - week(s) - True - - - - - - True - month(s) - True - - - - - - True - year(s) - True - - + for + True - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - 0 - - - + True - - - - True - for - True - - - - - - True - until - True - - - - - - True - forever - True - - + until + True - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 0 - 0 - + + True + forever + True + - - 0 - False - False - @@ -523,12 +412,12 @@ - + True - 0 + 0.5 0.5 - 1 - 1 + 0 + 0 @@ -536,8 +425,8 @@ 0 - True - True + False + False @@ -547,23 +436,56 @@ False + + + + True + 0 + 0.5 + 1 + 1 + + + + + + + 0 + True + True + + 0 - True - True + False + False + + + + + True + Recurrence Rule + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + - 0 - True - True + label_item - 3 + 0 False False @@ -576,51 +498,69 @@ 6 - + True - False - 6 - - - - True - <b>Exceptions</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + + 6 True False - 0 + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + False + 4 + + + + True + True + A_dd + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + + True + True + _Modify + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + + True + True + _Remove + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + 0 @@ -630,61 +570,18 @@ - + True False 6 - + True - False - 4 - - - - True - True - A_dd - True - GTK_RELIEF_NORMAL - - - 0 - False - False - - - - - - True - True - _Modify - True - GTK_RELIEF_NORMAL - - - 0 - False - False - - - - - - True - True - _Remove - True - GTK_RELIEF_NORMAL - - - 0 - False - False - - + make_exdate_date_edit + 0 + 0 + Tue, 16 May 2000 01:42:29 GMT 0 @@ -694,50 +591,22 @@ - + True - False - 6 + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - + True - make_exdate_date_edit - 0 - 0 - Tue, 16 May 2000 01:42:29 GMT - - - 0 - False - False - - - - - - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - - + True + True + False + False + True - - 0 - True - True - @@ -754,10 +623,24 @@ + + + + + True + Exceptions + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + - 0 - True - True + label_item @@ -777,9 +660,9 @@ True - <b>Preview</b> + Preview False - True + False GTK_JUSTIFY_CENTER False False diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c index 3f447c8222..8041395fb1 100644 --- a/calendar/gui/dialogs/save-comp.c +++ b/calendar/gui/dialogs/save-comp.c @@ -52,7 +52,6 @@ save_component_dialog (GtkWindow *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_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("_Discard Changes"),GTK_RESPONSE_NO, diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 2c5a1f7b37..65e4743c04 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -82,7 +82,6 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, str); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/calendar/gui/dialogs/task-details-page.glade b/calendar/gui/dialogs/task-details-page.glade index 10b8f3d8c3..23c34c116c 100644 --- a/calendar/gui/dialogs/task-details-page.glade +++ b/calendar/gui/dialogs/task-details-page.glade @@ -19,258 +19,205 @@ 6 - + True - False - 0 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - - True - <b>Progress</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - + + 6 True False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + 6 - + + 4 True False 6 - - 4 + True - False - 6 + _Status: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + status + + + 0 + False + False + + - - - True - _Status: - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - status - - - 0 - False - False - - + + + True + True + 0 - - + + True - True - 0 - - + + True + Not Started + True + + - - - True - Not Started - True - - - - - - True - In Progress - True - - + + + True + In Progress + True + + - - - True - Completed - True - - + + + True + Completed + True + + - - - True - Cancelled - True - - + + + True + Cancelled + True - - 0 - False - False - + + + 0 + False + False + + - - - True - _Priority: - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - priority - - - 0 - False - False - - + + + True + _Priority: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + priority + + + 0 + False + False + + + + + + True + True + 0 - - + + True - True - 0 - - + + True + High + True + + - - - True - High - True - - - - - - True - Normal - True - - + + + True + Normal + True + + - - - True - Low - True - - + + + True + Low + True + + - - - True - Undefined - True - - + + + True + Undefined + True - - 0 - False - False - + + + 0 + False + False + + - - - True - % _Complete - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - percent-complete - - - 0 - False - False - - + + + True + % _Complete + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + percent-complete + + + 0 + False + False + + - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - True - True - - + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 0 @@ -278,63 +225,63 @@ True + + + 0 + True + True + + + + + + 4 + True + 1 + 2 + False + 2 + 4 - - 4 + True - 1 - 2 - False - 2 - 4 - - - - True - _Date Completed: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - + _Date Completed: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - True - task_details_page_create_date_edit - 0 - 0 - Fri, 01 Jun 2001 18:58:51 GMT - - - 1 - 2 - 0 - 1 - fill - fill - - + + + True + task_details_page_create_date_edit + 0 + 0 + Fri, 01 Jun 2001 18:58:51 GMT - 0 - True - True + 1 + 2 + 0 + 1 + fill + fill @@ -345,33 +292,51 @@ + + + + + True + Progress + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + - 0 - True - True + label_item - 3 + 0 False False - + + 6 True + 1 + 2 False - 6 + 6 + 6 True - <b>Web Page</b> - False - True - GTK_JUSTIFY_LEFT + _Web Page: + True + False + GTK_JUSTIFY_CENTER False False 0 @@ -380,63 +345,34 @@ 0 - 0 - False - False + 0 + 1 + 0 + 1 + fill + - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - e_url_entry_new - 0 - 0 - Fri, 08 Feb 2002 21:02:37 GMT - - - 0 - True - True - - + e_url_entry_new + 0 + 0 + Fri, 08 Feb 2002 21:02:37 GMT - 0 - True - True + 1 + 2 + 0 + 1 + fill - 3 + 0 False True diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 094e92905c..33fce5a6c1 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -809,7 +809,6 @@ source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("Unable to open tasks in '%s'."), e_source_peek_name (source)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } else { diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade index 12a1b1dab8..49f91b1c98 100644 --- a/calendar/gui/dialogs/task-page.glade +++ b/calendar/gui/dialogs/task-page.glade @@ -19,304 +19,236 @@ 6 - - 3 + True + 1 + 2 False - 6 + 6 + 6 True - <b>Su_mmary</b> + Su_mmary: True - True - GTK_JUSTIFY_LEFT + False + GTK_JUSTIFY_CENTER False False - 0 + 0.5 0.5 0 0 summary - 0 - False - False + 0 + 1 + 0 + 1 + + - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 6 - True - True - - + True + True + True + 0 + + True + * + False - 0 - False - False + 1 + 2 + 0 + 1 + 0 - True + False True - - 3 + True - False - 0 - - - - True - <b>Date &amp; Time</b> - False - True - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + + 6 True False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + 6 - - 6 + True + 2 + 3 False - 6 + 2 + 4 + + + + True + Sta_rt Date: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + start-date + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + _Due Date: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + due-date + + + 0 + 1 + 0 + 1 + fill + + + - + True - 2 - 3 - False - 6 - 6 - - - - True - Sta_rt Date: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - start-date - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - _Due Date: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - due-date - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - task_page_create_date_edit - 0 - 0 - Fri, 01 Jun 2001 18:59:52 GMT - - - 1 - 2 - 0 - 1 - - - - - - - True - True - task_page_create_date_edit - 0 - 0 - Fri, 01 Jun 2001 18:59:57 GMT - - - 1 - 2 - 1 - 2 - - - - - - - True - make_timezone_entry - 0 - 0 - Tue, 19 Jun 2001 04:43:54 GMT - - - 2 - 3 - 0 - 1 - fill - - - - - - True - make_timezone_entry - 0 - 0 - Tue, 19 Jun 2001 04:43:46 GMT - - - 2 - 3 - 1 - 2 - fill - fill - - + True + task_page_create_date_edit + 0 + 0 + Fri, 01 Jun 2001 18:59:52 GMT - 0 - False - True + 1 + 2 + 0 + 1 + + + + + + + True + True + task_page_create_date_edit + 0 + 0 + Fri, 01 Jun 2001 18:59:57 GMT + + + 1 + 2 + 1 + 2 + + + + + + + True + make_timezone_entry + 0 + 0 + Tue, 19 Jun 2001 04:43:54 GMT + + + 2 + 3 + 0 + 1 + fill + + + + + + True + make_timezone_entry + 0 + 0 + Tue, 19 Jun 2001 04:43:46 GMT + + + 2 + 3 + 1 + 2 + fill + fill 0 - True + False True + + + + + True + Date & Time + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + - 0 - True - True + label_item @@ -329,7 +261,6 @@ - 3 True False 6 @@ -337,9 +268,9 @@ True - <b>Description</b> + Description: False - True + False GTK_JUSTIFY_CENTER False False @@ -356,63 +287,29 @@ - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - + True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - + True + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + - - 6 - True - True - @@ -430,52 +327,29 @@ - - 3 + True - False - 0 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - - True - <b>Classification</b> - False - True - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - + + 6 True False - 0 + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + True + Pu_blic + True + GTK_RELIEF_NORMAL + True + False + True 0 @@ -485,79 +359,61 @@ - - 6 + True - False - 6 - - - - True - True - Pu_blic - True - GTK_RELIEF_NORMAL - True - False - True - - - 0 - False - False - - - - - - True - True - Pri_vate - True - GTK_RELIEF_NORMAL - False - False - True - classification-public - - - 0 - False - False - - + True + Pri_vate + True + GTK_RELIEF_NORMAL + False + False + True + classification-public + + + 0 + False + False + + - - - True - True - Con_fidential - True - GTK_RELIEF_NORMAL - False - False - True - classification-public - - - 0 - False - False - - + + + True + True + Con_fidential + True + GTK_RELIEF_NORMAL + False + False + True + classification-public 0 - True - True + False + False + + + + + True + Classification + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + - 0 - True - True + label_item diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 1d04bf8bee..2251ec7f88 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -545,7 +545,6 @@ show_geo_warning (void) dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("The geographical position must be entered " "in the format: \n\n45.436845,125.862501")); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_widget_show (dialog); } diff --git a/calendar/gui/goto-dialog.glade b/calendar/gui/goto-dialog.glade index b09b11bd76..b268e03294 100644 --- a/calendar/gui/goto-dialog.glade +++ b/calendar/gui/goto-dialog.glade @@ -10,7 +10,7 @@ False True False - False + True diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 13ec86e756..09dd79b8d0 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -349,7 +349,6 @@ delete_task_list_cb (GtkWidget *widget, TasksComponent *comp) GTK_BUTTONS_YES_NO, _("Task List '%s' will be removed. Are you sure you want to continue?"), e_source_peek_name (selected_source)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES) { if (e_source_selector_source_is_selected (E_SOURCE_SELECTOR (priv->source_selector), selected_source)) @@ -698,7 +697,6 @@ setup_create_ecal (TasksComponent *component) GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("Unable to open the task list '%s' for creating events and meetings"), e_source_peek_name (source)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -710,7 +708,6 @@ setup_create_ecal (TasksComponent *component) dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("There is no calendar available for creating tasks")); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index aa63f91519..23a24e97fc 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -464,7 +464,6 @@ confirm_purge (ETasks *tasks) GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n\nReally erase these tasks?")); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_NO); checkbox = gtk_check_button_new_with_label (_("Do not ask me again.")); -- cgit v1.2.3