diff options
| -rw-r--r-- | src/file_browser.rs | 7 | ||||
| -rw-r--r-- | src/foldview.rs | 8 | ||||
| -rw-r--r-- | src/listview.rs | 12 | ||||
| -rw-r--r-- | src/proclist.rs | 8 |
4 files changed, 18 insertions, 17 deletions
diff --git a/src/file_browser.rs b/src/file_browser.rs index 779c47a..dc24fa8 100644 --- a/src/file_browser.rs +++ b/src/file_browser.rs @@ -1039,14 +1039,15 @@ impl Widget for FileBrowser { match key { Key::Char('/') => { self.turbo_cd()?; }, Key::Char('Q') => { self.quit_with_dir()?; }, - Key::Right | Key::Char('f') => { self.enter_dir()?; }, + Key::Right | Key::Char('l') => { self.enter_dir()?; }, Key::Char('F') => { self.open_bg()?; }, - Key::Left | Key::Char('b') => { self.go_back()?; }, + Key::Left | Key::Char('h') => { self.go_back()?; }, Key::Char('-') => { self.goto_prev_cwd()?; }, Key::Char('`') => { self.goto_bookmark()?; }, Key::Char('m') => { self.add_bookmark()?; }, + Key::Char('w') => { self.show_procview()?; }, - Key::Char('l') => self.show_log()?, + Key::Char('L') => self.show_log()?, Key::Char('z') => self.run_subshell()?, Key::Char('c') => self.toggle_colums(), _ => { self.main_widget_mut()?.on_key(key)?; }, diff --git a/src/foldview.rs b/src/foldview.rs index 4b3edfe..8e00209 100644 --- a/src/foldview.rs +++ b/src/foldview.rs @@ -285,10 +285,10 @@ where fn on_key(&mut self, key: Key) -> HResult<()> { match key { - Key::Up | Key::Char('p') => self.move_up(), - Key::Char('P') => for _ in 0..10 { self.move_up() }, - Key::Char('N') => for _ in 0..10 { self.move_down() }, - Key::Down | Key::Char('n') => self.move_down(), + Key::Up | Key::Char('k') => self.move_up(), + Key::Char('K') => for _ in 0..10 { self.move_up() }, + Key::Char('J') => for _ in 0..10 { self.move_down() }, + Key::Down | Key::Char('j') => self.move_down(), Key::Char('t') => self.toggle_fold()?, Key::Char('l') => self.popup_finnished()?, _ => {} diff --git a/src/listview.rs b/src/listview.rs index 976acb0..3c85529 100644 --- a/src/listview.rs +++ b/src/listview.rs @@ -55,13 +55,13 @@ impl Listable for ListView<Files> { fn on_key(&mut self, key: Key) -> HResult<()> { match key { - Key::Up | Key::Char('p') => { + Key::Up | Key::Char('k') => { self.move_up(); self.refresh()?; } - Key::Char('P') => { for _ in 0..10 { self.move_up() } self.refresh()?; } - Key::Char('N') => { for _ in 0..10 { self.move_down() } self.refresh()?; } - Key::Down | Key::Char('n') => { + Key::Char('K') => { for _ in 0..10 { self.move_up() } self.refresh()?; } + Key::Char('J') => { for _ in 0..10 { self.move_down() } self.refresh()?; } + Key::Down | Key::Char('j') => { self.move_down(); self.refresh()?; }, @@ -79,8 +79,8 @@ impl Listable for ListView<Files> { Key::Char('h') => self.toggle_hidden(), Key::Char('r') => self.reverse_sort(), Key::Char('s') => self.cycle_sort(), - Key::Char('K') => self.select_next_mtime(), - Key::Char('k') => self.select_prev_mtime(), + Key::Char('N') => self.select_next_mtime(), + Key::Char('n') => self.select_prev_mtime(), Key::Char('d') => self.toggle_dirs_first(), _ => { self.bad(Event::Key(key))?; } } diff --git a/src/proclist.rs b/src/proclist.rs index b8e0524..69dc1e8 100644 --- a/src/proclist.rs +++ b/src/proclist.rs @@ -562,16 +562,16 @@ impl Widget for ProcView { self.clear().log(); return Err(HError::PopupFinnished) } Key::Char('d') => { self.remove_proc()? } - Key::Char('k') => { self.get_listview_mut().kill_proc()? } + Key::Char('K') => { self.get_listview_mut().kill_proc()? } Key::Up | Key::Char('p') => { self.get_listview_mut().move_up(); } - Key::Down | Key::Char('n') => { + Key::Down | Key::Char('j') => { self.get_listview_mut().move_down(); } Key::Char('f') => { self.toggle_follow().log(); } - Key::Ctrl('n') => { self.scroll_down().log(); }, - Key::Ctrl('p') => { self.scroll_up().log(); }, + Key::Ctrl('j') => { self.scroll_down().log(); }, + Key::Ctrl('k') => { self.scroll_up().log(); }, Key::Ctrl('v') => { self.page_down().log(); }, Key::Alt('v') => { self.page_up().log(); }, Key::Char('>') => { self.scroll_bottom().log(); }, |