meli
/
meli
8
Fork 13
Code Issues 10 Pull Requests 11 Actions Packages Projects 1 Releases 18 Wiki Activity

compose: rename Overview to ThreadView

embed
Manos Pitsidianakis 2019-09-27 13:27:07 +03:00
parent d8ada69897
commit b3e1d88898
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ui/src/components/mail/compose.rs
View File

@ -74,7 +74,7 @@ enum ViewMode {
Discard(Uuid), Discard(Uuid),
Edit, Edit,
//Selector(Selector), //Selector(Selector),
Overview, ThreadView,
} }
impl ViewMode { impl ViewMode {
@ -94,8 +94,8 @@ impl ViewMode {
} }
} }
fn is_overview(&self) -> bool { fn is_threadview(&self) -> bool {
if let ViewMode::Overview = self { if let ViewMode::ThreadView = self {
true true
} else { } else {
false false
@ -314,11 +314,11 @@ impl Component for Composer {
if self.reply_context.is_some() { if self.reply_context.is_some() {
for i in get_y(upper_left) - 1..=get_y(bottom_right) { for i in get_y(upper_left) - 1..=get_y(bottom_right) {
set_and_join_box(grid, (mid, i), VERT_BOUNDARY); //set_and_join_box(grid, (mid, i), VERT_BOUNDARY);
grid[(mid, i)].set_fg(Color::Default); grid[(mid, i)].set_fg(Color::Default);
grid[(mid, i)].set_bg(Color::Default); grid[(mid, i)].set_bg(Color::Default);
} }
grid[set_x(bottom_right, mid)].set_ch(VERT_BOUNDARY); // Enforce full vert bar at the bottom //grid[set_x(bottom_right, mid)].set_ch(VERT_BOUNDARY); // Enforce full vert bar at the bottom
grid[set_x(bottom_right, mid)].set_fg(Color::Byte(240)); grid[set_x(bottom_right, mid)].set_fg(Color::Byte(240));
} }
@ -413,7 +413,7 @@ impl Component for Composer {
self.form.draw(grid, header_area, context); self.form.draw(grid, header_area, context);
match self.mode { match self.mode {
ViewMode::Overview | ViewMode::Edit => { ViewMode::ThreadView | ViewMode::Edit => {
self.pager.set_dirty(); self.pager.set_dirty();
self.pager.draw(grid, body_area, context); self.pager.draw(grid, body_area, context);
} }
@ -484,7 +484,7 @@ impl Component for Composer {
match (&mut self.mode, &mut self.reply_context, &event) { match (&mut self.mode, &mut self.reply_context, &event) {
// don't pass Reply command to thread view in reply_context // don't pass Reply command to thread view in reply_context
(_, _, UIEvent::Input(Key::Char('R'))) => {} (_, _, UIEvent::Input(Key::Char('R'))) => {}
(ViewMode::Overview, Some((_, ref mut view)), _) => { (ViewMode::ThreadView, Some((_, ref mut view)), _) => {
if view.process_event(event, context) { if view.process_event(event, context) {
self.dirty = true; self.dirty = true;
return true; return true;
@ -494,7 +494,7 @@ impl Component for Composer {
return true; return true;
} }
} }
(ViewMode::Overview, _, _) => { (ViewMode::ThreadView, _, _) => {
/* Cannot mutably borrow in pattern guard, pah! */ /* Cannot mutably borrow in pattern guard, pah! */
if self.pager.process_event(event, context) { if self.pager.process_event(event, context) {
return true; return true;
@ -614,23 +614,23 @@ impl Component for Composer {
return false; return false;
} }
} }
self.mode = ViewMode::Overview; self.mode = ViewMode::ThreadView;
self.set_dirty(); self.set_dirty();
return true; return true;
} }
/* Switch to Overview mode if we're on Edit mode */ /* Switch to thread view mode if we're on Edit mode */
UIEvent::Input(Key::Char('v')) if self.mode.is_edit() => { UIEvent::Input(Key::Char('v')) if self.mode.is_edit() => {
self.mode = ViewMode::Overview; self.mode = ViewMode::ThreadView;
self.set_dirty(); self.set_dirty();
return true; return true;
} }
/* Switch to Edit mode if we're on Overview mode */ /* Switch to Edit mode if we're on ThreadView mode */
UIEvent::Input(Key::Char('o')) if self.mode.is_overview() => { UIEvent::Input(Key::Char('o')) if self.mode.is_threadview() => {
self.mode = ViewMode::Edit; self.mode = ViewMode::Edit;
self.set_dirty(); self.set_dirty();
return true; return true;
} }
UIEvent::Input(Key::Char('s')) if self.mode.is_overview() => { UIEvent::Input(Key::Char('s')) => {
self.update_draft(); self.update_draft();
if send_draft(context, self.account_cursor, self.draft.clone()) { if send_draft(context, self.account_cursor, self.draft.clone()) {
context context
@ -776,7 +776,7 @@ impl Component for Composer {
} }
fn get_shortcuts(&self, context: &Context) -> ShortcutMaps { fn get_shortcuts(&self, context: &Context) -> ShortcutMaps {
let mut map = if self.mode.is_overview() { let mut map = if self.mode.is_threadview() {
self.pager.get_shortcuts(context) self.pager.get_shortcuts(context)
} else { } else {
Default::default() Default::default()
@ -787,13 +787,13 @@ impl Component for Composer {
} }
let mut our_map: ShortcutMap = Default::default(); let mut our_map: ShortcutMap = Default::default();
if self.mode.is_overview() { if self.mode.is_threadview() {
our_map.insert("Switch to edit mode.", Key::Char('o')); our_map.insert("Switch to right panel (draft editing).", Key::Char('o'));
our_map.insert("Deliver draft to mailer.", Key::Char('s'));
} }
if self.mode.is_edit() { if self.mode.is_edit() && self.reply_context.is_some() {
our_map.insert("Switch to overview", Key::Char('v')); our_map.insert("Switch to left panel (thread view)", Key::Char('v'));
} }
our_map.insert("Deliver draft to mailer.", Key::Char('s'));
our_map.insert("Edit in $EDITOR", Key::Char('e')); our_map.insert("Edit in $EDITOR", Key::Char('e'));
map.insert(Composer::DESCRIPTION.to_string(), our_map); map.insert(Composer::DESCRIPTION.to_string(), our_map);