From b681ca2a8137816dcbc077eeca7d409dc196dd03 Mon Sep 17 00:00:00 2001 From: "Sergey I. Panov" Date: Thu, 18 Feb 1999 00:05:17 +0000 Subject: will define fonts via fontset. Friendlier to locales that use iso8859-[^1] * gnome-month-item.c,gnome-month-item.h,goto.c,mark.h, month-view.c,prop.c,quick-view.c,year-view.c: will define fonts via fontset. Friendlier to locales that use iso8859-[^1] and koi8-r encodings. Does not solve problem for Asian languiges --- better solution is needed (e.g. standart GNOME fontstyles defined in gtkrc). Interpol svn path=/trunk/; revision=677 --- calendar/ChangeLog | 9 +++++++++ calendar/gnome-month-item.c | 32 ++++++++++++++++++++++++++++++++ calendar/gnome-month-item.h | 2 ++ calendar/goto.c | 4 ++-- calendar/gui/gnome-month-item.c | 32 ++++++++++++++++++++++++++++++++ calendar/gui/gnome-month-item.h | 2 ++ calendar/gui/goto.c | 4 ++-- calendar/gui/mark.h | 17 +++++++++-------- calendar/gui/month-view.c | 15 ++++++--------- calendar/gui/prop.c | 2 +- calendar/gui/quick-view.c | 6 +++--- calendar/gui/year-view.c | 12 ++++++------ calendar/mark.h | 17 +++++++++-------- calendar/month-view.c | 15 ++++++--------- calendar/prop.c | 2 +- calendar/quick-view.c | 6 +++--- calendar/year-view.c | 12 ++++++------ 17 files changed, 131 insertions(+), 58 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 6c65af5ba3..3527356303 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +1999-02-17 Sergey Panov + + * gnome-month-item.c,gnome-month-item.h,goto.c,mark.h, + month-view.c,prop.c,quick-view.c,year-view.c: will define + fonts via fontset. Friendlier to locales that use iso8859-[^1] + and koi8-r encodings. Does not solve problem for Asian languiges + --- better solution is needed (e.g. standart GNOME fontstyles + defined in gtkrc). + 1999-02-16 Sergey Panov * main.c: Use N_() macro for color settings labels in diff --git a/calendar/gnome-month-item.c b/calendar/gnome-month-item.c index 1eb8412f5c..ec799112de 100644 --- a/calendar/gnome-month-item.c +++ b/calendar/gnome-month-item.c @@ -58,8 +58,10 @@ enum { ARG_DAY_ANCHOR, ARG_START_ON_MONDAY, ARG_HEAD_FONT, + ARG_HEAD_FONTSET, ARG_HEAD_FONT_GDK, ARG_DAY_FONT, + ARG_DAY_FONTSET, ARG_DAY_FONT_GDK, ARG_HEAD_COLOR, ARG_HEAD_COLOR_GDK, @@ -136,8 +138,10 @@ gnome_month_item_class_init (GnomeMonthItemClass *class) gtk_object_add_arg_type ("GnomeMonthItem::day_anchor", GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_DAY_ANCHOR); gtk_object_add_arg_type ("GnomeMonthItem::start_on_monday", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_START_ON_MONDAY); gtk_object_add_arg_type ("GnomeMonthItem::heading_font", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_FONT); + gtk_object_add_arg_type ("GnomeMonthItem::heading_fontset", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_FONTSET); gtk_object_add_arg_type ("GnomeMonthItem::heading_font_gdk", GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_HEAD_FONT_GDK); gtk_object_add_arg_type ("GnomeMonthItem::day_font", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_FONT); + gtk_object_add_arg_type ("GnomeMonthItem::day_fontset", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_FONTSET); gtk_object_add_arg_type ("GnomeMonthItem::day_font_gdk", GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_DAY_FONT_GDK); gtk_object_add_arg_type ("GnomeMonthItem::heading_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_COLOR); gtk_object_add_arg_type ("GnomeMonthItem::heading_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_HEAD_COLOR_GDK); @@ -977,6 +981,20 @@ gnome_month_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) reshape (mitem); break; + case ARG_HEAD_FONTSET: + gdk_font_unref (mitem->head_font); + + mitem->head_font = gdk_fontset_load (GTK_VALUE_STRING (*arg)); + if (!mitem->head_font) { + mitem->head_font = + gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*"); + g_assert (mitem->head_font != NULL); + } + + set_head_font (mitem); + reshape (mitem); + break; + case ARG_HEAD_FONT_GDK: gdk_font_unref (mitem->head_font); @@ -999,6 +1017,20 @@ gnome_month_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) reshape (mitem); break; + case ARG_DAY_FONTSET: + gdk_font_unref (mitem->day_font); + + mitem->head_font = gdk_fontset_load (GTK_VALUE_STRING (*arg)); + if (!mitem->day_font) { + mitem->day_font = + gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*"); + g_assert (mitem->day_font != NULL); + } + + set_day_font (mitem); + reshape (mitem); + break; + case ARG_DAY_FONT_GDK: gdk_font_unref (mitem->day_font); diff --git a/calendar/gnome-month-item.h b/calendar/gnome-month-item.h index 51487b1fc7..0ec4fd484c 100644 --- a/calendar/gnome-month-item.h +++ b/calendar/gnome-month-item.h @@ -67,8 +67,10 @@ typedef enum { * day_anchor GtkAnchorType RW Anchor side for day numbers inside day boxes * start_on_monday boolean RW Specifies whether the week starts on Monday or Sunday * heading_font string W X logical font descriptor for the headings + * heading_fontset string W X logical fontset descriptor for the headings * heading_font_gdk GdkFont * RW Pointer to GdkFont for the headings * day_font string W X logical font descriptor for the day numbers + * day_fontset string W X logical fontset descriptor for the day numbers * day_font_gdk GdkFont * RW Pointer to GdkFont for the day numbers * heading_color string W X color specification for heading labels * heading_color_gdk GdkColor * RW Pointer to an allocated GdkColor for heading labels diff --git a/calendar/goto.c b/calendar/goto.c index 843be699d9..c371b74db4 100644 --- a/calendar/goto.c +++ b/calendar/goto.c @@ -38,7 +38,7 @@ update (void) GNOME_MONTH_ITEM_DAY_LABEL + current_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_DAY_FG), - "font", NORMAL_DAY_FONT, + "fontset", NORMAL_DAY_FONTSET, NULL); current_index = -1; } @@ -54,7 +54,7 @@ update (void) GNOME_MONTH_ITEM_DAY_LABEL + current_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_CURRENT_DAY_FG), - "font", CURRENT_DAY_FONT, + "fontset", CURRENT_DAY_FONTSET, NULL); } } diff --git a/calendar/gui/gnome-month-item.c b/calendar/gui/gnome-month-item.c index 1eb8412f5c..ec799112de 100644 --- a/calendar/gui/gnome-month-item.c +++ b/calendar/gui/gnome-month-item.c @@ -58,8 +58,10 @@ enum { ARG_DAY_ANCHOR, ARG_START_ON_MONDAY, ARG_HEAD_FONT, + ARG_HEAD_FONTSET, ARG_HEAD_FONT_GDK, ARG_DAY_FONT, + ARG_DAY_FONTSET, ARG_DAY_FONT_GDK, ARG_HEAD_COLOR, ARG_HEAD_COLOR_GDK, @@ -136,8 +138,10 @@ gnome_month_item_class_init (GnomeMonthItemClass *class) gtk_object_add_arg_type ("GnomeMonthItem::day_anchor", GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_DAY_ANCHOR); gtk_object_add_arg_type ("GnomeMonthItem::start_on_monday", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_START_ON_MONDAY); gtk_object_add_arg_type ("GnomeMonthItem::heading_font", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_FONT); + gtk_object_add_arg_type ("GnomeMonthItem::heading_fontset", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_FONTSET); gtk_object_add_arg_type ("GnomeMonthItem::heading_font_gdk", GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_HEAD_FONT_GDK); gtk_object_add_arg_type ("GnomeMonthItem::day_font", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_FONT); + gtk_object_add_arg_type ("GnomeMonthItem::day_fontset", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_FONTSET); gtk_object_add_arg_type ("GnomeMonthItem::day_font_gdk", GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_DAY_FONT_GDK); gtk_object_add_arg_type ("GnomeMonthItem::heading_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_COLOR); gtk_object_add_arg_type ("GnomeMonthItem::heading_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_HEAD_COLOR_GDK); @@ -977,6 +981,20 @@ gnome_month_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) reshape (mitem); break; + case ARG_HEAD_FONTSET: + gdk_font_unref (mitem->head_font); + + mitem->head_font = gdk_fontset_load (GTK_VALUE_STRING (*arg)); + if (!mitem->head_font) { + mitem->head_font = + gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*"); + g_assert (mitem->head_font != NULL); + } + + set_head_font (mitem); + reshape (mitem); + break; + case ARG_HEAD_FONT_GDK: gdk_font_unref (mitem->head_font); @@ -999,6 +1017,20 @@ gnome_month_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) reshape (mitem); break; + case ARG_DAY_FONTSET: + gdk_font_unref (mitem->day_font); + + mitem->head_font = gdk_fontset_load (GTK_VALUE_STRING (*arg)); + if (!mitem->day_font) { + mitem->day_font = + gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*"); + g_assert (mitem->day_font != NULL); + } + + set_day_font (mitem); + reshape (mitem); + break; + case ARG_DAY_FONT_GDK: gdk_font_unref (mitem->day_font); diff --git a/calendar/gui/gnome-month-item.h b/calendar/gui/gnome-month-item.h index 51487b1fc7..0ec4fd484c 100644 --- a/calendar/gui/gnome-month-item.h +++ b/calendar/gui/gnome-month-item.h @@ -67,8 +67,10 @@ typedef enum { * day_anchor GtkAnchorType RW Anchor side for day numbers inside day boxes * start_on_monday boolean RW Specifies whether the week starts on Monday or Sunday * heading_font string W X logical font descriptor for the headings + * heading_fontset string W X logical fontset descriptor for the headings * heading_font_gdk GdkFont * RW Pointer to GdkFont for the headings * day_font string W X logical font descriptor for the day numbers + * day_fontset string W X logical fontset descriptor for the day numbers * day_font_gdk GdkFont * RW Pointer to GdkFont for the day numbers * heading_color string W X color specification for heading labels * heading_color_gdk GdkColor * RW Pointer to an allocated GdkColor for heading labels diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c index 843be699d9..c371b74db4 100644 --- a/calendar/gui/goto.c +++ b/calendar/gui/goto.c @@ -38,7 +38,7 @@ update (void) GNOME_MONTH_ITEM_DAY_LABEL + current_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_DAY_FG), - "font", NORMAL_DAY_FONT, + "fontset", NORMAL_DAY_FONTSET, NULL); current_index = -1; } @@ -54,7 +54,7 @@ update (void) GNOME_MONTH_ITEM_DAY_LABEL + current_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_CURRENT_DAY_FG), - "font", CURRENT_DAY_FONT, + "fontset", CURRENT_DAY_FONTSET, NULL); } } diff --git a/calendar/gui/mark.h b/calendar/gui/mark.h index 18ec39b76b..33a8fe23e5 100644 --- a/calendar/gui/mark.h +++ b/calendar/gui/mark.h @@ -14,14 +14,15 @@ /* These are the fonts used for the montly calendars */ -#define HEADING_FONT "-*-helvetica-bold-r-normal--14-*-*-*-p-*-*-*" -#define TITLE_FONT "-*-helvetica-bold-r-normal--12-*-*-*-p-*-*-*" -#define DAY_HEADING_FONT "-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*" -#define NORMAL_DAY_FONT "-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*" -#define CURRENT_DAY_FONT "-*-helvetica-bold-r-normal--12-*-*-*-p-*-*-*" -#define BIG_DAY_HEADING_FONT "-*-helvetica-bold-r-normal--14-*-*-*-p-*-*-*" -#define BIG_NORMAL_DAY_FONT "-*-helvetica-medium-r-normal--14-*-*-*-p-*-*-*" -#define BIG_CURRENT_DAY_FONT "-*-helvetica-bold-r-normal--14-*-*-*-p-*-*-*" +#define HEADING_FONTSET "-adobe-helvetica-medium-r-*-*-14-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-17-*-*-*-p-*-koi8-r" +#define TITLE_FONTSET "-adobe-helvetica-bold-r-normal--12-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-14-*-*-*-p-*-koi8-r" +#define DAY_HEADING_FONTSET "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r" +#define NORMAL_DAY_FONTSET "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r" +#define CURRENT_DAY_FONTSET "-adobe-helvetica-bold-r-normal--12-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-14-*-*-*-p-*-koi8-r" +#define BIG_DAY_HEADING_FONTSET "-adobe-helvetica-bold-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-bold-r-normal-*-17-*-*-*-p-*-koi8-r" +#define BIG_NORMAL_DAY_FONTSET "-adobe-helvetica-medium-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-17-*-*-*-p-*-koi8-r" +#define BIG_CURRENT_DAY_FONTSET "-adobe-helvetica-bold-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-bold-r-normal-*-17-*-*-*-p-*-koi8-r" +#define EVENT_FONTSET "-adobe-helvetica-medium-r-*-*-10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r" /* Functions of this type are used by the marking functions to fetch color specifications. Such diff --git a/calendar/gui/month-view.c b/calendar/gui/month-view.c index 07a92578dd..2759dada2f 100644 --- a/calendar/gui/month-view.c +++ b/calendar/gui/month-view.c @@ -22,9 +22,6 @@ /* Padding between day borders and event text */ #define EVENT_PADDING 3 -/* Font for the month view events */ -#define EVENT_FONT "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*" - static void month_view_class_init (MonthViewClass *class); static void month_view_init (MonthView *mv); @@ -416,7 +413,7 @@ month_view_init (MonthView *mv) mv->title = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (mv)), gnome_canvas_text_get_type (), "anchor", GTK_ANCHOR_N, - "font", HEADING_FONT, + "fontset", HEADING_FONTSET, "fill_color", "black", NULL); @@ -429,8 +426,8 @@ month_view_init (MonthView *mv) "day_anchor", GTK_ANCHOR_NE, "start_on_monday", week_starts_on_monday, "heading_padding", 2.0, - "heading_font", BIG_DAY_HEADING_FONT, - "day_font", BIG_NORMAL_DAY_FONT, + "heading_fontset", BIG_DAY_HEADING_FONTSET, + "day_fontset", BIG_NORMAL_DAY_FONTSET, NULL); /* Arrows and text items. The arrows start hidden by default; they will be shown as @@ -473,7 +470,7 @@ month_view_init (MonthView *mv) mv->text[i] = gnome_canvas_item_new (GNOME_CANVAS_GROUP (day_group), gnome_canvas_text_get_type (), - "font", EVENT_FONT, + "fontset", EVENT_FONTSET, "anchor", GTK_ANCHOR_NW, "fill_color", color_spec_from_prop (COLOR_PROP_DAY_FG), "clip", TRUE, @@ -714,7 +711,7 @@ mark_current_day (MonthView *mv) GNOME_MONTH_ITEM_DAY_LABEL + mv->old_current_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_DAY_FG), - "font", BIG_NORMAL_DAY_FONT, + "fontset", BIG_NORMAL_DAY_FONTSET, NULL); mv->old_current_index = -1; @@ -733,7 +730,7 @@ mark_current_day (MonthView *mv) GNOME_MONTH_ITEM_DAY_LABEL + mv->old_current_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_CURRENT_DAY_FG), - "font", BIG_CURRENT_DAY_FONT, + "fontset", BIG_CURRENT_DAY_FONTSET, NULL); } } diff --git a/calendar/gui/prop.c b/calendar/gui/prop.c index 1e771812f9..345c07fe96 100644 --- a/calendar/gui/prop.c +++ b/calendar/gui/prop.c @@ -395,7 +395,7 @@ set_current_day (void) item = gnome_month_item_num2child (GNOME_MONTH_ITEM (month_item), GNOME_MONTH_ITEM_DAY_LABEL + day_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_picker (COLOR_PROP_CURRENT_DAY_FG), - "font", CURRENT_DAY_FONT, + "fontset", CURRENT_DAY_FONTSET, NULL); } diff --git a/calendar/gui/quick-view.c b/calendar/gui/quick-view.c index 337cfdbf73..f8fe8d42fd 100644 --- a/calendar/gui/quick-view.c +++ b/calendar/gui/quick-view.c @@ -10,7 +10,7 @@ #include "main.h" -#define QUICK_VIEW_FONT "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*" +#define QUICK_VIEW_FONTSET "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r" static void quick_view_class_init (QuickViewClass *class); @@ -138,7 +138,7 @@ create_items_for_event (QuickView *qv, CalendarObject *co, double *y, double *ma "y", *y, "anchor", GTK_ANCHOR_NW, "text", str, - "font", QUICK_VIEW_FONT, + "fontset", QUICK_VIEW_FONTSET, NULL); g_free (str); @@ -173,7 +173,7 @@ setup_event_list (QuickView *qv, GList *event_list) "y", 0.0, "anchor", GTK_ANCHOR_NW, "text", _("No appointments for this day"), - "font", QUICK_VIEW_FONT, + "fontset", QUICK_VIEW_FONTSET, NULL); /* Measure the text and set the proper sizes */ diff --git a/calendar/gui/year-view.c b/calendar/gui/year-view.c index 786270bea3..a8bc79e6fe 100644 --- a/calendar/gui/year-view.c +++ b/calendar/gui/year-view.c @@ -497,7 +497,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", HEADING_FONT, + "fontset", HEADING_FONTSET, "fill_color", "black", NULL); @@ -513,7 +513,7 @@ year_view_init (YearView *yv) gnome_canvas_text_get_type (), "text", buf, "anchor", GTK_ANCHOR_N, - "font", TITLE_FONT, + "fontset", TITLE_FONTSET, "fill_color", "black", NULL); @@ -523,8 +523,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, + "heading_fontset", DAY_HEADING_FONTSET, + "day_fontset", NORMAL_DAY_FONTSET, NULL); setup_month_item (yv, i); } @@ -638,7 +638,7 @@ mark_current_day (YearView *yv) GNOME_MONTH_ITEM_DAY_LABEL + day_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_DAY_FG), - "font", NORMAL_DAY_FONT, + "fontset", NORMAL_DAY_FONTSET, NULL); yv->old_marked_day = -1; @@ -658,7 +658,7 @@ mark_current_day (YearView *yv) GNOME_MONTH_ITEM_DAY_LABEL + day_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_CURRENT_DAY_FG), - "font", CURRENT_DAY_FONT, + "fontset", CURRENT_DAY_FONTSET, NULL); yv->old_marked_day = month_index * 42 + day_index; diff --git a/calendar/mark.h b/calendar/mark.h index 18ec39b76b..33a8fe23e5 100644 --- a/calendar/mark.h +++ b/calendar/mark.h @@ -14,14 +14,15 @@ /* These are the fonts used for the montly calendars */ -#define HEADING_FONT "-*-helvetica-bold-r-normal--14-*-*-*-p-*-*-*" -#define TITLE_FONT "-*-helvetica-bold-r-normal--12-*-*-*-p-*-*-*" -#define DAY_HEADING_FONT "-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*" -#define NORMAL_DAY_FONT "-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*" -#define CURRENT_DAY_FONT "-*-helvetica-bold-r-normal--12-*-*-*-p-*-*-*" -#define BIG_DAY_HEADING_FONT "-*-helvetica-bold-r-normal--14-*-*-*-p-*-*-*" -#define BIG_NORMAL_DAY_FONT "-*-helvetica-medium-r-normal--14-*-*-*-p-*-*-*" -#define BIG_CURRENT_DAY_FONT "-*-helvetica-bold-r-normal--14-*-*-*-p-*-*-*" +#define HEADING_FONTSET "-adobe-helvetica-medium-r-*-*-14-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-17-*-*-*-p-*-koi8-r" +#define TITLE_FONTSET "-adobe-helvetica-bold-r-normal--12-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-14-*-*-*-p-*-koi8-r" +#define DAY_HEADING_FONTSET "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r" +#define NORMAL_DAY_FONTSET "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r" +#define CURRENT_DAY_FONTSET "-adobe-helvetica-bold-r-normal--12-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-14-*-*-*-p-*-koi8-r" +#define BIG_DAY_HEADING_FONTSET "-adobe-helvetica-bold-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-bold-r-normal-*-17-*-*-*-p-*-koi8-r" +#define BIG_NORMAL_DAY_FONTSET "-adobe-helvetica-medium-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-17-*-*-*-p-*-koi8-r" +#define BIG_CURRENT_DAY_FONTSET "-adobe-helvetica-bold-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-bold-r-normal-*-17-*-*-*-p-*-koi8-r" +#define EVENT_FONTSET "-adobe-helvetica-medium-r-*-*-10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r" /* Functions of this type are used by the marking functions to fetch color specifications. Such diff --git a/calendar/month-view.c b/calendar/month-view.c index 07a92578dd..2759dada2f 100644 --- a/calendar/month-view.c +++ b/calendar/month-view.c @@ -22,9 +22,6 @@ /* Padding between day borders and event text */ #define EVENT_PADDING 3 -/* Font for the month view events */ -#define EVENT_FONT "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*" - static void month_view_class_init (MonthViewClass *class); static void month_view_init (MonthView *mv); @@ -416,7 +413,7 @@ month_view_init (MonthView *mv) mv->title = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (mv)), gnome_canvas_text_get_type (), "anchor", GTK_ANCHOR_N, - "font", HEADING_FONT, + "fontset", HEADING_FONTSET, "fill_color", "black", NULL); @@ -429,8 +426,8 @@ month_view_init (MonthView *mv) "day_anchor", GTK_ANCHOR_NE, "start_on_monday", week_starts_on_monday, "heading_padding", 2.0, - "heading_font", BIG_DAY_HEADING_FONT, - "day_font", BIG_NORMAL_DAY_FONT, + "heading_fontset", BIG_DAY_HEADING_FONTSET, + "day_fontset", BIG_NORMAL_DAY_FONTSET, NULL); /* Arrows and text items. The arrows start hidden by default; they will be shown as @@ -473,7 +470,7 @@ month_view_init (MonthView *mv) mv->text[i] = gnome_canvas_item_new (GNOME_CANVAS_GROUP (day_group), gnome_canvas_text_get_type (), - "font", EVENT_FONT, + "fontset", EVENT_FONTSET, "anchor", GTK_ANCHOR_NW, "fill_color", color_spec_from_prop (COLOR_PROP_DAY_FG), "clip", TRUE, @@ -714,7 +711,7 @@ mark_current_day (MonthView *mv) GNOME_MONTH_ITEM_DAY_LABEL + mv->old_current_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_DAY_FG), - "font", BIG_NORMAL_DAY_FONT, + "fontset", BIG_NORMAL_DAY_FONTSET, NULL); mv->old_current_index = -1; @@ -733,7 +730,7 @@ mark_current_day (MonthView *mv) GNOME_MONTH_ITEM_DAY_LABEL + mv->old_current_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_CURRENT_DAY_FG), - "font", BIG_CURRENT_DAY_FONT, + "fontset", BIG_CURRENT_DAY_FONTSET, NULL); } } diff --git a/calendar/prop.c b/calendar/prop.c index 1e771812f9..345c07fe96 100644 --- a/calendar/prop.c +++ b/calendar/prop.c @@ -395,7 +395,7 @@ set_current_day (void) item = gnome_month_item_num2child (GNOME_MONTH_ITEM (month_item), GNOME_MONTH_ITEM_DAY_LABEL + day_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_picker (COLOR_PROP_CURRENT_DAY_FG), - "font", CURRENT_DAY_FONT, + "fontset", CURRENT_DAY_FONTSET, NULL); } diff --git a/calendar/quick-view.c b/calendar/quick-view.c index 337cfdbf73..f8fe8d42fd 100644 --- a/calendar/quick-view.c +++ b/calendar/quick-view.c @@ -10,7 +10,7 @@ #include "main.h" -#define QUICK_VIEW_FONT "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*" +#define QUICK_VIEW_FONTSET "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r" static void quick_view_class_init (QuickViewClass *class); @@ -138,7 +138,7 @@ create_items_for_event (QuickView *qv, CalendarObject *co, double *y, double *ma "y", *y, "anchor", GTK_ANCHOR_NW, "text", str, - "font", QUICK_VIEW_FONT, + "fontset", QUICK_VIEW_FONTSET, NULL); g_free (str); @@ -173,7 +173,7 @@ setup_event_list (QuickView *qv, GList *event_list) "y", 0.0, "anchor", GTK_ANCHOR_NW, "text", _("No appointments for this day"), - "font", QUICK_VIEW_FONT, + "fontset", QUICK_VIEW_FONTSET, NULL); /* Measure the text and set the proper sizes */ diff --git a/calendar/year-view.c b/calendar/year-view.c index 786270bea3..a8bc79e6fe 100644 --- a/calendar/year-view.c +++ b/calendar/year-view.c @@ -497,7 +497,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", HEADING_FONT, + "fontset", HEADING_FONTSET, "fill_color", "black", NULL); @@ -513,7 +513,7 @@ year_view_init (YearView *yv) gnome_canvas_text_get_type (), "text", buf, "anchor", GTK_ANCHOR_N, - "font", TITLE_FONT, + "fontset", TITLE_FONTSET, "fill_color", "black", NULL); @@ -523,8 +523,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, + "heading_fontset", DAY_HEADING_FONTSET, + "day_fontset", NORMAL_DAY_FONTSET, NULL); setup_month_item (yv, i); } @@ -638,7 +638,7 @@ mark_current_day (YearView *yv) GNOME_MONTH_ITEM_DAY_LABEL + day_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_DAY_FG), - "font", NORMAL_DAY_FONT, + "fontset", NORMAL_DAY_FONTSET, NULL); yv->old_marked_day = -1; @@ -658,7 +658,7 @@ mark_current_day (YearView *yv) GNOME_MONTH_ITEM_DAY_LABEL + day_index); gnome_canvas_item_set (item, "fill_color", color_spec_from_prop (COLOR_PROP_CURRENT_DAY_FG), - "font", CURRENT_DAY_FONT, + "fontset", CURRENT_DAY_FONTSET, NULL); yv->old_marked_day = month_index * 42 + day_index; -- cgit v1.2.3