1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
From: =?utf-8?q?Jeremy_B=C3=ADcha?= <jeremy.bicha@canonical.com>
Date: Sun, 15 Sep 2024 16:52:10 -0400
Subject: Build with Rust GTK4 0.10
---
Cargo.toml | 8 ++++----
src/timer.rs | 4 ++--
src/timerbutton.rs | 3 ++-
src/timerbuttonmark.rs | 3 ++-
src/timerbuttontrough.rs | 3 ++-
src/window.rs | 2 +-
6 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 86c2aec..0b767de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
log = "0.4"
pretty_env_logger = "0.5.0"
gettext-rs = { version = "0.7", features = ["gettext-system"] }
-gtk = { version = "0.8", package = "gtk4", features = ["v4_12"] }
-adw = { version = "0.6", package = "libadwaita", features = ["v1_5"] }
-gst = { version = "0.22", package = "gstreamer" }
-gstreamer-play = "0.22"
+gtk = { version = "0.10", package = "gtk4", features = ["v4_12"] }
+adw = { version = "0.8", package = "libadwaita", features = ["v1_5"] }
+gst = { version = "0.24", package = "gstreamer" }
+gstreamer-play = "0.24"
diff --git a/src/timer.rs b/src/timer.rs
index c2c0f7a..6f1bbfc 100644
--- a/src/timer.rs
+++ b/src/timer.rs
@@ -74,8 +74,8 @@ mod imp {
let ns_per_beat = 60_000_000_000 / (self.beats_per_minute.get() as u64);
let clicker = &self.clicker;
let (tx, rx) = std::sync::mpsc::channel();
- self.thread_cmd.set(tx);
- thread::spawn(clone!(@strong clicker => move || {
+ self.thread_cmd.replace(tx);
+ thread::spawn(clone!(#[strong] clicker, move || {
let recv_period = std::time::Duration::from_millis(1);
let mut ticktime = std::time::Duration::from_nanos(ns_per_beat);
let mut lastiter = std::time::Instant::now() - ticktime;
diff --git a/src/timerbutton.rs b/src/timerbutton.rs
index 341c8e1..7e91e6b 100644
--- a/src/timerbutton.rs
+++ b/src/timerbutton.rs
@@ -147,7 +147,8 @@ mod imp {
glib::wrapper! {
pub struct MtrTimerButton(ObjectSubclass<imp::MtrTimerButton>)
- @extends gtk::Widget;
+ @extends gtk::Widget,
+ @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget;
}
#[gtk::template_callbacks]
diff --git a/src/timerbuttonmark.rs b/src/timerbuttonmark.rs
index 018ece1..57ae8f5 100644
--- a/src/timerbuttonmark.rs
+++ b/src/timerbuttonmark.rs
@@ -56,7 +56,8 @@ mod imp {
glib::wrapper! {
pub struct MtrTimerButtonMark(ObjectSubclass<imp::MtrTimerButtonMark>)
- @extends gtk::Widget;
+ @extends gtk::Widget,
+ @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget;
}
impl Default for MtrTimerButtonMark {
diff --git a/src/timerbuttontrough.rs b/src/timerbuttontrough.rs
index 6257489..1cbfece 100644
--- a/src/timerbuttontrough.rs
+++ b/src/timerbuttontrough.rs
@@ -77,5 +77,6 @@ mod imp {
glib::wrapper! {
pub struct MtrTimerButtonTrough(ObjectSubclass<imp::MtrTimerButtonTrough>)
- @extends gtk::Widget;
+ @extends gtk::Widget,
+ @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget;
}
diff --git a/src/window.rs b/src/window.rs
index 5a08336..7bff124 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -149,7 +149,7 @@ mod imp {
glib::wrapper! {
pub struct MtrApplicationWindow(ObjectSubclass<imp::MtrApplicationWindow>)
@extends gtk::Widget, gtk::Window, gtk::ApplicationWindow, adw::ApplicationWindow,
- @implements gio::ActionMap, gio::ActionGroup;
+ @implements gio::ActionMap, gio::ActionGroup, gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::ShortcutManager, gtk::Root, gtk::Native;
}
#[gtk::template_callbacks]
|
