From e9a632c3c15bac86946af5f6d75a79517b4c6a07 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 1 Oct 1998 23:47:01 +0000 Subject: Use the font #defines. (month_view_new): Set the colors of the month view 1998-10-01 Federico Mena Quintero * month-view.c (month_view_init): Use the font #defines. (month_view_new): Set the colors of the month view upon creation. (mark_current_day): New function to mark the current day in the month view. (month_view_set): Mark the current day. (month_view_colors_changed): Mark the current day and colorify the month item appropriately. * month-view.h: Added year and month fields to the MonthView structure. * main.c: Renamed the Appointments color property, since it will be used by the month view as well. * goto.c (update): Set the current day's font and color. * year-view.c (year_view_init): Set the fonts of the month items when creating them. * mark.h: Added new #defines for HEADING_FONT and TITLE_FONT. * year-view.c (year_view_init): Use the new font #defines. * prop.c (prop_apply_colors): Fixed to work with the I-am-paranoid-and-I-need-to-size-my-ints changes to GnomeColorPicker. (color_spec_from_picker): Likewise. svn path=/trunk/; revision=424 --- calendar/year-view.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'calendar/year-view.c') diff --git a/calendar/year-view.c b/calendar/year-view.c index 93cd591292..6878080d3a 100644 --- a/calendar/year-view.c +++ b/calendar/year-view.c @@ -522,7 +522,7 @@ year_view_init (YearView *yv) yv->heading = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (yv)), gnome_canvas_text_get_type (), "anchor", GTK_ANCHOR_N, - "font", "-*-helvetica-bold-r-normal--14-*-*-*-*-*-iso8859-1", + "font", HEADING_FONT, "fill_color", "black", NULL); @@ -538,7 +538,7 @@ year_view_init (YearView *yv) gnome_canvas_text_get_type (), "text", buf, "anchor", GTK_ANCHOR_N, - "font", "-*-helvetica-bold-r-normal--12-*-*-*-*-*-iso8859-1", + "font", TITLE_FONT, "fill_color", "black", NULL); @@ -548,6 +548,8 @@ year_view_init (YearView *yv) gnome_canvas_item_set (yv->mitems[i], "anchor", GTK_ANCHOR_NW, "start_on_monday", week_starts_on_monday, + "heading_font", DAY_HEADING_FONT, + "day_font", NORMAL_DAY_FONT, NULL); setup_month_item (yv, i); } @@ -642,7 +644,7 @@ year_view_update (YearView *yv, iCalObject *object, int flags) year_view_set (yv, time_year_begin (time_from_day (yv->year, 0, 1))); } -/* Unmarks the old day that was marked as current and marks the current day */ +/* Unmarks the old day that was marked as current and marks the current day if appropriate */ static void mark_current_day (YearView *yv) { -- cgit v1.2.3