nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add attachment icon back to the message viewer.

Browse source
This commit is contained in:
Michael James Gratton 2016-04-15 02:24:52 +10:00
parent 89a1dc8c88
commit 21be64fe01
2 changed files with 43 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/client/conversation-viewer/conversation-message.vala
View file

@ -79,6 +79,8 @@ public class ConversationMessage : Gtk.Box {
[GtkChild]
private Gtk.Box date_header;
[GtkChild]
private Gtk.Image attachment_icon;
[GtkChild]
private Gtk.Button flag_button;
[GtkChild]
@ -193,9 +195,9 @@ public class ConversationMessage : Gtk.Box {
// get_style_context().add_class("sent");
// }
// // Set attachment icon and add the attachments container if there are displayed attachments.
// int displayed = displayed_attachments(email);
// set_attachment_icon(div_message, displayed > 0);
// Set attachment icon and add the attachments container if there are displayed attachments.
int displayed = displayed_attachments(email);
attachment_icon.set_visible(displayed > 0);
// if (displayed > 0) {
// insert_attachments(div_message, email.attachments);
// }
@ -987,32 +989,32 @@ public class ConversationMessage : Gtk.Box {
// messages in he current convo for this sender
}
// private bool should_show_attachment(Geary.Attachment attachment) {
// // if displayed inline, don't include in attachment list
// if (attachment.content_id in inlined_content_ids)
// return false;
// switch (attachment.content_disposition.disposition_type) {
// case Geary.Mime.DispositionType.ATTACHMENT:
// return true;
// case Geary.Mime.DispositionType.INLINE:
// return !is_content_type_supported_inline(attachment.content_type);
// default:
// assert_not_reached();
// }
// }
private int displayed_attachments(Geary.Email email) {
int ret = 0;
foreach (Geary.Attachment attachment in email.attachments) {
if (should_show_attachment(attachment)) {
ret++;
}
}
return ret;
}
// private int displayed_attachments(Geary.Email email) {
// int ret = 0;
// foreach (Geary.Attachment attachment in email.attachments) {
// if (should_show_attachment(attachment)) {
// ret++;
// }
// }
// return ret;
// }
private bool should_show_attachment(Geary.Attachment attachment) {
// if displayed inline, don't include in attachment list
if (attachment.content_id in inlined_content_ids)
return false;
switch (attachment.content_disposition.disposition_type) {
case Geary.Mime.DispositionType.ATTACHMENT:
return true;
case Geary.Mime.DispositionType.INLINE:
return !is_content_type_supported_inline(attachment.content_type);
default:
assert_not_reached();
}
}
// private void insert_attachments(WebKit.DOM.HTMLElement email_container,
// Gee.List<Geary.Attachment> attachments) {

13
ui/conversation-message.ui
View file

@ -397,6 +397,19 @@
<property name="vexpand">False</property>
<property name="spacing">1</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkImage" id="attachment_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">This message has attachments</property>
<property name="icon_name">mail-attachment-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="flag_button">
<property name="visible">True</property>