draft new actions

src/browser.rs

@@ -36,6 +36,9 @@ impl Browser {
         action_tab_append: Arc<SimpleAction>,
         action_tab_close: Arc<SimpleAction>,
         action_tab_close_all: Arc<SimpleAction>,
+        action_tab_page_navigation_base: Arc<SimpleAction>,
+        action_tab_page_navigation_history_back: Arc<SimpleAction>,
+        action_tab_page_navigation_history_forward: Arc<SimpleAction>,
         action_tab_page_navigation_reload: Arc<SimpleAction>,
         action_tab_pin: Arc<SimpleAction>,
     ) -> Browser {
@@ -49,6 +52,9 @@ impl Browser {
             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(),
         ));
@@ -74,6 +80,9 @@ impl Browser {
         widget.add_action(action_tab_append.as_ref());
         widget.add_action(action_tab_close.as_ref());
         widget.add_action(action_tab_close_all.as_ref());
+        widget.add_action(action_tab_page_navigation_base.as_ref());
+        widget.add_action(action_tab_page_navigation_history_back.as_ref());
+        widget.add_action(action_tab_page_navigation_history_forward.as_ref());
         widget.add_action(action_tab_page_navigation_reload.as_ref());
         widget.add_action(action_tab_pin.as_ref());
 
@@ -122,6 +131,27 @@ impl Browser {
             }
         });
 
+        action_tab_page_navigation_base.connect_activate({
+            let main = main.clone();
+            move |_, _| {
+                // @TODO
+            }
+        });
+
+        action_tab_page_navigation_history_back.connect_activate({
+            let main = main.clone();
+            move |_, _| {
+                // @TODO
+            }
+        });
+
+        action_tab_page_navigation_history_forward.connect_activate({
+            let main = main.clone();
+            move |_, _| {
+                // @TODO
+            }
+        });
+
         action_tab_page_navigation_reload.connect_activate({
             let main = main.clone();
             move |_, _| {

src/browser/header.rs

@@ -21,6 +21,9 @@ impl Header {
         action_tab_append: Arc<SimpleAction>,
         action_tab_close: Arc<SimpleAction>,
         action_tab_close_all: Arc<SimpleAction>,
+        action_tab_page_navigation_base: Arc<SimpleAction>,
+        action_tab_page_navigation_history_back: Arc<SimpleAction>,
+        action_tab_page_navigation_history_forward: Arc<SimpleAction>,
         action_tab_page_navigation_reload: Arc<SimpleAction>,
         action_tab_pin: Arc<SimpleAction>,
     ) -> Self {
@@ -31,6 +34,9 @@ impl Header {
             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,
         );

src/browser/header/tray.rs

@@ -23,6 +23,9 @@ impl Tray {
         action_tab_append: Arc<SimpleAction>,
         action_tab_close: Arc<SimpleAction>,
         action_tab_close_all: Arc<SimpleAction>,
+        action_tab_page_navigation_base: Arc<SimpleAction>,
+        action_tab_page_navigation_history_back: Arc<SimpleAction>,
+        action_tab_page_navigation_history_forward: Arc<SimpleAction>,
         action_tab_page_navigation_reload: Arc<SimpleAction>,
         action_tab_pin: Arc<SimpleAction>,
     ) -> Self {
@@ -35,6 +38,9 @@ impl Tray {
             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,
         );

src/browser/header/tray/menu.rs

@@ -18,6 +18,9 @@ impl Menu {
         action_tab_append: Arc<SimpleAction>,
         action_tab_close: Arc<SimpleAction>,
         action_tab_close_all: Arc<SimpleAction>,
+        action_tab_page_navigation_base: Arc<SimpleAction>,
+        action_tab_page_navigation_history_back: Arc<SimpleAction>,
+        action_tab_page_navigation_history_forward: Arc<SimpleAction>,
         action_tab_page_navigation_reload: Arc<SimpleAction>,
         action_tab_pin: Arc<SimpleAction>,
     ) -> Self {
@@ -31,15 +34,15 @@ impl Menu {
                 let model_tab_page = gio::Menu::new();
 
                     let model_tab_page_navigation = gio::Menu::new();
-                        model_tab_page_navigation.append(Some("Base"), Some("win.tab_page_base")); // @TODO
+                        model_tab_page_navigation.append(Some("Base"), Some(&detailed_action_name(action_tab_page_navigation_base)));
 
                         let model_tab_page_navigation_history = gio::Menu::new();
-                            model_tab_page_navigation_history.append(Some("Back"), Some("win.tab_page_history_back")); // @TODO
+                            model_tab_page_navigation_history.append(Some("Back"), Some(&detailed_action_name(action_tab_page_navigation_history_back)));
-                            model_tab_page_navigation_history.append(Some("Forward"), Some("win.tab_page_history_forward")); // @TODO
+                            model_tab_page_navigation_history.append(Some("Forward"), Some(&detailed_action_name(action_tab_page_navigation_history_forward)));
 
                         model_tab_page_navigation.append_submenu(Some("History"), &model_tab_page_navigation_history);
                         model_tab_page_navigation.append(Some("Reload"), Some(&detailed_action_name(action_tab_page_navigation_reload)));
-                        model_tab_page_navigation.append(Some("Bookmark"), Some("win.tab_page_bookmark")); // @TODO
+                         // @TODO model_tab_page_navigation.append(Some("Bookmark"), Some("win.tab_page_bookmark"));
 
                     model_tab_page.append_submenu(Some("Navigation"), &model_tab_page_navigation);
 

src/main.rs

@@ -25,7 +25,16 @@ fn main() -> ExitCode {
     let action_tab_append = Arc::new(SimpleAction::new("tab_append", None));
     let action_tab_close = Arc::new(SimpleAction::new("tab_close", None));
     let action_tab_close_all = Arc::new(SimpleAction::new("tab_close_all", None));
-    let action_tab_page_navigation_reload = Arc::new(SimpleAction::new("tab_page_reload", None));
+    let action_tab_page_navigation_base =
+        Arc::new(SimpleAction::new("tab_page_navigation_base", None));
+    let action_tab_page_navigation_history_back =
+        Arc::new(SimpleAction::new("tab_page_navigation_history_back", None));
+    let action_tab_page_navigation_history_forward = Arc::new(SimpleAction::new(
+        "tab_page_navigation_history_forward",
+        None,
+    ));
+    let action_tab_page_navigation_reload =
+        Arc::new(SimpleAction::new("tab_page_navigation_reload", None));
     let action_tab_pin = Arc::new(SimpleAction::new("tab_pin", None));
 
     // Init accels
@@ -36,11 +45,14 @@ fn main() -> ExitCode {
     app.set_accels_for_action("win.tab_append", &["<Primary>t"]);
     app.set_accels_for_action("win.tab_pin", &["<Primary>p"]);
     app.set_accels_for_action("win.tab_close", &["<Primary>q"]);
-    app.set_accels_for_action("win.tab_page_base", &["<Primary>h"]);
+    app.set_accels_for_action("win.tab_page_navigation_base", &["<Primary>h"]);
-    app.set_accels_for_action("win.tab_page_history_back", &["<Primary>Left"]);
+    app.set_accels_for_action("win.tab_page_navigation_history_back", &["<Primary>Left"]);
-    app.set_accels_for_action("win.tab_page_history_forward", &["<Primary>Right"]);
+    app.set_accels_for_action(
-    app.set_accels_for_action("win.tab_page_reload", &["<Primary>r"]);
+        "win.tab_page_navigation_history_forward",
-    app.set_accels_for_action("win.tab_page_bookmark", &["<Primary>b"]);
+        &["<Primary>Right"],
+    );
+    app.set_accels_for_action("win.tab_page_navigation_reload", &["<Primary>r"]);
+    //app.set_accels_for_action("win.tab_page_bookmark", &["<Primary>b"]);
 
     // Create new window
     app.connect_activate({
@@ -74,6 +86,9 @@ fn main() -> ExitCode {
                 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(),
             )