examples: Use glib::derived_properties

Author: bilelmoussaoui

examples/custom_editable/custom_tag/imp.rs

@@ -1,13 +1,12 @@
 use glib::clone;
 use glib::once_cell::sync::Lazy;
 use glib::subclass::Signal;
-use glib::{ParamSpec, Properties};
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use std::cell::{Cell, RefCell};
 
-#[derive(Debug, Properties)]
+#[derive(Debug, glib::Properties)]
 #[properties(wrapper_type = super::CustomTag)]
 pub struct CustomTag {
     pub container: gtk::Box,
@@ -40,19 +39,8 @@ impl ObjectSubclass for CustomTag {
     }
 }
 
+#[glib::derived_properties]
 impl ObjectImpl for CustomTag {
-    fn properties() -> &'static [ParamSpec] {
-        Self::derived_properties()
-    }
-
-    fn property(&self, id: usize, pspec: &ParamSpec) -> glib::Value {
-        self.derived_property(id, pspec)
-    }
-
-    fn set_property(&self, id: usize, value: &glib::Value, pspec: &ParamSpec) {
-        self.derived_set_property(id, value, pspec)
-    }
-
     fn signals() -> &'static [Signal] {
         static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
             vec![

examples/custom_layout_manager/custom_layout_child/imp.rs

@@ -1,10 +1,9 @@
-use glib::{ParamSpec, Properties, Value};
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::{gdk, glib, graphene};
 use std::cell::RefCell;
 
-#[derive(Debug, Properties)]
+#[derive(Debug, glib::Properties)]
 #[properties(wrapper_type = super::CustomLayoutChild)]
 pub struct CustomLayoutChild {
     #[property(get, set, construct_only)]
@@ -26,19 +25,8 @@ impl ObjectSubclass for CustomLayoutChild {
     type ParentType = gtk::Widget;
 }
 
+#[glib::derived_properties]
 impl ObjectImpl for CustomLayoutChild {
-    fn properties() -> &'static [ParamSpec] {
-        Self::derived_properties()
-    }
-
-    fn property(&self, id: usize, pspec: &ParamSpec) -> Value {
-        self.derived_property(id, pspec)
-    }
-
-    fn set_property(&self, id: usize, value: &Value, pspec: &ParamSpec) {
-        self.derived_set_property(id, value, pspec)
-    }
-
     fn constructed(&self) {
         self.parent_constructed();
         let widget = self.obj();

examples/custom_orientable/custom_orientable/imp.rs

@@ -9,6 +9,12 @@ use gtk::subclass::prelude::*;
 pub struct CustomOrientable {
     first_label: RefCell<Option<gtk::Widget>>,
     second_label: RefCell<Option<gtk::Widget>>,
+    // Every widget that implements Orientable has to define a "orientation"
+    // property like below, gtk::Orientation::Horizontal is a placeholder
+    // for the initial value.
+    //
+    // glib::ParamFlags::CONSTRUCT allows us to set that property the moment
+    // we create a new instance of the widget
     #[property(get, set=Self::set_orientation, builder(gtk::Orientation::Horizontal))]
     orientation: RefCell<gtk::Orientation>,
 }
@@ -66,24 +72,6 @@ impl ObjectImpl for CustomOrientable {
             child.unparent();
         }
     }
-
-    // Every widget that implements Orientable has to define a "orientation"
-    // property like below, gtk::Orientation::Horizontal is a placeholder
-    // for the initial value.
-    //
-    // glib::ParamFlags::CONSTRUCT allows us to set that property the moment
-    // we create a new instance of the widget
-    fn properties() -> &'static [glib::ParamSpec] {
-        Self::derived_properties()
-    }
-
-    fn set_property(&self, id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
-        self.derived_set_property(id, value, pspec)
-    }
-
-    fn property(&self, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
-        self.derived_property(id, pspec)
-    }
 }
 
 impl WidgetImpl for CustomOrientable {}

examples/expressions/metadata/imp.rs

@@ -28,16 +28,5 @@ impl ObjectSubclass for Metadata {
     }
 }
 
-impl ObjectImpl for Metadata {
-    fn properties() -> &'static [glib::ParamSpec] {
-        Self::derived_properties()
-    }
-
-    fn set_property(&self, id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
-        self.derived_set_property(id, value, pspec)
-    }
-
-    fn property(&self, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
-        self.derived_property(id, pspec)
-    }
-}
+#[glib::derived_properties]
+impl ObjectImpl for Metadata {}

examples/expressions/note/imp.rs

@@ -19,16 +19,5 @@ impl ObjectSubclass for Note {
     type Type = super::Note;
 }
 
-impl ObjectImpl for Note {
-    fn properties() -> &'static [glib::ParamSpec] {
-        Self::derived_properties()
-    }
-
-    fn set_property(&self, id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
-        self.derived_set_property(id, value, pspec)
-    }
-
-    fn property(&self, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
-        self.derived_property(id, pspec)
-    }
-}
+#[glib::derived_properties]
+impl ObjectImpl for Note {}

examples/list_box_model/list_box_row/imp.rs

@@ -23,19 +23,8 @@ impl ObjectSubclass for ListBoxRow {
     type Type = super::ListBoxRow;
 }
 
+#[glib::derived_properties]
 impl ObjectImpl for ListBoxRow {
-    fn properties() -> &'static [ParamSpec] {
-        Self::derived_properties()
-    }
-
-    fn set_property(&self, id: usize, value: &Value, pspec: &ParamSpec) {
-        self.derived_set_property(id, value, pspec)
-    }
-
-    fn property(&self, id: usize, pspec: &ParamSpec) -> Value {
-        self.derived_property(id, pspec)
-    }
-
     fn constructed(&self) {
         self.parent_constructed();
         let obj = self.obj();

examples/list_box_model/row_data/imp.rs

@@ -29,16 +29,5 @@ impl ObjectSubclass for RowData {
 //
 // This maps between the GObject properties and our internal storage of the
 // corresponding values of the properties.
-impl ObjectImpl for RowData {
-    fn properties() -> &'static [ParamSpec] {
-        Self::derived_properties()
-    }
-
-    fn set_property(&self, id: usize, value: &Value, pspec: &ParamSpec) {
-        self.derived_set_property(id, value, pspec)
-    }
-
-    fn property(&self, id: usize, pspec: &ParamSpec) -> Value {
-        self.derived_property(id, pspec)
-    }
-}
+#[glib::derived_properties]
+impl ObjectImpl for RowData {}

examples/rotation_bin/rotation_bin/imp.rs

@@ -22,19 +22,8 @@ impl ObjectSubclass for RotationBin {
     type ParentType = gtk::Widget;
 }
 
+#[glib::derived_properties]
 impl ObjectImpl for RotationBin {
-    fn properties() -> &'static [glib::ParamSpec] {
-        Self::derived_properties()
-    }
-
-    fn property(&self, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
-        self.derived_property(id, pspec)
-    }
-
-    fn set_property(&self, id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
-        self.derived_set_property(id, value, pspec)
-    }
-
     fn dispose(&self) {
         if let Some(child) = self.child.borrow_mut().take() {
             child.unparent();

examples/squeezer_bin/squeezer_bin/imp.rs

@@ -1,8 +1,6 @@
-use gtk::glib::{self, Properties};
-use gtk::glib::{ParamSpec, Value};
-use gtk::gsk;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
+use gtk::{glib, gsk};
 
 use std::cell::{Cell, RefCell};
 
@@ -17,7 +15,7 @@ fn child_size(child: &impl IsA<gtk::Widget>) -> ((i32, i32), (i32, i32)) {
     )
 }
 
-#[derive(Debug, Default, Properties)]
+#[derive(Debug, Default, glib::Properties)]
 #[properties(wrapper_type = super::SqueezerBin)]
 pub struct SqueezerBin {
     #[property(get, explicit_notify)]
@@ -33,19 +31,8 @@ impl ObjectSubclass for SqueezerBin {
     type Type = super::SqueezerBin;
 }
 
+#[glib::derived_properties]
 impl ObjectImpl for SqueezerBin {
-    fn properties() -> &'static [glib::ParamSpec] {
-        Self::derived_properties()
-    }
-
-    fn property(&self, id: usize, pspec: &ParamSpec) -> Value {
-        self.derived_property(id, pspec)
-    }
-
-    fn set_property(&self, id: usize, value: &Value, pspec: &ParamSpec) {
-        self.derived_set_property(id, value, pspec)
-    }
-
     fn constructed(&self) {
         self.parent_constructed();
         let obj = self.obj();