From 98746d11dad2b977f497049cdb21021790cdb53f Mon Sep 17 00:00:00 2001 From: Johnny Jacob Date: Mon, 30 Jan 2006 09:49:35 +0000 Subject: Fixed the page layouts as per HIG spacing. 2006-01-30 Johnny Jacob * gui/dialogs/event-page.c: (sensitize_widgets), (alarm_changed_cb): * gui/dialogs/event-page.glade: * gui/dialogs/task-page.c: (sensitize_widgets): * gui/dialogs/task-page.glade: Fixed the page layouts as per HIG spacing. svn path=/trunk/; revision=31356 --- calendar/gui/dialogs/event-page.c | 8 +- calendar/gui/dialogs/event-page.glade | 1040 ++++++++++++++++++--------------- calendar/gui/dialogs/task-page.c | 4 +- calendar/gui/dialogs/task-page.glade | 825 +++++++++++++------------- 4 files changed, 994 insertions(+), 883 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index c400aaa80f..54a548224d 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -805,7 +805,7 @@ sensitize_widgets (EventPage *epage) if (alarm && !priv->alarm_icon) { priv->alarm_icon = create_image_event_box ("stock_bell", _("This event has alarms")); - gtk_box_pack_start ((GtkBox *)priv->status_icons, priv->alarm_icon, FALSE, FALSE, 3); + gtk_box_pack_start ((GtkBox *)priv->status_icons, priv->alarm_icon, FALSE, FALSE, 6); } gtk_entry_set_editable (GTK_ENTRY (priv->summary), sensitize); @@ -870,13 +870,13 @@ sensitize_widgets (EventPage *epage) gtk_widget_hide (priv->list_box); gtk_widget_hide (priv->attendee_box); gtk_widget_hide (priv->organizer); - gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Cale_ndar")); + gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Cale_ndar:")); } else { gtk_widget_show (priv->calendar_label); gtk_widget_show (priv->list_box); gtk_widget_show (priv->attendee_box); gtk_widget_show (priv->organizer); - gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer")); + gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:")); } } @@ -2718,7 +2718,7 @@ alarm_changed_cb (GtkWidget *widget, gpointer data) } if (!priv->alarm_icon) { priv->alarm_icon = create_image_event_box ("stock_bell", _("This event has alarms")); - gtk_box_pack_start ((GtkBox *)priv->status_icons, priv->alarm_icon, FALSE, FALSE, 3); + gtk_box_pack_start ((GtkBox *)priv->status_icons, priv->alarm_icon, FALSE, FALSE, 6); } } else { e_alarm_list_clear (priv->alarm_list_store); diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade index 08a275dda9..cdc00bafe8 100644 --- a/calendar/gui/dialogs/event-page.glade +++ b/calendar/gui/dialogs/event-page.glade @@ -19,10 +19,27 @@ - 12 True False - 6 + 0 + + + + 2 + True + False + 0 + + + + + + + 0 + False + False + + @@ -30,19 +47,37 @@ False 0 + + + 6 + True + False + 0 + + + + + + + 0 + False + False + + + True 9 2 False - 6 - 6 + 0 + 12 - + True - Su_mmary: + Locat_ion: True False GTK_JUSTIFY_CENTER @@ -52,7 +87,7 @@ 0.5 0 0 - summary + location PANGO_ELLIPSIZE_NONE -1 False @@ -61,48 +96,27 @@ 0 1 - 2 - 3 + 3 + 4 fill - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 2 - 3 - - - - - - + True - Locat_ion: + D_escription: True False GTK_JUSTIFY_CENTER False False 7.45058015283e-09 - 0.5 + 0 0 0 - location + description PANGO_ELLIPSIZE_NONE -1 False @@ -111,89 +125,82 @@ 0 1 - 3 - 4 + 7 + 8 fill - + fill - + True - True - True - True - 0 - - True - * - False + Or_ganizer: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 1 - 2 - 3 - 4 + 0 + 1 + 0 + 1 + fill - + True - GTK_POLICY_AUTOMATIC - 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 - - - Event Description - - - + _Time: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 1 - 2 - 7 - 8 - expand|shrink|fill - expand|shrink|fill + 0 + 1 + 4 + 5 + fill + - + True - _Description: + Time _zone: True False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False - 7.45058015283e-09 - 0 + 0 + 0.5 0 0 - description PANGO_ELLIPSIZE_NONE -1 False @@ -202,26 +209,46 @@ 0 1 - 7 - 8 + 5 + 6 fill - fill + - + True - Or_ganizer: + True + Ca_tegories... + True + GTK_RELIEF_NORMAL + True + + + 0 + 1 + 6 + 7 + fill + + + + + + + True + Su_mmary: True False - GTK_JUSTIFY_LEFT + GTK_JUSTIFY_CENTER False False - 0 + 7.45058015283e-09 0.5 0 0 + summary PANGO_ELLIPSIZE_NONE -1 False @@ -230,173 +257,203 @@ 0 1 - 0 - 1 + 2 + 3 + 3 fill - + True - True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 2 + 3 + 3 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 3 + 4 + 3 + + + + + + + True + False 0 - + True - False - True - False - True - False - - - - True - True - True - True - 0 - - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - + make_date_edit + 0 + 0 + Sun, 09 Oct 2005 05:53:12 GMT 2 - True - True + False + False - + True False 0 - + + 24 True - Cale_ndar: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - source - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + True + 0 + + + + + + + True + for + True + + + + + + + True + until + True + + + + + - 2 + 12 False False - - True - event_page_create_source_option_menu - 0 - 0 - Wed, 17 Dec 2003 18:20:26 GMT - - - 0 - True - True - - - - - 0 - True - True - - - - - 1 - 2 - 0 - 1 - fill - fill - - - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - + True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + False + 0 - + True False - 2 + 0 - + + 52 True - gtk-jump-to - 4 + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 0 1 1 1 + + + 0 + False + False + + + + + + True + hours + False + False + GTK_JUSTIFY_LEFT + False + False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 + 6 False False - + True - Atte_ndees... - True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 59 5 10 10 + + + 0 + True + True + + + + + + True + minutes + False False GTK_JUSTIFY_LEFT False @@ -411,14 +468,54 @@ 0 - 0 + 6 False False + + 2 + False + False + + + + + + True + make_date_edit + 0 + 0 + Sun, 09 Oct 2005 06:12:10 GMT + + + 0 + True + True + + + 0 + True + True + + + + + + True + make_status_icons + 0 + 0 + Thu, 24 Nov 2005 07:10:06 GMT + + + 4 + False + False + @@ -427,27 +524,110 @@ False - - - - - 0 - 1 - 1 - 2 + 1 + 2 + 4 + 5 + 3 fill fill - - 150 + True - False - 10 + make_timezone_entry + 0 + 0 + Mon, 10 Oct 2005 11:05:54 GMT + + + 1 + 2 + 5 + 6 + 3 + fill + fill + + + + + + True + True + True + True + 0 + + True + * + False + + Categories + + + + 1 + 2 + 6 + 7 + 3 + + + + + + + True + GTK_POLICY_AUTOMATIC + 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 + + + Event Description + + + + + + 1 + 2 + 7 + 8 + 3 + expand|shrink|fill + expand|shrink|fill + + + + + + 150 + True + False + 6 @@ -457,7 +637,7 @@ True GTK_BUTTONBOX_START - 0 + 2 @@ -508,183 +688,173 @@ 2 1 2 + 3 fill fill - - True - _Time: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - + True - False + True 0 - + True - make_date_edit - 0 - 0 - Sun, 09 Oct 2005 05:53:12 GMT + False + True + False + True + False + + + + True + True + True + True + 0 + + True + * + False + + + + + + True + GTK_SELECTION_BROWSE + + - 2 - False - False + 0 + True + True - + True False 0 - + True - True - 0 - - - - - - - True - for - True - - - - - - - True - until - True - - - - - + Cale_ndar: + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + source + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 2 + 6 False False - + True - False - 0 + event_page_create_source_option_menu + 0 + 0 + Wed, 17 Dec 2003 18:20:26 GMT + + + 0 + True + True + + + + + 0 + True + True + + + + + 1 + 2 + 0 + 1 + 3 + fill + fill + + + + + + True + False + 0 + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True False - 0 - - - - 52 - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 0 1 1 1 - - - 0 - False - False - - + 2 - + True - hours - False - False - GTK_JUSTIFY_LEFT - False - False + gtk-jump-to + 4 0.5 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 2 + 0 False False - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 59 5 10 10 - - - 0 - True - True - - - - - + True - minutes - False + Atte_ndees... + True False GTK_JUSTIFY_LEFT False @@ -699,54 +869,14 @@ 0 - 2 + 0 False False - - 2 - False - False - - - - - - True - make_date_edit - 0 - 0 - Sun, 09 Oct 2005 06:12:10 GMT - - - 0 - True - True - - - 0 - True - True - - - - - - True - make_status_icons - 0 - 0 - Thu, 24 Nov 2005 07:10:06 GMT - - - 4 - False - False - @@ -755,110 +885,44 @@ False - - - 1 - 2 - 4 - 5 - fill - fill - - - - - True - Time _zone: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + 0 1 - 5 - 6 - fill - - - - - - - True - make_timezone_entry - 0 - 0 - Mon, 10 Oct 2005 11:05:54 GMT - - - 1 - 2 - 5 - 6 + 1 + 2 + 3 fill fill + + + 0 + True + True + + - - - True - True - Ca_tegories... - True - GTK_RELIEF_NORMAL - True - - - 0 - 1 - 6 - 7 - fill - - - + + + 6 + True + False + 0 - - True - True - True - True - 0 - - True - * - False - - Categories - - - - 1 - 2 - 6 - 7 - - + 0 - True - True + False + False @@ -868,6 +932,24 @@ True + + + + 2 + True + False + 0 + + + + + + + 0 + False + False + + diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 11c55a7dc7..2025c4075c 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -436,14 +436,14 @@ sensitize_widgets (TaskPage *tpage) gtk_widget_hide (priv->attendee_box); gtk_widget_hide (priv->organizer); gtk_widget_hide (priv->invite); - gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("_Group")); + gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("_Group:")); } else { gtk_widget_show (priv->invite); gtk_widget_show (priv->calendar_label); gtk_widget_show (priv->list_box); gtk_widget_show (priv->attendee_box); gtk_widget_show (priv->organizer); - gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer")); + gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:")); } } void diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade index 40928cc8bb..84a589a070 100644 --- a/calendar/gui/dialogs/task-page.glade +++ b/calendar/gui/dialogs/task-page.glade @@ -16,11 +16,10 @@ GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True - False - 12 + 3 True False 6 @@ -31,112 +30,74 @@ False 0 + + + True + False + 0 + + + + + + + 4 + False + True + + + True 8 2 False - 6 + 0 12 - + True - False - 0 - - - - True - False - 10 - - - - - - - - True - GTK_BUTTONBOX_START - 0 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - gtk-edit - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - True - GTK_PACK_END - - - - - 0 - True - True - - + Su_mmary: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + summary + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 1 - 2 - 1 - 2 + 0 + 1 + 2 + 3 fill - fill + - + True - Su_mmary: + Or_ganiser: True False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0 0.5 0 0 - summary PANGO_ELLIPSIZE_NONE -1 False @@ -145,47 +106,56 @@ 0 1 - 2 - 3 + 0 + 1 fill - + True - True - True - True - 0 - - True - * - False + _Due date: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + due-date + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 1 - 2 - 2 - 3 + 0 + 1 + 4 + 5 + fill - + True - Or_ganiser: + Sta_rt date: True False - GTK_JUSTIFY_LEFT + GTK_JUSTIFY_CENTER False False 0 0.5 0 0 + start-date PANGO_ELLIPSIZE_NONE -1 False @@ -194,231 +164,45 @@ 0 1 - 0 - 1 + 3 + 4 fill - + True - True - 0 - - - - True - False - True - False - True - False - - - - True - True - True - True - 0 - - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - - - - 2 - True - True - - - - - - True - False - 0 - - - - True - _Group: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - False - False - - - - - - True - task_page_create_source_option_menu - 0 - 0 - Thu, 18 Dec 2003 01:58:48 GMT - - - 0 - True - True - - - - - 0 - True - True - - + True + Categor_ies... + True + GTK_RELIEF_NORMAL + True - 1 - 2 - 0 - 1 + 0 + 1 + 6 + 7 fill - fill + - + True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-jump-to - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Atte_ndees... - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - - - - 0 - 1 - 1 - 2 - fill - fill - - - - - - True - _Due date: - True + Time zone: + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0 0.5 0 0 - due-date PANGO_ELLIPSIZE_NONE -1 False @@ -427,27 +211,27 @@ 0 1 - 4 - 5 + 5 + 6 fill - + True - Sta_rt date: + D_escription: True False GTK_JUSTIFY_CENTER False False 0 - 0.5 + 0 0 0 - start-date + description PANGO_ELLIPSIZE_NONE -1 False @@ -456,10 +240,10 @@ 0 1 - 3 - 4 + 7 + 8 fill - + fill @@ -476,6 +260,7 @@ 2 3 4 + 3 shrink|fill shrink|fill @@ -494,79 +279,12 @@ 2 4 5 + 3 fill fill - - - True - True - Categor_ies... - True - GTK_RELIEF_NORMAL - True - - - 0 - 1 - 6 - 7 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 6 - 7 - - - - - - - True - Time zone: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - fill - - - - True @@ -580,6 +298,7 @@ 2 5 6 + 3 fill fill @@ -618,37 +337,330 @@ 2 7 8 + 3 - + True - D_escription: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0 - 0 - 0 - description - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + True + True + True + 0 + + True + * + False + + + 1 + 2 + 2 + 3 + 3 + + + + + + + True + False + 6 + + + + + + + + True + GTK_BUTTONBOX_START + 0 + + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + True + gtk-edit + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + GTK_PACK_END + + + + + 1 + 2 + 1 + 2 + 3 + fill + fill + + + + + + True + False + 0 + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-jump-to + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Atte_ndees... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + 0 1 - 7 - 8 + 1 + 2 + fill + fill + + + + + + True + True + 6 + + + + True + False + True + False + True + False + + + + True + True + True + True + 0 + + True + * + False + + + + + + True + GTK_SELECTION_BROWSE + + + + + 0 + True + True + + + + + + True + False + 6 + + + + True + _Group: + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + 24 + True + task_page_create_source_option_menu + 0 + 0 + Thu, 18 Dec 2003 01:58:48 GMT + + + 0 + True + True + + + + + 0 + True + True + + + + + 1 + 2 + 0 + 1 + 3 fill fill + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 6 + 7 + 3 + + + 0 @@ -656,6 +668,23 @@ True + + + + True + False + 0 + + + + + + + 4 + False + True + + 0 -- cgit