diff options
| author | Oleh <45392385+olehs0@users.noreply.github.com> | 2020-06-26 14:59:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 13:59:10 +0200 |
| commit | efd85b86bf8c6371a19b61771ba6b79f5968669e (patch) | |
| tree | 95255bae473b35d634f9ef827481210cea3a909c | |
| parent | c0fe520d6a372243b7715cd0bf35170985eda3c8 (diff) | |
feat(ui): show quit shortcut ('q') in the legend (#46)
* Add <q> shortcut in the legend
* Fix typo for description
* Use <arrows> instead of <hjkl> or <arrow keys>
* Apply fmt
* Merge main
26 files changed, 29 insertions, 27 deletions
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__cannot_move_into_small_files.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__cannot_move_into_small_files.snap index 98ce135..ac9851e 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__cannot_move_into_small_files.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__cannot_move_into_small_files.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx│ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges.snap index b81ea17..c5db774 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file.snap index 92a48fa..340c2b8 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file_press_n.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file_press_n.snap index e0e8227..a7f99a7 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file_press_n.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file_press_n.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder.snap index 6e0377a..124698d 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_with_multiple_children.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_with_multiple_children.snap index 3671f15..1a38763 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_with_multiple_children.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_with_multiple_children.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__eleven_files.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__eleven_files.snap index 0d2c26c..7c05474 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__eleven_files.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__eleven_files.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ 8.0K (2%) │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────┴───────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__empty_folder.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__empty_folder.snap index e91cab9..401a47d 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__empty_folder.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__empty_folder.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████│ └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder.snap index d731bee..c8682e3 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_medium_width.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_medium_width.snap index 3e5a9f9..d34776a 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_medium_width.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_medium_width.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ └────────────────────────────────────────────────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + ←↓↑→/<ENTER>/<ESC>: navigate, <Ctrl-D>: del diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_largest_folder_with_no_selected_tile.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_largest_folder_with_no_selected_tile.snap index fdaeb61..e3b440c 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_largest_folder_with_no_selected_tile.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_largest_folder_with_no_selected_tile.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__esc_to_go_up.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__esc_to_go_up.snap index e98c224..716cee3 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__esc_to_go_up.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__esc_to_go_up.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__files_with_size_zero.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__files_with_size_zero.snap index fd6625c..2a4a48b 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__files_with_size_zero.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__files_with_size_zero.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__minimum_tile_sides.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__minimum_tile_sides.snap index 2589017..27722cf 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__minimum_tile_sides.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__minimum_tile_sides.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ 4.0K │ 4.0K │ 4.0K │xxxxxxxxxxxxxxxx│ └───────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────┴─────────┴────────┴─────────┴────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_down_and_enter_folder.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_down_and_enter_folder.snap index e4cd7de..df0b86c 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_down_and_enter_folder.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_down_and_enter_folder.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_left_and_enter_folder.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_left_and_enter_folder.snap index 2ad6811..08b556c 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_left_and_enter_folder.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_left_and_enter_folder.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_right_and_enter_folder.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_right_and_enter_folder.snap index 5167e36..a6fda47 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_right_and_enter_folder.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_right_and_enter_folder.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_up_and_enter_folder.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_up_and_enter_folder.snap index 2b2d499..4d33df0 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_up_and_enter_folder.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_up_and_enter_folder.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__noop_when_entering_file.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__noop_when_entering_file.snap index 026a19b..eacd654 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__noop_when_entering_file.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__noop_when_entering_file.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────────┘ (x = Small files) - <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete + <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <Ctrl-D> - delete, <q> - quit diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder.snap index 3b00395..eb60511 100644 --- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder.snap +++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder.snap @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]" │ │ │ └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────── |