From 330075164dec6bf6c490b933bd48c6dcdef1f308 Mon Sep 17 00:00:00 2001 From: yggverse Date: Sat, 15 Feb 2025 12:12:31 +0200 Subject: [PATCH] rename action --- src/app/browser/window.rs | 2 +- src/app/browser/window/action.rs | 12 ++++++------ src/app/browser/window/action/{open.rs => load.rs} | 8 ++++---- src/app/browser/window/header/bar/menu.rs | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) rename src/app/browser/window/action/{open.rs => load.rs} (89%) diff --git a/src/app/browser/window.rs b/src/app/browser/window.rs index d1033415..d13014e7 100644 --- a/src/app/browser/window.rs +++ b/src/app/browser/window.rs @@ -119,7 +119,7 @@ impl Window { } }); - action.open.on_activate({ + action.load.on_activate({ let tab = tab.clone(); move |_, request| { tab.append(Position::End, Some(&request), false, true, false, true); diff --git a/src/app/browser/window/action.rs b/src/app/browser/window/action.rs index 56c5e7fa..f799ad82 100644 --- a/src/app/browser/window/action.rs +++ b/src/app/browser/window/action.rs @@ -6,7 +6,7 @@ mod find; mod history_back; mod history_forward; mod home; -mod open; +mod load; mod pin; mod reload; mod save_as; @@ -20,7 +20,7 @@ use find::Find; use history_back::HistoryBack; use history_forward::HistoryForward; use home::Home; -use open::Open; +use load::Load; use pin::Pin; use reload::Reload; use save_as::SaveAs; @@ -46,7 +46,7 @@ pub struct Action { pub history_back: Rc, pub history_forward: Rc, pub home: Rc, - pub open: Rc, + pub load: Rc, pub pin: Rc, pub reload: Rc, pub save_as: Rc, @@ -76,7 +76,7 @@ impl Action { let history_back = Rc::new(HistoryBack::new()); let history_forward = Rc::new(HistoryForward::new()); let home = Rc::new(Home::new()); - let open = Rc::new(Open::new()); + let load = Rc::new(Load::new()); let pin = Rc::new(Pin::new()); let reload = Rc::new(Reload::new()); let save_as = Rc::new(SaveAs::new()); @@ -97,7 +97,7 @@ impl Action { simple_action_group.add_action(&history_back.simple_action); simple_action_group.add_action(&history_forward.simple_action); simple_action_group.add_action(&home.simple_action); - simple_action_group.add_action(&open.simple_action); + simple_action_group.add_action(&load.simple_action); simple_action_group.add_action(&pin.simple_action); simple_action_group.add_action(&reload.simple_action); simple_action_group.add_action(&save_as.simple_action); @@ -113,7 +113,7 @@ impl Action { history_back, history_forward, home, - open, + load, pin, reload, save_as, diff --git a/src/app/browser/window/action/open.rs b/src/app/browser/window/action/load.rs similarity index 89% rename from src/app/browser/window/action/open.rs rename to src/app/browser/window/action/load.rs index 99805dee..64a452c5 100644 --- a/src/app/browser/window/action/open.rs +++ b/src/app/browser/window/action/load.rs @@ -6,18 +6,18 @@ use gtk::{ prelude::StaticVariantType, }; -/// Open [SimpleAction](https://docs.gtk.org/gio/class.SimpleAction.html) -pub struct Open { +/// Load [SimpleAction](https://docs.gtk.org/gio/class.SimpleAction.html) +pub struct Load { pub simple_action: SimpleAction, } -impl Default for Open { +impl Default for Load { fn default() -> Self { Self::new() } } -impl Open { +impl Load { // Constructors /// Create new `Self` diff --git a/src/app/browser/window/header/bar/menu.rs b/src/app/browser/window/header/bar/menu.rs index 07afa6d7..7cac6152 100644 --- a/src/app/browser/window/header/bar/menu.rs +++ b/src/app/browser/window/header/bar/menu.rs @@ -201,7 +201,7 @@ impl Menu for MenuButton { menu_item.set_action_and_target_value(Some(&format!( "{}.{}", window_action.id, - window_action.open.simple_action.name() + window_action.load.simple_action.name() )), Some(&request.to_variant())); main_bookmarks.append_item(&menu_item); @@ -215,7 +215,7 @@ impl Menu for MenuButton { menu_item.set_action_and_target_value(Some(&format!( "{}.{}", window_action.id, - window_action.open.simple_action.name() + window_action.load.simple_action.name() )), Some(&item_request.to_variant())); main_history_tab.append_item(&menu_item); @@ -293,7 +293,7 @@ fn menu_item(action: &WindowAction, uri: &Uri, is_parent: bool) -> gio::MenuItem Some(&format!( "{}.{}", action.id, - action.open.simple_action.name() + action.load.simple_action.name() )), Some(&uri.to_string().to_variant()), );