From 86f1335f469ed37ef0cee803dcc04a9eae30d315 Mon Sep 17 00:00:00 2001 From: Canop Date: Fri, 31 Jul 2020 15:49:48 +0200 Subject: version 0.19.4 --- CHANGELOG.md | 5 +++++ Cargo.lock | 2 +- Cargo.toml | 2 +- src/app/app.rs | 2 ++ src/app/standard_status.rs | 11 ++++------- src/browser/browser_state.rs | 4 ---- src/syntactic/syntactic_view.rs | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3f8717..35f2154 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ + +### v0.19.4 - 2020-07-31 +- don't install the br shell function when --outcmd is set or $BR_INSTALL is "no" - Fix #265 +- more relevant status hints - Fix #261 + ### v0.19.3 - 2020-07-27 - refined search in preview interaction (see blog https://dystroy.org/blog/broot-c-search/) diff --git a/Cargo.lock b/Cargo.lock index f761827..7dbf509 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "broot" -version = "0.19.3" +version = "0.19.4" dependencies = [ "bet", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 13c7dd1..9807a92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "broot" -version = "0.19.3" +version = "0.19.4" authors = ["dystroy "] repository = "https://github.com/Canop/broot" documentation = "https://dystroy.org/broot" diff --git a/src/app/app.rs b/src/app/app.rs index 2e8f0c7..1ef8c95 100644 --- a/src/app/app.rs +++ b/src/app/app.rs @@ -401,6 +401,8 @@ impl App { self.display_panels(w, screen, &skin, con)?; w.flush()?; if self.do_pending_tasks(screen, con, &mut dam)? { + let other_path = self.get_other_panel_path(); + self.mut_panel().refresh_input_status(&other_path, con); self.display_panels(w, screen, &skin, con)?; w.flush()?; } diff --git a/src/app/standard_status.rs b/src/app/standard_status.rs index c4d1f61..3712371 100644 --- a/src/app/standard_status.rs +++ b/src/app/standard_status.rs @@ -1,13 +1,11 @@ use { super::*, crate::{ - keys, verb::{ Internal, VerbStore, }, }, - crossterm::event::KeyEvent, }; pub struct StandardStatus { @@ -16,7 +14,7 @@ pub struct StandardStatus { tree_dir_cd: Option, // TODO check outcmd tree_file_open_stay: Option, tree_file_open_leave: Option, - tree_file_enter: Option, // defined if enter doesn't do open or alt-open + // tree_file_enter: Option, // defined if enter doesn't do open or alt-open tree_unfiltered: String, tree_filtered: String, preview_unfiltered: String, // ctrl-left to close, or a pattern to filter @@ -29,7 +27,6 @@ pub struct StandardStatus { impl StandardStatus { pub fn new(verb_store: &VerbStore) -> Self { - let dir_focus_key = verb_store.key_desc_of_internal_stype(Internal::focus, SelectionType::Directory); let tree_top_focus = "*enter* to go up".to_string(); // enter is hardcoded on focus let tree_dir_focus = "*enter* to focus".to_string(); let tree_dir_cd = verb_store.key_desc_of_internal_stype(Internal::open_leave, SelectionType::Directory) @@ -38,7 +35,7 @@ impl StandardStatus { .map(|k| format!("*{}* to open the file", k)); let tree_file_open_leave = verb_store.key_desc_of_internal_stype(Internal::open_leave, SelectionType::File) .map(|k| format!("*{}* to open and quit", k)); - let tree_file_enter = None; // TODO (for when enter is customized) + //let tree_file_enter = None; // TODO (for when enter is customized) let tree_unfiltered = "a few letters to search".to_string(); let tree_filtered = "*esc* to clear the filter".to_string(); let preview_unfiltered = "a pattern to filter".to_string(); @@ -55,7 +52,7 @@ impl StandardStatus { tree_dir_cd, tree_file_open_stay, tree_file_open_leave, - tree_file_enter, + //tree_file_enter, tree_unfiltered, tree_filtered, preview_unfiltered, @@ -91,7 +88,7 @@ impl<'b> StatusParts<'b> { fn len(&self) -> usize { self.md_parts.len() } - fn to_status(self) -> Status { + fn to_status(&self) -> Status { let mut md = String::new(); for (i, p) in self.md_parts.iter().enumerate() { md.push_str( diff --git a/src/browser/browser_state.rs b/src/browser/browser_state.rs index 187d962..15539d0 100644 --- a/src/browser/browser_state.rs +++ b/src/browser/browser_state.rs @@ -83,10 +83,6 @@ impl BrowserState { self.tree.root() } - fn selection_type(&self) -> SelectionType { - self.displayed_tree().selected_line().selection_type() - } - pub fn page_height(screen: &Screen) -> i32 { i32::from(screen.height) - 2 } diff --git a/src/syntactic/syntactic_view.rs b/src/syntactic/syntactic_view.rs index 2947d6e..a069d7d 100644 --- a/src/syntactic/syntactic_view.rs +++ b/src/syntactic/syntactic_view.rs @@ -195,7 +195,7 @@ impl SyntacticView { } pub fn select_first(&mut self) { - if self.lines.len() > 0 { + if !self.lines.is_empty() { self.selection_idx = Some(0); self.scroll = 0; } -- cgit v1.2.3