YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-02-10 18:34:14 +00:00
Code Issues Projects Releases Wiki Activity

activate on construct

Browse Source
This commit is contained in:
yggverse 2024-10-03 20:03:43 +03:00
parent 711226737a
commit 56b2a26020
3 changed files with 74 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/app.rs
View File

@ -7,7 +7,7 @@ use browser::Browser;
use database::Database; use database::Database;
use gtk::{ use gtk::{
gio::SimpleAction, // gio::SimpleAction,
glib::ExitCode, glib::ExitCode,
prelude::{ActionExt, ApplicationExt, ApplicationExtManual, GtkApplicationExt, GtkWindowExt}, prelude::{ActionExt, ApplicationExt, ApplicationExtManual, GtkApplicationExt, GtkWindowExt},
Application, Application,
@ -20,9 +20,9 @@ const APPLICATION_ID: &str = "io.github.yggverse.Yoda";
pub struct App { pub struct App {
// Actions // Actions
action_update: Arc<SimpleAction>, // action_update: Arc<SimpleAction>,
// Components // Components
browser: Arc<Browser>, // browser: Arc<Browser>,
// Extras // Extras
database: Arc<Database>, database: Arc<Database>,
// GTK // GTK
@ -93,30 +93,16 @@ impl App {
action_tab_pin.simple(), action_tab_pin.simple(),
)); ));
// Return app struct // Init events
Self { app.connect_activate({
// Actions (SimpleAction)
action_update: action_update.simple(),
// Components
browser,
// Extras
database,
// GTK
app,
}
}
// Actions
pub fn activate(&self) -> &Self {
self.app.connect_activate({
// let database = database.clone(); // let database = database.clone();
let action_update = self.action_update.clone(); let action_update = action_update.simple();
let browser = self.browser.clone(); let browser = browser.clone();
move |this| { move |this| {
// @TODO restore previous session from DB // @TODO restore previous session from DB
// Activate events // Activate events
browser.activate().widget().set_application(Some(this)); browser.widget().set_application(Some(this));
// Show main widget // Show main widget
browser.widget().present(); browser.widget().present();
@ -129,9 +115,20 @@ impl App {
// @TODO save session to DB // @TODO save session to DB
// self.app.connect_window_removed(|_, _| todo!()); // self.app.connect_window_removed(|_, _| todo!());
&self // Return activated App struct
Self {
// Actions (SimpleAction)
// action_update: action_update.simple(),
// Components
// browser,
// Extras
database,
// GTK
app,
}
} }
// Actions
pub fn run(&self) -> ExitCode { pub fn run(&self) -> ExitCode {
self.app.run() self.app.run()
} }

141
src/app/browser.rs
View File

@ -15,24 +15,12 @@ const DEFAULT_HEIGHT: i32 = 480;
const DEFAULT_WIDTH: i32 = 640; const DEFAULT_WIDTH: i32 = 640;
pub struct Browser { pub struct Browser {
// Actions
action_debug: Arc<SimpleAction>,
action_quit: Arc<SimpleAction>,
action_update: Arc<SimpleAction>,
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>,
// Extras // Extras
// db: db::Browser, // db: db::Browser,
widget: ApplicationWindow, widget: ApplicationWindow,
// Components // Components
header: Arc<Header>, // header: Arc<Header>,
main: Arc<Main>, // main: Arc<Main>,
} }
impl Browser { impl Browser {
@ -86,130 +74,107 @@ impl Browser {
.default_width(DEFAULT_WIDTH) .default_width(DEFAULT_WIDTH)
.build(); .build();
// Return new Browser
Self {
// Actions
action_debug,
action_quit,
action_update,
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,
// db,
widget,
// Components
header,
main,
}
}
// Actions
pub fn activate(&self) -> &Self {
// Assign actions // Assign actions
self.widget.add_action(self.action_debug.as_ref()); widget.add_action(action_debug.as_ref());
self.widget.add_action(self.action_quit.as_ref()); widget.add_action(action_quit.as_ref());
self.widget.add_action(self.action_update.as_ref()); widget.add_action(action_update.as_ref());
self.widget.add_action(self.action_tab_append.as_ref()); widget.add_action(action_tab_append.as_ref());
self.widget.add_action(self.action_tab_close.as_ref()); widget.add_action(action_tab_close.as_ref());
self.widget.add_action(self.action_tab_close_all.as_ref()); widget.add_action(action_tab_close_all.as_ref());
self.widget widget.add_action(action_tab_page_navigation_base.as_ref());
.add_action(self.action_tab_page_navigation_base.as_ref()); widget.add_action(action_tab_page_navigation_history_back.as_ref());
self.widget widget.add_action(action_tab_page_navigation_history_forward.as_ref());
.add_action(self.action_tab_page_navigation_history_back.as_ref()); widget.add_action(action_tab_page_navigation_reload.as_ref());
self.widget widget.add_action(action_tab_pin.as_ref());
.add_action(self.action_tab_page_navigation_history_forward.as_ref());
self.widget
.add_action(self.action_tab_page_navigation_reload.as_ref());
self.widget.add_action(self.action_tab_pin.as_ref());
// Events // Init events
self.action_debug.connect_activate({ action_debug.connect_activate({
let widget = self.widget.clone(); let widget = widget.clone();
move |_, _| { move |_, _| {
widget.emit_enable_debugging(true); widget.emit_enable_debugging(true);
} }
}); });
self.action_quit.connect_activate({ action_quit.connect_activate({
let widget = self.widget.clone(); let widget = widget.clone();
move |_, _| { move |_, _| {
widget.close(); widget.close();
} }
}); });
self.action_update.connect_activate({ action_update.connect_activate({
let header = self.header.clone(); let header = header.clone();
let main = self.main.clone(); let main = main.clone();
move |_, _| { move |_, _| {
main.update(); main.update();
header.update(main.tab_page_title(), main.tab_page_description()); header.update(main.tab_page_title(), main.tab_page_description());
} }
}); });
self.action_tab_append.connect_activate({ action_tab_append.connect_activate({
let main = self.main.clone(); let main = main.clone();
move |_, _| { move |_, _| {
main.tab_append(None); main.tab_append(None);
} }
}); });
self.action_tab_close.connect_activate({ action_tab_close.connect_activate({
let main = self.main.clone(); let main = main.clone();
move |_, _| { move |_, _| {
main.tab_close(); main.tab_close();
} }
}); });
self.action_tab_close_all.connect_activate({ action_tab_close_all.connect_activate({
let main = self.main.clone(); let main = main.clone();
move |_, _| { move |_, _| {
main.tab_close_all(); main.tab_close_all();
} }
}); });
self.action_tab_page_navigation_base.connect_activate({ action_tab_page_navigation_base.connect_activate({
let main = self.main.clone(); let main = main.clone();
move |_, _| { move |_, _| {
main.tab_page_navigation_base(); main.tab_page_navigation_base();
} }
}); });
self.action_tab_page_navigation_history_back action_tab_page_navigation_history_back.connect_activate({
.connect_activate({ let main = main.clone();
let main = self.main.clone(); move |_, _| {
move |_, _| { main.tab_page_navigation_history_back();
main.tab_page_navigation_history_back(); }
} });
});
self.action_tab_page_navigation_history_forward action_tab_page_navigation_history_forward.connect_activate({
.connect_activate({ let main = main.clone();
let main = self.main.clone(); move |_, _| {
move |_, _| { main.tab_page_navigation_history_forward();
main.tab_page_navigation_history_forward(); }
} });
});
self.action_tab_page_navigation_reload.connect_activate({ action_tab_page_navigation_reload.connect_activate({
let main = self.main.clone(); let main = main.clone();
move |_, _| { move |_, _| {
main.tab_page_navigation_reload(); main.tab_page_navigation_reload();
} }
}); });
self.action_tab_pin.connect_activate({ action_tab_pin.connect_activate({
let main = self.main.clone(); let main = main.clone();
move |_, _| { move |_, _| {
main.tab_pin(); main.tab_pin();
} }
}); });
&self // Return new activated Browser struct
Self {
// db,
widget,
// Components
// header,
// main,
}
} }
// Getters // Getters

2
src/main.rs
View File

@ -32,7 +32,7 @@ fn main() -> ExitCode {
// Init GTK, start application // Init GTK, start application
match gtk::init() { match gtk::init() {
Ok(_) => App::new(profile_database_connection).activate().run(), Ok(_) => App::new(profile_database_connection).run(),
Err(_) => ExitCode::FAILURE, Err(_) => ExitCode::FAILURE,
} }
} }