From 618a43b501914fdf2659e171172ad180364cf87a Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Sat, 27 Sep 2025 21:34:07 +0000 Subject: [PATCH] docs: fix numerous typos --- CHANGELOG.md | 2 +- README.md | 2 +- _typos.toml | 3 --- src/app_data/container_state.rs | 4 ++-- src/app_data/mod.rs | 2 +- src/input_handler/mod.rs | 6 +++--- src/ui/draw_blocks/help.rs | 4 ++-- ...ker__ui__draw_blocks__help__tests__draw_blocks_help.snap | 2 +- ...blocks__help__tests__draw_blocks_help_custom_colors.snap | 2 +- ...ests__draw_blocks_help_custom_keymap_one_definition.snap | 2 +- ...sts__draw_blocks_help_custom_keymap_two_definitions.snap | 2 +- ...lp__tests__draw_blocks_help_one_and_two_definitions.snap | 2 +- ...blocks__help__tests__draw_blocks_help_show_timezone.snap | 2 +- ..._blocks__tests__draw_blocks_whole_layout_help_panel.snap | 2 +- 14 files changed, 17 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0edac81..5b5db52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ see [v0.11.0 release notes](https://github.com/mrjackwills/oxker/releases/tag/v0 ### Features + Horizontally scroll across logs. By default use `←` & `→` keys to traverse horizontally across the lines when logs panel selected. Updated `config.toml` with `log_scroll_forward` and `log_scroll_back` [c190f020](https://github.com/mrjackwills/oxker/commit/c190f0206cc55b8e45b8373f9be954e828c18b3b), [8939ac03](https://github.com/mrjackwills/oxker/commit/8939ac0345326633e794cc10a981a1f3c5c07549) + Force clear screen & redraw of UI. By default uses `f` key, `config.toml` updated with `force_redraw` [50edbc0c](https://github.com/mrjackwills/oxker/commit/50edbc0cc09db864835fe81a03cba8eadafe548b) -+ Increase scroll speed using the `ctrl` key in conjuction with a scroll key, `config.toml` updated with `scroll_modifier`. The next release will remove `scroll_down_many` & `scroll_down_up` keys, [c5bbffdb](https://github.com/mrjackwills/oxker/commit/c5bbffdb5f9e800951e4060aa6aee8e00db589aa) ++ Increase scroll speed using the `ctrl` key in conjunction with a scroll key, `config.toml` updated with `scroll_modifier`. The next release will remove `scroll_down_many` & `scroll_down_up` keys, [c5bbffdb](https://github.com/mrjackwills/oxker/commit/c5bbffdb5f9e800951e4060aa6aee8e00db589aa) ### Refactors + remove macos cfg none-const functions, Zigbuild now uses Rust 1.87.0, [eb686e2c](https://github.com/mrjackwills/oxker/commit/eb686e2c952e04da74b3e12c0bfa015ec4615e1d) diff --git a/README.md b/README.md index 79c65cd..7aaaa01 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ In application controls, these, amongst many other settings, can be customized w | ```( tab )``` or ```( shift+tab )``` | Change panel, clicking on a panel also changes the selected panel.| | ```( ↑ ↓ )``` or ```( j k )``` or ```( Home End )```| Scroll line in selected panel - mouse wheel will also scroll.| | ```( ← → )``` | When logs panel selected, scroll horizontally across the text of the logs.| -| ```( ctrl )``` | Increase scroll speed, used in conjuction with scroll keys.| +| ```( ctrl )``` | Increase scroll speed, used in conjunction with scroll keys.| | ```( enter )```| Run selected docker command.| | ```( 1-9 )``` | Sort containers by heading, clicking on headings also sorts the selected column. | | ```( 0 )``` | Stop sorting.| diff --git a/_typos.toml b/_typos.toml index 6fd8cd3..372dc95 100644 --- a/_typos.toml +++ b/_typos.toml @@ -1,5 +1,2 @@ [default.extend-words] ratatui = "ratatui" - -[default] -extend-ignore-words-re = ["[(?:[0-9a-fA-F]{8}|[0-9a-fA-F]{40})]"] diff --git a/src/app_data/container_state.rs b/src/app_data/container_state.rs index 00a88d7..11e39b3 100644 --- a/src/app_data/container_state.rs +++ b/src/app_data/container_state.rs @@ -816,7 +816,7 @@ impl Logs { } } - /// If scrolling horiztonally along the logs, display a counter of the position in the in the scroll, `x/y` + /// If scrolling horizontally along the logs, display a counter of the position in the in the scroll, `x/y` pub fn get_scroll_title(&mut self, width: u16) -> Option { if self.horizontal_scroll_able(width) { let text_width = self.adjust_max_width_text_len; @@ -909,7 +909,7 @@ impl Logs { self.lines.get_state_title() } - /// Return true it currently selected cotnainer logs are wide enough to horizontally scroll + /// Return true it currently selected container logs are wide enough to horizontally scroll pub fn horizontal_scroll_able(&mut self, width: u16) -> bool { if self.lines.items.is_empty() { return false; diff --git a/src/app_data/mod.rs b/src/app_data/mod.rs index cf306ae..1139ad6 100644 --- a/src/app_data/mod.rs +++ b/src/app_data/mod.rs @@ -661,7 +661,7 @@ impl AppData { }) } - /// If scrolling horiztonally along the logs, display a counter of the position in the in the scroll, `x/y` + /// If scrolling horizontally along the logs, display a counter of the position in the in the scroll, `x/y` pub fn get_scroll_title(&mut self, width: u16) -> Option { self.get_mut_selected_container() .and_then(|i| i.logs.get_scroll_title(width)) diff --git a/src/input_handler/mod.rs b/src/input_handler/mod.rs index 4d7b08b..000577b 100644 --- a/src/input_handler/mod.rs +++ b/src/input_handler/mod.rs @@ -677,12 +677,12 @@ impl InputHandler { let contains_exec = contains(Status::Exec); let contains_filter = contains(Status::Filter); let contains_delete = contains(Status::DeleteConfirm); - let containes_search_logs = contains(Status::SearchLogs); + let contains_search_logs = contains(Status::SearchLogs); if !contains_exec { let is_q = || key_code == self.keymap.quit.0 || Some(key_code) == self.keymap.quit.1; if key_modifier == KeyModifiers::CONTROL && key_code == KeyCode::Char('c') - || is_q() && !contains_filter && !containes_search_logs + || is_q() && !contains_filter && !contains_search_logs { // Always just quit on Ctrl + c/C or q/Q, unless in filter/search_logs mode, i.e. when user inmput can include the q key self.quit(); @@ -694,7 +694,7 @@ impl InputHandler { self.handle_help(key_code); } else if contains_filter { self.handle_filter(key_code); - } else if containes_search_logs { + } else if contains_search_logs { self.handle_search_logs(key_code, key_modifier); } else if contains_delete { self.handle_delete(key_code).await; diff --git a/src/ui/draw_blocks/help.rs b/src/ui/draw_blocks/help.rs index e7cd8b4..7e16abc 100644 --- a/src/ui/draw_blocks/help.rs +++ b/src/ui/draw_blocks/help.rs @@ -117,7 +117,7 @@ impl HelpInfo { Line::from(vec![ space(), button_item("ctrl"), - button_desc("increase scroll speed, used in conjuction scroll keys"), + button_desc("increase scroll speed, used in conjunction scroll keys"), ]), Line::from(vec![ space(), @@ -289,7 +289,7 @@ impl HelpInfo { Line::from(vec![ space(), button_item(km.scroll_many.to_string().as_str()), - button_desc("increase scroll speed, used in conjuction scroll keys"), + button_desc("increase scroll speed, used in conjunction scroll keys"), ]), Line::from(vec![ space(), diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap index 05c3479..9d29eeb 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap @@ -19,7 +19,7 @@ expression: setup.terminal.backend() " │ ( tab ) or ( shift+tab ) change panels │ " " │ ( ↑ ↓ ) or ( j k ) or ( Home End ) scroll vertically │ " " │ ( ← → ) horizontal scroll across logs │ " -" │ ( ctrl ) increase scroll speed, used in conjuction scroll keys │ " +" │ ( ctrl ) increase scroll speed, used in conjunction scroll keys │ " " │ ( enter ) send docker container command │ " " │ ( e ) exec into a container │ " " │ ( f ) force clear the screen & redraw the gui │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap index 05c3479..9d29eeb 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap @@ -19,7 +19,7 @@ expression: setup.terminal.backend() " │ ( tab ) or ( shift+tab ) change panels │ " " │ ( ↑ ↓ ) or ( j k ) or ( Home End ) scroll vertically │ " " │ ( ← → ) horizontal scroll across logs │ " -" │ ( ctrl ) increase scroll speed, used in conjuction scroll keys │ " +" │ ( ctrl ) increase scroll speed, used in conjunction scroll keys │ " " │ ( enter ) send docker container command │ " " │ ( e ) exec into a container │ " " │ ( f ) force clear the screen & redraw the gui │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap index fe1fb83..97b4d43 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap @@ -23,7 +23,7 @@ expression: setup.terminal.backend() " │ ( q ) scroll list to start │ " " │ ( h ) horizontal scroll logs right │ " " │ ( g ) horizontal scroll logs left │ " -" │ ( Alt ) increase scroll speed, used in conjuction scroll keys │ " +" │ ( Alt ) increase scroll speed, used in conjunction scroll keys │ " " │ ( enter ) send docker container command │ " " │ ( d ) exec into a container │ " " │ ( f ) force clear the screen & redraw the gui │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap index 173bc53..f884948 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap @@ -23,7 +23,7 @@ expression: setup.terminal.backend() " │ ( p ) or ( P ) scroll list to start │ " " │ ( g ) or ( G ) horizontal scroll logs right │ " " │ ( f ) or ( F ) horizontal scroll logs left │ " -" │ ( Alt ) increase scroll speed, used in conjuction scroll keys │ " +" │ ( Alt ) increase scroll speed, used in conjunction scroll keys │ " " │ ( enter ) send docker container command │ " " │ ( d ) or ( D ) exec into a container │ " " │ ( f ) or ( F ) force clear the screen & redraw the gui │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap index b63b168..6fcfd2e 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap @@ -23,7 +23,7 @@ expression: setup.terminal.backend() " │ ( q ) or ( Q ) scroll list to start │ " " │ ( h ) horizontal scroll logs right │ " " │ ( g ) or ( G ) horizontal scroll logs left │ " -" │ ( Alt ) increase scroll speed, used in conjuction scroll keys │ " +" │ ( Alt ) increase scroll speed, used in conjunction scroll keys │ " " │ ( enter ) send docker container command │ " " │ ( d ) exec into a container │ " " │ ( f ) force clear the screen & redraw the gui │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_show_timezone.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_show_timezone.snap index 6d237f2..6c8b9ef 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_show_timezone.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_show_timezone.snap @@ -20,7 +20,7 @@ expression: setup.terminal.backend() " │ ( tab ) or ( shift+tab ) change panels │ " " │ ( ↑ ↓ ) or ( j k ) or ( Home End ) scroll vertically │ " " │ ( ← → ) horizontal scroll across logs │ " -" │ ( ctrl ) increase scroll speed, used in conjuction scroll keys │ " +" │ ( ctrl ) increase scroll speed, used in conjunction scroll keys │ " " │ ( enter ) send docker container command │ " " │ ( e ) exec into a container │ " " │ ( f ) force clear the screen & redraw the gui │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_help_panel.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_help_panel.snap index c573cfb..a69c2d8 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_help_panel.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_help_panel.snap @@ -20,7 +20,7 @@ expression: setup.terminal.backend() "│ │ ( tab ) or ( shift+tab ) change panels │ │" "│ │ ( ↑ ↓ ) or ( j k ) or ( Home End ) scroll vertically │ │" "│ │ ( ← → ) horizontal scroll across logs │ │" -"│ │ ( ctrl ) increase scroll speed, used in conjuction scroll keys │ │" +"│ │ ( ctrl ) increase scroll speed, used in conjunction scroll keys │ │" "│ │ ( enter ) send docker container command │ │" "│ │ ( e ) exec into a container │ │" "│ │ ( f ) force clear the screen & redraw the gui │ │"