ui: add tags in plain listing
parent
6d380cefd1
commit
d31c629ac4
|
@ -507,6 +507,7 @@ impl CompactListing {
|
||||||
if is_snoozed { "💤" } else { "" }
|
if is_snoozed { "💤" } else { "" }
|
||||||
)),
|
)),
|
||||||
from: FromString(address_list!((e.from()) as comma_sep_list)),
|
from: FromString(address_list!((e.from()) as comma_sep_list)),
|
||||||
|
tags: TagString(String::new()),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
EntryStrings {
|
EntryStrings {
|
||||||
|
@ -518,6 +519,7 @@ impl CompactListing {
|
||||||
if is_snoozed { "💤" } else { "" }
|
if is_snoozed { "💤" } else { "" }
|
||||||
)),
|
)),
|
||||||
from: FromString(address_list!((e.from()) as comma_sep_list)),
|
from: FromString(address_list!((e.from()) as comma_sep_list)),
|
||||||
|
tags: TagString(String::new()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,7 @@ pub(super) struct EntryStrings {
|
||||||
pub(super) subject: SubjectString,
|
pub(super) subject: SubjectString,
|
||||||
pub(super) flag: FlagString,
|
pub(super) flag: FlagString,
|
||||||
pub(super) from: FromString,
|
pub(super) from: FromString,
|
||||||
|
pub(super) tags: TagString,
|
||||||
}
|
}
|
||||||
|
|
||||||
macro_rules! address_list {
|
macro_rules! address_list {
|
||||||
|
@ -72,6 +73,7 @@ column_str!(struct DateString(String));
|
||||||
column_str!(struct FromString(String));
|
column_str!(struct FromString(String));
|
||||||
column_str!(struct SubjectString(String));
|
column_str!(struct SubjectString(String));
|
||||||
column_str!(struct FlagString(String));
|
column_str!(struct FlagString(String));
|
||||||
|
column_str!(struct TagString(String));
|
||||||
|
|
||||||
/// A list of all mail (`Envelope`s) in a `Mailbox`. On `\n` it opens the `Envelope` content in a
|
/// A list of all mail (`Envelope`s) in a `Mailbox`. On `\n` it opens the `Envelope` content in a
|
||||||
/// `ThreadView`.
|
/// `ThreadView`.
|
||||||
|
@ -483,6 +485,7 @@ impl ConversationsListing {
|
||||||
if is_snoozed { "💤" } else { "" }
|
if is_snoozed { "💤" } else { "" }
|
||||||
)),
|
)),
|
||||||
from: FromString(address_list!((from) as comma_sep_list)),
|
from: FromString(address_list!((from) as comma_sep_list)),
|
||||||
|
tags: TagString(String::new()),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
EntryStrings {
|
EntryStrings {
|
||||||
|
@ -494,6 +497,7 @@ impl ConversationsListing {
|
||||||
if is_snoozed { "💤" } else { "" }
|
if is_snoozed { "💤" } else { "" }
|
||||||
)),
|
)),
|
||||||
from: FromString(address_list!((from) as comma_sep_list)),
|
from: FromString(address_list!((from) as comma_sep_list)),
|
||||||
|
tags: TagString(String::new()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -468,12 +468,13 @@ impl PlainListing {
|
||||||
id: ComponentId::new_v4(),
|
id: ComponentId::new_v4(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fn make_entry_string(e: EnvelopeRef) -> EntryStrings {
|
fn make_entry_string(e: EnvelopeRef, tags: String) -> EntryStrings {
|
||||||
EntryStrings {
|
EntryStrings {
|
||||||
date: DateString(PlainListing::format_date(&e)),
|
date: DateString(PlainListing::format_date(&e)),
|
||||||
subject: SubjectString(format!("{}", e.subject())),
|
subject: SubjectString(format!("{}", e.subject())),
|
||||||
flag: FlagString(format!("{}", if e.has_attachments() { "📎" } else { "" },)),
|
flag: FlagString(format!("{}", if e.has_attachments() { "📎" } else { "" },)),
|
||||||
from: FromString(address_list!((e.from()) as comma_sep_list)),
|
from: FromString(address_list!((e.from()) as comma_sep_list)),
|
||||||
|
tags: TagString(tags),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -544,6 +545,8 @@ impl PlainListing {
|
||||||
fn redraw_list(&mut self, context: &Context) {
|
fn redraw_list(&mut self, context: &Context) {
|
||||||
let account = &context.accounts[self.cursor_pos.0];
|
let account = &context.accounts[self.cursor_pos.0];
|
||||||
let mailbox = &account[self.cursor_pos.1].unwrap();
|
let mailbox = &account[self.cursor_pos.1].unwrap();
|
||||||
|
let folder_hash = &account[self.cursor_pos.1].unwrap().folder.hash();
|
||||||
|
let folder = &account.folder_confs[&folder_hash];
|
||||||
|
|
||||||
self.order.clear();
|
self.order.clear();
|
||||||
self.selection.clear();
|
self.selection.clear();
|
||||||
|
@ -599,12 +602,32 @@ impl PlainListing {
|
||||||
panic!();
|
panic!();
|
||||||
}
|
}
|
||||||
let envelope: EnvelopeRef = context.accounts[self.cursor_pos.0].collection.get_env(i);
|
let envelope: EnvelopeRef = context.accounts[self.cursor_pos.0].collection.get_env(i);
|
||||||
|
let mut tags = String::new();
|
||||||
|
let backend_lck = context.accounts[self.cursor_pos.0].backend.read().unwrap();
|
||||||
|
if let Some(t) = backend_lck.tags() {
|
||||||
|
let tags_lck = t.read().unwrap();
|
||||||
|
for t in envelope.labels().iter() {
|
||||||
|
if folder.folder_conf.ignore_tags.contains(t) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
tags.push(' ');
|
||||||
|
tags.push_str(tags_lck.get(t).as_ref().unwrap());
|
||||||
|
tags.push(' ');
|
||||||
|
}
|
||||||
|
if !tags.is_empty() {
|
||||||
|
tags.pop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
drop(backend_lck);
|
||||||
|
|
||||||
let entry_strings = PlainListing::make_entry_string(envelope);
|
let entry_strings = PlainListing::make_entry_string(envelope, tags);
|
||||||
min_width.1 = cmp::max(min_width.1, entry_strings.date.grapheme_width()); /* date */
|
min_width.1 = cmp::max(min_width.1, entry_strings.date.grapheme_width()); /* date */
|
||||||
min_width.2 = cmp::max(min_width.2, entry_strings.from.grapheme_width()); /* from */
|
min_width.2 = cmp::max(min_width.2, entry_strings.from.grapheme_width()); /* from */
|
||||||
min_width.3 = cmp::max(min_width.3, entry_strings.flag.grapheme_width()); /* flags */
|
min_width.3 = cmp::max(min_width.3, entry_strings.flag.grapheme_width()); /* flags */
|
||||||
min_width.4 = cmp::max(min_width.4, entry_strings.subject.grapheme_width()); /* subject */
|
min_width.4 = cmp::max(
|
||||||
|
min_width.4,
|
||||||
|
entry_strings.subject.grapheme_width() + 1 + entry_strings.tags.grapheme_width(),
|
||||||
|
); /* tags + subject */
|
||||||
rows.push(entry_strings);
|
rows.push(entry_strings);
|
||||||
if refresh_mailbox {
|
if refresh_mailbox {
|
||||||
self.all_envelopes.insert(i);
|
self.all_envelopes.insert(i);
|
||||||
|
@ -733,6 +756,32 @@ impl PlainListing {
|
||||||
((0, idx), (min_width.4, idx)),
|
((0, idx), (min_width.4, idx)),
|
||||||
None,
|
None,
|
||||||
);
|
);
|
||||||
|
let x = {
|
||||||
|
let mut x = x + 1;
|
||||||
|
use std::convert::TryInto;
|
||||||
|
for (m, t) in strings.tags.split_whitespace().enumerate() {
|
||||||
|
let m = 2 * m.try_into().unwrap_or(0);
|
||||||
|
let (_x, _) = write_string_to_grid(
|
||||||
|
t,
|
||||||
|
&mut self.data_columns.columns[4],
|
||||||
|
Color::White,
|
||||||
|
Color::Byte(103 + m),
|
||||||
|
Attr::Bold,
|
||||||
|
((x + 1, idx), (min_width.4, idx)),
|
||||||
|
None,
|
||||||
|
);
|
||||||
|
self.data_columns.columns[4][(x, idx)].set_bg(Color::Byte(103 + m));
|
||||||
|
self.data_columns.columns[4][(_x, idx)].set_bg(Color::Byte(103 + m));
|
||||||
|
for x in (x + 1).._x {
|
||||||
|
self.data_columns.columns[4][(x, idx)].set_keep_fg(true);
|
||||||
|
self.data_columns.columns[4][(x, idx)].set_keep_bg(true);
|
||||||
|
}
|
||||||
|
self.data_columns.columns[4][(x, idx)].set_keep_bg(true);
|
||||||
|
self.data_columns.columns[4][(_x, idx)].set_keep_bg(true);
|
||||||
|
x = _x + 1;
|
||||||
|
}
|
||||||
|
x
|
||||||
|
};
|
||||||
for x in x..min_width.4 {
|
for x in x..min_width.4 {
|
||||||
self.data_columns.columns[4][(x, idx)].set_bg(bg_color);
|
self.data_columns.columns[4][(x, idx)].set_bg(bg_color);
|
||||||
}
|
}
|
||||||
|
|
|
@ -372,11 +372,7 @@ impl Component for MailView {
|
||||||
(set_y(upper_left, y), bottom_right),
|
(set_y(upper_left, y), bottom_right),
|
||||||
Some(get_x(upper_left)),
|
Some(get_x(upper_left)),
|
||||||
);
|
);
|
||||||
for x in _x..=get_x(bottom_right) {
|
clear_area(grid, ((_x, _y), (get_x(bottom_right), _y)));
|
||||||
grid[(x, _y)].set_ch(' ');
|
|
||||||
grid[(x, _y)].set_bg(Color::Default);
|
|
||||||
grid[(x, _y)].set_fg(Color::Default);
|
|
||||||
}
|
|
||||||
y = _y + 1;
|
y = _y + 1;
|
||||||
} else {
|
} else {
|
||||||
skip_header_ctr -= 1;
|
skip_header_ctr -= 1;
|
||||||
|
@ -416,6 +412,7 @@ impl Component for MailView {
|
||||||
let mut x = get_x(upper_left);
|
let mut x = get_x(upper_left);
|
||||||
if let Some(id) = id {
|
if let Some(id) = id {
|
||||||
if sticky || skip_header_ctr == 0 {
|
if sticky || skip_header_ctr == 0 {
|
||||||
|
clear_area(grid, (set_y(upper_left, y), set_y(bottom_right, y)));
|
||||||
let (_x, _) = write_string_to_grid(
|
let (_x, _) = write_string_to_grid(
|
||||||
"List-ID: ",
|
"List-ID: ",
|
||||||
grid,
|
grid,
|
||||||
|
|
Loading…
Reference in New Issue