Archives
/
meli
mirror of https://git.meli.delivery/meli/meli
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

listing: remember previous `set [index_style]]` preferences

Browse Source 
Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
pull/312/head
Manos Pitsidianakis 6 months ago
parent 3495ffd61b
commit ccf6f9a26e
No known key found for this signature in database
GPG Key ID: 7729C7707F7E09D0
1 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File

59
meli/src/mail/listing.rs
Unescape Escape View File

@ -20,7 +20,7 @@
*/ */
use std::{ use std::{
collections::{BTreeSet, HashMap, HashSet}, collections::{BTreeMap, BTreeSet, HashMap, HashSet},
convert::TryFrom, convert::TryFrom,
fs::File, fs::File,
future::Future, future::Future,
@ -488,7 +488,7 @@ column_str!(struct SubjectString(String));
column_str!(struct FlagString(String)); column_str!(struct FlagString(String));
column_str!(struct TagString(String, SmallVec<[Option<Color>; 8]>)); column_str!(struct TagString(String, SmallVec<[Option<Color>; 8]>));
#[derive(Debug)] #[derive(Debug, Copy, Clone)]
struct MailboxMenuEntry { struct MailboxMenuEntry {
depth: usize, depth: usize,
indentation: u32, indentation: u32,
@ -496,6 +496,7 @@ struct MailboxMenuEntry {
visible: bool, visible: bool,
collapsed: bool, collapsed: bool,
mailbox_hash: MailboxHash, mailbox_hash: MailboxHash,
index_style: Option<IndexStyle>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -1196,6 +1197,12 @@ impl Component for Listing {
} }
}) })
.collect::<_>(); .collect::<_>();
let previous_index_styles: BTreeMap<MailboxHash, IndexStyle> = self.accounts
[account_index]
.entries
.iter()
.filter_map(|e| Some((e.mailbox_hash, e.index_style?)))
.collect::<_>();
self.accounts[account_index].entries = context.accounts[&*account_hash] self.accounts[account_index].entries = context.accounts[&*account_hash]
.list_mailboxes() .list_mailboxes()
.into_iter() .into_iter()
@ -1215,6 +1222,7 @@ impl Component for Listing {
} else { } else {
previous_collapsed_mailboxes.contains(&f.hash) previous_collapsed_mailboxes.contains(&f.hash)
}, },
index_style: previous_index_styles.get(&f.hash).copied(),
}) })
.collect::<_>(); .collect::<_>();
self.menu.grid_mut().empty(); self.menu.grid_mut().empty();
@ -1245,6 +1253,12 @@ impl Component for Listing {
} }
}) })
.collect::<_>(); .collect::<_>();
let previous_index_styles: BTreeMap<MailboxHash, IndexStyle> = self.accounts
[account_index]
.entries
.iter()
.filter_map(|e| Some((e.mailbox_hash, e.index_style?)))
.collect::<_>();
self.accounts[account_index].entries = context.accounts[&*account_hash] self.accounts[account_index].entries = context.accounts[&*account_hash]
.list_mailboxes() .list_mailboxes()
.into_iter() .into_iter()
@ -1260,6 +1274,7 @@ impl Component for Listing {
mailbox_hash: f.hash, mailbox_hash: f.hash,
visible: true, visible: true,
collapsed: previous_collapsed_mailboxes.contains(&f.hash), collapsed: previous_collapsed_mailboxes.contains(&f.hash),
index_style: previous_index_styles.get(&f.hash).copied(),
}) })
.collect::<_>(); .collect::<_>();
let mut fallback = 0; let mut fallback = 0;
@ -1595,19 +1610,19 @@ impl Component for Listing {
match event { match event {
UIEvent::Action(ref action) => match action { UIEvent::Action(ref action) => match action {
Action::Listing(ListingAction::SetPlain) => { Action::Listing(ListingAction::SetPlain) => {
self.set_style(IndexStyle::Plain, context); self.set_index_style(IndexStyle::Plain, context);
return true; return true;
} }
Action::Listing(ListingAction::SetThreaded) => { Action::Listing(ListingAction::SetThreaded) => {
self.set_style(IndexStyle::Threaded, context); self.set_index_style(IndexStyle::Threaded, context);
return true; return true;
} }
Action::Listing(ListingAction::SetCompact) => { Action::Listing(ListingAction::SetCompact) => {
self.set_style(IndexStyle::Compact, context); self.set_index_style(IndexStyle::Compact, context);
return true; return true;
} }
Action::Listing(ListingAction::SetConversations) => { Action::Listing(ListingAction::SetConversations) => {
self.set_style(IndexStyle::Conversations, context); self.set_index_style(IndexStyle::Conversations, context);
return true; return true;
} }
Action::Listing(ListingAction::Import(file_path, mailbox_path)) => { Action::Listing(ListingAction::Import(file_path, mailbox_path)) => {
@ -2489,6 +2504,7 @@ impl Listing {
mailbox_hash: f.hash, mailbox_hash: f.hash,
visible: true, visible: true,
collapsed: a[&f.hash].conf.collapsed, collapsed: a[&f.hash].conf.collapsed,
index_style: a[&f.hash].conf.conf_override().listing.index_style,
}) })
.collect::<_>(); .collect::<_>();
@ -2677,6 +2693,7 @@ impl Listing {
mailbox_hash, mailbox_hash,
visible: _, visible: _,
collapsed, collapsed,
index_style: _,
}, },
) in self.accounts[aidx].entries.iter().enumerate() ) in self.accounts[aidx].entries.iter().enumerate()
{ {
@ -3011,6 +3028,12 @@ impl Listing {
} }
}) })
.collect::<_>(); .collect::<_>();
let previous_index_styles: BTreeMap<MailboxHash, IndexStyle> = self.accounts
[self.cursor_pos.account]
.entries
.iter()
.filter_map(|e| Some((e.mailbox_hash, e.index_style?)))
.collect::<_>();
self.accounts[self.cursor_pos.account].entries = context.accounts[self.cursor_pos.account] self.accounts[self.cursor_pos.account].entries = context.accounts[self.cursor_pos.account]
.list_mailboxes() .list_mailboxes()
.into_iter() .into_iter()
@ -3032,13 +3055,17 @@ impl Listing {
} else { } else {
previous_collapsed_mailboxes.contains(&f.hash) previous_collapsed_mailboxes.contains(&f.hash)
}, },
index_style: previous_index_styles.get(&f.hash).copied(),
}) })
.collect::<_>(); .collect::<_>();
match self.cursor_pos.menu { match self.cursor_pos.menu {
MenuEntryCursor::Mailbox(idx) => { MenuEntryCursor::Mailbox(idx) => {
/* Account might have no mailboxes yet if it's offline */ // Account might have no mailboxes yet if it's offline
if let Some(MailboxMenuEntry { mailbox_hash, .. }) = if let Some(MailboxMenuEntry {
self.accounts[self.cursor_pos.account].entries.get(idx) mailbox_hash,
index_style,
..
}) = self.accounts[self.cursor_pos.account].entries.get(idx)
{ {
self.component self.component
.process_event(&mut UIEvent::VisibilityChange(false), context); .process_event(&mut UIEvent::VisibilityChange(false), context);
@ -3046,9 +3073,10 @@ impl Listing {
.set_coordinates((account_hash, *mailbox_hash)); .set_coordinates((account_hash, *mailbox_hash));
self.component.refresh_mailbox(context, true); self.component.refresh_mailbox(context, true);
let index_style = // Check if per-mailbox configuration overrides general configuration
mailbox_settings!(context[account_hash][mailbox_hash].listing.index_style); let index_style_override =
self.set_style(*index_style, context); *mailbox_settings!(context[account_hash][mailbox_hash].listing.index_style);
self.set_index_style(index_style.unwrap_or(index_style_override), context);
} else if !matches!(self.component, ListingComponent::Offline(_)) { } else if !matches!(self.component, ListingComponent::Offline(_)) {
self.component.unrealize(context); self.component.unrealize(context);
self.component = self.component =
@ -3095,7 +3123,7 @@ impl Listing {
!matches!(self.component.focus(), Focus::EntryFullscreen) && self.menu_visibility !matches!(self.component.focus(), Focus::EntryFullscreen) && self.menu_visibility
} }
fn set_style(&mut self, new_style: IndexStyle, context: &mut Context) { fn set_index_style(&mut self, new_style: IndexStyle, context: &mut Context) {
let old = match new_style { let old = match new_style {
IndexStyle::Conversations | IndexStyle::Threaded | IndexStyle::Plain => { IndexStyle::Conversations | IndexStyle::Threaded | IndexStyle::Plain => {
if matches!(self.component, Plain(_)) { if matches!(self.component, Plain(_)) {
@ -3139,6 +3167,11 @@ impl Listing {
// // coordinates)), // // coordinates)),
//} //}
}; };
if let MenuEntryCursor::Mailbox(idx) = self.cursor_pos.menu {
if let Some(mbox_entry) = self.accounts[self.cursor_pos.account].entries.get_mut(idx) {
mbox_entry.index_style = Some(new_style);
}
}
self.component self.component
.process_event(&mut UIEvent::VisibilityChange(true), context); .process_event(&mut UIEvent::VisibilityChange(true), context);
old.unrealize(context); old.unrealize(context);

Write Preview
Loading…
Cancel
Save