Index: gui/widgets/eab-contact-display.c
===================================================================
--- gui/widgets/eab-contact-display.c (revision 34801)
+++ gui/widgets/eab-contact-display.c (working copy)
@@ -325,10 +325,19 @@
{
char *value = e_text_to_html (str, html_flags);
- gtk_html_stream_printf (html_stream, "");
- if (icon)
- gtk_html_stream_printf (html_stream, "![](\"evo-icon:%s\") ", icon);
- gtk_html_stream_printf (html_stream, " | %s: | %s |
", label, value);
+ if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) {
+ gtk_html_stream_printf (html_stream, "| %s | %s: | ", value, label);
+ gtk_html_stream_printf (html_stream, "");
+ if (icon)
+ gtk_html_stream_printf (html_stream, " |
", icon);
+ else
+ gtk_html_stream_printf (html_stream, "");
+ } else {
+ gtk_html_stream_printf (html_stream, "| ");
+ if (icon)
+ gtk_html_stream_printf (html_stream, "", icon);
+ gtk_html_stream_printf (html_stream, " | %s: | %s |
", label, value);
+ }
g_free (value);
}
@@ -350,15 +359,22 @@
{
EContactAddress *adr;
const char *label;
+ gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
label = e_contact_get_const (contact, label_field);
if (label) {
char *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL);
#ifdef mapping_works
- g_string_append_printf (gstr, " | %s:
%s | %s |
", html_label, _("(map)"), html);
+ if (is_rtl)
+ g_string_append_printf (gstr, "| %s | %s:
%s | |
", html, html_label, _("(map)"));
+ else
+ g_string_append_printf (gstr, " | %s:
%s | %s |
", html_label, _("(map)"), html);
#else
- g_string_append_printf (gstr, " | %s: | %s |
", html_label, html);
+ if (is_rtl)
+ g_string_append_printf (gstr, "| %s | %s: | |
", html, html_label);
+ else
+ g_string_append_printf (gstr, " | %s: | %s |
", html_label, html);
#endif
g_free (html);
@@ -368,8 +384,11 @@
adr = e_contact_get (contact, adr_field);
if (adr &&
(adr->po || adr->ext || adr->street || adr->locality || adr->region || adr->code || adr->country)) {
+ if (is_rtl)
+ g_string_append_printf (gstr, "| ");
+ else
+ g_string_append_printf (gstr, " |
| %s:
%s | ", html_label, _("map"));
- g_string_append_printf (gstr, " |
| %s:
%s | ", html_label, _("map"));
if (adr->po && *adr->po) g_string_append_printf (gstr, "%s
", adr->po);
if (adr->ext && *adr->ext) g_string_append_printf (gstr, "%s
", adr->ext);
@@ -379,7 +398,10 @@
if (adr->code && *adr->code) g_string_append_printf (gstr, "%s
", adr->code);
if (adr->country && *adr->country) g_string_append_printf (gstr, "%s
", adr->country);
- g_string_append_printf (gstr, " |
");
+ if (is_rtl)
+ g_string_append_printf (gstr, "%s:
%s | | ", html_label, _("map"));
+ else
+ g_string_append_printf (gstr, "");
}
if (adr)
e_contact_address_free (adr);
@@ -390,10 +412,19 @@
{
char *value = e_text_to_html (str, html_flags);
- g_string_append_printf (gstr, "| ");
- if (icon)
- g_string_append_printf (gstr, "", icon);
- g_string_append_printf (gstr, " | %s: | %s |
", label, value);
+ if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) {
+ g_string_append_printf (gstr, "| %s | %s: | ", value, label);
+ g_string_append_printf (gstr, "");
+ if (icon)
+ g_string_append_printf (gstr, " |
", icon);
+ else
+ g_string_append_printf (gstr, "");
+ } else {
+ g_string_append_printf (gstr, "| ");
+ if (icon)
+ g_string_append_printf (gstr, "", icon);
+ g_string_append_printf (gstr, " | %s: | %s |
", label, value);
+ }
g_free (value);
}
@@ -494,6 +525,7 @@
{
GString *accum;
GList *email_list, *l, *email_attr_list, *al;
+ gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
#ifdef HANDLE_MAILTO_INTERNALLY
int email_num = 0;
#endif
@@ -529,10 +561,16 @@
if (accum->len) {
#ifdef HANDLE_MAILTO_INTERNALLY
- gtk_html_stream_printf (html_stream, "| ");
- gtk_html_stream_printf (html_stream,
+ if (is_rtl) {
+ gtk_html_stream_printf (html_stream,
+ " |
| %s | %s: | |
",
+ accum->str, _("Email"));
+ } else {
+ gtk_html_stream_printf (html_stream, "| ");
+ gtk_html_stream_printf (html_stream,
" | %s: | %s |
",
_("Email"), accum->str);
+ }
#else
render_name_value (html_stream, _("Email"), accum->str, NULL,
E_TEXT_TO_HTML_CONVERT_ADDRESSES | E_TEXT_TO_HTML_CONVERT_NL);
@@ -612,6 +650,7 @@
eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact)
{
GtkHTMLStream *html_stream;
+ gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
if (display->priv->contact)
g_object_unref (display->priv->contact);
@@ -621,14 +660,14 @@
html_stream = gtk_html_begin (GTK_HTML (display));
gtk_html_stream_write (html_stream, HTML_HEADER, sizeof (HTML_HEADER) - 1);
- gtk_html_stream_write (html_stream, "\n", 7);
+ gtk_html_stream_printf (html_stream, "\n", is_rtl ? " align=\"right\" " : "");
if (contact) {
const char *str;
char *html;
EContactPhoto *photo;
- gtk_html_stream_printf (html_stream, "");
+ gtk_html_stream_printf (html_stream, "| ", is_rtl ? " align=\"right\" " : "");
photo = e_contact_get (contact, E_CONTACT_PHOTO);
if (!photo)
photo = e_contact_get (contact, E_CONTACT_LOGO);
@@ -638,7 +677,7 @@
e_contact_photo_free (photo);
}
- gtk_html_stream_printf (html_stream, " | \n");
+ gtk_html_stream_printf (html_stream, " | \n", is_rtl ? " align=\"right\" " : "");
str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
if (!str)
@@ -664,7 +703,7 @@
gtk_html_stream_printf (html_stream, " |
\n");
}
- gtk_html_stream_write (html_stream, "\n", 15);
+ gtk_html_stream_printf (html_stream, " |
|