implement tabs id features

src/app/browser/window/tab.rs

@@ -23,7 +23,7 @@ pub struct Tab {
     action_tab_page_navigation_reload: Arc<SimpleAction>,
     action_update: Arc<SimpleAction>,
     // Dynamically allocated reference index
-    index: RefCell<HashMap<GString, Arc<Item>>>,
+    index: Arc<RefCell<HashMap<GString, Arc<Item>>>>,
     // GTK
     widget: Arc<Widget>,
 }
@@ -39,24 +39,29 @@ impl Tab {
         action_update: Arc<SimpleAction>,
     ) -> Arc<Self> {
         // Init empty HashMap index as no tabs appended yet
-        let index = RefCell::new(HashMap::new());
+        let index = Arc::new(RefCell::new(HashMap::new()));
 
         // Init widget
         let widget = Arc::new(Widget::new());
 
         // Init events
-        widget.gobject().connect_close_page(move |_, _| {
+        widget.gobject().connect_close_page({
-            /* @TODO
+            let index = index.clone();
-            // Cleanup HashMap index
+            move |_, item| {
-            let id = tab_page.widget_name();
+                // Get index ID by keyword saved
-
+                match item.keyword() {
-            // Check for required value as raw access to gobject @TODO
+                    Some(id) => {
-            if id.is_empty() {
+                        if id.is_empty() {
-                panic!("Undefined tab index!")
+                            panic!("Tab index can not be empty!")
-            }
+                        }
+                        // Cleanup HashMap index
+                        index.borrow_mut().remove(&id);
+                    }
+                    None => panic!("Undefined tab index!"),
+                }
 
-            tab.index.borrow_mut().remove(&id); */
+                Propagation::Proceed
-            Propagation::Proceed
+            }
         });
 
         // Return activated struct
@@ -108,7 +113,7 @@ impl Tab {
 
     // Toggle pin status for active tab
     pub fn pin(&self) {
-        if let Some(id) = self.widget.current_name() {
+        if let Some(id) = self.widget.current_page_keyword() {
             if let Some(item) = self.index.borrow().get(&id) {
                 item.pin(); // toggle
             }
@@ -116,7 +121,7 @@ impl Tab {
     }
 
     pub fn page_navigation_base(&self) {
-        if let Some(id) = self.widget.current_name() {
+        if let Some(id) = self.widget.current_page_keyword() {
             if let Some(item) = self.index.borrow().get(&id) {
                 item.page_navigation_base();
             }
@@ -124,7 +129,7 @@ impl Tab {
     }
 
     pub fn page_navigation_history_back(&self) {
-        if let Some(id) = self.widget.current_name() {
+        if let Some(id) = self.widget.current_page_keyword() {
             if let Some(item) = self.index.borrow().get(&id) {
                 item.page_navigation_history_back();
             }
@@ -132,7 +137,7 @@ impl Tab {
     }
 
     pub fn page_navigation_history_forward(&self) {
-        if let Some(id) = self.widget.current_name() {
+        if let Some(id) = self.widget.current_page_keyword() {
             if let Some(item) = self.index.borrow().get(&id) {
                 item.page_navigation_history_forward();
             }
@@ -140,7 +145,7 @@ impl Tab {
     }
 
     pub fn page_navigation_reload(&self) {
-        if let Some(id) = self.widget.current_name() {
+        if let Some(id) = self.widget.current_page_keyword() {
             if let Some(item) = self.index.borrow().get(&id) {
                 item.page_navigation_reload();
             }
@@ -148,7 +153,7 @@ impl Tab {
     }
 
     pub fn update(&self) {
-        if let Some(id) = self.widget.current_name() {
+        if let Some(id) = self.widget.current_page_keyword() {
             if let Some(item) = self.index.borrow().get(&id) {
                 item.update();
             }

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

@@ -49,7 +49,7 @@ impl Item {
             action_update.clone(),
         );
 
-        let widget = Widget::new_arc(tab_view, page.gobject(), None, is_selected); // @TODO
+        let widget = Widget::new_arc(id.as_str(), tab_view, page.gobject(), None, is_selected); // @TODO
 
         // Return struct
         Arc::new(Self { id, page, widget })

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

@@ -11,6 +11,7 @@ pub struct Widget {
 impl Widget {
     // Construct
     pub fn new_arc(
+        keyword: &str, // ID
         tab_view: &TabView,
         page: &Box,
         title: Option<&str>,
@@ -18,6 +19,8 @@ impl Widget {
     ) -> Arc<Self> {
         let gobject = tab_view.append(page);
 
+        gobject.set_keyword(keyword);
+
         gobject.set_title(match title {
             Some(value) => value,
             None => DEFAULT_TITLE,

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

@@ -29,17 +29,10 @@ impl Widget {
     }
 
     // Getters
-    pub fn current_name(&self) -> Option<GString> {
+    pub fn current_page_keyword(&self) -> Option<GString> {
         let page = self.gobject.selected_page()?;
-
+        let id = page.keyword()?;
-        /* @TODO
+        Some(id)
-        let widget_name = page.widget_name();
-        if !widget_name.is_empty() {
-            Some(widget_name)
-        } else {
-            None
-        } */
-        None
     }
 
     pub fn gobject(&self) -> &TabView {