give name to gobject variables

This commit is contained in:
yggverse 2024-12-14 06:50:30 +02:00
parent 702269f1f1
commit a1617b2b1b
35 changed files with 213 additions and 209 deletions

View file

@ -2,7 +2,7 @@ use gtk::{gio::SimpleAction, glib::uuid_string_random};
/// [SimpleAction](https://docs.gtk.org/gio/class.SimpleAction.html) wrapper for `About` action of `Browser` group
pub struct About {
pub gobject: SimpleAction,
pub simple_action: SimpleAction,
}
impl About {
@ -11,7 +11,7 @@ impl About {
/// Create new `Self`
pub fn new() -> Self {
Self {
gobject: SimpleAction::new(&uuid_string_random(), None),
simple_action: SimpleAction::new(&uuid_string_random(), None),
}
}
@ -20,6 +20,6 @@ impl About {
/// Define callback function for
/// [SimpleAction::activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
pub fn connect_activate(&self, callback: impl Fn() + 'static) {
self.gobject.connect_activate(move |_, _| callback());
self.simple_action.connect_activate(move |_, _| callback());
}
}

View file

@ -2,7 +2,7 @@ use gtk::{gio::SimpleAction, glib::uuid_string_random};
/// [SimpleAction](https://docs.gtk.org/gio/class.SimpleAction.html) wrapper for `Close` action of `Browser` group
pub struct Close {
pub gobject: SimpleAction,
pub simple_action: SimpleAction,
}
impl Close {
@ -11,7 +11,7 @@ impl Close {
/// Create new `Self`
pub fn new() -> Self {
Self {
gobject: SimpleAction::new(&uuid_string_random(), None),
simple_action: SimpleAction::new(&uuid_string_random(), None),
}
}
@ -20,6 +20,6 @@ impl Close {
/// Define callback function for
/// [SimpleAction::activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
pub fn connect_activate(&self, callback: impl Fn() + 'static) {
self.gobject.connect_activate(move |_, _| callback());
self.simple_action.connect_activate(move |_, _| callback());
}
}

View file

@ -2,7 +2,7 @@ use gtk::{gio::SimpleAction, glib::uuid_string_random};
/// [SimpleAction](https://docs.gtk.org/gio/class.SimpleAction.html) wrapper for `Debug` action of `Browser` group
pub struct Debug {
pub gobject: SimpleAction,
pub simple_action: SimpleAction,
}
impl Debug {
@ -11,7 +11,7 @@ impl Debug {
/// Create new `Self`
pub fn new() -> Self {
Self {
gobject: SimpleAction::new(&uuid_string_random(), None),
simple_action: SimpleAction::new(&uuid_string_random(), None),
}
}
@ -20,6 +20,6 @@ impl Debug {
/// Define callback function for
/// [SimpleAction::activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
pub fn connect_activate(&self, callback: impl Fn() + 'static) {
self.gobject.connect_activate(move |_, _| callback());
self.simple_action.connect_activate(move |_, _| callback());
}
}

View file

@ -2,7 +2,7 @@ use gtk::{gio::SimpleAction, glib::uuid_string_random, prelude::ActionExt};
/// [SimpleAction](https://docs.gtk.org/gio/class.SimpleAction.html) wrapper for `Focus` action of `Browser` group
pub struct Focus {
pub gobject: SimpleAction,
pub simple_action: SimpleAction,
}
impl Focus {
@ -11,7 +11,7 @@ impl Focus {
/// Create new `Self`
pub fn new() -> Self {
Self {
gobject: SimpleAction::new(&uuid_string_random(), None),
simple_action: SimpleAction::new(&uuid_string_random(), None),
}
}
@ -20,7 +20,7 @@ impl Focus {
/// Emit [activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
/// with formatted for this action [Variant](https://docs.gtk.org/glib/struct.Variant.html) value
pub fn activate(&self) {
self.gobject.activate(None); // @TODO custom value
self.simple_action.activate(None); // @TODO custom value
}
// Events
@ -28,6 +28,6 @@ impl Focus {
/// Define callback function for
/// [SimpleAction::activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
pub fn connect_activate(&self, callback: impl Fn() + 'static) {
self.gobject.connect_activate(move |_, _| callback());
self.simple_action.connect_activate(move |_, _| callback());
}
}

View file

@ -2,7 +2,7 @@ use gtk::{gio::SimpleAction, glib::uuid_string_random};
/// [SimpleAction](https://docs.gtk.org/gio/class.SimpleAction.html) wrapper for `Profile` action of `Browser` group
pub struct Profile {
pub gobject: SimpleAction,
pub simple_action: SimpleAction,
}
impl Profile {
@ -11,7 +11,7 @@ impl Profile {
/// Create new `Self`
pub fn new() -> Self {
Self {
gobject: SimpleAction::new(&uuid_string_random(), None),
simple_action: SimpleAction::new(&uuid_string_random(), None),
}
}
@ -20,6 +20,6 @@ impl Profile {
/// Define callback function for
/// [SimpleAction::activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
pub fn connect_activate(&self, callback: impl Fn() + 'static) {
self.gobject.connect_activate(move |_, _| callback());
self.simple_action.connect_activate(move |_, _| callback());
}
}

View file

@ -6,7 +6,7 @@ use gtk::{
/// [SimpleAction](https://docs.gtk.org/gio/class.SimpleAction.html) wrapper for `Update` action of `Browser` group
pub struct Update {
pub gobject: SimpleAction,
pub simple_action: SimpleAction,
}
impl Update {
@ -15,7 +15,10 @@ impl Update {
/// Create new `Self`
pub fn new() -> Self {
Self {
gobject: SimpleAction::new(&uuid_string_random(), Some(&String::static_variant_type())),
simple_action: SimpleAction::new(
&uuid_string_random(),
Some(&String::static_variant_type()),
),
}
}
@ -24,7 +27,7 @@ impl Update {
/// Emit [activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
/// with formatted for this action [Variant](https://docs.gtk.org/glib/struct.Variant.html) value
pub fn activate(&self, tab_item_id: Option<&str>) {
self.gobject.activate(Some(
self.simple_action.activate(Some(
&match tab_item_id {
Some(value) => String::from(value),
None => String::new(),
@ -38,7 +41,7 @@ impl Update {
/// Define callback function for
/// [SimpleAction::activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
pub fn connect_activate(&self, callback: impl Fn(Option<GString>) + 'static) {
self.gobject.connect_activate(move |_, variant| {
self.simple_action.connect_activate(move |_, variant| {
let tab_item_id = variant
.expect("Variant required to call this action")
.get::<String>()