Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MessageListItem: Parse message_info.from into a linkbutton #362

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

MessageListItem: Parse message_info.from into a linkbutton #362

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9bff79
MessageListItem: Parse message_info.from into a linkbutton
danirabbit Feb 14, 2019
1614094
keep left align when we wrap
danirabbit Feb 14, 2019
7d3b8a4
Merge branch 'master' into messagelistitem-parse-from
danirabbit Feb 14, 2019
39b1e0e
Move from parsing out of individual widget
danirabbit Feb 15, 2019
5f5a985
Merge branch 'master' into messagelistitem-parse-from
danirabbit Feb 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 42 additions & 7 deletions src/MessageList/MessageListItem.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public class Mail.MessageListItem : Gtk.ListBoxRow {
style_context = get_style_context ();
style_context.add_class ("card");

string[] parsed_from = message_info.from.replace (">", "").split ("<");

var avatar = new Granite.Widgets.Avatar.with_default_icon (48);
avatar.valign = Gtk.Align.START;

Expand All @@ -88,9 +90,7 @@ public class Mail.MessageListItem : Gtk.ListBoxRow {
subject_label.valign = Gtk.Align.START;
subject_label.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);

var from_val_label = new Gtk.Label (message_info.from);
from_val_label.wrap = true;
from_val_label.xalign = 0;
var from_individualitem = new IndividualItem (parsed_from[0], parsed_from [1]);

var to_val_label = new Gtk.Label (message_info.to);
to_val_label.wrap = true;
Expand All @@ -106,7 +106,7 @@ public class Mail.MessageListItem : Gtk.ListBoxRow {
fields_grid.attach (from_label, 0, 0, 1, 1);
fields_grid.attach (to_label, 0, 1, 1, 1);
fields_grid.attach (subject_label, 0, 3, 1, 1);
fields_grid.attach (from_val_label, 1, 0, 1, 1);
fields_grid.attach (from_individualitem, 1, 0);
fields_grid.attach (to_val_label, 1, 1, 1, 1);
fields_grid.attach (subject_val_label, 1, 3, 1, 1);

Expand All @@ -125,9 +125,7 @@ public class Mail.MessageListItem : Gtk.ListBoxRow {
fields_grid.attach (cc_val_label, 1, 2, 1, 1);
}

var small_from_label = new Gtk.Label (message_info.from);
from_val_label.ellipsize = Pango.EllipsizeMode.END;
from_val_label.xalign = 0;
var small_from_label = new IndividualItem (parsed_from[0], parsed_from [1]);

var small_fields_grid = new Gtk.Grid ();
small_fields_grid.attach (small_from_label, 0, 0, 1, 1);
Expand Down Expand Up @@ -485,4 +483,41 @@ public class Mail.MessageListItem : Gtk.ListBoxRow {
public string get_message_body_html () {
return web_view.get_body_html ();
}

private class IndividualItem : Gtk.Button {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not subclass Gtk.LinkButton directly ?

public string display_name { get; construct; }
public string email_address { get; construct; }

public IndividualItem (string display_name, string email_address) {
Object (
display_name: display_name,
email_address: email_address
);
}

construct {
var display_name_label = new Gtk.Label (display_name);
display_name_label.wrap = true;
display_name_label.tooltip_text = email_address;
display_name_label.xalign = 0;

halign = Gtk.Align.START;
add (display_name_label);

var style_context = get_style_context ();
style_context.add_class (Gtk.STYLE_CLASS_FLAT);
style_context.add_class ("link");

/* Connecting to clicked () doesn't allow us to prevent the event from propagating to header_event_box */
button_release_event.connect (() => {
try {
AppInfo.launch_default_for_uri ("mailto:" + email_address, null);
} catch (Error e) {
warning ("Failed to open mailto link: %s", e.message);
}

return Gdk.EVENT_STOP;
});
}
}
}