diff options
author | Kid <44045911+kidonng@users.noreply.github.com> | 2021-08-22 02:49:16 +0000 |
---|---|---|
committer | Sebastian Thiel <sebastian.thiel@icloud.com> | 2021-08-22 15:23:15 +0800 |
commit | 29017f6f94003f58118ad7d1fded1d47f79349eb (patch) | |
tree | aab2dba6c72097f2c7be008c5abc847599828235 | |
parent | 8977c17bcb10373c33d695dd682781fd9590e4e7 (diff) |
Support Home/End and fix inconsistent help text
-rw-r--r-- | src/interactive/app/eventloop.rs | 4 | ||||
-rw-r--r-- | src/interactive/widgets/entries.rs | 2 | ||||
-rw-r--r-- | src/interactive/widgets/help.rs | 26 | ||||
-rw-r--r-- | src/interactive/widgets/mark.rs | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/interactive/app/eventloop.rs b/src/interactive/app/eventloop.rs index f5f89a3..9579b31 100644 --- a/src/interactive/app/eventloop.rs +++ b/src/interactive/app/eventloop.rs @@ -142,8 +142,8 @@ impl AppState { Char('o') | Char('l') | Char('\n') | Right => { self.enter_node_with_traversal(traversal) } - Char('H') => self.change_entry_selection(CursorDirection::ToTop), - Char('G') => self.change_entry_selection(CursorDirection::ToBottom), + Char('H') | Home => self.change_entry_selection(CursorDirection::ToTop), + Char('G') | End => self.change_entry_selection(CursorDirection::ToBottom), Ctrl('u') | PageUp => self.change_entry_selection(CursorDirection::PageUp), Char('k') | Up => self.change_entry_selection(CursorDirection::Up), Char('j') | Down => self.change_entry_selection(CursorDirection::Down), diff --git a/src/interactive/widgets/entries.rs b/src/interactive/widgets/entries.rs index 1d947cf..5552d08 100644 --- a/src/interactive/widgets/entries.rs +++ b/src/interactive/widgets/entries.rs @@ -167,7 +167,7 @@ impl Entries { list.render(props, lines, area, buf); if *is_focussed { - let help_text = " . = o|.. = u ── ⇊ = CTRL+d|↓ = j|⇈ = CTRL+u|↑ = k "; + let help_text = " . = o|.. = u ── ⇊ = Ctrl+d|↓ = j|⇈ = Ctrl+u|↑ = k "; let help_text_block_width = block_width(help_text); let bound = Rect { width: area.width.saturating_sub(1), diff --git a/src/interactive/widgets/help.rs b/src/interactive/widgets/help.rs index 769cfda..8ff5e98 100644 --- a/src/interactive/widgets/help.rs +++ b/src/interactive/widgets/help.rs @@ -98,32 +98,32 @@ impl HelpPane { title("Keys for pane control"); { hotkey( - "q/<ESC>", + "q/<Esc>", "Close the current pane. Closes the program if no", Some("pane is open"), ); - hotkey("<tab>", "Cycle between all open panes", None); + hotkey("<Tab>", "Cycle between all open panes", None); hotkey("?", "Show or hide the help pane", None); spacer(); } title("Keys for Navigation"); { - hotkey("j/<down>", "move down an entry", None); - hotkey("k/<up>", "move up an entry", None); - hotkey("o/l/<enter>", "descent into the selected directory", None); - hotkey("<right>", "^", None); + hotkey("j/<Down>", "move down an entry", None); + hotkey("k/<Up>", "move up an entry", None); + hotkey("o/l/<Enter>", "descent into the selected directory", None); + hotkey("<Right>", "^", None); hotkey( - "u/h/<left>", + "u/h/<Left>", "ascent one level into the parent directory", None, ); - hotkey("<backspace>", "^", None); + hotkey("<Backspace>", "^", None); hotkey("Ctrl + d", "move down 10 entries at once", None); hotkey("<Page Down>", "^", None); hotkey("Ctrl + u", "move up 10 entries at once", None); hotkey("<Page Up>", "^", None); - hotkey("H", "Move to the top of the entries list", None); - hotkey("G", "Move to the bottom of the entries list", None); + hotkey("H/<Home>", "Move to the top of the entries list", None); + hotkey("G/<End>", "Move to the bottom of the entries list", None); spacer(); } title("Keys for display"); @@ -153,13 +153,13 @@ impl HelpPane { "Mark for the currently selected entry for deletion and move down", None, ); - hotkey("<space bar>", "Toggle the currently selected entry", None); + hotkey("<Space>", "Toggle the currently selected entry", None); spacer(); } title("Keys in the Mark pane"); { hotkey( - "x/d/<space>", + "x/d/<Space>", "remove the selected entry from the list", None, ); @@ -202,7 +202,7 @@ impl HelpPane { block.render(area, buf); if *has_focus { - let help_text = " . = o|.. = u || ⇊ = CTRL+d|↓ = j|⇈ = CTRL+u|↑ = k "; + let help_text = " . = o|.. = u ── ⇊ = Ctrl+d|↓ = j|⇈ = Ctrl+u|↑ = k "; let help_text_block_width = block_width(help_text); let bound = Rect { width: area.width.saturating_sub(1), diff --git a/src/interactive/widgets/mark.rs b/src/interactive/widgets/mark.rs index 0cc48f2..ad730db 100644 --- a/src/interactive/widgets/mark.rs +++ b/src/interactive/widgets/mark.rs @@ -397,7 +397,7 @@ impl MarkPane { self.list.render(props, entries, list_area, buf); if has_focus { - let help_text = " . = o|.. = u ── ⇊ = CTRL+d|↓ = j|⇈ = CTRL+u|↑ = k "; + let help_text = " . = o|.. = u ── ⇊ = Ctrl+d|↓ = j|⇈ = Ctrl+u|↑ = k "; let help_text_block_width = block_width(help_text); let bound = Rect { width: area.width.saturating_sub(1), |