From f31f8a05595ba7070423e151df988b82e818f2a0 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 27 Feb 2024 13:08:31 -0700 Subject: [PATCH] Do not show operations page any time an operation is done --- src/app.rs | 5 ++--- src/menu.rs | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app.rs b/src/app.rs index da4b3b0..34bb78a 100644 --- a/src/app.rs +++ b/src/app.rs @@ -50,6 +50,7 @@ pub enum Action { MoveToTrash, NewFile, NewFolder, + Operations, Paste, Properties, RestoreFromTrash, @@ -77,6 +78,7 @@ impl Action { Action::MoveToTrash => Message::MoveToTrash(entity_opt), Action::NewFile => Message::NewItem(entity_opt, false), Action::NewFolder => Message::NewItem(entity_opt, true), + Action::Operations => Message::ToggleContextPage(ContextPage::Operations), Action::Paste => Message::Paste(entity_opt), Action::Properties => Message::ToggleContextPage(ContextPage::Properties), Action::RestoreFromTrash => Message::RestoreFromTrash(entity_opt), @@ -220,9 +222,6 @@ impl App { let id = self.pending_operation_id; self.pending_operation_id += 1; self.pending_operations.insert(id, (operation, 0.0)); - //TODO: have some button to show current status - self.core.window.show_context = true; - self.context_page = ContextPage::Operations; } fn rescan_tab( diff --git a/src/menu.rs b/src/menu.rs index f5a8824..e041028 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -146,6 +146,9 @@ pub fn menu_bar<'a>(key_binds: &HashMap) -> Element<'a, Message menu_item(fl!("copy"), Action::Copy), menu_item(fl!("paste"), Action::Paste), menu_item(fl!("select-all"), Action::SelectAll), + MenuTree::new(horizontal_rule(1)), + //TODO: edit history + menu_item(fl!("operations"), Action::Operations), ], ), MenuTree::with_children(