diff --git a/src/components/mod.rs b/src/components/mod.rs index a581f71..b1eed83 100644 --- a/src/components/mod.rs +++ b/src/components/mod.rs @@ -2,7 +2,6 @@ mod base; pub mod bluetooth; mod input; pub mod output; +pub mod utils; pub mod wifi; pub mod window; -pub mod utils; - diff --git a/src/components/wifi/mod.rs b/src/components/wifi/mod.rs index 4d8da17..ac1d8de 100644 --- a/src/components/wifi/mod.rs +++ b/src/components/wifi/mod.rs @@ -1,14 +1,15 @@ #![allow(non_snake_case)] pub mod savedWifiEntry; pub mod savedWifiEntryImpl; +pub mod utils; +pub mod wifiAddressEntry; +pub mod wifiAddressEntryImpl; pub mod wifiBox; pub mod wifiBoxImpl; pub mod wifiEntry; pub mod wifiEntryImpl; pub mod wifiOptions; pub mod wifiOptionsImpl; -pub mod wifiAddressEntry; -pub mod wifiAddressEntryImpl; pub mod wifiRouteEntry; pub mod wifiRouteEntryImpl; -pub mod utils; \ No newline at end of file + diff --git a/src/components/wifi/savedWifiEntryImpl.rs b/src/components/wifi/savedWifiEntryImpl.rs index 31a0bdc..568019c 100644 --- a/src/components/wifi/savedWifiEntryImpl.rs +++ b/src/components/wifi/savedWifiEntryImpl.rs @@ -1,7 +1,7 @@ -use std::cell::RefCell; -use adw::ActionRow; use adw::subclass::preferences_row::PreferencesRowImpl; use adw::subclass::prelude::ActionRowImpl; +use adw::ActionRow; +use std::cell::RefCell; use dbus::Path; use gtk::subclass::prelude::*; diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs index b9228ad..93b894e 100644 --- a/src/components/wifi/wifiEntry.rs +++ b/src/components/wifi/wifiEntry.rs @@ -2,6 +2,7 @@ use std::sync::atomic::AtomicBool; use std::sync::Arc; use std::time::Duration; +use crate::components::wifi::utils::getConnectionSettings; use adw::glib; use adw::glib::{Object, PropertySet}; use adw::prelude::{ActionRowExt, ButtonExt, EditableExt, PopoverExt}; @@ -12,7 +13,6 @@ use glib::clone; use gtk::gio; use gtk::prelude::{ListBoxRowExt, WidgetExt}; use ReSet_Lib::network::network::{AccessPoint, WifiStrength}; -use crate::components::wifi::utils::getConnectionSettings; use crate::components::wifi::wifiBoxImpl::WifiBox; use crate::components::wifi::wifiEntryImpl; @@ -99,8 +99,11 @@ pub fn click_disconnect(entry: Arc) { "/org/Xetibo/ReSetDaemon", Duration::from_millis(10000), ); - let res: Result<(bool,), Error> = - proxy.method_call("org.Xetibo.ReSetWireless", "DisconnectFromCurrentAccessPoint", ()); + let res: Result<(bool,), Error> = proxy.method_call( + "org.Xetibo.ReSetWireless", + "DisconnectFromCurrentAccessPoint", + (), + ); if res.is_err() { println!("res of disconnect was error bro"); return; diff --git a/src/components/wifi/wifiEntryImpl.rs b/src/components/wifi/wifiEntryImpl.rs index c60ce62..a9dbf35 100644 --- a/src/components/wifi/wifiEntryImpl.rs +++ b/src/components/wifi/wifiEntryImpl.rs @@ -1,11 +1,11 @@ use crate::components::base::popup::Popup; use crate::components::wifi::wifiEntry; +use adw::subclass::preferences_row::PreferencesRowImpl; +use adw::subclass::prelude::ActionRowImpl; +use adw::ActionRow; use gtk::subclass::prelude::*; use gtk::{glib, Button, CompositeTemplate, Image, Label}; use std::cell::RefCell; -use adw::ActionRow; -use adw::subclass::preferences_row::PreferencesRowImpl; -use adw::subclass::prelude::ActionRowImpl; use ReSet_Lib::network::network::{AccessPoint, WifiStrength}; #[allow(non_snake_case)] diff --git a/src/components/wifi/wifiOptionsImpl.rs b/src/components/wifi/wifiOptionsImpl.rs index 58033b3..e8176c0 100644 --- a/src/components/wifi/wifiOptionsImpl.rs +++ b/src/components/wifi/wifiOptionsImpl.rs @@ -1,10 +1,10 @@ +use crate::components::wifi::wifiOptions; +use adw::subclass::prelude::NavigationPageImpl; +use adw::{ActionRow, ComboRow, EntryRow, NavigationPage, PreferencesGroup, SwitchRow}; +use gtk::subclass::prelude::*; +use gtk::{glib, Button, CompositeTemplate}; use std::cell::RefCell; use std::rc::Rc; -use adw::{ActionRow, ComboRow, EntryRow, NavigationPage, PreferencesGroup, SwitchRow}; -use adw::subclass::prelude::NavigationPageImpl; -use crate::components::wifi::{wifiOptions}; -use gtk::subclass::prelude::*; -use gtk::{glib, CompositeTemplate, Button}; use ReSet_Lib::network::connection::Connection; #[allow(non_snake_case)] @@ -58,7 +58,7 @@ pub struct WifiOptions { // Misc #[template_child] pub wifiOptionsApplyButton: TemplateChild