From 1694555107ecb947f833270ffb2e229c5c3b6879 Mon Sep 17 00:00:00 2001 From: Lleyton Gray Date: Mon, 1 Jul 2024 20:44:06 -0700 Subject: [PATCH] *: various changes --- Cargo.lock | 131 +++++++++++++++++++++++------------------- Cargo.toml | 4 +- src/disks.rs | 2 + src/main.rs | 2 - src/pages/language.rs | 10 ++-- 5 files changed, 81 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d2f8963..b795b41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,7 +90,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools", @@ -112,9 +112,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -155,9 +155,9 @@ version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", - "glib 0.19.8", + "glib 0.19.9", "libc", "thiserror", ] @@ -170,14 +170,14 @@ checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ "glib-sys 0.19.8", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] name = "cc" -version = "1.0.100" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" dependencies = [ "jobserver", "libc", @@ -463,9 +463,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" dependencies = [ "serde", ] @@ -715,7 +715,7 @@ checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" dependencies = [ "gdk-pixbuf-sys 0.19.8", "gio 0.19.8", - "glib 0.19.8", + "glib 0.19.9", "libc", ] @@ -729,7 +729,7 @@ dependencies = [ "glib-sys 0.18.1", "gobject-sys 0.18.0", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -742,7 +742,7 @@ dependencies = [ "glib-sys 0.19.8", "gobject-sys 0.19.8", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -755,7 +755,7 @@ dependencies = [ "gdk-pixbuf 0.19.8", "gdk4-sys", "gio 0.19.8", - "glib 0.19.8", + "glib 0.19.9", "libc", "pango", ] @@ -774,7 +774,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -846,7 +846,7 @@ dependencies = [ "futures-io", "futures-util", "gio-sys 0.19.8", - "glib 0.19.8", + "glib 0.19.9", "libc", "pin-project-lite", "smallvec", @@ -862,7 +862,7 @@ dependencies = [ "glib-sys 0.18.1", "gobject-sys 0.18.0", "libc", - "system-deps", + "system-deps 6.2.2", "winapi", ] @@ -875,7 +875,7 @@ dependencies = [ "glib-sys 0.19.8", "gobject-sys 0.19.8", "libc", - "system-deps", + "system-deps 6.2.2", "windows-sys", ] @@ -885,7 +885,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -904,18 +904,18 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.8" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b664491bc77ab55daa6714a592cdbe1a55e28abec09cb50e87689b90de456ff4" +checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", "futures-task", "futures-util", "gio-sys 0.19.8", - "glib-macros 0.19.8", + "glib-macros 0.19.9", "glib-sys 0.19.8", "gobject-sys 0.19.8", "libc", @@ -940,9 +940,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.8" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d405205a405182f95e637710850a8e82f25ba01fdd6baebc82dabeaf0883376" +checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" dependencies = [ "heck 0.5.0", "proc-macro-crate 3.1.0", @@ -958,7 +958,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -968,7 +968,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" dependencies = [ "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1003,7 +1003,7 @@ dependencies = [ "gobject-sys 0.18.0", "gsettings-desktop-schemas-sys", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1014,7 +1014,7 @@ checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys 0.18.1", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1025,7 +1025,7 @@ checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" dependencies = [ "glib-sys 0.19.8", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1034,7 +1034,7 @@ version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" dependencies = [ - "glib 0.19.8", + "glib 0.19.9", "graphene-sys", "libc", ] @@ -1048,7 +1048,7 @@ dependencies = [ "glib-sys 0.19.8", "libc", "pkg-config", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1057,7 +1057,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "875c5582b4695e2de7bf763bedd3e4b610adcaa08c13028d38cc421c4e5857b5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "glib 0.18.5", "gsettings-desktop-schemas-sys", "libc", @@ -1071,7 +1071,7 @@ checksum = "3badaaef1ab8bd74d009abde5694c2713178b0ee6f7c9bf70af986a8ed7cee58" dependencies = [ "glib-sys 0.18.1", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1082,7 +1082,7 @@ checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" dependencies = [ "cairo-rs", "gdk4", - "glib 0.19.8", + "glib 0.19.9", "graphene-rs", "gsk4-sys", "libc", @@ -1102,7 +1102,7 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1117,7 +1117,7 @@ dependencies = [ "gdk-pixbuf 0.19.8", "gdk4", "gio 0.19.8", - "glib 0.19.8", + "glib 0.19.9", "graphene-rs", "gsk4", "gtk4-macros", @@ -1154,7 +1154,7 @@ dependencies = [ "gsk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1340,16 +1340,16 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libhelium" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282d2045acb5c9e45b794ada82e2403ff142e09849dc633ee9d58187ea8eefc5" +checksum = "d49776d474fb0403573e459bee21e8cb99f0b4bf53c15bca186d73cc23519b8c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "gdk-pixbuf 0.19.8", "gdk4", "gio 0.19.8", - "glib 0.19.8", + "glib 0.19.9", "gtk4", "libc", "libhelium-sys", @@ -1359,9 +1359,9 @@ dependencies = [ [[package]] name = "libhelium-sys" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b74dfcb6099ac20a7ed9a406d7fc27accb286e62ae2a16323c5b39b8a9510c" +checksum = "d70f9504679545b3dd05bd9c2455cc062af1b4451da434a21d19a2f2d7b708ae" dependencies = [ "gdk4-sys", "gio-sys 0.19.8", @@ -1370,7 +1370,7 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -1414,9 +1414,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "loopdev-3" @@ -1431,9 +1431,9 @@ dependencies = [ [[package]] name = "lsblk" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1757d98c6c4b1a1b2bf98c740f2e2bfd9cae9504ff2bec4e0ebe8e48b8677e28" +checksum = "5cc23583b8029308356876da6bd05c8b861309d4647fb54f9ad8dd1e6b37a8a0" dependencies = [ "thiserror", ] @@ -1645,7 +1645,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" dependencies = [ "gio 0.19.8", - "glib 0.19.8", + "glib 0.19.9", "libc", "pango-sys", ] @@ -1659,7 +1659,7 @@ dependencies = [ "glib-sys 0.19.8", "gobject-sys 0.19.8", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -2043,7 +2043,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -2137,9 +2137,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -2157,9 +2157,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "079f3a42cd87588d924ed95b533f8d30a483388c4e400ab736a7058e34f16169" dependencies = [ "base64", "chrono", @@ -2175,9 +2175,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "bc03aad67c1d26b7de277d51c86892e7d9a0110a2fe44bf6b26cc569fba302d6" dependencies = [ "darling 0.20.9", "proc-macro2", @@ -2293,7 +2293,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6acb8bb63826062d5a44b68298cf2e25b84bc151bc0c31c35a83b61f818682a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "loopdev-3", "smart-default", @@ -2314,6 +2314,19 @@ dependencies = [ "version-compare", ] +[[package]] +name = "system-deps" +version = "7.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml", + "version-compare", +] + [[package]] name = "tap" version = "1.0.1" diff --git a/Cargo.toml b/Cargo.toml index 9a1edc1..bd95ee0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ serde_json = "1.0.115" relm4 = { version = "0.8", features = ["macros"] } relm4-components = "0.8" bytesize = { version = "1.3.0", features = ["serde"] } -libhelium = { version = "0.2.0", features = ["gtk_v4_10", "v1_6"] } +libhelium = { version = "0.3.0", features = ["gtk_v4_10", "v1_6"] } # udisks2 = "0.1.0" cmd_lib = "1.9.3" tracing = { version = "0.1.40", features = ["log"] } @@ -31,7 +31,7 @@ chrono-tz = "0.9.0" paste = "1.0.15" tempfile = "3.10.1" glob = "0.3.1" -lsblk = "0.2.1" +lsblk = "0.2.3" serde_ini = "0.2.0" serde-enum-str = "0.4.0" const_format = "0.2.32" diff --git a/src/disks.rs b/src/disks.rs index 41d8d74..8b5e03a 100644 --- a/src/disks.rs +++ b/src/disks.rs @@ -20,6 +20,8 @@ const OSNAME_PLACEHOLDER: &str = "Unknown"; pub fn detect_os() -> Vec { let disks = lsblk::BlockDevice::list().unwrap(); + println!("{:?}", disks); + let osprobe: HashMap<_, _> = OSProbe::scan() .map(|probe| (probe.into_iter().map(|os| (os.part, os.os_name_pretty))).collect()) .unwrap_or_default(); diff --git a/src/main.rs b/src/main.rs index baf742c..20972c7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -71,7 +71,6 @@ macro_rules! generate_pages { } generate_pages!(Page AppModel AppMsg: - Region, Language, Welcome, Destination, @@ -108,7 +107,6 @@ impl SimpleComponent for AppModel { #[wrap(Some)] #[transition = "SlideLeftRight"] set_child = match model.page { - Page::Region => *model.region_page.widget(), Page::Language => *model.language_page.widget(), Page::Welcome => *model.welcome_page.widget(), Page::Destination => *model.destination_page.widget(), diff --git a/src/pages/language.rs b/src/pages/language.rs index a014158..dd498e4 100644 --- a/src/pages/language.rs +++ b/src/pages/language.rs @@ -101,10 +101,10 @@ impl SimpleComponent for LanguagePage { set_orientation: gtk::Orientation::Horizontal, set_spacing: 4, - libhelium::TextButton { - set_label: &gettext("Previous"), - connect_clicked => LanguagePageMsg::Navigate(NavigationAction::GoTo(crate::Page::Region)), - }, + // libhelium::TextButton { + // set_label: &gettext("Previous"), + // connect_clicked => LanguagePageMsg::Navigate(NavigationAction::GoTo(crate::Page::Region)), + // }, gtk::Box { set_hexpand: true, @@ -115,7 +115,7 @@ impl SimpleComponent for LanguagePage { inline_css: "padding-left: 48px; padding-right: 48px", connect_clicked => LanguagePageMsg::Navigate(NavigationAction::GoTo(crate::Page::Welcome)), #[watch] - set_sensitive: crate::INSTALLATION_STATE.read().timezone.is_some() + set_sensitive: crate::INSTALLATION_STATE.read().langlocale.is_some() } } }