From ffd00fd518cf17f3faabeb4a9fad42b96f1f4c86 Mon Sep 17 00:00:00 2001 From: Tim Dengel Date: Sun, 11 Aug 2024 03:50:56 +0200 Subject: [PATCH 1/2] Use bin-src in justfile run target instead of hardcoded target dir --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index e87351b..a36f6d7 100644 --- a/justfile +++ b/justfile @@ -62,7 +62,7 @@ dev *args: # Run with debug logs run *args: cargo build --release - env RUST_LOG=cosmic_files=info RUST_BACKTRACE=full target/release/cosmic-files {{args}} + env RUST_LOG=cosmic_files=info RUST_BACKTRACE=full {{bin-src}} {{args}} # Run tests test *args: From ede7b4ae946a9dbac692fae8821d7c6916ec0775 Mon Sep 17 00:00:00 2001 From: Tim Dengel Date: Sun, 11 Aug 2024 03:57:28 +0200 Subject: [PATCH 2/2] Display no-results message instead of empty-folder when there are no search results --- i18n/de/cosmic_files.ftl | 1 + i18n/en/cosmic_files.ftl | 1 + src/app.rs | 2 +- src/tab.rs | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/i18n/de/cosmic_files.ftl b/i18n/de/cosmic_files.ftl index b1dc5e8..795fc6e 100644 --- a/i18n/de/cosmic_files.ftl +++ b/i18n/de/cosmic_files.ftl @@ -1,6 +1,7 @@ cosmic-files = COSMIC Dateien empty-folder = Leerer Ordner empty-folder-hidden = Leerer Ordner (hat versteckte Dateien) +no-results = Keine Ergebnisse gefunden filesystem = Dateisystem home = Home trash = Papierkorb diff --git a/i18n/en/cosmic_files.ftl b/i18n/en/cosmic_files.ftl index 7a7f587..c67b844 100644 --- a/i18n/en/cosmic_files.ftl +++ b/i18n/en/cosmic_files.ftl @@ -1,6 +1,7 @@ cosmic-files = COSMIC Files empty-folder = Empty folder empty-folder-hidden = Empty folder (has hidden items) +no-results = No results found filesystem = Filesystem home = Home notification-in-progress = File operations are in progress. diff --git a/src/app.rs b/src/app.rs index ef9f54f..5608c9b 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1113,7 +1113,7 @@ impl Application for App { fn on_nav_select(&mut self, entity: Entity) -> Command { self.search_active = false; self.search_input.clear(); - + self.nav_model.activate(entity); if let Some(location) = self.nav_model.data::(entity) { let message = Message::TabMessage(None, tab::Message::Location(location.clone())); diff --git a/src/tab.rs b/src/tab.rs index f80056c..9382275 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -2294,6 +2294,8 @@ impl Tab { .into(), widget::text(if has_hidden { fl!("empty-folder-hidden") + } else if matches!(self.location, Location::Search(_, _)) { + fl!("no-results") } else { fl!("empty-folder") })