Adapt for gtk 0.7.0

Hofer-Julian · Hofer-Julian · commit 2dcdfd0e4c96 · 2023-07-24T09:58:44.000+02:00
diff --git a/book/listings/Cargo.lock b/book/listings/Cargo.lock
diff --git a/book/listings/actions/3/main.rs b/book/listings/actions/3/main.rs
@@ -62,7 +62,7 @@ fn build_ui(app: &Application) {
     let action_count = SimpleAction::new_stateful(
         "count",
         Some(&i32::static_variant_type()),
-        original_state.to_variant(),
+        &original_state.to_variant(),
     );
     action_count.connect_activate(clone!(@weak label => move |action, parameter| {
         // Get state
@@ -80,7 +80,7 @@ fn build_ui(app: &Application) {
 
         // Increase state by parameter and store state
         state += parameter;
-        action.set_state(state.to_variant());
+        action.set_state(&state.to_variant());
 
         // Update label with new state
         label.set_label(&format!("Counter: {state}"));
diff --git a/book/listings/actions/4/main.rs b/book/listings/actions/4/main.rs
@@ -58,7 +58,7 @@ fn build_ui(app: &Application) {
     let action_count = SimpleAction::new_stateful(
         "count",
         Some(&i32::static_variant_type()),
-        original_state.to_variant(),
+        &original_state.to_variant(),
     );
     action_count.connect_activate(clone!(@weak label => move |action, parameter| {
         // Get state
@@ -76,7 +76,7 @@ fn build_ui(app: &Application) {
 
         // Increase state by parameter and save state
         state += parameter;
-        action.set_state(state.to_variant());
+        action.set_state(&state.to_variant());
 
         // Update label with new state
         label.set_label(&format!("Counter: {state}"));
diff --git a/book/listings/actions/5/window/mod.rs b/book/listings/actions/5/window/mod.rs
@@ -28,7 +28,7 @@ impl Window {
         let action_count = SimpleAction::new_stateful(
             "count",
             Some(&i32::static_variant_type()),
-            original_state.to_variant(),
+            &original_state.to_variant(),
         );
 
         action_count.connect_activate(clone!(@weak label => move |action, parameter| {
@@ -47,7 +47,7 @@ impl Window {
 
             // Increase state by parameter and save state
             state += parameter;
-            action.set_state(state.to_variant());
+            action.set_state(&state.to_variant());
 
             // Update label with new state
             label.set_label(&format!("Counter: {state}"));
diff --git a/book/listings/actions/6/window/mod.rs b/book/listings/actions/6/window/mod.rs
@@ -29,7 +29,7 @@ impl Window {
         let action_count = SimpleAction::new_stateful(
             "count",
             Some(&i32::static_variant_type()),
-            original_state.to_variant(),
+            &original_state.to_variant(),
         );
 
         action_count.connect_activate(clone!(@weak label => move |action, parameter| {
@@ -48,7 +48,7 @@ impl Window {
 
             // Increase state by parameter and save state
             state += parameter;
-            action.set_state(state.to_variant());
+            action.set_state(&state.to_variant());
 
             // Update label with new state
             label.set_label(&format!("Counter: {state}"));
@@ -70,7 +70,7 @@ impl Window {
         let action_orientation = SimpleAction::new_stateful(
             "orientation",
             Some(&String::static_variant_type()),
-            "Vertical".to_variant(),
+            &"Vertical".to_variant(),
         );
 
         action_orientation.connect_activate(clone!(@weak gtk_box =>
@@ -89,7 +89,7 @@ impl Window {
 
                 // Set orientation and save state
                 gtk_box.set_orientation(orientation);
-                action.set_state(parameter.to_variant());
+                action.set_state(&parameter.to_variant());
         }));
         self.add_action(&action_orientation);
         //ANCHOR_END: action_orientation
diff --git a/book/listings/actions/7/window/mod.rs b/book/listings/actions/7/window/mod.rs
@@ -47,7 +47,7 @@ impl Window {
         let action_count = SimpleAction::new_stateful(
             "count",
             Some(&i32::static_variant_type()),
-            original_state.to_variant(),
+            &original_state.to_variant(),
         );
 
         action_count.connect_activate(clone!(@weak label => move |action, parameter| {
@@ -66,7 +66,7 @@ impl Window {
 
             // Increase state by parameter and save state
             state += parameter;
-            action.set_state(state.to_variant());
+            action.set_state(&state.to_variant());
 
             // Update label with new state
             label.set_label(&format!("Counter: {state}"));
diff --git a/book/listings/css/1/main.rs b/book/listings/css/1/main.rs
@@ -1,8 +1,6 @@
 use gdk::Display;
 use gtk::prelude::*;
-use gtk::{
-    gdk, glib, Application, ApplicationWindow, Button, CssProvider, StyleContext,
-};
+use gtk::{gdk, glib, Application, ApplicationWindow, Button, CssProvider};
 
 // ANCHOR: main
 const APP_ID: &str = "org.gtk_rs.Css1";
@@ -25,7 +23,7 @@ fn load_css() {
     provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
-    StyleContext::add_provider_for_display(
+    gtk::style_context_add_provider_for_display(
         &Display::default().expect("Could not connect to a display."),
         &provider,
         gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
diff --git a/book/listings/css/2/main.rs b/book/listings/css/2/main.rs
@@ -1,8 +1,6 @@
 use gdk::Display;
 use gtk::prelude::*;
-use gtk::{
-    gdk, glib, Application, ApplicationWindow, Button, CssProvider, StyleContext,
-};
+use gtk::{gdk, glib, Application, ApplicationWindow, Button, CssProvider};
 
 const APP_ID: &str = "org.gtk_rs.Css2";
 
@@ -24,7 +22,7 @@ fn load_css() {
     provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
-    StyleContext::add_provider_for_display(
+    gtk::style_context_add_provider_for_display(
         &Display::default().expect("Could not connect to a display."),
         &provider,
         gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
diff --git a/book/listings/css/3/main.rs b/book/listings/css/3/main.rs
@@ -1,8 +1,6 @@
 use gdk::Display;
 use gtk::prelude::*;
-use gtk::{
-    gdk, glib, Application, ApplicationWindow, Button, CssProvider, StyleContext,
-};
+use gtk::{gdk, glib, Application, ApplicationWindow, Button, CssProvider};
 
 const APP_ID: &str = "org.gtk_rs.Css3";
 
@@ -24,7 +22,7 @@ fn load_css() {
     provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
-    StyleContext::add_provider_for_display(
+    gtk::style_context_add_provider_for_display(
         &Display::default().expect("Could not connect to a display."),
         &provider,
         gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
diff --git a/book/listings/css/4/main.rs b/book/listings/css/4/main.rs
@@ -1,8 +1,6 @@
 use gdk::Display;
 use gtk::prelude::*;
-use gtk::{
-    gdk, glib, Application, ApplicationWindow, Button, CssProvider, StyleContext,
-};
+use gtk::{gdk, glib, Application, ApplicationWindow, Button, CssProvider};
 
 const APP_ID: &str = "org.gtk_rs.Css4";
 
@@ -24,7 +22,7 @@ fn load_css() {
     provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
-    StyleContext::add_provider_for_display(
+    gtk::style_context_add_provider_for_display(
         &Display::default().expect("Could not connect to a display."),
         &provider,
         gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
diff --git a/book/listings/css/7/main.rs b/book/listings/css/7/main.rs
@@ -2,7 +2,7 @@ mod window;
 
 use gdk::Display;
 use gtk::prelude::*;
-use gtk::{gdk, glib, Application, CssProvider, StyleContext};
+use gtk::{gdk, glib, Application, CssProvider};
 
 use crate::window::Window;
 
@@ -26,7 +26,7 @@ fn load_css() {
     provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
-    StyleContext::add_provider_for_display(
+    gtk::style_context_add_provider_for_display(
         &Display::default().expect("Could not connect to a display."),
         &provider,
         gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
diff --git a/book/listings/css/8/main.rs b/book/listings/css/8/main.rs
@@ -2,7 +2,7 @@ mod window;
 
 use gdk::Display;
 use gtk::prelude::*;
-use gtk::{gdk, glib, Application, CssProvider, StyleContext};
+use gtk::{gdk, glib, Application, CssProvider};
 
 use crate::window::Window;
 
@@ -26,7 +26,7 @@ fn load_css() {
     provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
-    StyleContext::add_provider_for_display(
+    gtk::style_context_add_provider_for_display(
         &Display::default().expect("Could not connect to a display."),
         &provider,
         gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
diff --git a/book/listings/css/9/main.rs b/book/listings/css/9/main.rs
@@ -2,7 +2,7 @@ mod window;
 
 use gdk::Display;
 use gtk::prelude::*;
-use gtk::{gdk, glib, Application, CssProvider, StyleContext};
+use gtk::{gdk, glib, Application, CssProvider};
 
 use crate::window::Window;
 
@@ -26,7 +26,7 @@ fn load_css() {
     provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
-    StyleContext::add_provider_for_display(
+    gtk::style_context_add_provider_for_display(
         &Display::default().expect("Could not connect to a display."),
         &provider,
         gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
diff --git a/book/listings/main_event_loop/3/main.rs b/book/listings/main_event_loop/3/main.rs
@@ -1,7 +1,7 @@
 use std::thread;
 use std::time::Duration;
 
-use glib::{clone, Continue, MainContext, Priority};
+use glib::{clone, MainContext, Priority};
 use gtk::prelude::*;
 use gtk::{glib, Application, ApplicationWindow, Button};
 
@@ -47,10 +47,10 @@ fn build_ui(app: &Application) {
     // The main loop executes the closure as soon as it receives the message
     receiver.attach(
         None,
-        clone!(@weak button => @default-return Continue(false),
+        clone!(@weak button => @default-return glib::ControlFlow::Break,
                     move |enable_button| {
                         button.set_sensitive(enable_button);
-                        Continue(true)
+                        glib::ControlFlow::Continue
                     }
         ),
     );
diff --git a/book/listings/main_event_loop/4/main.rs b/book/listings/main_event_loop/4/main.rs
@@ -1,4 +1,4 @@
-use glib::{clone, timeout_future_seconds, Continue, MainContext, Priority};
+use glib::{clone, timeout_future_seconds, MainContext, Priority};
 use gtk::prelude::*;
 use gtk::{glib, Application, ApplicationWindow, Button};
 
@@ -43,10 +43,10 @@ fn build_ui(app: &Application) {
     // The main loop executes the closure as soon as it receives the message
     receiver.attach(
         None,
-        clone!(@weak button => @default-return Continue(false),
+        clone!(@weak button => @default-return glib::ControlFlow::Break,
                     move |enable_button| {
                         button.set_sensitive(enable_button);
-                        Continue(true)
+                        glib::ControlFlow::Continue
                     }
         ),
     );
diff --git a/book/listings/saving_window_state/1/custom_window/imp.rs b/book/listings/saving_window_state/1/custom_window/imp.rs
@@ -1,5 +1,4 @@
 use gio::Settings;
-use glib::signal::Inhibit;
 use gtk::subclass::prelude::*;
 use gtk::{gio, glib, ApplicationWindow};
 use once_cell::sync::OnceCell;
@@ -28,14 +27,13 @@ impl ObjectImpl for Window {
 impl WidgetImpl for Window {}
 impl WindowImpl for Window {
     // Save window state right before the window will be closed
-    fn close_request(&self) -> Inhibit {
+    fn close_request(&self) -> glib::ControlFlow {
         // Save window size
         self.obj()
             .save_window_size()
             .expect("Failed to save window state");
 
-        // Don't inhibit the default handler
-        Inhibit(false)
+        glib::ControlFlow::Continue
     }
 }
 impl ApplicationWindowImpl for Window {}
diff --git a/book/listings/settings/1/main.rs b/book/listings/settings/1/main.rs
@@ -1,5 +1,4 @@
 use gio::Settings;
-use gtk::glib::signal::Inhibit;
 use gtk::prelude::*;
 use gtk::{gio, glib, Align, Application, ApplicationWindow, Switch};
 
@@ -47,7 +46,7 @@ fn build_ui(app: &Application) {
             .set_boolean("is-switch-enabled", is_enabled)
             .expect("Could not set setting.");
         // Don't inhibit the default handler
-        Inhibit(false)
+        glib::ControlFlow::Continue
     });
     // ANCHOR_END: connect_state_set
 
diff --git a/book/listings/todo/2/window/imp.rs b/book/listings/todo/2/window/imp.rs
@@ -2,7 +2,6 @@ use std::cell::RefCell;
 use std::fs::File;
 
 use gio::Settings;
-use glib::signal::Inhibit;
 use glib::subclass::InitializingObject;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
@@ -68,7 +67,7 @@ impl WidgetImpl for Window {}
 // ANCHOR: window_impl
 // Trait shared by all windows
 impl WindowImpl for Window {
-    fn close_request(&self) -> Inhibit {
+    fn close_request(&self) -> glib::ControlFlow {
         // Store task data in vector
         let backup_data: Vec<TaskData> = self
             .obj()
diff --git a/book/listings/todo/3/main.rs b/book/listings/todo/3/main.rs
@@ -5,7 +5,7 @@ mod window;
 
 use gdk::Display;
 use gtk::prelude::*;
-use gtk::{gdk, gio, glib, Application, CssProvider, StyleContext};
+use gtk::{gdk, gio, glib, Application, CssProvider};
 use window::Window;
 
 const APP_ID: &str = "org.gtk_rs.Todo3";
@@ -43,7 +43,7 @@ fn load_css() {
     provider.load_from_resource("/org/gtk_rs/Todo3/style.css");
 
     // Add the provider to the default screen
-    StyleContext::add_provider_for_display(
+    gtk::style_context_add_provider_for_display(
         &Display::default().expect("Could not connect to a display."),
         &provider,
         gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
diff --git a/book/listings/todo/3/window/imp.rs b/book/listings/todo/3/window/imp.rs
@@ -2,7 +2,6 @@ use std::cell::RefCell;
 use std::fs::File;
 
 use gio::Settings;
-use glib::signal::Inhibit;
 use glib::subclass::InitializingObject;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
@@ -63,7 +62,7 @@ impl WidgetImpl for Window {}
 
 // Trait shared by all windows
 impl WindowImpl for Window {
-    fn close_request(&self) -> Inhibit {
+    fn close_request(&self) -> glib::ControlFlow {
         // Store task data in vector
         let backup_data: Vec<TaskData> = self
             .obj()
diff --git a/book/listings/todo/4/window/imp.rs b/book/listings/todo/4/window/imp.rs
@@ -2,7 +2,6 @@ use std::cell::RefCell;
 use std::fs::File;
 
 use gio::Settings;
-use glib::signal::Inhibit;
 use glib::subclass::InitializingObject;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
@@ -63,7 +62,7 @@ impl WidgetImpl for Window {}
 
 // Trait shared by all windows
 impl WindowImpl for Window {
-    fn close_request(&self) -> Inhibit {
+    fn close_request(&self) -> glib::ControlFlow {
         // Store task data in vector
         let backup_data: Vec<TaskData> = self
             .obj()
diff --git a/book/listings/todo/5/window/imp.rs b/book/listings/todo/5/window/imp.rs
diff --git a/book/listings/todo/6/window/imp.rs b/book/listings/todo/6/window/imp.rs
diff --git a/book/listings/todo/7/window/imp.rs b/book/listings/todo/7/window/imp.rs
diff --git a/book/listings/todo/8/collection_object/mod.rs b/book/listings/todo/8/collection_object/mod.rs
diff --git a/book/listings/todo/8/window/imp.rs b/book/listings/todo/8/window/imp.rs
