Skip to content

Commit

Permalink
fix(controls): change delete key to backspace (#64)
Browse files Browse the repository at this point in the history 
* Change delete key to backspace

* Add BACKSPACE as delete key within snap tests

* Readd delete key for warning modal

* Change key for warning modal to Backspace
  • Loading branch information
Max Heyer authored Jul 9, 2020
1 parent cceb2a2 commit adbae50
Show file tree
Hide file tree
Showing 37 changed files with 51 additions and 51 deletions.
14 changes: 7 additions & 7 deletions src/input/controls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ pub fn handle_keypress_loading_mode<B: Backend>(evt: Event, app: &mut App<B>) {
key!(char '\n') => {
app.handle_enter();
}
key!(Delete) => {
key!(Backspace) => {
app.show_warning_modal();
}
key!(Esc) | key!(Backspace) => {
key!(Esc) => {
app.go_up();
}
_ => (),
Expand All @@ -76,7 +76,7 @@ pub fn handle_keypress_normal_mode<B: Backend>(evt: Event, app: &mut App<B>) {
key!(ctrl 'c') | key!(char 'q') => {
app.prompt_exit();
}
key!(Delete) => {
key!(Backspace) => {
app.prompt_file_deletion();
}
key!(char 'l') | key!(Right) | key!(ctrl 'f') => {
Expand All @@ -103,7 +103,7 @@ pub fn handle_keypress_normal_mode<B: Backend>(evt: Event, app: &mut App<B>) {
key!(char '\n') => {
app.handle_enter();
}
key!(Esc) | key!(Backspace) => {
key!(Esc) => {
app.go_up();
}
_ => (),
Expand All @@ -116,7 +116,7 @@ pub fn handle_keypress_delete_file_mode<B: Backend>(
file_to_delete: FileToDelete,
) {
match evt {
key!(ctrl 'c') | key!(char 'q') | key!(Esc) | key!(Backspace) | key!(char 'n') => {
key!(ctrl 'c') | key!(char 'q') | key!(Esc) | key!(char 'n') => {
app.normal_mode();
}
key!(char 'y') => {
Expand All @@ -128,7 +128,7 @@ pub fn handle_keypress_delete_file_mode<B: Backend>(

pub fn handle_keypress_error_message<B: Backend>(evt: Event, app: &mut App<B>) {
match evt {
key!(ctrl 'c') | key!(char 'q') | key!(Esc) | key!(Backspace) => {
key!(ctrl 'c') | key!(char 'q') | key!(Esc) => {
app.normal_mode();
}
_ => (),
Expand All @@ -146,7 +146,7 @@ pub fn handle_keypress_screen_too_small<B: Backend>(evt: Event, app: &mut App<B>

pub fn handle_keypress_exiting_mode<B: Backend>(evt: Event, app: &mut App<B>) {
match evt {
key!(ctrl 'c') | key!(char 'q') | key!(Esc) | key!(Backspace) | key!(char 'n') => {
key!(ctrl 'c') | key!(char 'q') | key!(Esc) | key!(char 'n') => {
app.reset_ui_mode();
// we have to manually call render here to make sure ui gets updated
// because reset_ui_mode does not call it itself
Expand Down
2 changes: 1 addition & 1 deletion src/tests/cases/snapshots/diskonaut__tests__cases__ui__cannot_move_into_small_files.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx│
└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────┘
(x = Small files)
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit

2 changes: 1 addition & 1 deletion .../snapshots/diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
(x = Small files)
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit

2 changes: 1 addition & 1 deletion src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
(x = Small files)
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit

2 changes: 1 addition & 1 deletion src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file_press_n.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
(x = Small files)
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit

2 changes: 1 addition & 1 deletion src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
(x = Small files)
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit

2 changes: 1 addition & 1 deletion src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_small_window.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │
└──────────────────────────────────────────────────────────┘
(x = Small files)
←↓↑→/<ENTER>/<ESC>: navigate, <DELETE>: del
←↓↑→/<ENTER>/<ESC>: navigate, <BACKSPACE>: del

2 changes: 1 addition & 1 deletion ...ts/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_with_multiple_children.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────┘
(x = Small files)
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit

2 changes: 1 addition & 1 deletion src/tests/cases/snapshots/diskonaut__tests__cases__ui__eleven_files.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit

2 changes: 1 addition & 1 deletion src/tests/cases/snapshots/diskonaut__tests__cases__ui__empty_folder.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████│
└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
(x = Small files)
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit

2 changes: 1 addition & 1 deletion src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────┘
(x = Small files)
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit

2 changes: 1 addition & 1 deletion src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_medium_width.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │
└────────────────────────────────────────────────────────────────────────────────────────┘
(x = Small files)
←↓↑→/<ENTER>/<ESC>: navigate, <DELETE>: del
←↓↑→/<ENTER>/<ESC>: navigate, <BACKSPACE>: del

2 changes: 1 addition & 1 deletion src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_small_width.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │
└──────────────────────────────────────────────────────────┘
(x = Small files)
←↓↑→/<ENTER>/<ESC>: navigate, <DELETE>: del
←↓↑→/<ENTER>/<ESC>: navigate, <BACKSPACE>: del

2 changes: 1 addition & 1 deletion ...es/snapshots/diskonaut__tests__cases__ui__enter_largest_folder_with_no_selected_tile.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────┘
(x = Small files)
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit

2 changes: 1 addition & 1 deletion src/tests/cases/snapshots/diskonaut__tests__cases__ui__esc_to_go_up.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
(x = Small files)
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit

Loading

0 comments on commit adbae50

Please sign in to comment.