YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-01-29 20:44:25 +00:00
Code Issues Projects Releases Wiki Activity

remove extra wrapper

Browse Source
This commit is contained in:
yggverse 2024-11-05 18:48:00 +02:00
parent d7c0577052
commit 7079cc7230
2 changed files with 55 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/app.rs
View File

@ -1,14 +1,13 @@
mod action;
mod browser; mod browser;
mod database; mod database;
use action::Action;
use browser::Browser; use browser::Browser;
use database::Database; use database::Database;
use adw::Application; use adw::Application;
use gtk::{ use gtk::{
glib::ExitCode, gio::SimpleAction,
glib::{gformat, uuid_string_random, ExitCode},
prelude::{ prelude::{
ActionExt, ApplicationExt, ApplicationExtManual, GtkApplicationExt, GtkWindowExt, ActionExt, ApplicationExt, ApplicationExtManual, GtkApplicationExt, GtkWindowExt,
StaticVariantType, ToVariant, StaticVariantType, ToVariant,
@ -44,19 +43,26 @@ impl App {
let default_state = (-1).to_variant(); let default_state = (-1).to_variant();
// Init actions // Init actions
let action_about = Action::new("win", true, None); let action_about = SimpleAction::new(&uuid_string_random(), None);
let action_debug = Action::new("win", true, None); let action_debug = SimpleAction::new(&uuid_string_random(), None);
let action_profile = Action::new("win", true, None); let action_profile = SimpleAction::new(&uuid_string_random(), None);
let action_quit = Action::new("win", true, None); let action_quit = SimpleAction::new(&uuid_string_random(), None);
let action_update = Action::new("win", true, Some(&String::static_variant_type())); let action_update =
let action_page_new = Action::new("win", true, None); SimpleAction::new(&uuid_string_random(), Some(&String::static_variant_type()));
let action_page_close = Action::new_stateful("win", true, None, &default_state); let action_page_new = SimpleAction::new(&uuid_string_random(), None);
let action_page_close_all = Action::new("win", true, None); let action_page_close =
let action_page_home = Action::new_stateful("win", false, None, &default_state); SimpleAction::new_stateful(&uuid_string_random(), None, &default_state);
let action_page_history_back = Action::new_stateful("win", false, None, &default_state); let action_page_close_all = SimpleAction::new(&uuid_string_random(), None);
let action_page_history_forward = Action::new_stateful("win", false, None, &default_state); let action_page_home =
let action_page_reload = Action::new_stateful("win", true, None, &default_state); SimpleAction::new_stateful(&uuid_string_random(), None, &default_state);
let action_page_pin = Action::new_stateful("win", true, None, &default_state); let action_page_history_back =
SimpleAction::new_stateful(&uuid_string_random(), None, &default_state);
let action_page_history_forward =
SimpleAction::new_stateful(&uuid_string_random(), None, &default_state);
let action_page_reload =
SimpleAction::new_stateful(&uuid_string_random(), None, &default_state);
let action_page_pin =
SimpleAction::new_stateful(&uuid_string_random(), None, &default_state);
// Init GTK // Init GTK
let gobject = Application::builder() let gobject = Application::builder()
@ -65,19 +71,28 @@ impl App {
// Init accels // Init accels
let accels_config = &[ let accels_config = &[
(action_page_reload.detailed_name(), &["<Primary>r"]),
(action_debug.detailed_name(), &["<Primary>i"]),
(action_page_close.detailed_name(), &["<Primary>q"]),
(action_page_history_back.detailed_name(), &["<Primary>Left"]),
( (
action_page_history_forward.detailed_name(), gformat!("win.{}", action_page_reload.name()),
&["<Primary>r"],
),
(gformat!("win.{}", action_debug.name()), &["<Primary>i"]),
(
gformat!("win.{}", action_page_close.name()),
&["<Primary>q"],
),
(
gformat!("win.{}", action_page_history_back.name()),
&["<Primary>Left"],
),
(
gformat!("win.{}", action_page_history_forward.name()),
&["<Primary>Right"], &["<Primary>Right"],
), ),
(action_page_home.detailed_name(), &["<Primary>h"]), (gformat!("win.{}", action_page_home.name()), &["<Primary>h"]),
(action_page_new.detailed_name(), &["<Primary>t"]), (gformat!("win.{}", action_page_new.name()), &["<Primary>t"]),
(action_page_pin.detailed_name(), &["<Primary>p"]), (gformat!("win.{}", action_page_pin.name()), &["<Primary>p"]),
(action_quit.detailed_name(), &["<Primary>Escape"]), (gformat!("win.{}", action_quit.name()), &["<Primary>Escape"]),
(action_update.detailed_name(), &["<Primary>u"]), (gformat!("win.{}", action_update.name()), &["<Primary>u"]),
]; // @TODO config ]; // @TODO config
for (detailed_action_name, &accels) in accels_config { for (detailed_action_name, &accels) in accels_config {
@ -87,24 +102,24 @@ impl App {
// Init components // Init components
let browser = Arc::new(Browser::new( let browser = Arc::new(Browser::new(
profile_path, profile_path,
action_about.simple(), action_about.clone(),
action_debug.simple(), action_debug.clone(),
action_profile.simple(), action_profile.clone(),
action_quit.simple(), action_quit.clone(),
action_update.simple(), action_update.clone(),
action_page_new.simple(), action_page_new.clone(),
action_page_close.simple(), action_page_close.clone(),
action_page_close_all.simple(), action_page_close_all.clone(),
action_page_home.simple(), action_page_home.clone(),
action_page_history_back.simple(), action_page_history_back.clone(),
action_page_history_forward.simple(), action_page_history_forward.clone(),
action_page_reload.simple(), action_page_reload.clone(),
action_page_pin.simple(), action_page_pin.clone(),
)); ));
// Init events // Init events
gobject.connect_activate({ gobject.connect_activate({
let action_update = action_update.simple(); let action_update = action_update.clone();
move |_| { move |_| {
// Make initial update // Make initial update
action_update.activate(Some(&"".to_variant())); // @TODO action_update.activate(Some(&"".to_variant())); // @TODO

60
src/app/action.rs
View File

@ -1,60 +0,0 @@
// This helper created as the attempt to drop static names usage
// and replace them with objects (to follow encapsulation for children mods)
// @TODO find alternative implementation, if exist for GTK 4
use gtk::{
gio::SimpleAction,
glib::{gformat, uuid_string_random, GString, Variant, VariantTy},
prelude::ActionExt,
};
pub struct Action {
group: GString,
simple: SimpleAction,
}
impl Action {
// Construct
pub fn new(group: &str, is_enabled: bool, parameter_type: Option<&VariantTy>) -> Self {
// Create random action name as no static values should be in use
let simple = SimpleAction::new(&uuid_string_random(), parameter_type);
simple.set_enabled(is_enabled);
// Assign action to the group
let group = GString::from(group);
// Return new Action
Self { group, simple }
}
/// Stateful constructors useful for actions that require custom values
/// but could not receive it directly with action argument
/// e.g. [MenuModel](https://docs.gtk.org/gio/class.MenuModel.html)
pub fn new_stateful(
group: &str,
is_enabled: bool,
parameter_type: Option<&VariantTy>,
state: &Variant,
) -> Self {
// Create random action name as no static values should be in use
let simple = SimpleAction::new_stateful(&uuid_string_random(), parameter_type, state);
simple.set_enabled(is_enabled);
// Assign action to the group
let group = GString::from(group);
// Return new Action
Self { group, simple }
}
// Getters
pub fn detailed_name(&self) -> GString {
gformat!("{}.{}", self.group, self.simple.name()) // @TODO find the way to ident parent group
// from SimpleAction object
}
// App mods work with simple and system-wide data types, let them take it
pub fn simple(&self) -> SimpleAction {
self.simple.clone()
}
}