diff options
-rw-r--r-- | calendar/ChangeLog | 9 | ||||
-rw-r--r-- | calendar/gui/event-editor-dialog.glade | 13 | ||||
-rw-r--r-- | calendar/gui/event-editor-dialog.glade.h | 44 |
3 files changed, 37 insertions, 29 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 507ac1c795..d2e9d64224 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2001-01-20 Federico Mena Quintero <federico@ximian.com> + + * gui/event-editor-dialog.glade: Fix bug #1243. Turn on the Y + expand/fill options for the date widgets in the General page. + This makes them be vertically aligned with the "All day event" + toggle so that they will get the focus in the proper order; the + toggle would get the focus before them because it was a pixel or + two above them. + 2001-01-19 Federico Mena Quintero <federico@ximian.com> * gui/weekday-picker.c (weekday_picker_init): Unset the diff --git a/calendar/gui/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade index 9304d425b1..f1eef9196b 100644 --- a/calendar/gui/event-editor-dialog.glade +++ b/calendar/gui/event-editor-dialog.glade @@ -242,11 +242,11 @@ <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> - <yexpand>False</yexpand> + <yexpand>True</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>False</xfill> - <yfill>False</yfill> + <yfill>True</yfill> </child> </widget> @@ -265,11 +265,11 @@ <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> - <yexpand>False</yexpand> + <yexpand>True</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>False</xfill> - <yfill>False</yfill> + <yfill>True</yfill> </child> </widget> </widget> @@ -378,6 +378,7 @@ <class>GtkButton</class> <name>categories-button</name> <can_focus>True</can_focus> + <relief>GTK_RELIEF_NORMAL</relief> <child> <padding>0</padding> <expand>False</expand> @@ -416,6 +417,7 @@ <class>GtkButton</class> <name>categories-button</name> <can_focus>True</can_focus> + <relief>GTK_RELIEF_NORMAL</relief> <child> <padding>0</padding> <expand>False</expand> @@ -1346,6 +1348,7 @@ forever <name>recurrence-exception-add</name> <can_focus>True</can_focus> <label>Add</label> + <relief>GTK_RELIEF_NORMAL</relief> <child> <padding>0</padding> <expand>False</expand> @@ -1358,6 +1361,7 @@ forever <name>recurrence-exception-modify</name> <can_focus>True</can_focus> <label>Modify</label> + <relief>GTK_RELIEF_NORMAL</relief> <child> <padding>0</padding> <expand>False</expand> @@ -1370,6 +1374,7 @@ forever <name>recurrence-exception-delete</name> <can_focus>True</can_focus> <label>Delete</label> + <relief>GTK_RELIEF_NORMAL</relief> <child> <padding>0</padding> <expand>False</expand> diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h index 57c95fa0f6..05cfff27f8 100644 --- a/calendar/gui/event-editor-dialog.glade.h +++ b/calendar/gui/event-editor-dialog.glade.h @@ -17,22 +17,18 @@ gchar *s = N_("_Confidential"); gchar *s = N_("_Contacts"); gchar *s = N_("Ca_tegories..."); gchar *s = N_("General"); -gchar *s = N_("Minutes\n" - "Hours\n" - "Days\n" - ""); -gchar *s = N_("Minutes\n" - "Hours\n" - "Days\n" - ""); -gchar *s = N_("Minutes\n" - "Hours\n" - "Days\n" - ""); -gchar *s = N_("Minutes\n" - "Hours\n" - "Days\n" - ""); +gchar *s = N_("Minutes"); +gchar *s = N_("Hours"); +gchar *s = N_("Days"); +gchar *s = N_("Minutes"); +gchar *s = N_("Hours"); +gchar *s = N_("Days"); +gchar *s = N_("Minutes"); +gchar *s = N_("Hours"); +gchar *s = N_("Days"); +gchar *s = N_("Minutes"); +gchar *s = N_("Hours"); +gchar *s = N_("Days"); gchar *s = N_("_Display"); gchar *s = N_("_Program"); gchar *s = N_("_Mail"); @@ -48,15 +44,13 @@ gchar *s = N_("No recurrence"); gchar *s = N_("Simple recurrence"); gchar *s = N_("Custom recurrence"); gchar *s = N_("Every"); -gchar *s = N_("day(s)\n" - "week(s)\n" - "month(s)\n" - "year(s)\n" - ""); -gchar *s = N_("for\n" - "until\n" - "forever\n" - ""); +gchar *s = N_("day(s)"); +gchar *s = N_("week(s)"); +gchar *s = N_("month(s)"); +gchar *s = N_("year(s)"); +gchar *s = N_("for"); +gchar *s = N_("until"); +gchar *s = N_("forever"); gchar *s = N_("Exceptions"); gchar *s = N_("Add"); gchar *s = N_("Modify"); |