diff --git a/src/lib/launcher/states.rs b/src/lib/launcher/states.rs index c7529a4..c43c3a9 100644 --- a/src/lib/launcher/states.rs +++ b/src/lib/launcher/states.rs @@ -1,6 +1,3 @@ -use gtk4::{self as gtk, prelude::*}; -use libadwaita::{self as adw, prelude::*}; - use std::io::{Error, ErrorKind}; use anime_game_core::prelude::*; @@ -42,7 +39,7 @@ impl Default for LauncherState { } impl LauncherState { - pub fn get(status_page: Option<&adw::StatusPage>) -> std::io::Result { + pub fn get(status_page: Option<&libadwaita::StatusPage>) -> std::io::Result { let config = config::get()?; if config.game.wine.selected == None { diff --git a/src/main.rs b/src/main.rs index dfe8102..0e5629d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ use gtk4::{self as gtk, prelude::*}; -use libadwaita::{self as adw, prelude::*}; +use libadwaita as adw; use gtk::{CssProvider, StyleContext, STYLE_PROVIDER_PRIORITY_APPLICATION}; use gtk::gdk::Display; diff --git a/src/ui/components/progress_bar.rs b/src/ui/components/progress_bar.rs index 05ab179..b52e5d0 100644 --- a/src/ui/components/progress_bar.rs +++ b/src/ui/components/progress_bar.rs @@ -1,5 +1,5 @@ use gtk4::{self as gtk, prelude::*}; -use libadwaita::{self as adw, prelude::*}; +use libadwaita as adw; use gtk::glib; diff --git a/src/ui/components/wine_group.rs b/src/ui/components/wine_group.rs index 5e16e6c..f855d40 100644 --- a/src/ui/components/wine_group.rs +++ b/src/ui/components/wine_group.rs @@ -1,4 +1,3 @@ -use gtk4::{self as gtk, prelude::*}; use libadwaita::{self as adw, prelude::*}; use crate::lib::wine::Group; diff --git a/src/ui/first_run.rs b/src/ui/first_run.rs index 4546410..7166691 100644 --- a/src/ui/first_run.rs +++ b/src/ui/first_run.rs @@ -1,5 +1,5 @@ use gtk4::{self as gtk, prelude::*}; -use libadwaita::{self as adw, prelude::*}; +use libadwaita as adw; use gtk::glib; use gtk::glib::clone; @@ -138,7 +138,7 @@ pub struct Values; #[derive(Clone)] pub struct App { widgets: AppWidgets, - values: Rc>, + // values: Rc>, actions: Rc>>> } @@ -148,7 +148,7 @@ impl App { // Get default widgets from ui file and add events to them let result = Self { widgets: AppWidgets::try_get()?, - values: Default::default(), + // values: Default::default(), actions: Default::default() }.init_events().init_actions(); diff --git a/src/ui/main.rs b/src/ui/main.rs index 006fd68..68ef6ad 100644 --- a/src/ui/main.rs +++ b/src/ui/main.rs @@ -1,5 +1,5 @@ use gtk4::{self as gtk, prelude::*}; -use libadwaita::{self as adw, prelude::*}; +use libadwaita as adw; use gtk4::glib; use gtk4::glib::clone; @@ -295,9 +295,9 @@ impl App { }); }, Err(err) => { - glib::MainContext::default().invoke(clone!(@strong this => move || { - this.toast_error("Failed to load config", err); - })); + this.update(Actions::ToastError(Rc::new(( + String::from("Failed to load config"), err + )))).unwrap(); } } } diff --git a/src/ui/mod.rs b/src/ui/mod.rs index c655869..54630e3 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,5 +1,5 @@ use gtk4::{self as gtk, prelude::*}; -use libadwaita::{self as adw, prelude::*}; +use libadwaita as adw; mod first_run; mod main; diff --git a/src/ui/preferences/enhancements_page.rs b/src/ui/preferences/enhancements_page.rs index 6d06bfb..d198604 100644 --- a/src/ui/preferences/enhancements_page.rs +++ b/src/ui/preferences/enhancements_page.rs @@ -1,4 +1,4 @@ -use gtk4::{self as gtk, prelude::*}; +use gtk4 as gtk; use libadwaita::{self as adw, prelude::*}; use gtk4::glib; diff --git a/src/ui/preferences/mod.rs b/src/ui/preferences/mod.rs index 012860e..5fc43d6 100644 --- a/src/ui/preferences/mod.rs +++ b/src/ui/preferences/mod.rs @@ -1,5 +1,5 @@ use gtk4::{self as gtk, prelude::*}; -use libadwaita::{self as adw, prelude::*}; +use libadwaita as adw; use gtk::glib; diff --git a/src/ui/traits/toast_error.rs b/src/ui/traits/toast_error.rs index 42cd516..d74234b 100644 --- a/src/ui/traits/toast_error.rs +++ b/src/ui/traits/toast_error.rs @@ -1,5 +1,5 @@ use gtk4::{self as gtk, prelude::*}; -use libadwaita::{self as adw, prelude::*}; +use libadwaita as adw; use crate::ui::add_action;