From fb8be1c3e2d094b9e3f5739af3252cb3de38726f Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 19 Dec 2003 17:49:02 +0000 Subject: Remove separators from dialogs. Use frame style recommended by the HIG. 2003-12-19 William Jon McCann * gui/dialogs/task-page.c (source_changed_cb): * gui/dialogs/send-comp.c (send_component_dialog): * gui/dialogs/save-comp.c (save_component_dialog): * gui/dialogs/recur-comp.c (recur_component_dialog): * gui/dialogs/event-page.c (source_changed_cb): * gui/dialogs/delete-error.c (delete_error_dialog): * gui/dialogs/delete-comp.c (delete_component_dialog): * gui/dialogs/changed-comp.c (changed_component_dialog): * gui/dialogs/cancel-comp.c (cancel_component_dialog): * gui/dialogs/alarm-options.glade: * gui/dialogs/alarm-page.glade: * gui/dialogs/cal-prefs-dialog.glade: * gui/dialogs/e-delegate-dialog.glade: * gui/dialogs/event-page.glade: * gui/dialogs/new-calendar.glade: * gui/dialogs/new-task-list.glade: * gui/dialogs/recurrence-page.glade: * gui/dialogs/task-details-page.glade: * gui/dialogs/task-page.glade: * gui/tasks-control.c (confirm_purge): * gui/tasks-component.c (delete_task_list_cb) (rename_task_list_cb, setup_create_ecal): * gui/goto-dialog.glade: * gui/e-cal-model-tasks.c (show_geo_warning): * gui/comp-editor-factory.c (cal_opened_cb): * gui/calendar-component.c (delete_calendar_cb) (rename_calendar_cb, setup_create_ecal, delete_calendar_cb): * gui/calendar-commands.c (purge_cmd): Remove separators from dialogs. Use frame style recommended by the HIG. svn path=/trunk/; revision=23989 --- calendar/ChangeLog | 33 + calendar/gui/calendar-commands.c | 1 + calendar/gui/calendar-component.c | 4 + 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 | 4 + calendar/gui/tasks-control.c | 1 + 27 files changed, 3617 insertions(+), 2489 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 521331daf5..4275af7a1d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,36 @@ +2003-12-19 William Jon McCann + + * gui/dialogs/task-page.c (source_changed_cb): + * gui/dialogs/send-comp.c (send_component_dialog): + * gui/dialogs/save-comp.c (save_component_dialog): + * gui/dialogs/recur-comp.c (recur_component_dialog): + * gui/dialogs/event-page.c (source_changed_cb): + * gui/dialogs/delete-error.c (delete_error_dialog): + * gui/dialogs/delete-comp.c (delete_component_dialog): + * gui/dialogs/changed-comp.c (changed_component_dialog): + * gui/dialogs/cancel-comp.c (cancel_component_dialog): + * gui/dialogs/alarm-options.glade: + * gui/dialogs/alarm-page.glade: + * gui/dialogs/cal-prefs-dialog.glade: + * gui/dialogs/e-delegate-dialog.glade: + * gui/dialogs/event-page.glade: + * gui/dialogs/new-calendar.glade: + * gui/dialogs/new-task-list.glade: + * gui/dialogs/recurrence-page.glade: + * gui/dialogs/task-details-page.glade: + * gui/dialogs/task-page.glade: + * gui/tasks-control.c (confirm_purge): + * gui/tasks-component.c (delete_task_list_cb) + (rename_task_list_cb, setup_create_ecal): + * gui/goto-dialog.glade: + * gui/e-cal-model-tasks.c (show_geo_warning): + * gui/comp-editor-factory.c (cal_opened_cb): + * gui/calendar-component.c (delete_calendar_cb) + (rename_calendar_cb, setup_create_ecal, delete_calendar_cb): + * gui/calendar-commands.c (purge_cmd): + Remove separators from dialogs. Use frame style recommended + by the HIG. + 2003-12-18 Rodrigo Moya * gui/tasks-component.c (impl_createControls): diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index f509921594..cc7896bd13 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -358,6 +358,7 @@ 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 ee1cd283a9..b978c003a6 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -374,6 +374,7 @@ 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)) @@ -413,6 +414,7 @@ rename_calendar_cb (GtkWidget *widget, CalendarComponent *comp) GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, _("Rename this calendar to")); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); entry = gtk_entry_new (); gtk_entry_set_text (GTK_ENTRY (entry), e_source_peek_name (selected_source)); gtk_widget_show (entry); @@ -708,6 +710,7 @@ 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); @@ -719,6 +722,7 @@ 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 a50b135f90..e6075101c6 100644 --- a/calendar/gui/comp-editor-factory.c +++ b/calendar/gui/comp-editor-factory.c @@ -472,6 +472,7 @@ 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 d58e817ba3..d5f82c450e 100644 --- a/calendar/gui/dialogs/alarm-options.glade +++ b/calendar/gui/dialogs/alarm-options.glade @@ -13,7 +13,7 @@ True True True - True + False @@ -66,30 +66,51 @@ 6 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 0 + + + + True + <b>Alarm Repeat</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - 6 True False - 6 + 0 - + True - True - True - Repeat the alarm - True - GTK_RELIEF_NORMAL - False - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -99,43 +120,23 @@ - + + 6 True False - 4 + 6 - + True 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 + True + Repeat the alarm + True + GTK_RELIEF_NORMAL + False + False + True 0 @@ -145,58 +146,111 @@ - + True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 0 999 1 10 10 - - - 0 - True - True - - + False + 4 - - - True - True - 0 + + + True + 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 + False + False + + - - + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 0 999 1 10 10 + + + 0 + True + True + + - - - True - minutes - True - - + + + True + True + 0 - - + + True - hours - True - - - - - True - days - True + + + True + minutes + True + + + + + + True + hours + True + + + + + + True + days + True + + + + 0 + False + False + @@ -208,29 +262,15 @@ 0 - False - False + True + True - - - - - True - Alarm Repeat - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True @@ -249,9 +289,9 @@ True - Message to Display: + <b>Message to Display</b> False - False + True GTK_JUSTIFY_CENTER False False @@ -268,29 +308,63 @@ - + True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True - True - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - + 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 + @@ -308,20 +382,20 @@ - + False 6 - + True - Play sound: + <b>Alarm Sound</b> False - False - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 @@ -334,24 +408,92 @@ - + True - 10 - False - True + False + 0 - - + + True - True - True - True - 0 - - True - * - False + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + 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 + @@ -362,7 +504,7 @@ - 0 + 3 False False @@ -370,49 +512,16 @@ - True False 6 - - True - False - 6 - - - - True - True - Send To: - True - GTK_RELIEF_NORMAL - - - 0 - False - False - - - - - - - - - 0 - True - True - - - - - + True - Message to Send + <b>Alarm Email</b> False - False - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_LEFT False False 0 @@ -428,30 +537,130 @@ - + True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT + False + 0 - + True - True - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 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 + @@ -462,27 +671,27 @@ - 0 + 3 False False - + False 6 - + True - Run program: + <b>Alarm Action</b> False - False - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 @@ -495,56 +704,124 @@ - + True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - + False + 0 - - - True - With these arguments: - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - True - True - True - 0 - - True - * - 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 + 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 + + 0 @@ -554,7 +831,7 @@ - 0 + 3 False False diff --git a/calendar/gui/dialogs/alarm-page.glade b/calendar/gui/dialogs/alarm-page.glade index 7c2f06bae3..6de3afb8da 100644 --- a/calendar/gui/dialogs/alarm-page.glade +++ b/calendar/gui/dialogs/alarm-page.glade @@ -19,433 +19,525 @@ 6 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 - - 6 + + True + <b>Basics</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True - 2 - 2 False - 6 - 6 + 0 - + True - Summary: + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - Date/Time: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - fill - - + 2 + 2 + False + 6 + 6 - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - - - 1 - 2 - 0 - 1 - - - + + + True + Summary: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 7.45058e-09 - 0.5 - 4 - 0 + + + True + 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 + 7.45058e-09 + 0.5 + 4 + 0 + + + 1 + 2 + 1 + 2 + fill + + - 1 - 2 - 1 - 2 - fill + 0 + True + True + + 0 + True + True + + + + 3 + False + True + + + + + + True + False + 6 - + True - Basics + <b>Reminders</b> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 - label_item + 0 + False + False - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - 6 + True False - 6 + 0 - + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True False 6 - + True - True - 0 + False + 6 - - + + True + True + 0 - - - True - Display a message - True - - - - - - True - Play a sound - True - - - - - + + True - Run a program - True - - - - - True - Send an Email - True + + + True + Display a message + True + + + + + + True + Play a sound + True + + + + + + True + Run a program + True + + + + + + True + Send an Email + True + + + + 0 + False + False + - - - 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 + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 0 999 1 10 10 + + + 0 + False + True + + - - + + True + True + 0 - - + + True - minute(s) - True - - - - - True - hour(s) - True - - - - - - True - day(s) - True + + + True + minute(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 - after - True + + + True + before + True + + + + + + True + after + True + + + + 0 + False + False + - - - 0 - False - False - - - - - True - True - 0 - - - + + True + True + 0 - - + + True - start of appointment - True - - - - - True - end of appointment - True + + + True + start 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 - True - False - False - True + _Options... + True + GTK_RELIEF_NORMAL + + 0 + False + False + 0 - True + False True - + True - GTK_BUTTONBOX_START - 6 + False + 8 - + True - True - True - gtk-add - True - GTK_RELIEF_NORMAL + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + 0 + True + True + - + True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL + GTK_BUTTONBOX_START + 6 + + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + + + + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + 0 - False - False + True + True @@ -456,29 +548,15 @@ - - - - - True - Reminders - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True - 0 + 3 True True diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade index d566368611..194d198e27 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.glade +++ b/calendar/gui/dialogs/cal-prefs-dialog.glade @@ -11,7 +11,7 @@ False True False - True + False @@ -86,623 +86,719 @@ 6 - - 3 + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 - - 6 + True - 2 - 3 - False - 6 - 6 + <b>Time</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - Time _zone: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - timezone - - - 0 - 1 - 0 - 1 - fill - - - + + + True + False + 0 - + True - Time format: + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - 0 - 1 - 1 - 2 - fill - + 0 + False + False - + True - True - 4 + 2 + 3 + False + 6 + 6 - + True + Time _zone: + True + False + GTK_JUSTIFY_CENTER + False + False 0 0.5 - 3.35276e-08 - 1 + 0 + 0 + timezone + + + 0 + 1 + 0 + 1 + fill + + + + + + + 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 + + - + True True - _12 hour (AM/PM) + _24 hour True GTK_RELIEF_NORMAL False False True + use_12_hour + + 0 + True + True + - 0 - True - True + 1 + 2 + 1 + 2 + fill + fill - + True True - _24 hour - True - GTK_RELIEF_NORMAL - False - False - True - use_12_hour + make_timezone_entry + 0 + 0 + Wed, 20 Jun 2001 02:22:46 GMT - 0 - True - True + 1 + 3 + 0 + 1 + fill + fill - 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 + + 0 + True + True + + + + 3 + False + True + + + + + + True + False + 6 - + True - Time + <b>Work Week</b> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 - label_item + 0 + False + False - - - 0 - False - True - - - - - - 3 - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - 6 + True - 3 - 4 False - 6 - 6 + 0 - + True - _Day begins: - True + + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - 0 - 1 - 2 - 3 - fill - + 0 + False + False - + True + 3 + 4 False - 3 - - - - True - cal_prefs_dialog_create_time_edit - 0 - 0 - Thu, 30 May 2002 19:26:53 GMT - - - 0 - False - False - - + 6 + 6 - + True - Day _ends: + _Day begins: True False - GTK_JUSTIFY_RIGHT + GTK_JUSTIFY_CENTER False False - 1 + 0 0.5 0 0 - 0 - False - True + 0 + 1 + 2 + 3 + fill + - + True - 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 - - + False + 3 - - - True - False - 6 + + + True + cal_prefs_dialog_create_time_edit + 0 + 0 + Thu, 30 May 2002 19:26:53 GMT + + + 0 + False + False + + - - - True - True - _Mon - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + + + True + Day _ends: + True + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + True + + - - - True - True - _Tue - True - GTK_RELIEF_NORMAL - False - False - True + + + True + cal_prefs_dialog_create_time_edit + 0 + 0 + Thu, 30 May 2002 19:27:35 GMT + + + 0 + False + False + + - 0 - False - False + 1 + 4 + 2 + 3 + fill + fill - + True - True - _Wed - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + False + 6 - - - True - True - T_hu - 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 - _Fri - 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 - _Sat - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - True - - + + + True + True + _Wed + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + - - - True - True - S_un - True - GTK_RELIEF_NORMAL - False - False - True + + + 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 + _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 + + - 0 - False - False + 1 + 4 + 1 + 2 + fill - - - 1 - 4 - 1 - 2 - fill - - - - - - True - 7.45058e-09 - 0.5 - 0 - 1 - + True - True - 0 + 7.45058e-09 + 0.5 + 0 + 1 - - + + True + True + 0 - - + + True - Monday - True - - - - - True - Tuesday - True - - + + + True + Monday + True + + - - - True - Wednesday - True - - + + + True + Tuesday + True + + - - - True - Thursday - True - - + + + True + Wednesday + True + + - - - True - Friday - True - - + + + True + Thursday + True + + - - - True - Saturday - True - - + + + True + Friday + True + + - - - True - Sunday - True + + + True + Saturday + 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 + + + True + Work days: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + - 0 - 1 - 1 - 2 - fill - + 0 + True + True + + 0 + True + True + + + + 3 + False + True + + + + + + True + False + 6 - + True - Work Week + <b>Alerts</b> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 - label_item + 0 + False + False - - - 0 - False - True - - - - - - 3 - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - 6 + True False - 6 + 0 - - 3 + True - True - _Ask for confirmation when deleting items - True - GTK_RELIEF_NORMAL - False - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -712,17 +808,17 @@ - - 3 + True False - 3 + 6 - + + 3 True True - Sh_ow a reminder + _Ask for confirmation when deleting items True GTK_RELIEF_NORMAL False @@ -737,90 +833,122 @@ - + + 3 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 + False + 3 - + True True - 0 + Sh_ow a reminder + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + - - - True + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 9999 1 10 10 + + + 0 + False + False + + - - - True - Minutes - True - - + + + True + 7.45058e-09 + 0.5 + 0 + 0 - - - True - Hours - True - - + + + True + True + 0 - - + + True - Days - True + + + + True + Minutes + True + + + + + + True + Hours + True + + + + + + 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 + + + True + before every appointment + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + 0 @@ -831,34 +959,20 @@ 0 - False - False + True + True - - - - - True - Alerts - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True - 0 + 3 False False @@ -1045,113 +1159,51 @@ - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 + + + + True + <b>Task List</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True False - 6 + 0 - + 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 - - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -1161,21 +1213,105 @@ - + True False 6 - + True - True - _Hide completed tasks after - True - GTK_RELIEF_NORMAL - False - False - 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 + + + 0 @@ -1185,58 +1321,89 @@ - + True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 9999 1 10 10 - - - 0 - False - True - - + False + 6 - - - True - True - 0 + + + True + True + _Hide completed tasks after + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + - - + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 9999 1 10 10 + + + 0 + False + True + + - - - True - Minutes - True - - + + + True + True + 0 - - + + True - Hours - True - - - - - True - Days - True + + + True + Minutes + True + + + + + + True + Hours + True + + + + + + True + Days + True + + + + 0 + False + False + @@ -1248,34 +1415,20 @@ 0 - False - False + True + True - - - - - True - Task List - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True - 0 + 3 False False diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index 27f9b9b91e..a19f4f526d 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -88,6 +88,7 @@ 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 af595fe1df..6ca498f721 100644 --- a/calendar/gui/dialogs/changed-comp.c +++ b/calendar/gui/dialogs/changed-comp.c @@ -104,6 +104,7 @@ 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 c4f9e5dc3d..4cfd5d09e6 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -152,6 +152,7 @@ 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 cb076885c1..d99a9482f5 100644 --- a/calendar/gui/dialogs/delete-error.c +++ b/calendar/gui/dialogs/delete-error.c @@ -104,6 +104,7 @@ 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 f08c03ad1d..65491e5918 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.glade +++ b/calendar/gui/dialogs/e-delegate-dialog.glade @@ -2,7 +2,6 @@ - Enter Delegate @@ -11,7 +10,7 @@ False True False - True + False diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 99a49f33a6..c8b90f6d81 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -1226,6 +1226,7 @@ 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 46e1cc0bb0..40161a8f9a 100644 --- a/calendar/gui/dialogs/event-page.glade +++ b/calendar/gui/dialogs/event-page.glade @@ -19,20 +19,17 @@ 6 - + True - 2 - 2 False - 6 - 6 + 6 True - Su_mmary: + <b>Su_mmary</b> True - False + True GTK_JUSTIFY_CENTER False False @@ -43,42 +40,84 @@ general-summary - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - True - True - True - 0 - - True - * - False + 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 + + - 1 - 2 - 0 - 1 - + 0 + True + True + + + 3 + True + True + + + + + + True + False + 6 True - L_ocation: + <b>L_ocation</b> True - False + True GTK_JUSTIFY_CENTER False False @@ -89,270 +128,406 @@ location - 0 - 1 - 1 - 2 - fill - + 0 + False + False - + True - True - True - True - 0 - - True - * - False + 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 + + - 1 - 2 - 1 - 2 - + 0 + True + True - 0 - False + 3 + True True - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 + + + + True + <b>Date &amp; Time</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True - 2 - 4 False - 6 - 6 + 0 - + True - _Start time: - True + + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - start-time - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - _End time: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - end-time - - - 0 - 1 - 1 - 2 - fill - - - + 2 + 4 + False + 6 + 6 - - - True - True - make_date_edit - - - 0 - 0 - Tue, 16 May 2000 19:11:05 GMT - - - 1 - 2 - 0 - 1 - - - + + + True + _Start time: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + start-time + + + 0 + 1 + 0 + 1 + fill + + + - - - True - True - make_date_edit - 0 - 0 - Tue, 16 May 2000 19:11:10 GMT - - - 1 - 2 - 1 - 2 - - - + + + True + _End time: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + end-time + + + 0 + 1 + 1 + 2 + fill + + + - - - True - make_timezone_entry - 0 - 0 - Mon, 18 Jun 2001 23:51:40 GMT - - - 2 - 3 - 1 - 2 - - fill - - + + + True + True + make_date_edit + + + 0 + 0 + Tue, 16 May 2000 19:11:05 GMT + + + 1 + 2 + 0 + 1 + + + - - - True - make_timezone_entry - 0 - 0 - Mon, 18 Jun 2001 23:51:34 GMT - - - 2 - 3 - 0 - 1 - fill - fill - - + + + True + True + make_date_edit + 0 + 0 + Tue, 16 May 2000 19:11:10 GMT + + + 1 + 2 + 1 + 2 + + + - - - True - 1 - 7.45058e-09 - 0 - 0 + + + True + make_timezone_entry + 0 + 0 + Mon, 18 Jun 2001 23:51:40 GMT + + + 2 + 3 + 1 + 2 + + fill + + - + True - True - A_ll day event - True - GTK_RELIEF_NORMAL - False - False - 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 + True + A_ll day event + True + GTK_RELIEF_NORMAL + False + False + True + + + + + 3 + 4 + 0 + 2 + fill + - 3 - 4 - 0 - 2 - fill + 0 + True + True + + 0 + True + True + + + + 3 + False + False + + + + + + True + False + 6 - + True - Date & Time + <b>Description</b> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 - label_item + 0 + False + False - - - 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 - + 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 + + + + 0 + True + True + - 0 + 3 True True @@ -369,63 +544,97 @@ True 0 0.5 - GTK_SHADOW_ETCHED_IN + GTK_SHADOW_NONE - - 6 + True False - 6 + 0 - + True - True - Pu_blic - True - GTK_RELIEF_NORMAL - True - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 - True - True + False + False - + + 6 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 + 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 + + 0 @@ -439,9 +648,9 @@ True - Classification + <b>Classification</b> False - False + True GTK_JUSTIFY_LEFT False False @@ -467,44 +676,78 @@ True 0 0.5 - GTK_SHADOW_ETCHED_IN + GTK_SHADOW_NONE - - 6 + True False - 6 + 0 - + True - True - F_ree - True - GTK_RELIEF_NORMAL - False - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 - True - True + False + False - + + 6 True - True - B_usy - True - GTK_RELIEF_NORMAL - False - False - True - show-time-as-free + 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 + + 0 @@ -518,9 +761,9 @@ True - Show Time As + <b>Show Time As</b> False - False + True GTK_JUSTIFY_LEFT False False diff --git a/calendar/gui/dialogs/new-calendar.glade b/calendar/gui/dialogs/new-calendar.glade index 0a136ed7c8..391215134c 100644 --- a/calendar/gui/dialogs/new-calendar.glade +++ b/calendar/gui/dialogs/new-calendar.glade @@ -12,7 +12,7 @@ False False False - True + False diff --git a/calendar/gui/dialogs/new-task-list.glade b/calendar/gui/dialogs/new-task-list.glade index ffc38582c8..0c27e735e1 100644 --- a/calendar/gui/dialogs/new-task-list.glade +++ b/calendar/gui/dialogs/new-task-list.glade @@ -2,7 +2,6 @@ - 12 @@ -13,7 +12,7 @@ False False False - True + False diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c index f097d542f7..682ac43a1a 100644 --- a/calendar/gui/dialogs/recur-comp.c +++ b/calendar/gui/dialogs/recur-comp.c @@ -66,6 +66,7 @@ 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 c5c2158979..bbe3d488ba 100644 --- a/calendar/gui/dialogs/recurrence-page.glade +++ b/calendar/gui/dialogs/recurrence-page.glade @@ -19,139 +19,178 @@ 6 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 + + + + True + <b>Basics</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True - 2 - 2 False - 6 - 6 + 0 - + True - Summary: + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - Date/Time: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - + 2 + 2 + False + 6 + 6 - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 4 - 0 - - - 1 - 2 - 0 - 1 - - - + + + True + Summary: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 4 - 0 + + + True + 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 + 1 + 2 + + + - 1 - 2 - 1 - 2 - + 0 + True + True - - - - - True - Basics - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True - 0 + 3 False False @@ -161,83 +200,54 @@ True False - 0 + 6 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 - - 6 + + True + <b>Recurrence Rule</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True False - 6 + 0 - + True - 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 - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -247,30 +257,27 @@ - + True False 6 - + True False - 2 + 6 - + True - Every - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 + True + _No recurrence + True + GTK_RELIEF_NORMAL + False + False + True 0 @@ -280,16 +287,16 @@ - + True True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 10000 1 10 10 + _Simple recurrence + True + GTK_RELIEF_NORMAL + False + False + True + none 0 @@ -299,48 +306,16 @@ - + True True - 0 - - - - True - - - - True - day(s) - True - - - - - - True - week(s) - True - - - - - - True - month(s) - True - - - - - - True - year(s) - True - - - - + _Custom recurrence + True + GTK_RELIEF_NORMAL + False + False + True + none 0 @@ -348,60 +323,196 @@ False + + + 0 + False + False + + + + + + True + False + 6 - + True - 0.5 - 0.5 - 0 - 0 + False + 2 - + + True + Every + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + - - - 0 - False - False - - - - - True - True - 0 + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 1 10000 1 10 10 + + + 0 + False + False + + - - + + True + True + 0 - - + + True - for - True + + + + True + day(s) + True + + + + + + True + week(s) + True + + + + + + True + month(s) + True + + + + + + True + year(s) + True + + + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 0 + 0 - + + + + + 0 + False + False + + + + + + True + True + 0 + + + True - until - True + + + + True + for + True + + + + + + True + until + True + + + + + + True + forever + True + + + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 0 + 0 - - True - forever - True - + + + 0 + False + False + @@ -412,12 +523,12 @@ - + True - 0.5 + 0 0.5 - 0 - 0 + 1 + 1 @@ -425,8 +536,8 @@ 0 - False - False + True + True @@ -436,56 +547,23 @@ False - - - - True - 0 - 0.5 - 1 - 1 - - - - - - - 0 - True - True - - 0 - False - False + True + True - - - - - True - Recurrence Rule - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True - 0 + 3 False False @@ -498,69 +576,51 @@ 6 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 + + + + True + <b>Exceptions</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True False - 6 + 0 - + 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 - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -570,18 +630,61 @@ - + True False 6 - + True - make_exdate_date_edit - 0 - 0 - Tue, 16 May 2000 01:42:29 GMT + 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 @@ -591,22 +694,50 @@ - + True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + False + 6 - + True - True - True - False - False - 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 + + + + + 0 + True + True + @@ -623,24 +754,10 @@ - - - - - True - Exceptions - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True @@ -660,9 +777,9 @@ True - Preview + <b>Preview</b> False - False + True GTK_JUSTIFY_CENTER False False diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c index 8041395fb1..3f447c8222 100644 --- a/calendar/gui/dialogs/save-comp.c +++ b/calendar/gui/dialogs/save-comp.c @@ -52,6 +52,7 @@ 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 65e4743c04..2c5a1f7b37 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -82,6 +82,7 @@ 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 23c34c116c..10b8f3d8c3 100644 --- a/calendar/gui/dialogs/task-details-page.glade +++ b/calendar/gui/dialogs/task-details-page.glade @@ -19,205 +19,258 @@ 6 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 0 - - 6 + + True + <b>Progress</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True False - 6 + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 4 + True False 6 - + + 4 True - _Status: - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - status - - - 0 - False - False - - + False + 6 - - - True - True - 0 + + + True + _Status: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + status + + + 0 + False + False + + - - + + True + True + 0 - - + + True - Not Started - True - - - - - True - In Progress - True - - + + + True + Not Started + True + + - - - True - Completed - True - - + + + True + In Progress + True + + - - - True - Cancelled - True + + + True + Completed + 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 - True - 0 + + + True + _Priority: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + priority + + + 0 + False + False + + - - + + True + True + 0 - - + + True - High - True - - - - - True - Normal - True - - + + + True + High + True + + - - - True - Low - True - - + + + True + Normal + True + + - - - True - Undefined - True + + + True + Low + 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 + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 0 + True + True + + 0 @@ -225,63 +278,63 @@ True - - - 0 - True - True - - - - - - 4 - True - 1 - 2 - False - 2 - 4 - + + 4 True - _Date Completed: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - + 1 + 2 + False + 2 + 4 - - - True - task_details_page_create_date_edit - 0 - 0 - Fri, 01 Jun 2001 18:58:51 GMT + + + True + _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 + + - 1 - 2 - 0 - 1 - fill - fill + 0 + True + True @@ -292,51 +345,33 @@ - - - - - True - Progress - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True - 0 + 3 False False - - 6 + True - 1 - 2 False - 6 - 6 + 6 True - _Web Page: - True - False - GTK_JUSTIFY_CENTER + <b>Web Page</b> + False + True + GTK_JUSTIFY_LEFT False False 0 @@ -345,34 +380,63 @@ 0 - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - e_url_entry_new - 0 - 0 - Fri, 08 Feb 2002 21:02:37 GMT + 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 + + - 1 - 2 - 0 - 1 - fill + 0 + True + True - 0 + 3 False True diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 1ff2cd608d..e2be632847 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -808,6 +808,7 @@ 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 49f91b1c98..12a1b1dab8 100644 --- a/calendar/gui/dialogs/task-page.glade +++ b/calendar/gui/dialogs/task-page.glade @@ -19,236 +19,304 @@ 6 - + + 3 True - 1 - 2 False - 6 - 6 + 6 True - Su_mmary: + <b>Su_mmary</b> True - False - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 summary - 0 - 1 - 0 - 1 - - + 0 + False + False - + True - True - True - True - 0 - - True - * - False + 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 + + - 1 - 2 - 0 - 1 - + 0 + False + False 0 - False + True True - + + 3 True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 0 + + + + True + <b>Date &amp; Time</b> + False + True + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True False - 6 + 0 - + True - 2 - 3 - False - 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 - 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 - - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - make_timezone_entry - 0 - 0 - Tue, 19 Jun 2001 04:43:54 GMT - - - 2 - 3 - 0 - 1 - fill - - + + + 6 + True + False + 6 - + True - make_timezone_entry - 0 - 0 - Tue, 19 Jun 2001 04:43:46 GMT + 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 + + - 2 - 3 - 1 - 2 - fill - fill + 0 + False + True 0 - False + True True - - - - - True - Date & Time - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True @@ -261,6 +329,7 @@ + 3 True False 6 @@ -268,9 +337,9 @@ True - Description: + <b>Description</b> False - False + True GTK_JUSTIFY_CENTER False False @@ -287,29 +356,63 @@ - + True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + False + 0 - + True - True - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - + + 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 + + + + + 6 + True + True + @@ -327,29 +430,52 @@ - + + 3 True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 0 - - 6 + + True + <b>Classification</b> + False + True + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True False - 6 + 0 - + True - True - Pu_blic - True - GTK_RELIEF_NORMAL - True - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -359,61 +485,79 @@ - + + 6 True - True - Pri_vate - True - GTK_RELIEF_NORMAL - False - False - True - classification-public - - - 0 - False - False - - + False + 6 - - - True - True - Con_fidential - True - GTK_RELIEF_NORMAL - False - False - True - classification-public + + + 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 + True + Con_fidential + True + GTK_RELIEF_NORMAL + False + False + True + classification-public + + + 0 + False + False + + 0 - False - False + True + True - - - - - True - Classification - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 2251ec7f88..1d04bf8bee 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -545,6 +545,7 @@ 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 b268e03294..b09b11bd76 100644 --- a/calendar/gui/goto-dialog.glade +++ b/calendar/gui/goto-dialog.glade @@ -10,7 +10,7 @@ False True False - True + False diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 619f753906..2b57dc5411 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -347,6 +347,7 @@ 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)) @@ -386,6 +387,7 @@ rename_task_list_cb (GtkWidget *widget, TasksComponent *comp) GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, _("Rename this task list to")); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); entry = gtk_entry_new (); gtk_entry_set_text (GTK_ENTRY (entry), e_source_peek_name (selected_source)); gtk_widget_show (entry); @@ -659,6 +661,7 @@ 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); @@ -670,6 +673,7 @@ 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 d2139a5bbb..cd1e00fedf 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -445,6 +445,7 @@ 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