mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-09 01:28:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: update dependencies

Browse source
This commit is contained in:
Gabriele Musco 2023-09-13 20:25:21 +02:00
commit 17d7d74805
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
6 changed files with 259 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

503
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

27
Cargo.toml
View file

@ -6,33 +6,36 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
anyhow = "1.0.71" anyhow = "1.0.75"
gettext-rs = { version = "0.7.0", features = [ gettext-rs = { version = "0.7.0", features = [
"gettext-system" "gettext-system"
] } ] }
git2 = "0.17.2" git2 = "0.17.2"
gtk4 = { version = "0.6.6", features = [ gtk4 = { version = "0.7.2", features = [
"v4_10", "v4_10",
] } ] }
libadwaita = { version = "0.5.2", features = [
"v1_3"
] }
libusb = "0.3.0" libusb = "0.3.0"
nix = { version = "0.26.2", features = [ nix = { version = "0.26.4", features = [
"fs" "fs"
] } ] }
phf = "0.11.1" phf = "0.11.2"
phf_macros = "0.11.1" phf_macros = "0.11.2"
relm4 = { version = "0.6.0", features = [ relm4 = { version = "0.7.0-alpha.1", features = [
"libadwaita" "libadwaita"
] } ] }
relm4-components = "0.6.0" relm4-components = "0.7.0-alpha.1"
reqwest = { version = "0.11.18", features = [ reqwest = { version = "0.11.20", features = [
"blocking" "blocking"
] } ] }
serde = { version = "1.0.163", features = [ serde = { version = "1.0.188", features = [
"derive" "derive"
] } ] }
serde_json = "1.0.96" serde_json = "1.0.106"
sourceview5 = { version = "0.6.1", features = [ sourceview5 = { version = "0.7.1", features = [
"v5_6" "v5_6"
] } ] }
tracker = "0.2.1" tracker = "0.2.1"
uuid = { version = "1.3.4", features = ["v4", "fast-rng"] } uuid = { version = "1.4.1", features = ["v4", "fast-rng"] }

4
src/ui/app.rs
View file

@ -273,7 +273,7 @@ impl SimpleComponent for App {
}, },
connect_close_request[sender] => move |win| { connect_close_request[sender] => move |win| {
sender.input(Msg::SaveWinSize(win.width(), win.height())); sender.input(Msg::SaveWinSize(win.width(), win.height()));
gtk::Inhibit(false) gtk::glib::Propagation::Proceed
} }
} }
} }
@ -711,7 +711,7 @@ impl SimpleComponent for App {
withclones![sender]; withclones![sender];
glib::timeout_add_local(Duration::from_millis(1000), move || { glib::timeout_add_local(Duration::from_millis(1000), move || {
sender.input(Msg::ClockTicking); sender.input(Msg::ClockTicking);
glib::Continue(true) glib::ControlFlow::Continue
}); });
} }

11
src/ui/libsurvive_setup_window.rs
View file

@ -74,14 +74,14 @@ impl LibsurviveSetupWindow {
calibration_running: &Rc<Cell<bool>>, calibration_running: &Rc<Cell<bool>>,
progressbar: &gtk::ProgressBar, progressbar: &gtk::ProgressBar,
page1: &adw::StatusPage, page1: &adw::StatusPage,
) -> gtk::Inhibit { ) -> gtk::glib::Propagation {
if calibration_running.get() { if calibration_running.get() {
return gtk::Inhibit(true); return gtk::glib::Propagation::Stop;
} }
carousel.scroll_to(page1, true); carousel.scroll_to(page1, true);
progressbar.set_fraction(0.0); progressbar.set_fraction(0.0);
sender.input(LibsurviveSetupMsg::SetSteamLighthousePath(None)); sender.input(LibsurviveSetupMsg::SetSteamLighthousePath(None));
gtk::Inhibit(false) gtk::glib::Propagation::Proceed
} }
} }
@ -379,7 +379,10 @@ impl SimpleComponent for LibsurviveSetupWindow {
let cont = self.calibration_running.clone(); let cont = self.calibration_running.clone();
glib::timeout_add_local(Duration::from_millis(1000), move || { glib::timeout_add_local(Duration::from_millis(1000), move || {
timer_sender.input(LibsurviveSetupMsg::TickCalibrationRunner); timer_sender.input(LibsurviveSetupMsg::TickCalibrationRunner);
glib::Continue(cont.get()) match cont.get() {
true => glib::ControlFlow::Continue,
false => glib::ControlFlow::Break,
}
}); });
} }
self.calibration_runner = Some(runner); self.calibration_runner = Some(runner);

3
src/ui/preference_rows.rs
View file

@ -4,10 +4,9 @@ use gtk::{
glib::{self, GString}, glib::{self, GString},
}; };
use relm4::prelude::*; use relm4::prelude::*;
use crate::withclones; use crate::withclones;
pub fn switch_row<F: Fn(&gtk::Switch, bool) -> glib::signal::Inhibit + 'static>( pub fn switch_row<F: Fn(&gtk::Switch, bool) -> glib::Propagation + 'static>(
title: &str, title: &str,
description: Option<&str>, description: Option<&str>,
value: bool, value: bool,

10
src/ui/profile_editor.rs
View file

@ -92,7 +92,7 @@ impl SimpleComponent for ProfileEditor {
model.profile.borrow().pull_on_build, model.profile.borrow().pull_on_build,
move |_, state| { move |_, state| {
prof.borrow_mut().pull_on_build = state; prof.borrow_mut().pull_on_build = state;
gtk::Inhibit(false) gtk::glib::Propagation::Proceed
} }
) )
}, },
@ -207,7 +207,7 @@ impl SimpleComponent for ProfileEditor {
model.profile.borrow().features.libsurvive.enabled, model.profile.borrow().features.libsurvive.enabled,
move |_, state| { move |_, state| {
prof.borrow_mut().features.libsurvive.enabled = state; prof.borrow_mut().features.libsurvive.enabled = state;
gtk::Inhibit(false) gtk::glib::Propagation::Proceed
} }
) )
}, },
@ -244,7 +244,7 @@ impl SimpleComponent for ProfileEditor {
model.profile.borrow().features.openhmd.enabled, model.profile.borrow().features.openhmd.enabled,
move |_, state| { move |_, state| {
prof.borrow_mut().features.openhmd.enabled = state; prof.borrow_mut().features.openhmd.enabled = state;
gtk::Inhibit(false) gtk::glib::Propagation::Proceed
} }
) )
}, },
@ -281,7 +281,7 @@ impl SimpleComponent for ProfileEditor {
model.profile.borrow().features.basalt.enabled, model.profile.borrow().features.basalt.enabled,
move |_, state| { move |_, state| {
prof.borrow_mut().features.basalt.enabled = state; prof.borrow_mut().features.basalt.enabled = state;
gtk::Inhibit(false) gtk::glib::Propagation::Proceed
} }
) )
}, },
@ -318,7 +318,7 @@ impl SimpleComponent for ProfileEditor {
model.profile.borrow().features.mercury_enabled, model.profile.borrow().features.mercury_enabled,
move |_, state| { move |_, state| {
prof.borrow_mut().features.mercury_enabled = state; prof.borrow_mut().features.mercury_enabled = state;
gtk::Inhibit(false) gtk::glib::Propagation::Proceed
} }
) )
}, },