diff --git a/data/webview.css b/data/webview.css index 8d4c3397c2..f28ed3d668 100644 --- a/data/webview.css +++ b/data/webview.css @@ -72,6 +72,50 @@ object { /* GtkWidgets */ font-weight: bold; } +/**** HEADERS ****/ + +table.header { + border-spacing: 0px; + border-top-width: 0px; + border-right-width: 0px; + border-bottom-width: 0px; + border-left-width: 0px; + width: 100%; +} + +tr.header { + vertical-align: top; + width: 100%; +} + +th.header { + white-space: nowrap; +} + +td.header { + width: inherit; +} + +.ltr { + text-align: left; +} + +th.ltr { + padding-right: 6px; + text-align: right; + width: auto; +} + +.rtl { + text-align: right; +} + +th.rtl { + padding-left: 6px; + text-align: left; + width: auto; +} + /***** PRINTING *******/ .printing-header { diff --git a/em-format/e-mail-formatter-headers.c b/em-format/e-mail-formatter-headers.c index 89ac5f677a..a3d7b20680 100644 --- a/em-format/e-mail-formatter-headers.c +++ b/em-format/e-mail-formatter-headers.c @@ -54,6 +54,7 @@ format_short_headers (EMailFormatter *formatter, guint32 flags, GCancellable *cancellable) { + GtkTextDirection direction; const gchar *charset; CamelContentType *ct; gchar *hdr_charset; @@ -62,11 +63,12 @@ format_short_headers (EMailFormatter *formatter, struct _camel_header_address *addrs = NULL; struct _camel_header_raw *header; GString *from; - gboolean is_rtl; if (g_cancellable_is_cancelled (cancellable)) return; + direction = gtk_widget_get_default_direction (); + ct = camel_mime_part_get_content_type ((CamelMimePart *) part); charset = camel_content_type_param (ct, "charset"); charset = camel_iconv_charset_name (charset); @@ -79,9 +81,9 @@ format_short_headers (EMailFormatter *formatter, g_string_append_printf ( buffer, - "", - flags & E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSED ? "block" : "none"); + flags & E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSED ? "table" : "none"); header = ((CamelMimePart *) part)->headers; while (header) { @@ -96,8 +98,10 @@ format_short_headers (EMailFormatter *formatter, formatter, tmp, addrs, header->name, FALSE, !(flags & E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE)); - if (tmp->len) - g_string_printf (from, _("From: %s"), tmp->str); + if (tmp->len > 0) + g_string_printf ( + from, "%s: %s", + _("From"), tmp->str); g_string_free (tmp, TRUE); } else if (!g_ascii_strcasecmp (header->name, "Subject")) { @@ -114,32 +118,20 @@ format_short_headers (EMailFormatter *formatter, g_free (hdr_charset); - is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; - if (is_rtl) { - g_string_append ( - buffer, ""); - } else { - g_string_append ( - buffer, ""); - } + g_string_append (buffer, ""); + if (direction == GTK_TEXT_DIR_RTL) + g_string_append (buffer, ""); g_string_append (buffer, "
"); - if (from->len > 0) - g_string_append_printf (buffer, "(%s) ", from->str); - g_string_append (buffer, ""); - if (subject != NULL && *subject != '\0') - g_string_append (buffer, subject); - else - g_string_append (buffer, _("(no subject)")); - g_string_append (buffer, ""); - g_string_append (buffer, "
"); - g_string_append (buffer, ""); - if (subject != NULL && *subject != '\0') - g_string_append (buffer, subject); - else - g_string_append (buffer, _("(no subject)")); - g_string_append (buffer, ""); - if (from->len > 0) - g_string_append_printf (buffer, " (%s)", from->str); - g_string_append (buffer, "
"); + else + g_string_append (buffer, ""); + g_string_append (buffer, ""); + if (subject != NULL && *subject != '\0') + g_string_append (buffer, subject); + else + g_string_append (buffer, _("(no subject)")); + g_string_append (buffer, ""); + if (from->len > 0) + g_string_append_printf (buffer, " (%s)", from->str); + g_string_append (buffer, "
"); @@ -257,10 +249,23 @@ format_full_headers (EMailFormatter *formatter, gboolean mail_from_delegate = FALSE; gchar *hdr_charset; gchar *evolution_imagesdir; + const gchar *direction; if (g_cancellable_is_cancelled (cancellable)) return; + switch (gtk_widget_get_default_direction ()) { + case GTK_TEXT_DIR_RTL: + direction = "rtl"; + break; + case GTK_TEXT_DIR_LTR: + direction = "ltr"; + break; + default: + direction = "inherit"; + break; + } + ct = camel_mime_part_get_content_type ((CamelMimePart *) part); charset = camel_content_type_param (ct, "charset"); charset = camel_iconv_charset_name (charset); @@ -272,9 +277,12 @@ format_full_headers (EMailFormatter *formatter, g_string_append_printf ( buffer, - "", - flags & E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSED ? "none" : "block"); + "
", + flags & E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSED ? "none" : "table", + direction); header = ((CamelMimePart *) part)->headers; while (header != NULL) { @@ -356,7 +364,7 @@ format_full_headers (EMailFormatter *formatter, g_string_append ( buffer, ""; + fmt = "" + ""; } else { - fmt = ""; + fmt = "" + ""; } } else if (flags & E_MAIL_FORMATTER_HEADER_FLAG_NODEC) { - if (is_rtl) - fmt = ""; + if (direction == GTK_TEXT_DIR_RTL) + fmt = "" + "" + "" + ""; else - fmt = ""; + fmt = "" + "" + "" + ""; } else { - if (flags & E_MAIL_FORMATTER_HEADER_FLAG_BOLD) { - if (is_rtl) - fmt = ""; - else - fmt = ""; - } else { - if (is_rtl) - fmt = ""; - else - fmt = ""; - } + if (direction == GTK_TEXT_DIR_RTL) + fmt = "" + "" + "" + ""; + else + fmt = "" + "" + "" + ""; } g_string_append_printf ( diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 7f6063b07d..7d7f04f9cf 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -1007,15 +1007,15 @@ toggle_headers_visibility (WebKitDOMElement *button, css_full = webkit_dom_element_get_style (full_headers); css_value = webkit_dom_css_style_declaration_get_property_value ( css_full, "display"); - expanded = (g_strcmp0 (css_value, "block") == 0); + expanded = (g_strcmp0 (css_value, "table") == 0); g_free (css_value); webkit_dom_css_style_declaration_set_property ( css_full, "display", - expanded ? "none" : "block", "", NULL); + expanded ? "none" : "table", "", NULL); webkit_dom_css_style_declaration_set_property ( css_short, "display", - expanded ? "block" : "none", "", NULL); + expanded ? "table" : "none", "", NULL); if (expanded) path = "evo-file://" EVOLUTION_IMAGESDIR "/plus.png";
" - "\n"); + "
\n"); g_free (evolution_imagesdir); @@ -456,8 +464,9 @@ format_full_headers (EMailFormatter *formatter, gchar *name; name = g_uri_escape_string (photo_name, NULL, FALSE); - g_string_append (buffer, ""); @@ -490,16 +501,19 @@ format_full_headers (EMailFormatter *formatter, CamelMimePart *iconpart = NULL; icon_info = gtk_icon_theme_lookup_icon ( - gtk_icon_theme_get_default (), - "evolution", 16, GTK_ICON_LOOKUP_NO_SVG); + gtk_icon_theme_get_default (), + "evolution", 16, GTK_ICON_LOOKUP_NO_SVG); if (icon_info != NULL) { iconpart = load_picture_from_file ( - "image/png", gtk_icon_info_get_filename (icon_info), + "image/png", + gtk_icon_info_get_filename (icon_info), cancellable); gtk_icon_info_free (icon_info); } - if (iconpart) { - g_string_append (buffer, ""); @@ -522,6 +536,9 @@ emfe_headers_format (EMailFormatterExtension *extension, const GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 }; const GdkRGBA *body_rgba = &white; const GdkRGBA *header_rgba; + const gchar *direction; + gboolean is_collapsable; + gboolean is_collapsed; if (g_cancellable_is_cancelled (cancellable)) return FALSE; @@ -529,6 +546,24 @@ emfe_headers_format (EMailFormatterExtension *extension, if (!part->part) return FALSE; + switch (gtk_widget_get_default_direction ()) { + case GTK_TEXT_DIR_RTL: + direction = "rtl"; + break; + case GTK_TEXT_DIR_LTR: + direction = "ltr"; + break; + default: + direction = "inherit"; + break; + } + + is_collapsable = + (context->flags & E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSABLE); + + is_collapsed = + (context->flags & E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSED); + buffer = g_string_new (""); if (context->mode != E_MAIL_FORMATTER_MODE_PRINTING) @@ -541,28 +576,32 @@ emfe_headers_format (EMailFormatterExtension *extension, g_string_append_printf ( buffer, "
" - "
"); - + g_string_append ( + buffer, + ""); g_string_append_printf ( buffer, ""); + g_string_append ( + buffer, + ""); write_contact_picture (part, 48, buffer); g_string_append (buffer, ""); + if (iconpart != NULL) { + g_string_append ( + buffer, + ""); write_contact_picture (iconpart, 16, buffer); g_string_append (buffer, "
\n" - ""); + + g_string_append (buffer, "
\n", + "" + "", e_rgba_to_value (body_rgba), part->id, - e_rgba_to_value (header_rgba)); + e_rgba_to_value (header_rgba), + direction); - if (context->flags & E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSABLE) { + if (is_collapsable) g_string_append_printf ( buffer, + "", EVOLUTION_IMAGESDIR, - (context->flags & E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSED) ? - "plus.png" : "minus.png"); + is_collapsed ? "plus.png" : "minus.png"); + g_string_append (buffer, "
" "" - "", + " id=\"__evo-collapse-headers-img\" />" + ""); + + if (is_collapsable) format_short_headers ( formatter, buffer, CAMEL_MEDIUM (part->part), context->flags, cancellable); - } format_full_headers ( formatter, buffer, @@ -571,7 +610,9 @@ emfe_headers_format (EMailFormatterExtension *extension, context->flags, cancellable); - g_string_append (buffer, "
"); + g_string_append (buffer, "
"); camel_stream_write_string (stream, buffer->str, cancellable, NULL); diff --git a/em-format/e-mail-formatter-utils.c b/em-format/e-mail-formatter-utils.c index a2e0d43ff1..d5bff2ecd0 100644 --- a/em-format/e-mail-formatter-utils.c +++ b/em-format/e-mail-formatter-utils.c @@ -45,9 +45,9 @@ e_mail_formatter_format_text_header (EMailFormatter *formatter, const gchar *value, guint32 flags) { + GtkTextDirection direction; const gchar *fmt, *html; gchar *mhtml = NULL; - gboolean is_rtl; g_return_if_fail (E_IS_MAIL_FORMATTER (formatter)); g_return_if_fail (buffer != NULL); @@ -70,31 +70,38 @@ e_mail_formatter_format_text_header (EMailFormatter *formatter, html = value; } - is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; + direction = gtk_widget_get_default_direction (); if (flags & E_MAIL_FORMATTER_HEADER_FLAG_NOCOLUMNS) { if (flags & E_MAIL_FORMATTER_HEADER_FLAG_BOLD) { - fmt = "
%s: %s
%s: %s
%s: %s
%s: %s
%2$s%1$s 
%s%s
%s %s
%s%s
%2$s%1$s: 
%s: %s
%2$s%1$s: 
%s: %s
%s:%s
%s:%s