feat: make headerbars better

Author: Byson94

src/headerbar.rs

@@ -1,24 +1,77 @@
-use gtk4::gio::Menu;
+use crate::state::FmState;
+use gtk4::gio::{Menu, SimpleAction};
 use gtk4::prelude::*;
-use gtk4::{Box as GtkBox, MenuButton};
+use gtk4::{Box as GtkBox, MenuButton, ApplicationWindow, Application};
+use std::cell::RefCell;
+use std::rc::Rc;
+use gtk4::glib;
 
 pub fn build_headerbar() -> GtkBox {
     let headerbar = GtkBox::new(gtk4::Orientation::Horizontal, 6);
 
-    // Main menu
+    // Main menu model
     let menu = Menu::new();
-    menu.append(Some("File"), Some("app.file"));
-    menu.append(Some("Edit"), Some("app.edit"));
+
+    // "File" submenu
+    let file_submenu = Menu::new();
+    file_submenu.append(Some("New Window"), Some("win.open_new_window"));
+    file_submenu.append(Some("Close Window"), Some("win.close_window"));
+    menu.append_submenu(Some("File"), &file_submenu);
+
+    // "Edit" submenu
+    let edit_submenu = Menu::new();
+    edit_submenu.append(Some("Undo"), Some("win.undo_history"));
+    edit_submenu.append(Some("Redo"), Some("win.redo_history"));
+    menu.append_submenu(Some("Edit"), &edit_submenu);
 
     // "View" submenu
     let view_submenu = Menu::new();
     view_submenu.append(Some("Show Hidden Files"), Some("win.show_hidden"));
-
     menu.append_submenu(Some("View"), &view_submenu);
 
+    // Menu button
     let menu_button = MenuButton::new();
     menu_button.set_menu_model(Some(&menu));
 
     headerbar.append(&menu_button);
     headerbar
 }
+
+pub fn implement_actions(window: &ApplicationWindow, app: &Application, fmstate: Rc<RefCell<FmState>>) {
+    // Show Hidden Files action
+    let show_hidden_initial = fmstate.borrow().settings.show_hidden;
+    let show_hidden_action =
+        SimpleAction::new_stateful("show_hidden", None, &show_hidden_initial.into());
+
+    show_hidden_action.connect_activate(glib::clone!(#[strong] fmstate, move |action, _| {
+        let current: bool = action.state().unwrap().get().unwrap();
+        action.set_state(&(!current).into());
+        fmstate.borrow_mut().settings.show_hidden = !current;
+    }));
+
+    window.add_action(&show_hidden_action);
+
+    let new_window_action = SimpleAction::new("open_new_window", None);
+    new_window_action.connect_activate(glib::clone!(#[weak] window, #[weak] app, move |_, _| {
+        crate::build_fm(&app);
+    }));
+    window.add_action(&new_window_action);
+
+    let close_window_action = SimpleAction::new("close_window", None);
+    close_window_action.connect_activate(glib::clone!(#[weak] window, move |_, _| {
+        window.close();
+    }));
+    window.add_action(&close_window_action);
+
+    let undo_action = SimpleAction::new("undo_history", None);
+    undo_action.connect_activate(move |_, _| {
+        println!("Undo triggered");
+    });
+    window.add_action(&undo_action);
+
+    let redo_action = SimpleAction::new("redo_history", None);
+    redo_action.connect_activate(move |_, _| {
+        println!("Redo triggered");
+    });
+    window.add_action(&redo_action);
+}

src/main.rs

@@ -7,7 +7,6 @@ mod state;
 mod style;
 mod utils;
 
-use gtk4::gio::SimpleAction;
 use gtk4::prelude::*;
 use gtk4::{Application, ApplicationWindow, Box as GtkBox, GestureClick, Orientation, Paned};
 use gtk4::{gio, glib};
@@ -38,20 +37,8 @@ fn build_fm(app: &Application) {
     let home_path = gio::File::for_path(glib::home_dir());
     let fmstate = Rc::new(RefCell::new(state::FmState::new(home_path.clone())));
 
-    // TODO: Move it to its own module
-    let initial = fmstate.borrow().settings.show_hidden;
-    let show_hidden_action = SimpleAction::new_stateful("show_hidden", None, &initial.into());
-
-    show_hidden_action.connect_activate(glib::clone!(
-        #[strong]
-        fmstate,
-        move |action, _| {
-            let current: bool = action.state().unwrap().get().unwrap();
-            action.set_state(&(!current).into());
-            fmstate.borrow_mut().settings.show_hidden = !current;
-        }
-    ));
-    window.add_action(&show_hidden_action);
+    // implement all actions for the headerbar
+    headerbar::implement_actions(&window, &app, fmstate.clone());
 
     let (files_scroll, files_list, list_view) = files_panel::build_files_panel(fmstate.clone());
     let (sidebar_box, sidebar_selection) = sidebar::build_sidebar(fmstate.clone(), &files_list);