llange
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Add search shortcut to shortcut map

async
Manos Pitsidianakis 2020-02-26 16:23:02 +02:00
parent 33c1bf6558
commit 760c1e859d
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
3 changed files with 64 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin.rs
View File

@ -371,14 +371,17 @@ fn run_app() -> Result<()> {
/* Create the application State. */
let mut state = State::new(sender, receiver.clone())?;
let window = Box::new(Tabbed::new(vec![
Box::new(listing::Listing::new(&mut state.context)),
Box::new(ContactList::new(&state.context)),
Box::new(StatusPanel::new(crate::conf::value(
&state.context,
"theme_default",
))),
]));
let window = Box::new(Tabbed::new(
vec![
Box::new(listing::Listing::new(&mut state.context)),
Box::new(ContactList::new(&state.context)),
Box::new(StatusPanel::new(crate::conf::value(
&state.context,
"theme_default",
))),
],
&state.context,
));
let status_bar = Box::new(StatusBar::new(window));
state.register_component(status_bar);

2
src/components/mail/listing.rs
View File

@ -902,7 +902,7 @@ impl From<(IndexStyle, (usize, MailboxHash))> for ListingComponent {
}
impl Listing {
const DESCRIPTION: &'static str = "listing";
pub const DESCRIPTION: &'static str = "listing";
pub fn new(context: &mut Context) -> Self {
let account_entries: Vec<AccountMenuEntry> = context
.accounts

60
src/components/utilities.rs
View File

@ -1449,20 +1449,26 @@ pub struct Tabbed {
}
impl Tabbed {
pub fn new(children: Vec<Box<dyn Component>>) -> Self {
pub fn new(children: Vec<Box<dyn Component>>, context: &Context) -> Self {
let pinned = children.len();
Tabbed {
let mut ret = Tabbed {
help_curr_views: children
.get(0)
.map(|c| c.get_shortcuts(context))
.unwrap_or_default(),
help_content: CellBuffer::default(),
help_screen_cursor: (0, 0),
help_search: None,
pinned,
children,
cursor_pos: 0,
show_shortcuts: false,
help_content: CellBuffer::default(),
help_screen_cursor: (0, 0),
help_curr_views: ShortcutMaps::default(),
help_search: None,
dirty: true,
id: ComponentId::new_v4(),
}
};
ret.help_curr_views
.extend(ret.get_shortcuts(context).into_iter());
ret
}
fn draw_tabs(&mut self, grid: &mut CellBuffer, area: Area, context: &mut Context) {
let upper_left = upper_left!(area);
@ -1819,12 +1825,15 @@ impl Component for Tabbed {
self.dirty = false;
}
fn process_event(&mut self, mut event: &mut UIEvent, context: &mut Context) -> bool {
let shortcuts = self.get_shortcuts(context);
let shortcuts = &self.help_curr_views;
match &mut event {
UIEvent::Input(Key::Alt(no)) if *no >= '1' && *no <= '9' => {
let no = *no as usize - '1' as usize;
if no < self.children.len() {
self.cursor_pos = no % self.children.len();
let mut children_maps = self.children[self.cursor_pos].get_shortcuts(context);
children_maps.extend(self.get_shortcuts(context));
self.help_curr_views = children_maps;
context
.replies
.push_back(UIEvent::StatusEvent(StatusEvent::UpdateStatus(
@ -1836,6 +1845,9 @@ impl Component for Tabbed {
}
UIEvent::Input(ref key) if shortcut!(key == shortcuts["general"]["next_tab"]) => {
self.cursor_pos = (self.cursor_pos + 1) % self.children.len();
let mut children_maps = self.children[self.cursor_pos].get_shortcuts(context);
children_maps.extend(self.get_shortcuts(context));
self.help_curr_views = children_maps;
context
.replies
.push_back(UIEvent::StatusEvent(StatusEvent::UpdateStatus(
@ -1861,6 +1873,9 @@ impl Component for Tabbed {
self.add_component(Box::new(composer));
self.cursor_pos = self.children.len() - 1;
self.children[self.cursor_pos].set_dirty(true);
let mut children_maps = self.children[self.cursor_pos].get_shortcuts(context);
children_maps.extend(self.get_shortcuts(context));
self.help_curr_views = children_maps;
return true;
}
UIEvent::Action(Tab(Reply(coordinates, msg))) => {
@ -1871,6 +1886,9 @@ impl Component for Tabbed {
)));
self.cursor_pos = self.children.len() - 1;
self.children[self.cursor_pos].set_dirty(true);
let mut children_maps = self.children[self.cursor_pos].get_shortcuts(context);
children_maps.extend(self.get_shortcuts(context));
self.help_curr_views = children_maps;
return true;
}
UIEvent::Action(Tab(Edit(account_pos, msg))) => {
@ -1899,12 +1917,18 @@ impl Component for Tabbed {
self.add_component(Box::new(composer));
self.cursor_pos = self.children.len() - 1;
self.children[self.cursor_pos].set_dirty(true);
let mut children_maps = self.children[self.cursor_pos].get_shortcuts(context);
children_maps.extend(self.get_shortcuts(context));
self.help_curr_views = children_maps;
return true;
}
UIEvent::Action(Tab(New(ref mut e))) if e.is_some() => {
self.add_component(e.take().unwrap());
self.cursor_pos = self.children.len() - 1;
self.children[self.cursor_pos].set_dirty(true);
let mut children_maps = self.children[self.cursor_pos].get_shortcuts(context);
children_maps.extend(self.get_shortcuts(context));
self.help_curr_views = children_maps;
return true;
}
UIEvent::Action(Tab(Close)) => {
@ -1913,6 +1937,9 @@ impl Component for Tabbed {
}
let id = self.children[self.cursor_pos].id();
self.children[self.cursor_pos].kill(id, context);
let mut children_maps = self.children[self.cursor_pos].get_shortcuts(context);
children_maps.extend(self.get_shortcuts(context));
self.help_curr_views = children_maps;
self.set_dirty(true);
return true;
}
@ -1924,6 +1951,9 @@ impl Component for Tabbed {
self.children.remove(c_idx);
self.cursor_pos = 0;
self.set_dirty(true);
let mut children_maps = self.children[self.cursor_pos].get_shortcuts(context);
children_maps.extend(self.get_shortcuts(context));
self.help_curr_views = children_maps;
return true;
} else {
debug!(
@ -1976,6 +2006,20 @@ impl Component for Tabbed {
UIEvent::Resize => {
self.dirty = true;
}
UIEvent::Input(ref key)
if self.show_shortcuts
&& shortcut!(
key == shortcuts[super::listing::Listing::DESCRIPTION]["search"]
) =>
{
context
.replies
.push_back(UIEvent::ExInput(Key::Paste("filter ".to_string())));
context
.replies
.push_back(UIEvent::ChangeMode(UIMode::Execute));
return true;
}
UIEvent::Input(ref key) if self.show_shortcuts => {
match key {
_ if shortcut!(key == shortcuts["general"]["scroll_up"]) => {