Port to latest gtk-rs crates

Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 
 
 [dependencies]
-gtk = { package = "gtk4", version = "0.4", features= ["v4_2"]}
+gtk = { package = "gtk4", version = "0.5", features= ["v4_2"]}
 log = "0.4"
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
-adw = {package = "libadwaita", version = "0.1"}
+adw = {package = "libadwaita", version = "0.2"}
 pretty_env_logger = "0.4"
 regex = "1.5"

src/application.rs

 use crate::config;
-use crate::utils;
 use crate::widgets::Window;
 use adw::prelude::*;
-use gtk::{
-    gio,
-    glib::{self, clone},
-    subclass::prelude::*,
-};
-use log::info;
+use gtk::{gio, glib, subclass::prelude::*};
 
 mod imp {
     use super::*;
@@ -28,66 +22,55 @@ mod imp {
 
     impl ObjectImpl for Application {}
     impl ApplicationImpl for Application {
-        fn activate(&self, application: &Self::Type) {
-            let window = Window::new(application);
+        fn activate(&self) {
+            self.parent_activate();
+            let application = self.instance();
+
+            let window = Window::new(&application);
             application.add_window(&window);
             window.present();
             self.window.set(window.downgrade()).unwrap();
-            self.parent_activate(application);
         }
 
-        fn startup(&self, application: &Self::Type) {
+        fn startup(&self) {
+            self.parent_startup();
+            let application = self.instance();
             // Quit
-            utils::action(
-                application,
-                "quit",
-                clone!(@weak application => move |_, _| {
-                    application.quit();
-                }),
-            );
-
+            let quit = gio::ActionEntry::builder("quit")
+                .activate(move |app: &Self::Type, _, _| app.quit())
+                .build();
             // Start Tour
-            utils::action(
-                application,
-                "start-tour",
-                clone!(@weak application => move |_, _| {
-                    application.window().start_tour();
-                }),
-            );
-
+            let start_tour = gio::ActionEntry::builder("start-tour")
+                .activate(move |app: &Self::Type, _, _| app.window().start_tour())
+                .build();
             // Skip Tour
-            utils::action(
-                application,
-                "skip-tour",
-                clone!(@weak application => move |_, _| {
-                    application.quit();
-                }),
-            );
-
-            utils::action(
-                application,
-                "next-page",
-                clone!(@weak application => move |_, _| {
-                    let window = application.window();
+            let skip_tour = gio::ActionEntry::builder("skip-tour")
+                .activate(move |app: &Self::Type, _, _| app.quit())
+                .build();
+            // Next page
+            let next_page = gio::ActionEntry::builder("next-page")
+                .activate(move |app: &Self::Type, _, _| {
+                    let window = app.window();
                     if window.paginator().try_next().is_none() {
                         window.close();
                     }
-                }),
-            );
-
-            utils::action(
-                application,
-                "previous-page",
-                clone!(@weak application => move |_, _| {
-                    let window = application.window();
+                })
+                .build();
+            // Previous page
+            let previous_page = gio::ActionEntry::builder("previous-page")
+                .activate(move |app: &Self::Type, _, _| {
+                    let window = app.window();
                     if window.paginator().try_previous().is_none() {
                         window.reset_tour();
                     }
-                }),
-            );
+                })
+                .build();
+            application
+                .add_action_entries([quit, start_tour, skip_tour, next_page, previous_page])
+                .unwrap();
+
             application.set_accels_for_action("app.quit", &["<Control>q"]);
             application.set_accels_for_action("app.skip-tour", &["Escape"]);
-            self.parent_startup(application);
         }
     }
     impl GtkApplicationImpl for Application {}
@@ -107,7 +90,6 @@ impl Application {
             ("application-id", &config::APP_ID),
             ("resource-base-path", &Some("/org/gnome/Tour")),
         ])
-        .unwrap()
     }
 
     fn window(&self) -> Window {
@@ -115,9 +97,9 @@ impl Application {
     }
 
     pub fn run() {
-        info!("GNOME Tour ({})", config::APP_ID);
-        info!("Version: {} ({})", config::VERSION, config::PROFILE);
-        info!("Datadir: {}", config::PKGDATADIR);
+        log::info!("GNOME Tour ({})", config::APP_ID);
+        log::info!("Version: {} ({})", config::VERSION, config::PROFILE);
+        log::info!("Datadir: {}", config::PKGDATADIR);
         let app = Self::new();
         gtk::prelude::ApplicationExtManual::run(&app);
     }

src/utils.rs

 // based on https://gitlab.gnome.org/World/podcasts/-/blob/master/podcasts-gtk/src/i18n|utils.rs
 use gettextrs::gettext;
-use gtk::{gio, glib};
 use regex::{Captures, Regex};
 
-pub fn action<T, F>(thing: &T, name: &str, action: F)
-where
-    T: gio::traits::ActionMapExt,
-    for<'r, 's> F: Fn(&'r gio::SimpleAction, Option<&glib::Variant>) + 'static,
-{
-    // Create a stateless, parameterless action
-    let act = gio::SimpleAction::new(name, None);
-    // Connect the handler
-    act.connect_activate(action);
-    // Add it to the map
-    thing.add_action(&act);
-}
-
 pub fn i18n_f(format: &str, kwargs: &[(&str, &str)]) -> String {
     let mut s = gettext(format);
     for (k, v) in kwargs {

src/widgets/image_page.rs

@@ -5,7 +5,7 @@ use gtk::subclass::prelude::*;
 mod imp {
     use super::*;
     use glib::once_cell::sync::Lazy;
-    use glib::{ParamFlags, ParamSpec, ParamSpecString, Value};
+    use glib::{ParamSpec, ParamSpecString, Value};
     use gtk::glib::once_cell::sync::OnceCell;
     use std::cell::RefCell;
 
@@ -25,7 +25,9 @@ mod imp {
     }
 
     impl ObjectImpl for ImagePageWidget {
-        fn constructed(&self, obj: &Self::Type) {
+        fn constructed(&self) {
+            self.parent_constructed();
+            let obj = self.instance();
             let layout_manager = obj
                 .layout_manager()
                 .map(|l| l.downcast::<gtk::BoxLayout>().unwrap())
@@ -81,27 +83,22 @@ mod imp {
             container.append(&body_label);
 
             obj.append(&clamp);
-            self.parent_constructed(obj);
         }
 
         fn properties() -> &'static [ParamSpec] {
             static PROPERTIES: Lazy<Vec<ParamSpec>> = Lazy::new(|| {
                 vec![
                     ParamSpecString::builder("resource-uri")
-                        .flags(ParamFlags::READWRITE | ParamFlags::CONSTRUCT_ONLY)
-                        .build(),
-                    ParamSpecString::builder("head")
-                        .flags(ParamFlags::READWRITE | ParamFlags::CONSTRUCT_ONLY)
-                        .build(),
-                    ParamSpecString::builder("body")
-                        .flags(ParamFlags::READWRITE | ParamFlags::CONSTRUCT)
+                        .construct_only()
                         .build(),
+                    ParamSpecString::builder("head").construct_only().build(),
+                    ParamSpecString::builder("body").construct().build(),
                 ]
             });
             PROPERTIES.as_ref()
         }
 
-        fn set_property(&self, _obj: &Self::Type, _id: usize, value: &Value, pspec: &ParamSpec) {
+        fn set_property(&self, _id: usize, value: &Value, pspec: &ParamSpec) {
             match pspec.name() {
                 "resource-uri" => {
                     let resource_uri: String = value.get().unwrap();
@@ -121,7 +118,7 @@ mod imp {
             }
         }
 
-        fn property(&self, _obj: &Self::Type, _id: usize, pspec: &ParamSpec) -> Value {
+        fn property(&self, _id: usize, pspec: &ParamSpec) -> Value {
             match pspec.name() {
                 "resource-uri" => self.resource_uri.get().to_value(),
                 "head" => self.head.get().to_value(),
@@ -146,7 +143,6 @@ impl ImagePageWidget {
             ("head", &head),
             ("body", &body),
         ])
-        .unwrap()
     }
 
     pub fn set_body(&self, body: &str) {

src/widgets/paginator.rs

@@ -42,7 +42,9 @@ mod imp {
     }
 
     impl ObjectImpl for PaginatorWidget {
-        fn constructed(&self, obj: &Self::Type) {
+        fn constructed(&self) {
+            self.parent_constructed();
+            let obj = self.instance();
             let layout_manager = obj
                 .layout_manager()
                 .map(|l| l.downcast::<gtk::BoxLayout>().unwrap())
@@ -66,24 +68,17 @@ mod imp {
             }));
 
             obj.add_controller(&controller);
-
-            self.parent_constructed(obj);
         }
     }
     impl WidgetImpl for PaginatorWidget {}
     impl BoxImpl for PaginatorWidget {}
     impl BuildableImpl for PaginatorWidget {
-        fn add_child(
-            &self,
-            buildable: &Self::Type,
-            builder: &gtk::Builder,
-            child: &glib::Object,
-            type_: Option<&str>,
-        ) {
+        fn add_child(&self, builder: &gtk::Builder, child: &glib::Object, type_: Option<&str>) {
             if !self.carousel.is_bound() {
-                self.parent_add_child(buildable, builder, child, type_);
+                self.parent_add_child(builder, child, type_);
             } else {
-                buildable.add_page(child.clone().downcast::<gtk::Widget>().unwrap());
+                self.instance()
+                    .add_page(child.clone().downcast::<gtk::Widget>().unwrap());
             }
         }
     }
@@ -97,7 +92,7 @@ glib::wrapper! {
 
 impl PaginatorWidget {
     pub fn new() -> Self {
-        glib::Object::new(&[]).unwrap()
+        glib::Object::new(&[])
     }
 
     pub fn try_next(&self) -> Option<()> {

src/widgets/window.rs

@@ -37,7 +37,9 @@ mod imp {
     }
 
     impl ObjectImpl for Window {
-        fn constructed(&self, widget: &Self::Type) {
+        fn constructed(&self) {
+            self.parent_constructed();
+            let widget = self.instance();
             widget.set_icon_name(Some(config::APP_ID));
 
             // Devel Profile
@@ -53,7 +55,6 @@ mod imp {
                 &[("name", &name), ("version", &version)],
             );
             self.welcome_page.set_body(&body);
-            self.parent_constructed(widget);
         }
     }
     impl WidgetImpl for Window {}
@@ -70,7 +71,7 @@ glib::wrapper! {
 
 impl Window {
     pub fn new(app: &Application) -> Self {
-        glib::Object::new(&[("application", app)]).unwrap()
+        glib::Object::new(&[("application", app)])
     }
 
     pub fn paginator(&self) -> PaginatorWidget {