From 37ca97bfbc298dae0f15957ad15c83b342e12a6a Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Wed, 2 Feb 2005 22:56:51 +0000 Subject: Set the border width for the internal dialog containers to be HIG 2005-02-02 Rodney Dawes * gui/dialogs/alarm-dialog.c (alarm_dialog_run): Set the border width for the internal dialog containers to be HIG compliant * gui/dialogs/alarm-dialog.glade: Remove the separator in the dialog and fix some spacing/padding issues to be HIG compliant * gui/dialogs/alarm-list-dialog.c (alarm_list_dialog_run): Set the border width for the internal dialog containers to be HIG compliant * gui/dialogs/alarm-list-dialog.glade: Remove the separator in the dialog and fix some spacing/padding issues to be HIG compliant svn path=/trunk/; revision=28681 --- calendar/ChangeLog | 14 + calendar/gui/dialogs/alarm-dialog.c | 6 +- calendar/gui/dialogs/alarm-dialog.glade | 1476 +++++++++++++------------- calendar/gui/dialogs/alarm-list-dialog.c | 4 + calendar/gui/dialogs/alarm-list-dialog.glade | 7 +- 5 files changed, 765 insertions(+), 742 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 72355b96cc..02b1cff878 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,17 @@ +2005-02-02 Rodney Dawes + + * gui/dialogs/alarm-dialog.c (alarm_dialog_run): Set the border width + for the internal dialog containers to be HIG compliant + + * gui/dialogs/alarm-dialog.glade: Remove the separator in the dialog + and fix some spacing/padding issues to be HIG compliant + + * gui/dialogs/alarm-list-dialog.c (alarm_list_dialog_run): Set the + border width for the internal dialog containers to be HIG compliant + + * gui/dialogs/alarm-list-dialog.glade: Remove the separator in the + dialog and fix some spacing/padding issues to be HIG compliant + 2005-02-02 Rodrigo Moya Fixes #72090 diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 1fe8c5c1d4..d0db059b62 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -935,7 +935,11 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm) init_widgets (&dialog); alarm_to_dialog (&dialog); - + + gtk_widget_ensure_style (dialog.toplevel); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12); + icon_list = e_icon_factory_get_icon_list ("stock_calendar"); if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list); diff --git a/calendar/gui/dialogs/alarm-dialog.glade b/calendar/gui/dialogs/alarm-dialog.glade index 0d53e84f5c..d6ded5f252 100644 --- a/calendar/gui/dialogs/alarm-dialog.glade +++ b/calendar/gui/dialogs/alarm-dialog.glade @@ -18,7 +18,7 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST - True + False @@ -66,44 +66,24 @@ - - True - <b>Alarm</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - + + 12 True False - 0 + 12 - + True - + <b>Alarm</b> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 - 12 + 0 0 @@ -114,122 +94,24 @@ - + True False - 6 - - - - True - True - 0 - - option menu to choose alarm action - - - - - True - - - - True - Pop up an alert - True - - - - - - True - Play a sound - True - - - - - - True - Run a program - True - - - - - - True - Send an email - True - - - - - - - 0 - False - False - - + 12 - + True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False + + False + False + GTK_JUSTIFY_LEFT False - 1 0 999 1 10 10 - - - 0 - False - True - - - - - - True - True - 0 - - option menu to choose alarm value units - - - - - True - - - - True - minute(s) - True - - - - - - True - hour(s) - True - - - - - - True - day(s) - True - - - - + False + 0.5 + 0.5 + 0 + 0 0 @@ -239,208 +121,55 @@ - + True - True - 0 - - option menu to choose alarm relative - - - - + False + 6 + + + True + True + 0 - - + + True - before - True - - - - - True - after - True - - - - - - - 0 - False - False - - + + + True + Pop up an alert + True + + - - - True - True - 0 - - option menu to choose alarm time - - - - - True + + + True + Play a sound + True + + - - - True - start of appointment - True - - + + + True + Run a program + True + + - - - True - end of appointment - True + + + True + Send an email + True + + - - - - 0 - False - False - - - - - 0 - False - True - - - - - 0 - False - True - - - - - - True - <b>Repeat</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - True - _Repeat the alarm - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 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 - 0 False @@ -449,7 +178,7 @@ - + True True 1 @@ -458,45 +187,45 @@ GTK_UPDATE_ALWAYS False False - 5 0 999 1 10 10 + 1 0 999 1 10 10 0 - True + False True - + True True 0 - + True - + True - minutes + minute(s) True - + True - hours + hour(s) True - + True - days + day(s) True @@ -509,102 +238,34 @@ False - - - 0 - True - True - - - - - 0 - False - True - - - - - 0 - False - True - - - - - - True - <b>Options</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - - - 0 - False - False - - - - - - True - False - False - GTK_POS_TOP - False - False - - - - True - False - 6 - + True True - Custom _message - True - GTK_RELIEF_NORMAL - True - False - False - True + 0 + + + + True + + + + True + before + True + + + + + + True + after + True + + + + 0 @@ -614,93 +275,85 @@ - + True - 1 - 2 - False - 6 - 6 + True + 0 - - + + True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - + True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - + start of appointment + True - - - 1 - 2 - 0 - 1 - fill - - - - - True - Mes_sage: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0 - 0 - 0 - option-notebook + + + True + end of appointment + True + + - - 0 - 1 - 0 - 1 - fill - fill - 0 - True - True + False + False - False - True + 0 + True + True + + + 0 + False + False + + + + + + True + <b>Repeat</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 - + True - label15 + False False GTK_JUSTIFY_LEFT @@ -712,21 +365,24 @@ 0 - tab + 0 + False + False - + True False 6 - + True True - Custom alarm sound + True + _Repeat the alarm True GTK_RELIEF_NORMAL True @@ -742,16 +398,35 @@ - + True False 6 - + True - _Sound: - 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 @@ -760,7 +435,6 @@ 0.5 0 0 - aalarm-attach 0 @@ -770,51 +444,119 @@ - + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 5 0 999 1 10 10 + + + 0 + True + True + + + + + True - 10 - False - True - True + True + 0 - - + + True - True - True - True - 0 - - True - * - False + + + + True + minutes + True + + + + + + True + hours + True + + + + + + True + days + True + + 0 - True - True + False + False 0 False - True + False - False - True + 0 + False + True + + + 0 + False + False + + + + + + True + <b>Options</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 - + True - label16 + False False GTK_JUSTIFY_LEFT @@ -826,333 +568,593 @@ 0 - tab + 0 + False + False - + True - False - 0 + False + False + GTK_POS_TOP + False + False - + True - 2 - 2 False - 6 - 6 + 6 - + True - _Program: + True + Custom _message True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - palarm-program + GTK_RELIEF_NORMAL + True + False + False + True - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - _Arguments: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - palarm-args + 1 + 2 + False + 6 + 6 + + + + True + Mes_sage: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0 + 0 + 0 + option-notebook + + + 0 + 1 + 0 + 1 + fill + fill + + + + + + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + 1 + 2 + 0 + 1 + + - 0 - 1 - 1 - 2 - fill - + 0 + True + True + + + False + True + + + + + + True + label15 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 6 - + True True - True - True - 0 - - True - * - False + Custom alarm sound + True + GTK_RELIEF_NORMAL + True + False + False + True - 1 - 2 - 0 - 1 - + 0 + False + False - + True - True - True - True - 0 - - True - * - False + False + 6 + + + + True + _Sound: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + aalarm-attach + + + 0 + False + False + + + + + + True + 10 + False + True + True + GTK_FILE_CHOOSER_ACTION_OPEN + + + + True + True + True + True + 0 + + True + * + False + + + + + 0 + True + True + + - 1 - 2 - 1 - 2 - + 0 + False + True - 0 - False - True + False + True - - - False - True - - - - - - True - label17 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - True - False - 0 + + + True + label16 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + - + True False - 6 + 0 - + True + 2 + 2 False - 6 + 6 + 6 - + True - True - Send To: + _Program: True - GTK_RELIEF_NORMAL - True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + palarm-program - 0 - False - False + 0 + 1 + 0 + 1 + fill + + + + + + + True + _Arguments: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + palarm-args + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + - + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + 0 - True + False True + + + False + True + + + + + + True + label17 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 0 - + True False 6 - + True - True - Custom _message - True - GTK_RELIEF_NORMAL - True - False - False - True + False + 6 + + + + True + True + Send To: + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + + 0 - False - False + True + True - + True - 1 - 2 False - 6 - 6 + 6 - + True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - + True + Custom _message + True + GTK_RELIEF_NORMAL + True + False + False + True - 1 - 2 - 0 - 1 - fill + 0 + False + False - + True - Mes_sage: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0 - 0 - 0 - option-notebook + 1 + 2 + False + 6 + 6 + + + + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + 1 + 2 + 0 + 1 + fill + + + + + + True + Mes_sage: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0 + 0 + 0 + option-notebook + + + 0 + 1 + 0 + 1 + fill + fill + + - 0 - 1 - 0 - 1 - fill - fill + 0 + True + True 0 - True - True + False + False 0 False - False + True - 0 - False - True + False + True - - - False - True - - - - - True - label18 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + + + True + label18 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + - tab + 0 + True + True diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index 31d98e6087..88460e0935 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -237,6 +237,10 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store) sensitize_buttons (&dialog); + gtk_widget_ensure_style (dialog.toplevel); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12); + icon_list = e_icon_factory_get_icon_list ("stock_calendar"); if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list); diff --git a/calendar/gui/dialogs/alarm-list-dialog.glade b/calendar/gui/dialogs/alarm-list-dialog.glade index 4987355f84..886b1a47b9 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.glade +++ b/calendar/gui/dialogs/alarm-list-dialog.glade @@ -4,7 +4,6 @@ - False Alarms GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER_ON_PARENT @@ -18,7 +17,7 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST - True + False @@ -67,10 +66,10 @@ - 6 + 12 True False - 6 + 12 -- cgit v1.2.3