From e49f2f47d04e0eaf40754c76a2452a9591bdc2c0 Mon Sep 17 00:00:00 2001
From: rabite <rabite@posteo.de>
Date: Wed, 22 May 2019 14:59:47 +0200
Subject: created new holy branch based off master for sanity

---
 src/file_browser.rs |  8 ++++----
 src/foldview.rs     | 10 +++++-----
 src/listview.rs     | 14 +++++++-------
 src/proclist.rs     | 10 +++++-----
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/file_browser.rs b/src/file_browser.rs
index b77109b..8687f9b 100644
--- a/src/file_browser.rs
+++ b/src/file_browser.rs
@@ -1305,14 +1305,14 @@ impl Widget for FileBrowser {
             Key::Char('~') => { self.go_home()?; },
             Key::Char('q') => HError::quit()?,
             Key::Char('Q') => { self.quit_with_dir()?; },
-            Key::Right | Key::Char('l') => { self.enter_dir()?; },
-            Key::Char('L') => { self.open_bg()?; },
-            Key::Left | Key::Char('h') => { self.go_back()?; },
+            Key::Right | Key::Char('f') => { self.enter_dir()?; },
+            Key::Char('F') => { self.open_bg()?; },
+            Key::Left | Key::Char('b') => { 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('g') => self.show_log()?,
+            Key::Char('l') => self.show_log()?,
             Key::Char('z') => self.run_subshell()?,
             Key::Char('c') => self.toggle_colums(),
             _ => {
diff --git a/src/foldview.rs b/src/foldview.rs
index 1f285bd..e4933cc 100644
--- a/src/foldview.rs
+++ b/src/foldview.rs
@@ -298,12 +298,12 @@ where
         let result = FoldableWidgetExt::on_key(self, key);
         if let Err(HError::WidgetUndefinedKeyError{key}) = result {
             match key {
-                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::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::Char('t') => self.toggle_fold()?,
-                Key::Char('g') | Key::Esc => self.popup_finnished()?,
+                Key::Char('l') => self.popup_finnished()?,
                 _ =>  { HError::undefined_key(key)?; },
             }
             // Key was defined, or _ match would have returned undefined key
diff --git a/src/listview.rs b/src/listview.rs
index c73c873..5264e01 100644
--- a/src/listview.rs
+++ b/src/listview.rs
@@ -61,13 +61,13 @@ impl Listable for ListView<Files> {
 
     fn on_key(&mut self, key: Key) -> HResult<()> {
         match key {
-            Key::Up | Key::Char('k') => {
+            Key::Up | Key::Char('p') => {
                 self.move_up();
                 self.refresh()?;
             }
-            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') => {
+            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') => {
                 self.move_down();
                 self.refresh()?;
             },
@@ -86,11 +86,11 @@ impl Listable for ListView<Files> {
             Key::Char('V') => self.clear_selections(),
             Key::Alt('v') => self.toggle_filter_selected(),
             Key::Char('t') => self.toggle_tag()?,
-            Key::Char('H') => self.toggle_hidden(),
+            Key::Char('h') => self.toggle_hidden(),
             Key::Char('r') => self.reverse_sort(),
             Key::Char('s') => self.cycle_sort(),
-            Key::Char('N') => self.select_next_mtime(),
-            Key::Char('n') => self.select_prev_mtime(),
+            Key::Char('K') => self.select_next_mtime(),
+            Key::Char('k') => self.select_prev_mtime(),
             Key::Char('d') => self.toggle_dirs_first(),
             _ => { HError::undefined_key(key)? }
         }
diff --git a/src/proclist.rs b/src/proclist.rs
index a6da1d3..0aba5c8 100644
--- a/src/proclist.rs
+++ b/src/proclist.rs
@@ -662,16 +662,16 @@ impl Widget for ProcView {
                 self.get_core()?.clear().log();
                 return Err(HError::PopupFinnished) }
             Key::Char('d') => { self.remove_proc()? }
-            Key::Char('K') => { self.get_listview_mut().kill_proc()? }
-            Key::Up | Key::Char('k') => {
+            Key::Char('k') => { self.get_listview_mut().kill_proc()? }
+            Key::Up | Key::Char('p') => {
                 self.get_listview_mut().move_up();
             }
-            Key::Down | Key::Char('j') => {
+            Key::Down | Key::Char('n') => {
                 self.get_listview_mut().move_down();
             }
             Key::Char('f') => { self.toggle_follow().log(); }
-            Key::Ctrl('j') => { self.scroll_down().log(); },
-            Key::Ctrl('k') => { self.scroll_up().log(); },
+            Key::Ctrl('n') => { self.scroll_down().log(); },
+            Key::Ctrl('p') => { self.scroll_up().log(); },
             Key::Ctrl('v') => { self.page_down().log(); },
             Key::Alt('v') => { self.page_up().log(); },
             Key::Char('>') => { self.scroll_bottom().log(); },
-- 
cgit v1.2.3