Update tooling

Cargo.toml

@@ -6,18 +6,17 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [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"
-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"
 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"
-serde_json = "1.0.113"
+serde_json = "1.0.120"
 serde = { version = "1.0", features = ["derive"] }
 gnome-desktop = "0.4.2"
-rust-i18n = "3"
+rust-i18n = "3.0.1"
 sys-locale = "0.3.1"

README.md

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

src/automatic_partitioning/mod.rs

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

src/build_ui.rs

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

src/done_page/mod.rs

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

src/efi_error_page/mod.rs

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

src/eula_page/mod.rs

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

src/install_page/mod.rs

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

src/keyboard_page/mod.rs

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

src/language_page/mod.rs

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

src/manual_partitioning/mod.rs

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

src/partitioning_page/mod.rs

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

src/timezone_page/mod.rs

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

src/welcome_page/mod.rs

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