[geary/wip/765516-gtk-widget-conversation-viewer: 161/174] Display Sender and Reply-To headers for conversation messages.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/765516-gtk-widget-conversation-viewer: 161/174] Display Sender and Reply-To headers for conversation messages.
- Date: Sun, 25 Sep 2016 13:19:35 +0000 (UTC)
commit 326bc0184a18a694160f8079a268f5322bd1114c
Author: Michael James Gratton <mike vee net>
Date: Tue Sep 13 15:34:22 2016 +1000
Display Sender and Reply-To headers for conversation messages.
.../conversation-viewer/conversation-message.vala | 215 +++++++++++++-------
ui/conversation-message.ui | 104 +++++++++-
2 files changed, 238 insertions(+), 81 deletions(-)
---
diff --git a/src/client/conversation-viewer/conversation-message.vala
b/src/client/conversation-viewer/conversation-message.vala
index 7e18396..59e6a1a 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -17,6 +17,41 @@
[GtkTemplate (ui = "/org/gnome/Geary/conversation-message.ui")]
public class ConversationMessage : Gtk.Grid {
+
+ internal static string get_dim_label_colour(Gtk.Widget widget) {
+ return GtkUtil.pango_color_from_theme(
+ widget.get_style_context(), "insensitive_fg_color"
+ );
+ }
+
+ internal static string format_address(Geary.RFC822.MailboxAddress address,
+ string dim_colour,
+ string weight = "normal") {
+ string markup = "";
+ string name = Geary.HTML.escape_markup(address.name);
+ string addr = Geary.HTML.escape_markup(address.address);
+ if (has_distinct_name(address)) {
+ markup = (
+ "<span weight=\"%s\">%s</span> <span color=\"%s\">%s</span>"
+ .printf(weight, name, dim_colour, addr)
+ );
+ } else {
+ markup = (
+ "<span weight=\"%s\">%s</span>".printf(weight, addr)
+ );
+ }
+ return markup;
+ }
+
+ internal static inline bool has_distinct_name(
+ Geary.RFC822.MailboxAddress address) {
+ return (
+ !Geary.String.is_empty(address.name) &&
+ address.name != address.address
+ );
+ }
+
+
// Widget used to display sender/recipient email addresses in
// message header Gtk.FlowBox instances.
private class AddressFlowBoxChild : Gtk.FlowBoxChild {
@@ -28,26 +63,16 @@ public class ConversationMessage : Gtk.Grid {
private string search_value;
public AddressFlowBoxChild(Geary.RFC822.MailboxAddress address,
- string dim_color, string weight) {
+ string markup) {
this.address = address;
this.search_value = address.address.casefold();
Gtk.Label label = new Gtk.Label(null);
label.ellipsize = Pango.EllipsizeMode.END;
label.set_xalign(0.0f);
-
- string name = Geary.HTML.escape_markup(address.name);
- string addr = Geary.HTML.escape_markup(address.address);
- if (!Geary.String.is_empty(address.name) && name != addr) {
- label.set_markup(
- "<span weight=\"%s\">%s</span> <span color=\"%s\">%s</span>"
- .printf(weight, name, dim_color, addr)
- );
+ label.set_markup(markup);
+ if (has_distinct_name(address)) {
this.search_value = address.name.casefold() + this.search_value;
- } else {
- label.set_markup(
- "<span weight=\"%s\">%s</span>".printf(weight, addr)
- );
}
add(label);
@@ -149,6 +174,17 @@ public class ConversationMessage : Gtk.Grid {
private Gtk.Label subject;
[GtkChild]
private Gtk.Label date;
+
+ [GtkChild]
+ private Gtk.Grid sender_header;
+ [GtkChild]
+ private Gtk.FlowBox sender_address;
+
+ [GtkChild]
+ private Gtk.Grid reply_to_header;
+ [GtkChild]
+ private Gtk.FlowBox reply_to_addresses;
+
[GtkChild]
private Gtk.Grid to_header;
[GtkChild]
@@ -287,6 +323,12 @@ public class ConversationMessage : Gtk.Grid {
// Preview headers
+ // Translators: This is displayed in place of the from address
+ // when the message has no from address.
+ string empty_from = _("No sender");
+
+ this.preview_from.set_markup(format_originator_preview(empty_from));
+
string date_text = "";
string date_tooltip = "";
if (this.message.date != null) {
@@ -299,39 +341,26 @@ public class ConversationMessage : Gtk.Grid {
this.message.date.value, clock_format
);
}
-
- string preview_str = this.message.get_preview();
- preview_str = Geary.String.reduce_whitespace(preview_str);
-
- this.preview_from.set_markup(format_sender_preview(this.message.from));
this.preview_date.set_text(date_text);
this.preview_date.set_tooltip_text(date_tooltip);
- this.preview_body.set_text(preview_str);
- // Full headers
+ this.preview_body.set_text(
+ Geary.String.reduce_whitespace(this.message.get_preview())
+ );
- if (this.message.from != null && this.message.from.size > 0) {
- set_flowbox_addresses(this.from, this.message.from, "bold");
- } else {
- Gtk.Label label = new Gtk.Label(null);
- label.set_markup(format_sender_preview(null));
+ // Full headers
- Gtk.FlowBoxChild child = new Gtk.FlowBoxChild();
- child.add(label);
- child.set_halign(Gtk.Align.START);
- child.show_all();
+ fill_originator_addresses(empty_from);
- this.from.add(child);
- }
this.date.set_text(date_text);
this.date.set_tooltip_text(date_tooltip);
if (this.message.subject != null) {
this.subject.set_text(this.message.subject.value);
this.subject.set_visible(true);
}
- set_header_addresses(this.to_header, this.message.to);
- set_header_addresses(this.cc_header, this.message.cc);
- set_header_addresses(this.bcc_header, this.message.bcc);
+ fill_header_addresses(this.to_header, this.message.to);
+ fill_header_addresses(this.cc_header, this.message.cc);
+ fill_header_addresses(this.bcc_header, this.message.bcc);
// Web view
@@ -625,62 +654,100 @@ public class ConversationMessage : Gtk.Grid {
return menu;
}
- private void set_header_addresses(Gtk.Grid header,
- Geary.RFC822.MailboxAddresses? addresses) {
- if (addresses != null && addresses.size > 0) {
- Gtk.FlowBox box = header.get_children().nth(0).data as Gtk.FlowBox;
- if (box != null) {
- set_flowbox_addresses(box, addresses);
+ private string format_originator_preview(string empty_from_markup) {
+ string dim_colour = get_dim_label_colour(preview_from);
+ string markup = "";
+
+ // From addresses
+ if (this.message.from != null && this.message.from.size > 0) {
+ int i = 0;
+ Gee.List<Geary.RFC822.MailboxAddress> list =
+ this.message.from.get_all();
+ foreach (Geary.RFC822.MailboxAddress addr in list) {
+ markup += format_address(addr, dim_colour, "bold");
+
+ if (++i < list.size)
+ // Translators: This separates multiple 'from'
+ // addresses in the header preview for a message.
+ markup += _(", ");
}
- header.set_visible(true);
+ } else {
+ markup = empty_from_markup;
}
+
+ return markup;
}
- private void set_flowbox_addresses(Gtk.FlowBox address_box,
- Geary.RFC822.MailboxAddresses? addresses,
- string weight = "normal") {
- string dim_color = GtkUtil.pango_color_from_theme(
- address_box.get_style_context(), "insensitive_fg_color"
- );
- foreach (Geary.RFC822.MailboxAddress address in addresses) {
+ private void fill_originator_addresses(string empty_from_markup) {
+ string dim_colour = get_dim_label_colour(this.from);
+
+ // Show any From header addresses
+ if (this.message.from != null && this.message.from.size > 0) {
+ foreach (Geary.RFC822.MailboxAddress address in this.message.from) {
+ AddressFlowBoxChild child = new AddressFlowBoxChild(
+ address, format_address(address, dim_colour, "bold")
+ );
+ this.searchable_addresses.add(child);
+ this.from.add(child);
+ }
+ } else {
+ Gtk.Label label = new Gtk.Label(null);
+ label.set_markup(empty_from_markup);
+
+ Gtk.FlowBoxChild child = new Gtk.FlowBoxChild();
+ child.add(label);
+ child.set_halign(Gtk.Align.START);
+ child.show_all();
+ this.from.add(child);
+ }
+
+ // Show the Sender header addresses if present, but only if
+ // not already in the From header.
+ if (this.message.sender != null &&
+ (this.message.from == null ||
+ !this.message.from.contains_normalized(this.message.sender.address))) {
AddressFlowBoxChild child = new AddressFlowBoxChild(
- address, dim_color, weight
+ this.message.sender,
+ format_address(this.message.sender, dim_colour)
);
this.searchable_addresses.add(child);
- address_box.add(child);
+ this.sender_header.show();
+ this.sender_address.add(child);
}
+ // Show any Reply-To header addresses if present, but only if
+ // each is not already in the From header.
+ if (this.message.reply_to != null) {
+ foreach (Geary.RFC822.MailboxAddress address in this.message.reply_to) {
+ if (this.message.from == null ||
+ !this.message.from.contains_normalized(address.address)) {
+ AddressFlowBoxChild child = new AddressFlowBoxChild(
+ address, format_address(address, dim_colour)
+ );
+ this.searchable_addresses.add(child);
+ this.reply_to_addresses.add(child);
+ this.reply_to_header.show();
}
+ }
+ }
}
- private string format_sender_preview(Geary.RFC822.MailboxAddresses? addresses) {
- string dim_color = GtkUtil.pango_color_from_theme(
- get_style_context(), "insensitive_fg_color"
- );
- string value = "";
+ private void fill_header_addresses(Gtk.Grid header,
+ Geary.RFC822.MailboxAddresses? addresses) {
if (addresses != null && addresses.size > 0) {
- int i = 0;
- Gee.List<Geary.RFC822.MailboxAddress> list = addresses.get_all();
- foreach (Geary.RFC822.MailboxAddress addr in list) {
- string address = Geary.HTML.escape_markup(addr.address);
- if (!Geary.String.is_empty(addr.name)) {
- string name = Geary.HTML.escape_markup(addr.name);
- value += "<span weight=\"bold\">%s</span> <span color=\"%s\">%s</span>".printf(
- name, dim_color, address
- );
- } else {
- value += "<span weight=\"bold\">%s</span>".printf(address);
+ Gtk.FlowBox box = header.get_children().nth(0).data as Gtk.FlowBox;
+ if (box != null) {
+ string dim_colour = get_dim_label_colour(this);
+ foreach (Geary.RFC822.MailboxAddress address in addresses) {
+ AddressFlowBoxChild child = new AddressFlowBoxChild(
+ address, format_address(address, dim_colour)
+ );
+ this.searchable_addresses.add(child);
+ box.add(child);
}
-
- if (++i < list.size)
- value += ", ";
}
- } else {
- value = "<span style=\"italic\">%s</span>".printf(
- _("No sender")
- );
+ header.set_visible(true);
}
- return value;
}
private async void set_avatar(InputStream data,
diff --git a/ui/conversation-message.ui b/ui/conversation-message.ui
index 7f4f1f6..cf65392 100644
--- a/ui/conversation-message.ui
+++ b/ui/conversation-message.ui
@@ -195,6 +195,96 @@
</packing>
</child>
<child>
+ <object class="GtkGrid" id="sender_header">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="sender_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Sent by:</property>
+ <property name="yalign">0</property>
+ <style>
+ <class name="dim-label"/>
+ <class name="geary-header"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFlowBox" id="sender_address">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">2</property>
+ <property name="min_children_per_line">2</property>
+ <property name="max_children_per_line">4</property>
+ <property name="selection_mode">none</property>
+ <signal name="child-activated" handler="on_address_box_child_activated"
swapped="no"/>
+ <style>
+ <class name="geary-header-value"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="reply_to_header">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="reply_to_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Reply to:</property>
+ <property name="yalign">0</property>
+ <style>
+ <class name="dim-label"/>
+ <class name="geary-header"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFlowBox" id="reply_to_addresses">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">2</property>
+ <property name="min_children_per_line">2</property>
+ <property name="max_children_per_line">4</property>
+ <property name="selection_mode">none</property>
+ <signal name="child-activated" handler="on_address_box_child_activated"
swapped="no"/>
+ <style>
+ <class name="geary-header-value"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkLabel" id="subject">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -211,7 +301,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -236,7 +326,7 @@
<child>
<object class="GtkFlowBox" id="to">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="column_spacing">2</property>
@@ -256,7 +346,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
@@ -281,7 +371,7 @@
<child>
<object class="GtkFlowBox" id="cc">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="column_spacing">2</property>
@@ -301,7 +391,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
@@ -326,7 +416,7 @@
<child>
<object class="GtkFlowBox" id="bcc">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="column_spacing">2</property>
@@ -346,7 +436,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<style>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
