From 12f514646818f2fb65772c67d3059b1b34c4c5e8 Mon Sep 17 00:00:00 2001 From: yggverse Date: Sat, 28 Sep 2024 01:53:16 +0300 Subject: [PATCH] replace static action names with objects --- src/browser.rs | 105 +++++++++++++++++--------------- src/browser/header.rs | 20 +++++- src/browser/header/tray.rs | 20 +++++- src/browser/header/tray/menu.rs | 42 +++++++++---- 4 files changed, 121 insertions(+), 66 deletions(-) diff --git a/src/browser.rs b/src/browser.rs index d5fd8b5c..06d67b1d 100644 --- a/src/browser.rs +++ b/src/browser.rs @@ -34,9 +34,23 @@ impl Browser { let action_quit = SimpleAction::new("quit", None); let action_update = SimpleAction::new("update", None); + let action_tab_append = SimpleAction::new("tab_append", None); + let action_tab_close = SimpleAction::new("tab_close", None); + let action_tab_close_all = SimpleAction::new("tab_close_all", None); + let action_tab_page_reload = SimpleAction::new("tab_page_reload", None); + let action_tab_pin = SimpleAction::new("tab_pin", None); + // Init components // let db = db::Browser::new(connection); - let header = Arc::new(Header::new(&action_debug, &action_quit)); + let header = Arc::new(Header::new( + &action_debug, + &action_quit, + &action_tab_append, + &action_tab_close, + &action_tab_close_all, + &action_tab_page_reload, + &action_tab_pin, + )); let main = Arc::new(Main::new(&action_debug, &action_quit, &action_update)); @@ -55,16 +69,16 @@ impl Browser { // Init events action_debug.connect_activate({ - let target = widget.clone(); + let widget = widget.clone(); move |_, _| { - target.emit_enable_debugging(true); + widget.emit_enable_debugging(true); } }); action_quit.connect_activate({ - let target = widget.clone(); + let widget = widget.clone(); move |_, _| { - target.close(); + widget.close(); } }); @@ -77,51 +91,42 @@ impl Browser { } }); - // Init actions @TODO - widget.add_action_entries([ - ActionEntry::builder("tab_append") - .activate({ - let main = main.clone(); - move |_, _, _| { - main.tab_append(None); - } - }) - .build(), - ActionEntry::builder("tab_page_reload") - .activate({ - let main = main.clone(); - move |_, _, _| { - main.tab_page_reload(); - } - }) - .build(), - ActionEntry::builder("tab_close") - .activate({ - let main = main.clone(); - move |_, _, _| { - main.tab_close(); - } - }) - .build(), - ActionEntry::builder("tab_close_all") - .activate({ - let main = main.clone(); - move |_, _, _| { - main.tab_close_all(); - } - }) - .build(), - ActionEntry::builder("tab_pin") - .activate({ - let main = main.clone(); - move |_, _, _| { - main.tab_pin(); - } - }) - .build(), - ]); - - // Return + action_tab_append.connect_activate({ + let main = main.clone(); + move |_, _| { + main.tab_append(None); + } + }); + + action_tab_close.connect_activate({ + let main = main.clone(); + move |_, _| { + main.tab_close(); + } + }); + + action_tab_close_all.connect_activate({ + let main = main.clone(); + move |_, _| { + main.tab_close_all(); + } + }); + + action_tab_page_reload.connect_activate({ + let main = main.clone(); + move |_, _| { + main.tab_page_reload(); + } + }); + + action_tab_pin.connect_activate({ + let main = main.clone(); + move |_, _| { + main.tab_pin(); + } + }); + + // Return activated browser struct Self { // db, widget, diff --git a/src/browser/header.rs b/src/browser/header.rs index 7a227ef2..25c62404 100644 --- a/src/browser/header.rs +++ b/src/browser/header.rs @@ -13,9 +13,25 @@ pub struct Header { impl Header { // Construct - pub fn new(action_debug: &SimpleAction, action_quit: &SimpleAction) -> Self { + pub fn new( + action_debug: &SimpleAction, + action_quit: &SimpleAction, + action_tab_append: &SimpleAction, + action_tab_close: &SimpleAction, + action_tab_close_all: &SimpleAction, + action_tab_page_reload: &SimpleAction, + action_tab_pin: &SimpleAction, + ) -> Self { // Init components - let tray = Tray::new(action_debug, action_quit); + let tray = Tray::new( + action_debug, + action_quit, + action_tab_append, + action_tab_close, + action_tab_close_all, + action_tab_page_reload, + action_tab_pin, + ); let subject = Subject::new(); diff --git a/src/browser/header/tray.rs b/src/browser/header/tray.rs index 8fc391a5..ab5dd564 100644 --- a/src/browser/header/tray.rs +++ b/src/browser/header/tray.rs @@ -12,9 +12,25 @@ pub struct Tray { } impl Tray { - pub fn new(action_debug: &SimpleAction, action_quit: &SimpleAction) -> Self { + pub fn new( + action_debug: &SimpleAction, + action_quit: &SimpleAction, + action_tab_append: &SimpleAction, + action_tab_close: &SimpleAction, + action_tab_close_all: &SimpleAction, + action_tab_page_reload: &SimpleAction, + action_tab_pin: &SimpleAction, + ) -> Self { // Init components - let menu = Menu::new(action_debug, action_quit); + let menu = Menu::new( + action_debug, + action_quit, + action_tab_append, + action_tab_close, + action_tab_close_all, + action_tab_page_reload, + action_tab_pin, + ); let tab = Tab::new(); // Init widget diff --git a/src/browser/header/tray/menu.rs b/src/browser/header/tray/menu.rs index 04c74553..9f14b667 100644 --- a/src/browser/header/tray/menu.rs +++ b/src/browser/header/tray/menu.rs @@ -1,5 +1,5 @@ use gtk::{ - gio::{self, MenuItem, SimpleAction}, + gio::{self, SimpleAction}, glib::{gformat, GString}, prelude::ActionExt, MenuButton, @@ -10,28 +10,45 @@ pub struct Menu { } impl Menu { - pub fn new(action_debug: &SimpleAction, action_quit: &SimpleAction) -> Self { + pub fn new( + action_debug: &SimpleAction, + action_quit: &SimpleAction, + action_tab_append: &SimpleAction, + action_tab_close: &SimpleAction, + action_tab_close_all: &SimpleAction, + action_tab_page_reload: &SimpleAction, + action_tab_pin: &SimpleAction, + ) -> Self { // Init model let model_tab = gio::Menu::new(); - model_tab.append(Some("New"), Some("win.tab_append")); - model_tab.append(Some("Pin"), Some("win.tab_pin")); + model_tab.append(Some("New"), Some(&detailed_action_name(action_tab_append))); + model_tab.append(Some("Pin"), Some(&detailed_action_name(action_tab_pin))); let model_tab_page = gio::Menu::new(); - model_tab_page.append(Some("Base"), Some("win.tab_page_base")); + model_tab_page.append(Some("Base"), Some("win.tab_page_base")); // @TODO let model_tab_page_history = gio::Menu::new(); - model_tab_page_history.append(Some("Back"), Some("win.tab_page_history_back")); - model_tab_page_history.append(Some("Forward"), Some("win.tab_page_history_forward")); + model_tab_page_history.append(Some("Back"), Some("win.tab_page_history_back")); // @TODO + model_tab_page_history.append(Some("Forward"), Some("win.tab_page_history_forward")); // @TODO model_tab_page.append_submenu(Some("History"), &model_tab_page_history); - model_tab_page.append(Some("Reload"), Some("win.tab_page_reload")); - model_tab_page.append(Some("Bookmark"), Some("win.tab_page_bookmark")); + model_tab_page.append( + Some("Reload"), + Some(&detailed_action_name(action_tab_page_reload)), + ); + model_tab_page.append(Some("Bookmark"), Some("win.tab_page_bookmark")); // @TODO model_tab.append_submenu(Some("Page"), &model_tab_page); let model_tab_close = gio::Menu::new(); - model_tab_close.append(Some("Current"), Some("win.tab_close")); - model_tab_close.append(Some("All"), Some("win.tab_close_all")); + model_tab_close.append( + Some("Current"), + Some(&detailed_action_name(action_tab_close)), + ); + model_tab_close.append( + Some("All"), + Some(&detailed_action_name(action_tab_close_all)), + ); model_tab.append_submenu(Some("Close"), &model_tab_close); let model = gio::Menu::new(); @@ -56,5 +73,6 @@ impl Menu { // Private helpers fn detailed_action_name(action: &SimpleAction) -> GString { - gformat!("win.{}", action.name()) // @TODO + gformat!("win.{}", action.name()) // @TODO find the way to ident parent group + // without application-wide dependencies import }