YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-02-05 16:04:15 +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 gtk::{
gio::SimpleAction,
// gio::SimpleAction,
glib::ExitCode,
prelude::{ActionExt, ApplicationExt, ApplicationExtManual, GtkApplicationExt, GtkWindowExt},
Application,
@ -20,9 +20,9 @@ const APPLICATION_ID: &str = "io.github.yggverse.Yoda";
pub struct App {
// Actions
action_update: Arc<SimpleAction>,
// action_update: Arc<SimpleAction>,
// Components
browser: Arc<Browser>,
// browser: Arc<Browser>,
// Extras
database: Arc<Database>,
// GTK
@ -93,30 +93,16 @@ impl App {
action_tab_pin.simple(),
));
// Return app struct
Self {
// Actions (SimpleAction)
action_update: action_update.simple(),
// Components
browser,
// Extras
database,
// GTK
app,
}
}
// Actions
pub fn activate(&self) -> &Self {
self.app.connect_activate({
// Init events
app.connect_activate({
// let database = database.clone();
let action_update = self.action_update.clone();
let browser = self.browser.clone();
let action_update = action_update.simple();
let browser = browser.clone();
move |this| {
// @TODO restore previous session from DB
// Activate events
browser.activate().widget().set_application(Some(this));
browser.widget().set_application(Some(this));
// Show main widget
browser.widget().present();
@ -129,9 +115,20 @@ impl App {
// @TODO save session to DB
// 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 {
self.app.run()
}

141
src/app/browser.rs
View File

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

2
src/main.rs
View File

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