Update tooling

This commit is contained in:
Ward from fusion-voyager-3 2024-08-03 03:41:51 +03:00
parent 95f6563e80
commit 2ed95c72a0
15 changed files with 422 additions and 307 deletions

672
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -6,18 +6,17 @@ 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]
adw = { version = "0.5.3", package = "libadwaita", features = ["v1_4"] } adw = { version = "0.7.0", package = "libadwaita", features = ["v1_5"] }
async-channel = "2.1.1" async-channel = "2.3.1"
duct = "0.13.7" duct = "0.13.7"
fragile = "2.0.0" glib = "0.20.0"
glib = "0.18.5" gtk = { version = "0.9.0", package = "gtk4", features = ["v4_14"] }
gtk = { version = "0.7.3", package = "gtk4", features = ["v4_12"] }
pretty-bytes = "0.2.2" pretty-bytes = "0.2.2"
time = "0.3.31" time = "0.3.31"
vte = { version = "0.0.2", package = "zoha-vte4", features = ["v0_72"] } vte = { version = "0.8.0", package = "vte4", features = ["v0_76"] }
glob = "0.3.1" glob = "0.3.1"
serde_json = "1.0.113" serde_json = "1.0.120"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
gnome-desktop = "0.4.2" gnome-desktop = "0.4.2"
rust-i18n = "3" rust-i18n = "3.0.1"
sys-locale = "0.3.1" sys-locale = "0.3.1"

View File

@ -1,6 +1,6 @@
### PikaOS installer ### PikaOS installer
A Rust based GTK4 + Libadwaita App A Rust based GTK4 + Libadwaita App
for installing PikaOS. for installing PikaOS (Highly Inspired by vanilla-installer).
### Help Us ### Help Us

View File

@ -2,7 +2,8 @@
// Use libraries // Use libraries
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)
use gtk::*; use gtk::*;

View File

@ -1,7 +1,8 @@
// Use libraries // Use libraries
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)
use gtk::*; use gtk::*;

View File

@ -2,7 +2,8 @@
// Use libraries // Use libraries
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)
use gtk::*; use gtk::*;

View File

@ -2,7 +2,8 @@
// Use libraries // Use libraries
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)
use gtk::*; use gtk::*;

View File

@ -2,7 +2,8 @@
// Use libraries // Use libraries
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)
use gtk::*; use gtk::*;

View File

@ -3,7 +3,8 @@ use std::cell::RefCell;
// Use libraries // Use libraries
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)
use gtk::*; use gtk::*;
@ -264,7 +265,7 @@ pub fn install_page(
.expect("Unable to read file")) .expect("Unable to read file"))
.unwrap() .unwrap()
.0 .0
.unwrap(), .unwrap().to_string(),
) )
.build(); .build();
install_confirm_detail_keyboard.add_css_class("property"); install_confirm_detail_keyboard.add_css_class("property");

View File

@ -1,7 +1,8 @@
// Use libraries // Use libraries
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)
use gtk::*; use gtk::*;
@ -206,7 +207,7 @@ pub fn keyboard_page(content_stack: &gtk::Stack,
.layout_info(&keyboard_layout) .layout_info(&keyboard_layout)
.unwrap() .unwrap()
.0 .0
.unwrap(), .unwrap().to_string(),
) )
.subtitle(keyboard_layout.clone()) .subtitle(keyboard_layout.clone())
.build(); .build();

View File

@ -2,7 +2,8 @@
use std::env; use std::env;
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)
use gtk::*; use gtk::*;

View File

@ -1,7 +1,8 @@
// Use libraries // Use libraries
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)
use gtk::*; use gtk::*;

View File

@ -1,7 +1,8 @@
// Use libraries // Use libraries
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
use glob::glob; use glob::glob;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)

View File

@ -1,7 +1,8 @@
// Use libraries // Use libraries
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)
use gtk::*; use gtk::*;

View File

@ -2,7 +2,8 @@
use crate::config::DISTRO_ICON; use crate::config::DISTRO_ICON;
use adw::prelude::*; use adw::prelude::*;
use adw::*; use adw::*;
use glib::*; use gtk::glib;
use gtk::glib::*;
/// Use all gtk4 libraries (gtk4 -> gtk because cargo) /// Use all gtk4 libraries (gtk4 -> gtk because cargo)
/// Use all libadwaita libraries (libadwaita -> adw because cargo) /// Use all libadwaita libraries (libadwaita -> adw because cargo)
use gtk::*; use gtk::*;