From ec95ae258093f86665134e37703f735879bc7e98 Mon Sep 17 00:00:00 2001 From: yggverse Date: Thu, 14 Nov 2024 14:33:29 +0200 Subject: [PATCH] enshort action namespace --- .../tab/item/page/navigation/bookmark/widget.rs | 4 ++-- .../tab/item/page/navigation/history/back.rs | 15 ++++++--------- .../item/page/navigation/history/back/widget.rs | 6 +++--- .../tab/item/page/navigation/history/forward.rs | 15 ++++++--------- .../page/navigation/history/forward/widget.rs | 6 +++--- .../tab/item/page/navigation/home/widget.rs | 4 ++-- .../tab/item/page/navigation/reload/widget.rs | 4 ++-- 7 files changed, 24 insertions(+), 30 deletions(-) diff --git a/src/app/browser/window/tab/item/page/navigation/bookmark/widget.rs b/src/app/browser/window/tab/item/page/navigation/bookmark/widget.rs index e6ac853d..2f1a9398 100644 --- a/src/app/browser/window/tab/item/page/navigation/bookmark/widget.rs +++ b/src/app/browser/window/tab/item/page/navigation/bookmark/widget.rs @@ -1,6 +1,6 @@ use gtk::{prelude::ButtonExt, Button}; -use crate::app::browser::window::action::Action as WindowAction; +use crate::app::browser::window::Action; use std::rc::Rc; const ICON_YES: &str = "starred-symbolic"; @@ -13,7 +13,7 @@ pub struct Widget { impl Widget { // Constructors - pub fn new(action: Rc) -> Self { + pub fn new(action: Rc) -> Self { // Init gobject let gobject = Button::builder() .icon_name(ICON_NON) 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 ad23fdee..113e156b 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 @@ -2,21 +2,21 @@ mod widget; use widget::Widget; -use crate::app::browser::window::action::Action as WindowAction; +use crate::app::browser::window::Action; use std::rc::Rc; pub struct Back { - window_action: Rc, + action: Rc, widget: Rc, } impl Back { // Constructors - pub fn new(window_action: Rc) -> Self { + pub fn new(action: Rc) -> Self { Self { - window_action: window_action.clone(), - widget: Rc::new(Widget::new(window_action)), + action: action.clone(), + widget: Rc::new(Widget::new(action)), } } @@ -24,10 +24,7 @@ impl Back { pub fn update(&self, status: bool) { // Update actions - self.window_action - .history_back() - .gobject() - .set_enabled(status); + self.action.history_back().gobject().set_enabled(status); // Update child components self.widget.update(status); 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 5d817b9d..3f35ec1d 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 @@ -1,4 +1,4 @@ -use crate::app::browser::window::action::Action as WindowAction; +use crate::app::browser::window::Action; use gtk::{ prelude::{ButtonExt, WidgetExt}, Button, @@ -11,7 +11,7 @@ pub struct Widget { impl Widget { // Construct - pub fn new(window_action: Rc) -> Self { + pub fn new(action: Rc) -> Self { // Init gobject let gobject = Button::builder() .icon_name("go-previous-symbolic") @@ -20,7 +20,7 @@ impl Widget { .build(); // Init events - gobject.connect_clicked(move |_| window_action.history_back().activate()); + gobject.connect_clicked(move |_| action.history_back().activate()); // Return activated `Self` Self { gobject } 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 438b9ca4..61df4268 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 @@ -2,30 +2,27 @@ mod widget; use widget::Widget; -use crate::app::browser::window::action::Action as WindowAction; +use crate::app::browser::window::Action; use std::rc::Rc; pub struct Forward { - window_action: Rc, + action: Rc, widget: Rc, } impl Forward { // Construct - pub fn new(window_action: Rc) -> Self { + pub fn new(action: Rc) -> Self { Self { - window_action: window_action.clone(), - widget: Rc::new(Widget::new(window_action)), + action: action.clone(), + widget: Rc::new(Widget::new(action)), } } // Actions pub fn update(&self, status: bool) { // Update actions - self.window_action - .history_forward() - .gobject() - .set_enabled(status); + self.action.history_forward().gobject().set_enabled(status); // Update child components self.widget.update(status); 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 79afe85e..617a4476 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 @@ -1,4 +1,4 @@ -use crate::app::browser::window::action::Action as WindowAction; +use crate::app::browser::window::Action; use gtk::{ prelude::{ButtonExt, WidgetExt}, Button, @@ -11,7 +11,7 @@ pub struct Widget { impl Widget { // Construct - pub fn new(window_action: Rc) -> Self { + pub fn new(action: Rc) -> Self { // Init gobject let gobject = Button::builder() .icon_name("go-next-symbolic") @@ -20,7 +20,7 @@ impl Widget { .build(); // Init events - gobject.connect_clicked(move |_| window_action.history_forward().activate()); + gobject.connect_clicked(move |_| action.history_forward().activate()); // Return activated `Self` Self { gobject } diff --git a/src/app/browser/window/tab/item/page/navigation/home/widget.rs b/src/app/browser/window/tab/item/page/navigation/home/widget.rs index 66dde9c1..224ae34c 100644 --- a/src/app/browser/window/tab/item/page/navigation/home/widget.rs +++ b/src/app/browser/window/tab/item/page/navigation/home/widget.rs @@ -1,4 +1,4 @@ -use crate::app::browser::window::action::Action as WindowAction; +use crate::app::browser::window::Action; use gtk::{ prelude::{ButtonExt, WidgetExt}, Button, @@ -11,7 +11,7 @@ pub struct Widget { impl Widget { // Construct - pub fn new(action: Rc) -> Self { + pub fn new(action: Rc) -> Self { // Init gobject let gobject = Button::builder() .icon_name("go-home-symbolic") 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 370df634..89f589c1 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 @@ -1,4 +1,4 @@ -use crate::app::browser::window::action::Action as WindowAction; +use crate::app::browser::window::Action; use gtk::{ prelude::{ButtonExt, WidgetExt}, Button, @@ -11,7 +11,7 @@ pub struct Widget { impl Widget { // Construct - pub fn new(action: Rc) -> Self { + pub fn new(action: Rc) -> Self { // Init gobject let gobject = Button::builder() .icon_name("view-refresh-symbolic")