diff options
author | Hans Petter Jansson <hpj@ximian.com> | 2003-01-26 09:42:05 +0800 |
---|---|---|
committer | Hans Petter <hansp@src.gnome.org> | 2003-01-26 09:42:05 +0800 |
commit | 3cf26e43e21a5c9c551332a1c687a157fbcd3e3c (patch) | |
tree | ebb4ed56342905ee2bc42e04622d6e4fd2d32f93 /calendar/gui/dialogs/comp-editor.c | |
parent | cc35ce98a7a85b09dca062f7a781d7718cd17db2 (diff) | |
download | gsoc2013-evolution-3cf26e43e21a5c9c551332a1c687a157fbcd3e3c.tar gsoc2013-evolution-3cf26e43e21a5c9c551332a1c687a157fbcd3e3c.tar.gz gsoc2013-evolution-3cf26e43e21a5c9c551332a1c687a157fbcd3e3c.tar.bz2 gsoc2013-evolution-3cf26e43e21a5c9c551332a1c687a157fbcd3e3c.tar.lz gsoc2013-evolution-3cf26e43e21a5c9c551332a1c687a157fbcd3e3c.tar.xz gsoc2013-evolution-3cf26e43e21a5c9c551332a1c687a157fbcd3e3c.tar.zst gsoc2013-evolution-3cf26e43e21a5c9c551332a1c687a157fbcd3e3c.zip |
Mainly making all views use PangoLayouts for text. When drawing a
2003-01-25 Hans Petter Jansson <hpj@ximian.com>
Mainly making all views use PangoLayouts for text. When drawing a
PangoLayout, the draw offset is the top left corner of the layout,
not the text's baseline. Keep this in mind when viewing the
changes. I'll be brief about the exact changes, since they speak
better for themselves.
* gui/e-day-view-time-item.c (e_day_view_time_item_get_column_width):
Use Pango.
(e_day_view_time_item_draw): Use Pango.
* gui/e-day-view-top-item.c (e_day_view_top_item_draw): Use Pango.
(e_day_view_top_item_draw_long_event): Add some FIXME text so we can
see when this is being used. Is it in use at all?
* gui/e-day-view.c: No longer specify an explicit X font string for
the large font. Use the main font, and change the point size.
(e_day_view_init): Use Pango.
(e_day_view_style_set): Use Pango. Comment out the gdk_font setting
for the drag text items for now.
* gui/e-day-view.h: Use Pango.
* gui/e-week-view-event-item.c (e_week_view_draw_time): Use Pango.
* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
Use Pango.
* gui/e-week-view-titles-item.c (e_week_view_titles_item_draw):
Use Pango.
* gui/e-week-view.c: No longer specify an explicit X font string for
the small font. Use the main font, and change the point size.
(e_week_view_init): Use Pango.
(e_week_view_destroy): Use Pango.
(get_string_width): Implemented for convenience.
(get_digit_width): Implemented for convenience.
(e_week_view_style_set): Use Pango.
(e_week_view_recalc_cell_sizes): Use Pango.
(e_week_view_get_time_string_width): Use Pango.
* gui/e-week-view.h: Use Pango.
Following are some random UTF-8 fixes and a crash fix.
* gui/itip-utils.c (comp_description): Use g_locale_to_utf8 ().
* gui/dialogs/comp-editor.c (make_title_from_comp): Return a
UTF-8 string.
* gui/dialogs/alarm-page.c (alarm_page_set_summary): Pass UTF-8
directly to GTK.
* gui/dialogs/delete-comp.c (delete_component_dialog): Ditto.
* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): Ditto.
(meeting_page_construct): Ditto.
* gui/dialogs/recurrence-page.c (recurrence_page_set_summary): Ditto.
* gui/dialogs/event-editor.c (event_editor_finalize): Fix crash caused
by gtk_object_destroy()-ing a non-GtkObject.
svn path=/trunk/; revision=19628
Diffstat (limited to 'calendar/gui/dialogs/comp-editor.c')
-rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 4b2e4fa882..61ce7e072e 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -768,7 +768,7 @@ comp_editor_get_cal_client (CompEditor *editor) static char * make_title_from_comp (CalComponent *comp) { - char *title; + char *title, *title_utf8; const char *type_string; CalComponentVType type; CalComponentText text; @@ -794,14 +794,15 @@ make_title_from_comp (CalComponent *comp) cal_component_get_summary (comp, &text); if (text.value) { - char *summary; - summary = e_utf8_to_locale_string (text.value); - title = g_strdup_printf (type_string, summary); - g_free (summary); - } else + title = g_strdup_printf (type_string, text.value); + } else { title = g_strdup_printf (type_string, _("No summary")); + } + + title_utf8 = g_locale_to_utf8 (title, -1, NULL, NULL, NULL); + g_free (title); - return title; + return title_utf8; } static const char * |