diff options
author | Damon Chaplin <damon@ximian.com> | 2001-09-29 09:51:45 +0800 |
---|---|---|
committer | Damon Chaplin <damon@src.gnome.org> | 2001-09-29 09:51:45 +0800 |
commit | 11b30502cd6b5b8b9679c21e57fd11d49725d375 (patch) | |
tree | a8597d7c7390553b0a912d58d7d9a4c6e66c5d85 /calendar/gui/dialogs | |
parent | 9072c0e4dca7048582bf59f89fca23c3a6a01e86 (diff) | |
download | gsoc2013-evolution-11b30502cd6b5b8b9679c21e57fd11d49725d375.tar.gz gsoc2013-evolution-11b30502cd6b5b8b9679c21e57fd11d49725d375.tar.zst gsoc2013-evolution-11b30502cd6b5b8b9679c21e57fd11d49725d375.zip |
use bound_text to print the summary, so it wraps instead of being clipped
001-09-28 Damon Chaplin <damon@ximian.com>
* gui/print.c (print_comp_item): use bound_text to print the summary,
so it wraps instead of being clipped to 1 line. Fixes part 3 of bug
#10285, I think.
* gui/dialogs/alarm-page.glade: left-aligned the Date/Time label.
Also set the width of the Summary & Date/Time labels to 10, and set
expand to TRUE, to make sure that the dialog doesn't keep getting
wider as the summary text on the main page gets longer. Could possibly
use an EClippedLabel here instead, so we get a '...' at the end if it
is clipped.
* gui/dialogs/recurrence-page.glade: changed Summary & Date/Time
widths as above.
* gui/print.c (print_calendar): use landscape mode for the month
preview.
(print_border_with_triangles): use EPSILON to account for floating
point errors. Hopefully fixes part 2b of bug #10285.
svn path=/trunk/; revision=13246
Diffstat (limited to 'calendar/gui/dialogs')
-rw-r--r-- | calendar/gui/dialogs/alarm-page.glade | 29 | ||||
-rw-r--r-- | calendar/gui/dialogs/recurrence-page.glade | 6 |
2 files changed, 18 insertions, 17 deletions
diff --git a/calendar/gui/dialogs/alarm-page.glade b/calendar/gui/dialogs/alarm-page.glade index fad62dad70..56c6f6ada1 100644 --- a/calendar/gui/dialogs/alarm-page.glade +++ b/calendar/gui/dialogs/alarm-page.glade @@ -110,53 +110,55 @@ <widget> <class>GtkLabel</class> - <name>date-time</name> + <name>summary</name> + <width>10</width> <label></label> <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> - <xalign>0.5</xalign> + <xalign>0</xalign> <yalign>0.5</yalign> <xpad>4</xpad> <ypad>0</ypad> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>False</xexpand> + <xexpand>True</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>True</yfill> + <yfill>False</yfill> </child> </widget> <widget> <class>GtkLabel</class> - <name>summary</name> + <name>date-time</name> + <width>10</width> <label></label> <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> - <xalign>0</xalign> + <xalign>7.45058e-09</xalign> <yalign>0.5</yalign> <xpad>4</xpad> <ypad>0</ypad> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>False</xexpand> + <xexpand>True</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>False</yfill> + <yfill>True</yfill> </child> </widget> </widget> @@ -282,7 +284,6 @@ end of appointment <name>button-options</name> <can_focus>True</can_focus> <label>_Options...</label> - <relief>GTK_RELIEF_NORMAL</relief> <child> <padding>0</padding> <expand>False</expand> @@ -361,7 +362,6 @@ end of appointment <can_default>True</can_default> <can_focus>True</can_focus> <label>_Add</label> - <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -370,7 +370,6 @@ end of appointment <can_default>True</can_default> <can_focus>True</can_focus> <label>_Delete</label> - <relief>GTK_RELIEF_NORMAL</relief> </widget> </widget> </widget> diff --git a/calendar/gui/dialogs/recurrence-page.glade b/calendar/gui/dialogs/recurrence-page.glade index 2858f3a9d6..a044a771aa 100644 --- a/calendar/gui/dialogs/recurrence-page.glade +++ b/calendar/gui/dialogs/recurrence-page.glade @@ -111,6 +111,7 @@ <widget> <class>GtkLabel</class> <name>summary</name> + <width>10</width> <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -125,7 +126,7 @@ <bottom_attach>1</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>False</xexpand> + <xexpand>True</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> @@ -137,6 +138,7 @@ <widget> <class>GtkLabel</class> <name>date-time</name> + <width>10</width> <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -151,7 +153,7 @@ <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>False</xexpand> + <xexpand>True</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> |