From 0ff98664ba2f06f71508288247b3b25ffb7f8f47 Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Sat, 30 Sep 2000 15:29:22 +0000 Subject: updated to support RDATE end times or durations. Note that if you have two 2000-09-29 Damon Chaplin * cal-util/cal-recur.c: updated to support RDATE end times or durations. Note that if you have two RDATEs with the same start times, but with different end dates/durations set, the results are unpredictable. So the event editor dialog should check for this. * gui/e-week-view-main-item.c (e_week_view_main_item_draw_day): make strftime() strings translatable, and changed the formats a bit. * NOTE: someone needs to check print.c to make sure strftime strings are OK for i18n. * gui/e-day-view.h: Changed EDayViewDateFormat enum. We now try to include the weekday if possible. Also changed EDayView struct so we store the month & weekdays with the longest names rather than the actual widths. This helps i18n. * gui/e-day-view.c (e_day_view_recalc_cell_sizes): used _() for strftime strings, tried to see if weekday fits, and rearranged a bit to make i18n easier. * gui/e-day-view-top-item.c (e_day_view_top_item_draw): used _() for strftime strings, and updated to use new formats. * gui/calendar-model.c: added use_24_hour_format boolean to CalendarModelPrivate so we can display dates in 12-hour format if requested. This meant adding a CalendarModel argument to a few functions. Also added get/set functions to set use_24_hour_format. I suppose ideally we should have an ECellDate renderer and this option should go there. svn path=/trunk/; revision=5646 --- calendar/gui/e-day-view.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'calendar/gui/e-day-view.h') diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index cfd11b057c..fda44c1289 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -118,13 +118,15 @@ typedef enum } EDayViewBusyType; /* This is used to specify the format used when displaying the dates. - The full format is like 'September 12'. The abbreviated format is like - 'Sep 12'. The short format is like '12'. The actual format used is - determined in style_set(), once we know the font being used. */ + The full format is like 'Thursday 12 September'. The abbreviated format is + like 'Thu 12 Sep'. The no weekday format is like '12 Sep'. The short format + is like '12'. The actual format used is determined in + e_day_view_recalc_cell_sizes(), once we know the font being used. */ typedef enum { E_DAY_VIEW_DATE_FULL, E_DAY_VIEW_DATE_ABBREVIATED, + E_DAY_VIEW_DATE_NO_WEEKDAY, E_DAY_VIEW_DATE_SHORT } EDayViewDateFormat; @@ -301,9 +303,12 @@ struct _EDayView /* This specifies how we are displaying the dates at the top. */ EDayViewDateFormat date_format; - /* These are the maximum widths of the different types of dates. */ - gint long_format_width; - gint abbreviated_format_width; + /* These are the longest month & weekday names in the current font. + Months are 0 to 11. Weekdays are 0 (Sun) to 6 (Sat). */ + gint longest_month_name; + gint longest_abbreviated_month_name; + gint longest_weekday_name; + gint longest_abbreviated_weekday_name; /* The large font use to display the hours. I don't think we need a fontset since we only display numbers. */ -- cgit v1.2.3