move identity feature to request area

src/app/browser/window/tab/item.rs

@@ -1,15 +1,14 @@
 mod action;
 mod client;
 mod database;
-mod identity;
 mod page;
 
 use super::{Action as TabAction, BrowserAction, Position, WindowAction};
 use crate::Profile;
 use action::Action;
-use adw::{prelude::AdwDialogExt, TabView};
+use adw::TabView;
 use client::Client;
-use gtk::prelude::{ActionMapExt, Cast};
+use gtk::prelude::ActionMapExt;
 use page::Page;
 use sqlite::Transaction;
 use std::rc::Rc;
@@ -81,29 +80,6 @@ impl Item {
             }
         });
 
-        action.ident.connect_activate({
-            let client = client.clone();
-            let page = page.clone();
-            let parent = tab_view.clone().upcast::<gtk::Widget>();
-            let profile = profile.clone();
-            move || {
-                if let Some(request) = page.navigation.uri() {
-                    if ["gemini", "titan"].contains(&request.scheme().as_str()) {
-                        return identity::default(&profile, &request, {
-                            let client = client.clone();
-                            let page = page.clone();
-                            move || {
-                                page.navigation.update(); // update indicators immediately
-                                client.handle(&page.navigation.request(), false);
-                            } // on apply
-                        })
-                        .present(Some(&parent));
-                    }
-                }
-                identity::unsupported().present(Some(&parent));
-            }
-        });
-
         action.load.connect_activate({
             let page = page.clone();
             let client = client.clone();

src/app/browser/window/tab/item/action.rs

@@ -1,13 +1,13 @@
 mod history;
 mod home;
-mod ident;
+mod identity;
 mod load;
 mod reload;
 
 use gtk::gio::SimpleAction;
 use history::History;
 use home::Home;
-use ident::Ident;
+use identity::Identity;
 use load::Load;
 use reload::Reload;
 
@@ -17,7 +17,7 @@ use std::rc::Rc;
 pub struct Action {
     pub history: Rc<History>,
     pub home: SimpleAction,
-    pub ident: Rc<Ident>,
+    pub identity: SimpleAction,
     pub load: Rc<Load>,
     pub reload: SimpleAction,
 }
@@ -33,9 +33,9 @@ impl Action {
 
     /// Create new `Self`
     pub fn new() -> Self {
-        let ident = Rc::new(Ident::new());
-        let load = Rc::new(Load::new());
         let home = SimpleAction::home();
+        let identity = SimpleAction::identity();
+        let load = Rc::new(Load::new());
         let reload = SimpleAction::reload();
 
         let history = Rc::new(History::build({
@@ -45,10 +45,10 @@ impl Action {
 
         Self {
             history,
-            reload,
             home,
-            ident,
+            identity,
             load,
+            reload,
         }
     }
 }

src/app/browser/window/tab/item/action/ident.rs

@@ -1,39 +0,0 @@
-use gtk::{gio::SimpleAction, glib::uuid_string_random, prelude::ActionExt};
-
-/// [SimpleAction](https://docs.gtk.org/gio/class.SimpleAction.html) wrapper for `Ident` action of `Item` group
-pub struct Ident {
-    pub simple_action: SimpleAction,
-}
-
-impl Default for Ident {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Ident {
-    // Constructors
-
-    /// Create new `Self`
-    pub fn new() -> Self {
-        Self {
-            simple_action: SimpleAction::new(&uuid_string_random(), None),
-        }
-    }
-
-    // Actions
-
-    /// Emit [activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
-    /// with formatted for this action [Variant](https://docs.gtk.org/glib/struct.Variant.html) value
-    pub fn activate(&self) {
-        self.simple_action.activate(None);
-    }
-
-    // Events
-
-    /// Define callback function for
-    /// [SimpleAction::activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
-    pub fn connect_activate(&self, callback: impl Fn() + 'static) {
-        self.simple_action.connect_activate(move |_, _| callback());
-    }
-}

src/app/browser/window/tab/item/action/identity.rs

@@ -0,0 +1,13 @@
+use gtk::{gio::SimpleAction, glib::uuid_string_random};
+
+pub trait Identity {
+    fn identity() -> Self;
+}
+
+impl Identity for SimpleAction {
+    fn identity() -> Self {
+        let identity = SimpleAction::new(&uuid_string_random(), None);
+        identity.set_enabled(false);
+        identity
+    }
+}

src/app/browser/window/tab/item/page.rs

@@ -47,7 +47,7 @@ impl Page {
         (position, is_pinned, is_selected, is_needs_attention): (Position, bool, bool, bool),
     ) -> Self {
         // Init components
-        let content = Rc::new(Content::build((window_action, item_action)));
+        let content = Rc::new(Content::build((window_action, tab_action, item_action)));
         let search = Rc::new(Search::new());
         let navigation = Rc::new(Navigation::build(
             profile,

src/app/browser/window/tab/item/page/content.rs

@@ -5,7 +5,7 @@ mod text;
 use image::Image;
 use text::Text;
 
-use super::{ItemAction, WindowAction};
+use super::{ItemAction, TabAction, WindowAction};
 use adw::StatusPage;
 use gtk::{
     gdk::Paintable,
@@ -19,6 +19,7 @@ use std::{rc::Rc, time::Duration};
 pub struct Content {
     window_action: Rc<WindowAction>,
     item_action: Rc<ItemAction>,
+    tab_action: Rc<TabAction>,
     pub g_box: Box,
 }
 
@@ -26,11 +27,18 @@ impl Content {
     // Construct
 
     /// Create new container for different components
-    pub fn build((window_action, item_action): (&Rc<WindowAction>, &Rc<ItemAction>)) -> Self {
+    pub fn build(
+        (window_action, tab_action, item_action): (
+            &Rc<WindowAction>,
+            &Rc<TabAction>,
+            &Rc<ItemAction>,
+        ),
+    ) -> Self {
         Self {
             g_box: Box::builder().orientation(Orientation::Vertical).build(),
             window_action: window_action.clone(),
             item_action: item_action.clone(),
+            tab_action: tab_action.clone(),
         }
     }
 
@@ -90,7 +98,7 @@ impl Content {
     /// * action removes previous children component from `Self`
     pub fn to_status_identity(&self) -> StatusPage {
         self.clean();
-        let status = status::identity::build(self.item_action.clone());
+        let status = status::identity::build((&self.tab_action, &self.item_action));
         self.g_box.append(&status);
         status
     }

src/app/browser/window/tab/item/page/content/status.rs

@@ -4,4 +4,4 @@ pub mod identity;
 pub mod loading;
 pub mod mime;
 
-use super::ItemAction;
+use super::{ItemAction, TabAction};

src/app/browser/window/tab/item/page/content/status/identity.rs

@@ -1,6 +1,6 @@
-use crate::app::browser::window::tab::item::Action;
+use super::{ItemAction, TabAction};
 use adw::StatusPage;
-use gtk::{prelude::ButtonExt, Align, Button};
+use gtk::{prelude::ActionExt, Align, Button};
 use std::rc::Rc;
 
 // Defaults
@@ -13,18 +13,16 @@ const DEFAULT_BUTTON_CLASS: &str = "suggested-action";
 
 /// Create new default preset for `Identity`
 /// [StatusPage](https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.StatusPage.html)
-pub fn build(action: Rc<Action>) -> StatusPage {
+pub fn build((tab_action, item_action): (&Rc<TabAction>, &Rc<ItemAction>)) -> StatusPage {
     // Init certificate selection
     let button = &Button::builder()
+        .action_name(format!("{}.{}", tab_action.id, item_action.identity.name()))
         .css_classes([DEFAULT_BUTTON_CLASS])
         .label(DEFAULT_BUTTON_LABEL)
         .tooltip_text(DEFAULT_BUTTON_TOOLTIP_TEXT)
         .halign(Align::Center)
         .build();
 
-    // Init events
-    button.connect_clicked(move |_| action.ident.activate());
-
     // Init status page
     StatusPage::builder()
         .description(DEFAULT_DESCRIPTION)

src/app/browser/window/tab/item/page/navigation/request.rs

@@ -1,6 +1,8 @@
 mod database;
+mod identity;
 mod primary_icon;
 
+use adw::prelude::AdwDialogExt;
 use primary_icon::PrimaryIcon;
 
 use super::{ItemAction, Profile};
@@ -71,8 +73,25 @@ impl Request for Entry {
         // Connect events
         entry.connect_icon_release({
             let item_action = item_action.clone();
+            let profile = profile.clone();
             move |this, position| match position {
-                EntryIconPosition::Primary => item_action.ident.activate(), // @TODO PrimaryIcon impl
+                EntryIconPosition::Primary => {
+                    if let Some(request) = this.uri() {
+                        if ["gemini", "titan"].contains(&request.scheme().as_str()) {
+                            return identity::default(&profile, &request, {
+                                let item_action = item_action.clone();
+                                let profile = profile.clone();
+                                let this = this.clone();
+                                move || {
+                                    this.update(&profile);
+                                    item_action.load.activate(Some(&this.text()), false);
+                                } // on apply
+                            })
+                            .present(Some(this));
+                        }
+                    }
+                    identity::unsupported().present(Some(this));
+                }
                 EntryIconPosition::Secondary => item_action.load.activate(Some(&this.text()), true),
                 _ => todo!(), // unexpected
             }