From 313122e5c3ace9832a47d6d4c2c2c738e5eae9f7 Mon Sep 17 00:00:00 2001 From: yggverse Date: Fri, 1 Nov 2024 03:09:09 +0200 Subject: [PATCH] rename actions --- src/app.rs | 62 ++++++------- src/app/browser.rs | 88 +++++++++---------- src/app/browser/window.rs | 48 +++++----- src/app/browser/window/header.rs | 40 ++++----- src/app/browser/window/header/bar.rs | 42 ++++----- src/app/browser/window/header/bar/menu.rs | 40 ++++----- src/app/browser/window/header/bar/tab.rs | 4 +- .../browser/window/header/bar/tab/append.rs | 4 +- .../window/header/bar/tab/append/widget.rs | 4 +- src/app/browser/window/tab.rs | 58 ++++++------ src/app/browser/window/tab/item.rs | 32 +++---- src/app/browser/window/tab/item/page.rs | 32 +++---- .../window/tab/item/page/content/text.rs | 4 +- .../window/tab/item/page/navigation.rs | 18 ++-- .../window/tab/item/page/navigation/base.rs | 10 +-- .../tab/item/page/navigation/base/widget.rs | 6 +- .../tab/item/page/navigation/history.rs | 8 +- .../tab/item/page/navigation/history/back.rs | 10 +-- .../page/navigation/history/back/widget.rs | 8 +- .../item/page/navigation/history/forward.rs | 10 +-- .../page/navigation/history/forward/widget.rs | 8 +- .../window/tab/item/page/navigation/reload.rs | 10 +-- .../tab/item/page/navigation/reload/widget.rs | 6 +- .../tab/item/page/navigation/request.rs | 4 +- .../item/page/navigation/request/widget.rs | 4 +- src/app/browser/window/tab/widget.rs | 4 +- 26 files changed, 274 insertions(+), 290 deletions(-) diff --git a/src/app.rs b/src/app.rs index 1beb0729..2aea7f3b 100644 --- a/src/app.rs +++ b/src/app.rs @@ -41,18 +41,18 @@ impl App { profile_path: PathBuf, ) -> Self { // Init actions - let action_tool_debug = Action::new("win", true, None); - let action_tool_profile = Action::new("win", true, None); + let action_debug = Action::new("win", true, None); + let action_profile = Action::new("win", true, None); let action_quit = Action::new("win", true, None); let action_update = Action::new("win", true, Some(&String::static_variant_type())); - let action_tab_append = Action::new("win", true, None); - let action_tab_close = Action::new("win", true, None); - let action_tab_close_all = Action::new("win", true, None); - let action_tab_page_navigation_base = Action::new("win", false, None); - let action_tab_page_navigation_history_back = Action::new("win", false, None); - let action_tab_page_navigation_history_forward = Action::new("win", false, None); - let action_tab_page_navigation_reload = Action::new("win", true, None); - let action_tab_pin = Action::new("win", true, None); + let action_page_new = Action::new("win", true, None); + let action_page_close = Action::new("win", true, None); + let action_page_close_all = Action::new("win", true, None); + let action_page_base = Action::new("win", false, None); + let action_page_history_back = Action::new("win", false, None); + let action_page_history_forward = Action::new("win", false, None); + let action_page_reload = Action::new("win", true, None); + let action_page_pin = Action::new("win", true, None); // Init GTK let gobject = Application::builder() @@ -60,44 +60,38 @@ impl App { .build(); // Init accels - gobject.set_accels_for_action(&action_tool_debug.detailed_name(), &["i"]); + gobject.set_accels_for_action(&action_debug.detailed_name(), &["i"]); gobject.set_accels_for_action(&action_update.detailed_name(), &["u"]); gobject.set_accels_for_action(&action_quit.detailed_name(), &["Escape"]); - gobject.set_accels_for_action(&action_tab_append.detailed_name(), &["t"]); - gobject.set_accels_for_action(&action_tab_pin.detailed_name(), &["p"]); - gobject.set_accels_for_action(&action_tab_close.detailed_name(), &["q"]); + gobject.set_accels_for_action(&action_page_new.detailed_name(), &["t"]); + gobject.set_accels_for_action(&action_page_pin.detailed_name(), &["p"]); + gobject.set_accels_for_action(&action_page_close.detailed_name(), &["q"]); + gobject.set_accels_for_action(&action_page_base.detailed_name(), &["h"]); gobject.set_accels_for_action( - &action_tab_page_navigation_base.detailed_name(), - &["h"], - ); - gobject.set_accels_for_action( - &action_tab_page_navigation_history_back.detailed_name(), + &action_page_history_back.detailed_name(), &["Left"], ); gobject.set_accels_for_action( - &action_tab_page_navigation_history_forward.detailed_name(), + &action_page_history_forward.detailed_name(), &["Right"], ); - gobject.set_accels_for_action( - &action_tab_page_navigation_reload.detailed_name(), - &["r"], - ); + gobject.set_accels_for_action(&action_page_reload.detailed_name(), &["r"]); // Init components let browser = Arc::new(Browser::new( profile_path, - action_tool_debug.simple(), - action_tool_profile.simple(), + action_debug.simple(), + action_profile.simple(), action_quit.simple(), action_update.simple(), - action_tab_append.simple(), - action_tab_close.simple(), - action_tab_close_all.simple(), - action_tab_page_navigation_base.simple(), - action_tab_page_navigation_history_back.simple(), - action_tab_page_navigation_history_forward.simple(), - action_tab_page_navigation_reload.simple(), - action_tab_pin.simple(), + action_page_new.simple(), + action_page_close.simple(), + action_page_close_all.simple(), + action_page_base.simple(), + action_page_history_back.simple(), + action_page_history_forward.simple(), + action_page_reload.simple(), + action_page_pin.simple(), )); // Init events diff --git a/src/app/browser.rs b/src/app/browser.rs index 18a455b0..11ccdcb2 100644 --- a/src/app/browser.rs +++ b/src/app/browser.rs @@ -28,68 +28,60 @@ impl Browser { // Extras profile_path: PathBuf, // Actions - action_tool_debug: SimpleAction, - action_tool_profile: SimpleAction, + action_debug: SimpleAction, + action_profile: SimpleAction, action_quit: SimpleAction, action_update: SimpleAction, - action_tab_append: SimpleAction, - action_tab_close: SimpleAction, - action_tab_close_all: SimpleAction, - action_tab_page_navigation_base: SimpleAction, - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, - action_tab_pin: SimpleAction, + action_page_new: SimpleAction, + action_page_close: SimpleAction, + action_page_close_all: SimpleAction, + action_page_base: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, + action_page_reload: SimpleAction, + action_page_pin: SimpleAction, ) -> Browser { let window = Arc::new(Window::new( - action_tool_debug.clone(), - action_tool_profile.clone(), + action_debug.clone(), + action_profile.clone(), action_quit.clone(), action_update.clone(), - action_tab_append.clone(), - action_tab_close.clone(), - action_tab_close_all.clone(), - action_tab_page_navigation_base.clone(), - action_tab_page_navigation_history_back.clone(), - action_tab_page_navigation_history_forward.clone(), - action_tab_page_navigation_reload.clone(), - action_tab_pin.clone(), + action_page_new.clone(), + action_page_close.clone(), + action_page_close_all.clone(), + action_page_base.clone(), + action_page_history_back.clone(), + action_page_history_forward.clone(), + action_page_reload.clone(), + action_page_pin.clone(), )); // Init widget let widget = Arc::new(Widget::new(window.gobject())); // Assign actions - widget.gobject().add_action(&action_tool_debug); - widget.gobject().add_action(&action_tool_profile); + widget.gobject().add_action(&action_debug); + widget.gobject().add_action(&action_profile); widget.gobject().add_action(&action_quit); widget.gobject().add_action(&action_update); - widget.gobject().add_action(&action_tab_append); - widget.gobject().add_action(&action_tab_close); - widget.gobject().add_action(&action_tab_close_all); - widget - .gobject() - .add_action(&action_tab_page_navigation_base); - widget - .gobject() - .add_action(&action_tab_page_navigation_history_back); - widget - .gobject() - .add_action(&action_tab_page_navigation_history_forward); - widget - .gobject() - .add_action(&action_tab_page_navigation_reload); - widget.gobject().add_action(&action_tab_pin); + widget.gobject().add_action(&action_page_new); + widget.gobject().add_action(&action_page_close); + widget.gobject().add_action(&action_page_close_all); + widget.gobject().add_action(&action_page_base); + widget.gobject().add_action(&action_page_history_back); + widget.gobject().add_action(&action_page_history_forward); + widget.gobject().add_action(&action_page_reload); + widget.gobject().add_action(&action_page_pin); // Init events - action_tool_debug.connect_activate({ + action_debug.connect_activate({ let widget = widget.clone(); move |_, _| { widget.gobject().emit_enable_debugging(true); } }); - action_tool_profile.connect_activate({ + action_profile.connect_activate({ move |_, _| { FileLauncher::new(Some(&File::for_path(&profile_path))).launch( None::<>k::Window>, @@ -123,56 +115,56 @@ impl Browser { } }); - action_tab_append.connect_activate({ + action_page_new.connect_activate({ let window = window.clone(); move |_, _| { window.tab_append(None); } }); - action_tab_close.connect_activate({ + action_page_close.connect_activate({ let window = window.clone(); move |_, _| { window.tab_close(); } }); - action_tab_close_all.connect_activate({ + action_page_close_all.connect_activate({ let window = window.clone(); move |_, _| { window.tab_close_all(); } }); - action_tab_page_navigation_base.connect_activate({ + action_page_base.connect_activate({ let window = window.clone(); move |_, _| { window.tab_page_navigation_base(); } }); - action_tab_page_navigation_history_back.connect_activate({ + action_page_history_back.connect_activate({ let window = window.clone(); move |_, _| { window.tab_page_navigation_history_back(); } }); - action_tab_page_navigation_history_forward.connect_activate({ + action_page_history_forward.connect_activate({ let window = window.clone(); move |_, _| { window.tab_page_navigation_history_forward(); } }); - action_tab_page_navigation_reload.connect_activate({ + action_page_reload.connect_activate({ let window = window.clone(); move |_, _| { window.tab_page_navigation_reload(); } }); - action_tab_pin.connect_activate({ + action_page_pin.connect_activate({ let window = window.clone(); move |_, _| { window.tab_pin(); diff --git a/src/app/browser/window.rs b/src/app/browser/window.rs index 3bde5a63..b84d6dfc 100644 --- a/src/app/browser/window.rs +++ b/src/app/browser/window.rs @@ -23,41 +23,41 @@ impl Window { // Construct pub fn new( // Actions - action_tool_debug: SimpleAction, - action_tool_profile: SimpleAction, + action_debug: SimpleAction, + action_profile: SimpleAction, action_quit: SimpleAction, action_update: SimpleAction, - action_tab_append: SimpleAction, - action_tab_close: SimpleAction, - action_tab_close_all: SimpleAction, - action_tab_page_navigation_base: SimpleAction, - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, - action_tab_pin: SimpleAction, + action_page_new: SimpleAction, + action_page_close: SimpleAction, + action_page_close_all: SimpleAction, + action_page_base: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, + action_page_reload: SimpleAction, + action_page_pin: SimpleAction, ) -> Self { // Init components let tab = Tab::new_arc( - action_tab_page_navigation_base.clone(), - action_tab_page_navigation_history_back.clone(), - action_tab_page_navigation_history_forward.clone(), - action_tab_page_navigation_reload.clone(), + action_page_base.clone(), + action_page_history_back.clone(), + action_page_history_forward.clone(), + action_page_reload.clone(), action_update.clone(), ); let header = Header::new_arc( // Actions - action_tool_debug.clone(), - action_tool_profile.clone(), + action_debug.clone(), + action_profile.clone(), action_quit.clone(), - action_tab_append.clone(), - action_tab_close.clone(), - action_tab_close_all.clone(), - action_tab_page_navigation_base.clone(), - action_tab_page_navigation_history_back.clone(), - action_tab_page_navigation_history_forward.clone(), - action_tab_page_navigation_reload.clone(), - action_tab_pin.clone(), + action_page_new.clone(), + action_page_close.clone(), + action_page_close_all.clone(), + action_page_base.clone(), + action_page_history_back.clone(), + action_page_history_forward.clone(), + action_page_reload.clone(), + action_page_pin.clone(), // Widgets tab.gobject(), ); diff --git a/src/app/browser/window/header.rs b/src/app/browser/window/header.rs index eda662e0..2f82d02c 100644 --- a/src/app/browser/window/header.rs +++ b/src/app/browser/window/header.rs @@ -16,33 +16,33 @@ impl Header { // Construct pub fn new_arc( // Actions - action_tool_debug: SimpleAction, - action_tool_profile: SimpleAction, + action_debug: SimpleAction, + action_profile: SimpleAction, action_quit: SimpleAction, - action_tab_append: SimpleAction, - action_tab_close: SimpleAction, - action_tab_close_all: SimpleAction, - action_tab_page_navigation_base: SimpleAction, - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, - action_tab_pin: SimpleAction, + action_page_new: SimpleAction, + action_page_close: SimpleAction, + action_page_close_all: SimpleAction, + action_page_base: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, + action_page_reload: SimpleAction, + action_page_pin: SimpleAction, // Widgets tab_view: &TabView, ) -> Arc { // Init components let bar = Bar::new_arc( - action_tool_debug, - action_tool_profile, + action_debug, + action_profile, action_quit, - action_tab_append, - action_tab_close, - action_tab_close_all, - action_tab_page_navigation_base, - action_tab_page_navigation_history_back, - action_tab_page_navigation_history_forward, - action_tab_page_navigation_reload, - action_tab_pin, + action_page_new, + action_page_close, + action_page_close_all, + action_page_base, + action_page_history_back, + action_page_history_forward, + action_page_reload, + action_page_pin, tab_view, ); diff --git a/src/app/browser/window/header/bar.rs b/src/app/browser/window/header/bar.rs index 17dedafc..f9a83200 100644 --- a/src/app/browser/window/header/bar.rs +++ b/src/app/browser/window/header/bar.rs @@ -19,34 +19,34 @@ pub struct Bar { impl Bar { // Construct pub fn new_arc( - action_tool_debug: SimpleAction, - action_tool_profile: SimpleAction, + action_debug: SimpleAction, + action_profile: SimpleAction, action_quit: SimpleAction, - action_tab_append: SimpleAction, - action_tab_close: SimpleAction, - action_tab_close_all: SimpleAction, - action_tab_page_navigation_base: SimpleAction, - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, - action_tab_pin: SimpleAction, + action_page_new: SimpleAction, + action_page_close: SimpleAction, + action_page_close_all: SimpleAction, + action_page_base: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, + action_page_reload: SimpleAction, + action_page_pin: SimpleAction, view: &TabView, ) -> Arc { // Init components let control = Control::new_arc(); - let tab = Tab::new_arc(action_tab_append.clone(), view); + let tab = Tab::new_arc(action_page_new.clone(), view); let menu = Menu::new_arc( - action_tool_debug, - action_tool_profile, + action_debug, + action_profile, action_quit, - action_tab_append, - action_tab_close, - action_tab_close_all, - action_tab_page_navigation_base, - action_tab_page_navigation_history_back, - action_tab_page_navigation_history_forward, - action_tab_page_navigation_reload, - action_tab_pin, + action_page_new, + action_page_close, + action_page_close_all, + action_page_base, + action_page_history_back, + action_page_history_forward, + action_page_reload, + action_page_pin, ); // Build result diff --git a/src/app/browser/window/header/bar/menu.rs b/src/app/browser/window/header/bar/menu.rs index 40d74cb9..7c3d6041 100644 --- a/src/app/browser/window/header/bar/menu.rs +++ b/src/app/browser/window/header/bar/menu.rs @@ -17,35 +17,35 @@ pub struct Menu { #[rustfmt::skip] // @TODO template builder? impl Menu { pub fn new_arc( - action_tool_debug: SimpleAction, - action_tool_profile: SimpleAction, + action_debug: SimpleAction, + action_profile: SimpleAction, action_quit: SimpleAction, - action_tab_append: SimpleAction, - action_tab_close: SimpleAction, - action_tab_close_all: SimpleAction, - action_tab_page_navigation_base: SimpleAction, - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, - action_tab_pin: SimpleAction, + action_page_new: SimpleAction, + action_page_close: SimpleAction, + action_page_close_all: SimpleAction, + action_page_base: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, + action_page_reload: SimpleAction, + action_page_pin: SimpleAction, ) -> Arc { // Main let main = gio::Menu::new(); // Main > Page let main_page = gio::Menu::new(); - main_page.append(Some("New"), Some(&detailed_action_name(action_tab_append))); - main_page.append(Some("Reload"), Some(&detailed_action_name(action_tab_page_navigation_reload))); - main_page.append(Some("Pin"), Some(&detailed_action_name(action_tab_pin))); + main_page.append(Some("New"), Some(&detailed_action_name(action_page_new))); + main_page.append(Some("Reload"), Some(&detailed_action_name(action_page_reload))); + main_page.append(Some("Pin"), Some(&detailed_action_name(action_page_pin))); // Main > Page > Navigation let main_page_navigation = gio::Menu::new(); - main_page_navigation.append(Some("Base"), Some(&detailed_action_name(action_tab_page_navigation_base))); + main_page_navigation.append(Some("Base"), Some(&detailed_action_name(action_page_base))); // Main > Page > Navigation > History let main_page_navigation_history = gio::Menu::new(); - main_page_navigation_history.append(Some("Back"), Some(&detailed_action_name(action_tab_page_navigation_history_back))); - main_page_navigation_history.append(Some("Forward"), Some(&detailed_action_name(action_tab_page_navigation_history_forward))); + main_page_navigation_history.append(Some("Back"), Some(&detailed_action_name(action_page_history_back))); + main_page_navigation_history.append(Some("Forward"), Some(&detailed_action_name(action_page_history_forward))); main_page_navigation.append_submenu(Some("History"), &main_page_navigation_history); @@ -53,8 +53,8 @@ impl Menu { // Main > Page > Close let main_page_close = gio::Menu::new(); - main_page_close.append(Some("Current"), Some(&detailed_action_name(action_tab_close))); - main_page_close.append(Some("All"), Some(&detailed_action_name(action_tab_close_all))); + main_page_close.append(Some("Current"), Some(&detailed_action_name(action_page_close))); + main_page_close.append(Some("All"), Some(&detailed_action_name(action_page_close_all))); main_page.append_submenu(Some("Close"), &main_page_close); @@ -62,8 +62,8 @@ impl Menu { // Main > Tool let main_tool = gio::Menu::new(); - main_tool.append(Some("Debug"), Some(&detailed_action_name(action_tool_debug))); - main_tool.append(Some("Profile"), Some(&detailed_action_name(action_tool_profile))); + main_tool.append(Some("Debug"), Some(&detailed_action_name(action_debug))); + main_tool.append(Some("Profile"), Some(&detailed_action_name(action_profile))); main.append_submenu(Some("Tool"), &main_tool); diff --git a/src/app/browser/window/header/bar/tab.rs b/src/app/browser/window/header/bar/tab.rs index 5f2a8291..a628d1d9 100644 --- a/src/app/browser/window/header/bar/tab.rs +++ b/src/app/browser/window/header/bar/tab.rs @@ -14,9 +14,9 @@ pub struct Tab { impl Tab { // Construct - pub fn new_arc(action_tab_append: SimpleAction, view: &TabView) -> Arc { + pub fn new_arc(action_page_new: SimpleAction, view: &TabView) -> Arc { Arc::new(Self { - widget: Widget::new_arc(view, Append::new_arc(action_tab_append).gobject()), + widget: Widget::new_arc(view, Append::new_arc(action_page_new).gobject()), }) } diff --git a/src/app/browser/window/header/bar/tab/append.rs b/src/app/browser/window/header/bar/tab/append.rs index a8900388..571dad3d 100644 --- a/src/app/browser/window/header/bar/tab/append.rs +++ b/src/app/browser/window/header/bar/tab/append.rs @@ -11,9 +11,9 @@ pub struct Append { impl Append { // Construct - pub fn new_arc(action_tab_append: SimpleAction) -> Arc { + pub fn new_arc(action_page_new: SimpleAction) -> Arc { Arc::new(Self { - widget: Widget::new_arc(action_tab_append), + widget: Widget::new_arc(action_page_new), }) } diff --git a/src/app/browser/window/header/bar/tab/append/widget.rs b/src/app/browser/window/header/bar/tab/append/widget.rs index c5fdf5e9..047a3cd6 100644 --- a/src/app/browser/window/header/bar/tab/append/widget.rs +++ b/src/app/browser/window/header/bar/tab/append/widget.rs @@ -11,7 +11,7 @@ pub struct Widget { impl Widget { // Construct - pub fn new_arc(action_tab_append: SimpleAction) -> Arc { + pub fn new_arc(action_page_new: SimpleAction) -> Arc { // Init gobject let gobject = Button::builder() .icon_name("tab-new-symbolic") @@ -22,7 +22,7 @@ impl Widget { // Init events gobject.connect_clicked(move |_| { - action_tab_append.activate(None); + action_page_new.activate(None); }); Arc::new(Self { gobject }) diff --git a/src/app/browser/window/tab.rs b/src/app/browser/window/tab.rs index eecc0e5e..65ff8893 100644 --- a/src/app/browser/window/tab.rs +++ b/src/app/browser/window/tab.rs @@ -20,10 +20,10 @@ pub struct Tab { // Local actions action_tab_open: SimpleAction, // Global actions - action_tab_page_navigation_base: SimpleAction, - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, + action_page_base: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, + action_page_reload: SimpleAction, action_update: SimpleAction, // Dynamically allocated reference index index: Arc>>>, @@ -35,10 +35,10 @@ impl Tab { // Construct pub fn new_arc( // Actions - action_tab_page_navigation_base: SimpleAction, - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, + action_page_base: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, + action_page_reload: SimpleAction, action_update: SimpleAction, ) -> Arc { // Init local actions @@ -76,12 +76,10 @@ impl Tab { let gobject = widget.gobject().clone(); // Actions let action_tab_open = action_tab_open.clone(); - let action_tab_page_navigation_base = action_tab_page_navigation_base.clone(); - let action_tab_page_navigation_history_back = - action_tab_page_navigation_history_back.clone(); - let action_tab_page_navigation_history_forward = - action_tab_page_navigation_history_forward.clone(); - let action_tab_page_navigation_reload = action_tab_page_navigation_reload.clone(); + let action_page_base = action_page_base.clone(); + let action_page_history_back = action_page_history_back.clone(); + let action_page_history_forward = action_page_history_forward.clone(); + let action_page_reload = action_page_reload.clone(); let action_update = action_update.clone(); move |_, request| { // Init new tab item @@ -90,10 +88,10 @@ impl Tab { // Local actions action_tab_open.clone(), // Global actions - action_tab_page_navigation_base.clone(), - action_tab_page_navigation_history_back.clone(), - action_tab_page_navigation_history_forward.clone(), - action_tab_page_navigation_reload.clone(), + action_page_base.clone(), + action_page_history_back.clone(), + action_page_history_forward.clone(), + action_page_reload.clone(), action_update.clone(), // Options match gobject.selected_page() { @@ -122,10 +120,10 @@ impl Tab { // Local actions action_tab_open, // Global actions - action_tab_page_navigation_base, - action_tab_page_navigation_history_back, - action_tab_page_navigation_history_forward, - action_tab_page_navigation_reload, + action_page_base, + action_page_history_back, + action_page_history_forward, + action_page_reload, action_update, // Init empty HashMap index as no tabs appended yet index, @@ -142,10 +140,10 @@ impl Tab { // Local actions self.action_tab_open.clone(), // Global actions - self.action_tab_page_navigation_base.clone(), - self.action_tab_page_navigation_history_back.clone(), - self.action_tab_page_navigation_history_forward.clone(), - self.action_tab_page_navigation_reload.clone(), + self.action_page_base.clone(), + self.action_page_history_back.clone(), + self.action_page_history_forward.clone(), + self.action_page_reload.clone(), self.action_update.clone(), // Options position, @@ -279,10 +277,10 @@ impl Tab { transaction, &record.id, self.action_tab_open.clone(), - self.action_tab_page_navigation_base.clone(), - self.action_tab_page_navigation_history_back.clone(), - self.action_tab_page_navigation_history_forward.clone(), - self.action_tab_page_navigation_reload.clone(), + self.action_page_base.clone(), + self.action_page_history_back.clone(), + self.action_page_history_forward.clone(), + self.action_page_reload.clone(), self.action_update.clone(), ) { Ok(items) => { diff --git a/src/app/browser/window/tab/item.rs b/src/app/browser/window/tab/item.rs index 9aeb306f..b00195b2 100644 --- a/src/app/browser/window/tab/item.rs +++ b/src/app/browser/window/tab/item.rs @@ -29,10 +29,10 @@ impl Item { tab_view: &TabView, // Actions action_tab_open: SimpleAction, - action_tab_page_navigation_base: SimpleAction, - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, + action_page_base: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, + action_page_reload: SimpleAction, action_update: SimpleAction, // Options position: Option, @@ -47,10 +47,10 @@ impl Item { id.clone(), // Actions action_tab_open.clone(), - action_tab_page_navigation_base.clone(), - action_tab_page_navigation_history_back.clone(), - action_tab_page_navigation_history_forward.clone(), - action_tab_page_navigation_reload.clone(), + action_page_base.clone(), + action_page_history_back.clone(), + action_page_history_forward.clone(), + action_page_reload.clone(), action_update.clone(), ); @@ -129,10 +129,10 @@ impl Item { app_browser_window_tab_id: &i64, // Actions action_tab_open: SimpleAction, - action_tab_page_navigation_base: SimpleAction, - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, + action_page_base: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, + action_page_reload: SimpleAction, action_update: SimpleAction, ) -> Result>, String> { let mut items = Vec::new(); @@ -145,10 +145,10 @@ impl Item { tab_view, // Actions action_tab_open.clone(), - action_tab_page_navigation_base.clone(), - action_tab_page_navigation_history_back.clone(), - action_tab_page_navigation_history_forward.clone(), - action_tab_page_navigation_reload.clone(), + action_page_base.clone(), + action_page_history_back.clone(), + action_page_history_forward.clone(), + action_page_reload.clone(), action_update.clone(), // Options None, diff --git a/src/app/browser/window/tab/item/page.rs b/src/app/browser/window/tab/item/page.rs index 480f8eb7..014bb9dc 100644 --- a/src/app/browser/window/tab/item/page.rs +++ b/src/app/browser/window/tab/item/page.rs @@ -35,7 +35,7 @@ pub struct Page { id: GString, // Actions action_page_open: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, + action_page_reload: SimpleAction, action_update: SimpleAction, // Components navigation: Arc, @@ -52,10 +52,10 @@ impl Page { pub fn new_arc( id: GString, action_tab_open: SimpleAction, - action_tab_page_navigation_base: SimpleAction, - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, + action_page_base: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, + action_page_reload: SimpleAction, action_update: SimpleAction, ) -> Arc { // Init local actions @@ -66,10 +66,10 @@ impl Page { let content = Content::new_arc(action_tab_open.clone(), action_page_open.clone()); let navigation = Navigation::new_arc( - action_tab_page_navigation_base.clone(), - action_tab_page_navigation_history_back.clone(), - action_tab_page_navigation_history_forward.clone(), - action_tab_page_navigation_reload.clone(), + action_page_base.clone(), + action_page_history_back.clone(), + action_page_history_forward.clone(), + action_page_reload.clone(), action_update.clone(), ); @@ -89,7 +89,7 @@ impl Page { // Init events action_page_open.connect_activate({ let navigation = navigation.clone(); - let action_tab_page_navigation_reload = action_tab_page_navigation_reload.clone(); + let action_page_reload = action_page_reload.clone(); move |_, request| { // Update request navigation.set_request_text( @@ -101,7 +101,7 @@ impl Page { ); // Reload page - action_tab_page_navigation_reload.activate(None); + action_page_reload.activate(None); } }); @@ -110,7 +110,7 @@ impl Page { id, // Actions action_page_open, - action_tab_page_navigation_reload, + action_page_reload, action_update, // Components content, @@ -141,7 +141,7 @@ impl Page { self.navigation.set_request_text(&request); // Reload page - self.action_tab_page_navigation_reload.activate(None); + self.action_page_reload.activate(None); } } @@ -151,7 +151,7 @@ impl Page { self.navigation.set_request_text(&request); // Reload page - self.action_tab_page_navigation_reload.activate(None); + self.action_page_reload.activate(None); } } @@ -218,7 +218,7 @@ impl Page { self.navigation.set_request_text(&request_text); // Reload page - self.action_tab_page_navigation_reload.activate(None); + self.action_page_reload.activate(None); } Err(_) => { // @TODO any action here? @@ -235,7 +235,7 @@ impl Page { self.navigation.set_request_text(&request_text); // Reload page - self.action_tab_page_navigation_reload.activate(None); + self.action_page_reload.activate(None); } } }; // Uri::parse diff --git a/src/app/browser/window/tab/item/page/content/text.rs b/src/app/browser/window/tab/item/page/content/text.rs index 1f95bd7a..c780b5b4 100644 --- a/src/app/browser/window/tab/item/page/content/text.rs +++ b/src/app/browser/window/tab/item/page/content/text.rs @@ -22,11 +22,11 @@ impl Text { pub fn gemini( gemtext: &str, base: &Uri, - action_tab_append: SimpleAction, + action_page_new: SimpleAction, action_page_open: SimpleAction, ) -> Self { // Init components - let gemini = Gemini::new(gemtext, base, action_tab_append, action_page_open); + let gemini = Gemini::new(gemtext, base, action_page_new, action_page_open); // Init meta let meta = Meta { diff --git a/src/app/browser/window/tab/item/page/navigation.rs b/src/app/browser/window/tab/item/page/navigation.rs index f785792d..8ee8291d 100644 --- a/src/app/browser/window/tab/item/page/navigation.rs +++ b/src/app/browser/window/tab/item/page/navigation.rs @@ -30,22 +30,22 @@ pub struct Navigation { impl Navigation { pub fn new_arc( - action_tab_page_navigation_base: SimpleAction, - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, + action_page_base: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, + action_page_reload: SimpleAction, action_update: SimpleAction, ) -> Arc { // Init components - let base = Base::new_arc(action_tab_page_navigation_base); + let base = Base::new_arc(action_page_base); let history = History::new_arc( - action_tab_page_navigation_history_back, - action_tab_page_navigation_history_forward, + action_page_history_back, + action_page_history_forward, ); - let reload = Reload::new_arc(action_tab_page_navigation_reload.clone()); + let reload = Reload::new_arc(action_page_reload.clone()); let request = Request::new_arc( action_update.clone(), - action_tab_page_navigation_reload.clone(), + action_page_reload.clone(), ); let bookmark = Bookmark::new_arc(); diff --git a/src/app/browser/window/tab/item/page/navigation/base.rs b/src/app/browser/window/tab/item/page/navigation/base.rs index 44fe6842..78276440 100644 --- a/src/app/browser/window/tab/item/page/navigation/base.rs +++ b/src/app/browser/window/tab/item/page/navigation/base.rs @@ -10,18 +10,18 @@ use gtk::{ use std::{cell::RefCell, sync::Arc}; pub struct Base { - action_tab_page_navigation_base: SimpleAction, + action_page_base: SimpleAction, uri: RefCell>, widget: Arc, } impl Base { // Construct - pub fn new_arc(action_tab_page_navigation_base: SimpleAction) -> Arc { + pub fn new_arc(action_page_base: SimpleAction) -> Arc { Arc::new(Self { - action_tab_page_navigation_base: action_tab_page_navigation_base.clone(), + action_page_base: action_page_base.clone(), uri: RefCell::new(None), - widget: Widget::new_arc(action_tab_page_navigation_base), + widget: Widget::new_arc(action_page_base), }) } @@ -37,7 +37,7 @@ impl Base { self.uri.replace(uri); // Update action status - self.action_tab_page_navigation_base.set_enabled(status); + self.action_page_base.set_enabled(status); // Update child components self.widget.update(status); diff --git a/src/app/browser/window/tab/item/page/navigation/base/widget.rs b/src/app/browser/window/tab/item/page/navigation/base/widget.rs index 8ceddf5e..5bced5e0 100644 --- a/src/app/browser/window/tab/item/page/navigation/base/widget.rs +++ b/src/app/browser/window/tab/item/page/navigation/base/widget.rs @@ -11,7 +11,7 @@ pub struct Widget { impl Widget { // Construct - pub fn new_arc(action_tab_page_navigation_base: SimpleAction) -> Arc { + pub fn new_arc(action_page_base: SimpleAction) -> Arc { // Init gobject let gobject = Button::builder() .icon_name("go-home-symbolic") @@ -21,9 +21,9 @@ impl Widget { // Init events gobject.connect_clicked({ - let action_tab_page_navigation_base = action_tab_page_navigation_base.clone(); + let action_page_base = action_page_base.clone(); move |_| { - action_tab_page_navigation_base.activate(None); + action_page_base.activate(None); } }); diff --git a/src/app/browser/window/tab/item/page/navigation/history.rs b/src/app/browser/window/tab/item/page/navigation/history.rs index 52cdc9a2..2ef7a751 100644 --- a/src/app/browser/window/tab/item/page/navigation/history.rs +++ b/src/app/browser/window/tab/item/page/navigation/history.rs @@ -28,12 +28,12 @@ pub struct History { impl History { // Construct pub fn new_arc( - action_tab_page_navigation_history_back: SimpleAction, - action_tab_page_navigation_history_forward: SimpleAction, + action_page_history_back: SimpleAction, + action_page_history_forward: SimpleAction, ) -> Arc { // init components - let back = Back::new_arc(action_tab_page_navigation_history_back); - let forward = Forward::new_arc(action_tab_page_navigation_history_forward); + let back = Back::new_arc(action_page_history_back); + let forward = Forward::new_arc(action_page_history_forward); // Init widget let widget = Widget::new_arc(back.gobject(), forward.gobject()); diff --git a/src/app/browser/window/tab/item/page/navigation/history/back.rs b/src/app/browser/window/tab/item/page/navigation/history/back.rs index a156aaec..335ad9b9 100644 --- a/src/app/browser/window/tab/item/page/navigation/history/back.rs +++ b/src/app/browser/window/tab/item/page/navigation/history/back.rs @@ -6,25 +6,25 @@ use gtk::{gio::SimpleAction, Button}; use std::sync::Arc; pub struct Back { - action_tab_page_navigation_history_back: SimpleAction, + action_page_history_back: SimpleAction, widget: Arc, } impl Back { // Construct - pub fn new_arc(action_tab_page_navigation_history_back: SimpleAction) -> Arc { + pub fn new_arc(action_page_history_back: SimpleAction) -> Arc { // Return activated struct Arc::new(Self { - action_tab_page_navigation_history_back: action_tab_page_navigation_history_back + action_page_history_back: action_page_history_back .clone(), - widget: Widget::new_arc(action_tab_page_navigation_history_back), + widget: Widget::new_arc(action_page_history_back), }) } // Actions pub fn update(&self, status: bool) { // Update actions - self.action_tab_page_navigation_history_back + self.action_page_history_back .set_enabled(status); // Update child components diff --git a/src/app/browser/window/tab/item/page/navigation/history/back/widget.rs b/src/app/browser/window/tab/item/page/navigation/history/back/widget.rs index 8256c50f..f4fb19c0 100644 --- a/src/app/browser/window/tab/item/page/navigation/history/back/widget.rs +++ b/src/app/browser/window/tab/item/page/navigation/history/back/widget.rs @@ -11,7 +11,7 @@ pub struct Widget { impl Widget { // Construct - pub fn new_arc(action_tab_page_navigation_history_back: SimpleAction) -> Arc { + pub fn new_arc(action_page_history_back: SimpleAction) -> Arc { // Init gobject let gobject = Button::builder() .icon_name("go-previous-symbolic") @@ -21,10 +21,10 @@ impl Widget { // Init events gobject.connect_clicked({ - let action_tab_page_navigation_history_back = - action_tab_page_navigation_history_back.clone(); + let action_page_history_back = + action_page_history_back.clone(); move |_| { - action_tab_page_navigation_history_back.activate(None); + action_page_history_back.activate(None); } }); diff --git a/src/app/browser/window/tab/item/page/navigation/history/forward.rs b/src/app/browser/window/tab/item/page/navigation/history/forward.rs index 15531722..27310e7b 100644 --- a/src/app/browser/window/tab/item/page/navigation/history/forward.rs +++ b/src/app/browser/window/tab/item/page/navigation/history/forward.rs @@ -6,25 +6,25 @@ use gtk::{gio::SimpleAction, Button}; use std::sync::Arc; pub struct Forward { - action_tab_page_navigation_history_forward: SimpleAction, + action_page_history_forward: SimpleAction, widget: Arc, } impl Forward { // Construct - pub fn new_arc(action_tab_page_navigation_history_forward: SimpleAction) -> Arc { + pub fn new_arc(action_page_history_forward: SimpleAction) -> Arc { // Return activated struct Arc::new(Self { - action_tab_page_navigation_history_forward: action_tab_page_navigation_history_forward + action_page_history_forward: action_page_history_forward .clone(), - widget: Widget::new_arc(action_tab_page_navigation_history_forward), + widget: Widget::new_arc(action_page_history_forward), }) } // Actions pub fn update(&self, status: bool) { // Update actions - self.action_tab_page_navigation_history_forward + self.action_page_history_forward .set_enabled(status); // Update child components diff --git a/src/app/browser/window/tab/item/page/navigation/history/forward/widget.rs b/src/app/browser/window/tab/item/page/navigation/history/forward/widget.rs index d3915afb..aae5fef9 100644 --- a/src/app/browser/window/tab/item/page/navigation/history/forward/widget.rs +++ b/src/app/browser/window/tab/item/page/navigation/history/forward/widget.rs @@ -11,7 +11,7 @@ pub struct Widget { impl Widget { // Construct - pub fn new_arc(action_tab_page_navigation_history_forward: SimpleAction) -> Arc { + pub fn new_arc(action_page_history_forward: SimpleAction) -> Arc { // Init gobject let gobject = Button::builder() .icon_name("go-next-symbolic") @@ -21,10 +21,10 @@ impl Widget { // Init events gobject.connect_clicked({ - let action_tab_page_navigation_history_forward = - action_tab_page_navigation_history_forward.clone(); + let action_page_history_forward = + action_page_history_forward.clone(); move |_| { - action_tab_page_navigation_history_forward.activate(None); + action_page_history_forward.activate(None); } }); diff --git a/src/app/browser/window/tab/item/page/navigation/reload.rs b/src/app/browser/window/tab/item/page/navigation/reload.rs index 2ec1ba38..dced5514 100644 --- a/src/app/browser/window/tab/item/page/navigation/reload.rs +++ b/src/app/browser/window/tab/item/page/navigation/reload.rs @@ -6,23 +6,23 @@ use gtk::{gio::SimpleAction, Button}; use std::sync::Arc; pub struct Reload { - action_tab_page_navigation_reload: SimpleAction, + action_page_reload: SimpleAction, widget: Arc, } impl Reload { // Construct - pub fn new_arc(action_tab_page_navigation_reload: SimpleAction) -> Arc { + pub fn new_arc(action_page_reload: SimpleAction) -> Arc { Arc::new(Self { - action_tab_page_navigation_reload: action_tab_page_navigation_reload.clone(), - widget: Widget::new_arc(action_tab_page_navigation_reload), + action_page_reload: action_page_reload.clone(), + widget: Widget::new_arc(action_page_reload), }) } // Actions pub fn update(&self, is_enabled: bool) { // Update actions - self.action_tab_page_navigation_reload + self.action_page_reload .set_enabled(is_enabled); // Update child components diff --git a/src/app/browser/window/tab/item/page/navigation/reload/widget.rs b/src/app/browser/window/tab/item/page/navigation/reload/widget.rs index 4d5e3ace..e0f13468 100644 --- a/src/app/browser/window/tab/item/page/navigation/reload/widget.rs +++ b/src/app/browser/window/tab/item/page/navigation/reload/widget.rs @@ -11,7 +11,7 @@ pub struct Widget { impl Widget { // Construct - pub fn new_arc(action_tab_page_navigation_reload: SimpleAction) -> Arc { + pub fn new_arc(action_page_reload: SimpleAction) -> Arc { // Init gobject let gobject = Button::builder() .icon_name("view-refresh-symbolic") @@ -21,9 +21,9 @@ impl Widget { // Init events gobject.connect_clicked({ - let action_tab_page_navigation_reload = action_tab_page_navigation_reload.clone(); + let action_page_reload = action_page_reload.clone(); move |_| { - action_tab_page_navigation_reload.activate(None); + action_page_reload.activate(None); } }); diff --git a/src/app/browser/window/tab/item/page/navigation/request.rs b/src/app/browser/window/tab/item/page/navigation/request.rs index 5f973637..f0f75b9a 100644 --- a/src/app/browser/window/tab/item/page/navigation/request.rs +++ b/src/app/browser/window/tab/item/page/navigation/request.rs @@ -22,10 +22,10 @@ impl Request { pub fn new_arc( // Actions action_update: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, // @TODO local `action_page_open`? + action_page_reload: SimpleAction, // @TODO local `action_page_open`? ) -> Arc { Arc::new(Self { - widget: Widget::new_arc(action_update, action_tab_page_navigation_reload), + widget: Widget::new_arc(action_update, action_page_reload), }) } diff --git a/src/app/browser/window/tab/item/page/navigation/request/widget.rs b/src/app/browser/window/tab/item/page/navigation/request/widget.rs index 393ec007..51226e02 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/widget.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/widget.rs @@ -32,7 +32,7 @@ impl Widget { // Construct pub fn new_arc( action_update: SimpleAction, - action_tab_page_navigation_reload: SimpleAction, // @TODO local `action_page_open`? + action_page_reload: SimpleAction, // @TODO local `action_page_open`? ) -> Arc { // Init animated progress bar state let progress = Arc::new(Progress { @@ -60,7 +60,7 @@ impl Widget { }); gobject.connect_activate(move |_| { - action_tab_page_navigation_reload.activate(None); + action_page_reload.activate(None); }); primary_button_controller.connect_pressed({ diff --git a/src/app/browser/window/tab/widget.rs b/src/app/browser/window/tab/widget.rs index 6d7e71a8..36b962a6 100644 --- a/src/app/browser/window/tab/widget.rs +++ b/src/app/browser/window/tab/widget.rs @@ -11,10 +11,10 @@ pub struct Widget { impl Widget { // Construct - pub fn new(action_tab_append: SimpleAction) -> Self { + pub fn new(action_page_new: SimpleAction) -> Self { // Init additional action group let action_group = SimpleActionGroup::new(); - action_group.add_action(&action_tab_append); + action_group.add_action(&action_page_new); // Init gobject let gobject = TabView::new();