aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorLauris Kaplinski <lauris@src.gnome.org>2000-09-09 06:32:24 +0800
committerLauris Kaplinski <lauris@src.gnome.org>2000-09-09 06:32:24 +0800
commit1768e0e4fde11a6dfdf2336536edce3c954f4474 (patch)
tree8d778c052a38846c98e1def4e10438a459c2debf /addressbook
parent16e05ea9a531460f45404773e0cb1f0a8aafb10f (diff)
downloadgsoc2013-evolution-1768e0e4fde11a6dfdf2336536edce3c954f4474.tar.gz
gsoc2013-evolution-1768e0e4fde11a6dfdf2336536edce3c954f4474.tar.zst
gsoc2013-evolution-1768e0e4fde11a6dfdf2336536edce3c954f4474.zip
Some UTF-8 fixes and experimental 16-bit unicode font support
svn path=/trunk/; revision=5279
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/minicard/e-minicard-label.c6
-rw-r--r--addressbook/gui/minicard/e-minicard.c10
-rw-r--r--addressbook/gui/widgets/e-minicard-label.c6
-rw-r--r--addressbook/gui/widgets/e-minicard.c10
5 files changed, 22 insertions, 18 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 41b1cc542f..6305e90367 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2000-09-08 Lauris Kaplinski <lauris@helixcode.com>
+
+ * gui/minicard/e-minicard-label.c (e_minicard_label_construct):
+ Use canvas default font
+
+ * gui/minicard/e-minicard.c (e_minicard_realize): Ditto
+ (get_left_width): Ditto
+
2000-09-08 Christopher James Lahey <clahey@helixcode.com>
* contact-editor/e-contact-editor-categories.c: Fixed a few warnings.
diff --git a/addressbook/gui/minicard/e-minicard-label.c b/addressbook/gui/minicard/e-minicard-label.c
index e765a89f21..c0f45f67c9 100644
--- a/addressbook/gui/minicard/e-minicard-label.c
+++ b/addressbook/gui/minicard/e-minicard-label.c
@@ -220,11 +220,9 @@ e_minicard_label_construct (GnomeCanvasItem *item)
{
EMinicardLabel *e_minicard_label;
GnomeCanvasGroup *group;
- static GdkFont *font = NULL;
+ GdkFont *font;
- if (font == NULL) {
- font = gdk_font_load("lucidasans-10");
- }
+ font = ((GtkWidget *) item->canvas)->style->font;
e_minicard_label = E_MINICARD_LABEL (item);
group = GNOME_CANVAS_GROUP( item );
diff --git a/addressbook/gui/minicard/e-minicard.c b/addressbook/gui/minicard/e-minicard.c
index e9bb85c89d..d870de7b25 100644
--- a/addressbook/gui/minicard/e-minicard.c
+++ b/addressbook/gui/minicard/e-minicard.c
@@ -285,7 +285,9 @@ e_minicard_realize (GnomeCanvasItem *item)
"width", (double) ( e_minicard->width - 12 ),
"clip", TRUE,
"use_ellipsis", TRUE,
- "font", "lucidasans-bold-10",
+#if 0
+ "font", "fixed-bold-10",
+#endif
"fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL],
"text", "",
NULL );
@@ -626,11 +628,9 @@ get_left_width(EMinicard *e_minicard)
gchar *name;
ECardSimpleField field;
gdouble width = -1;
- static GdkFont *font = NULL;
+ GdkFont *font;
- if (font == NULL) {
- font = gdk_font_load("lucidasans-10");
- }
+ font = ((GtkWidget *) ((GnomeCanvasItem *) e_minicard)->canvas)->style->font;
for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
gdouble this_width;
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index e765a89f21..c0f45f67c9 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -220,11 +220,9 @@ e_minicard_label_construct (GnomeCanvasItem *item)
{
EMinicardLabel *e_minicard_label;
GnomeCanvasGroup *group;
- static GdkFont *font = NULL;
+ GdkFont *font;
- if (font == NULL) {
- font = gdk_font_load("lucidasans-10");
- }
+ font = ((GtkWidget *) item->canvas)->style->font;
e_minicard_label = E_MINICARD_LABEL (item);
group = GNOME_CANVAS_GROUP( item );
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index e9bb85c89d..d870de7b25 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -285,7 +285,9 @@ e_minicard_realize (GnomeCanvasItem *item)
"width", (double) ( e_minicard->width - 12 ),
"clip", TRUE,
"use_ellipsis", TRUE,
- "font", "lucidasans-bold-10",
+#if 0
+ "font", "fixed-bold-10",
+#endif
"fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL],
"text", "",
NULL );
@@ -626,11 +628,9 @@ get_left_width(EMinicard *e_minicard)
gchar *name;
ECardSimpleField field;
gdouble width = -1;
- static GdkFont *font = NULL;
+ GdkFont *font;
- if (font == NULL) {
- font = gdk_font_load("lucidasans-10");
- }
+ font = ((GtkWidget *) ((GnomeCanvasItem *) e_minicard)->canvas)->style->font;
for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
gdouble this_width;