From a0e3f5fbee77efb5e8f6eb6caab04b76689f9c39 Mon Sep 17 00:00:00 2001 From: takotori Date: Tue, 7 Nov 2023 15:46:33 +0100 Subject: [PATCH] cleanup --- src/components/{temp => base}/listEntry.rs | 2 +- src/components/{temp => base}/listEntryImpl.rs | 3 +-- src/components/{temp => base}/mod.rs | 0 src/components/{temp => base}/settingBox.rs | 2 +- src/components/{temp => base}/settingBoxImpl.rs | 3 +-- src/components/bluetooth/bluetoothBox.rs | 2 +- src/components/bluetooth/bluetoothBoxImpl.rs | 2 +- src/components/mod.rs | 2 +- src/components/wifi/wifiBox.rs | 2 +- src/components/wifi/wifiBoxImpl.rs | 2 +- src/components/wifi/wifiEntryImpl.rs | 1 - src/components/window/handleSidebarClick.rs | 3 +-- 12 files changed, 10 insertions(+), 14 deletions(-) rename src/components/{temp => base}/listEntry.rs (91%) rename src/components/{temp => base}/listEntryImpl.rs (93%) rename src/components/{temp => base}/mod.rs (100%) rename src/components/{temp => base}/settingBox.rs (91%) rename src/components/{temp => base}/settingBoxImpl.rs (93%) diff --git a/src/components/temp/listEntry.rs b/src/components/base/listEntry.rs similarity index 91% rename from src/components/temp/listEntry.rs rename to src/components/base/listEntry.rs index 3c9bbd2..28d02f7 100644 --- a/src/components/temp/listEntry.rs +++ b/src/components/base/listEntry.rs @@ -1,4 +1,4 @@ -use crate::components::temp::listEntryImpl; +use crate::components::base::listEntryImpl; use adw::glib; use adw::glib::{IsA, Object}; use gtk::prelude::ListBoxRowExt; diff --git a/src/components/temp/listEntryImpl.rs b/src/components/base/listEntryImpl.rs similarity index 93% rename from src/components/temp/listEntryImpl.rs rename to src/components/base/listEntryImpl.rs index c31ca77..db0172b 100644 --- a/src/components/temp/listEntryImpl.rs +++ b/src/components/base/listEntryImpl.rs @@ -1,7 +1,6 @@ use gtk::{CompositeTemplate, glib}; -use gtk::prelude::*; use gtk::subclass::prelude::*; -use crate::components::temp::listEntry; +use crate::components::base::listEntry; #[allow(non_snake_case)] #[derive(Default, CompositeTemplate)] diff --git a/src/components/temp/mod.rs b/src/components/base/mod.rs similarity index 100% rename from src/components/temp/mod.rs rename to src/components/base/mod.rs diff --git a/src/components/temp/settingBox.rs b/src/components/base/settingBox.rs similarity index 91% rename from src/components/temp/settingBox.rs rename to src/components/base/settingBox.rs index 4ba51e7..95fea43 100644 --- a/src/components/temp/settingBox.rs +++ b/src/components/base/settingBox.rs @@ -1,4 +1,4 @@ -use crate::components::temp::settingBoxImpl; +use crate::components::base::settingBoxImpl; use adw::glib; use adw::glib::{IsA, Object}; use gtk::prelude::BoxExt; diff --git a/src/components/temp/settingBoxImpl.rs b/src/components/base/settingBoxImpl.rs similarity index 93% rename from src/components/temp/settingBoxImpl.rs rename to src/components/base/settingBoxImpl.rs index aee042e..da99683 100644 --- a/src/components/temp/settingBoxImpl.rs +++ b/src/components/base/settingBoxImpl.rs @@ -1,7 +1,6 @@ use gtk::{CompositeTemplate, glib}; -use gtk::prelude::*; use gtk::subclass::prelude::*; -use crate::components::temp::settingBox; +use crate::components::base::settingBox; #[allow(non_snake_case)] #[derive(Default, CompositeTemplate)] diff --git a/src/components/bluetooth/bluetoothBox.rs b/src/components/bluetooth/bluetoothBox.rs index 1ec60a8..527795a 100644 --- a/src/components/bluetooth/bluetoothBox.rs +++ b/src/components/bluetooth/bluetoothBox.rs @@ -5,7 +5,7 @@ use adw::subclass::prelude::ObjectSubclassIsExt; use crate::components::bluetooth::bluetoothBoxImpl; use crate::components::bluetooth::bluetoothEntry::BluetoothEntry; use crate::components::bluetooth::bluetoothEntryImpl::DeviceTypes; -use crate::components::temp::listEntry::ListEntry; +use crate::components::base::listEntry::ListEntry; glib::wrapper! { pub struct BluetoothBox(ObjectSubclass) diff --git a/src/components/bluetooth/bluetoothBoxImpl.rs b/src/components/bluetooth/bluetoothBoxImpl.rs index 294ea75..6d560fa 100644 --- a/src/components/bluetooth/bluetoothBoxImpl.rs +++ b/src/components/bluetooth/bluetoothBoxImpl.rs @@ -5,7 +5,7 @@ use gtk::subclass::prelude::*; use crate::components::bluetooth::bluetoothBox; use crate::components::bluetooth::bluetoothEntry::BluetoothEntry; -use crate::components::temp::listEntry::ListEntry; +use crate::components::base::listEntry::ListEntry; #[allow(non_snake_case)] #[derive(Default, CompositeTemplate)] diff --git a/src/components/mod.rs b/src/components/mod.rs index fa7867d..fb0f087 100644 --- a/src/components/mod.rs +++ b/src/components/mod.rs @@ -2,4 +2,4 @@ pub mod window; pub mod wifi; pub mod bluetooth; pub mod audio; -mod temp; \ No newline at end of file +mod base; \ No newline at end of file diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs index 6243317..ed3ee82 100644 --- a/src/components/wifi/wifiBox.rs +++ b/src/components/wifi/wifiBox.rs @@ -8,7 +8,7 @@ use dbus::blocking::Connection; use dbus::Error; use gtk::glib::Variant; use gtk::prelude::ActionableExt; -use crate::components::temp::listEntry::ListEntry; +use crate::components::base::listEntry::ListEntry; use crate::components::wifi::wifiBoxImpl; use crate::components::wifi::wifiEntry::WifiEntry; diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs index 4fcf76a..598e053 100644 --- a/src/components/wifi/wifiBoxImpl.rs +++ b/src/components/wifi/wifiBoxImpl.rs @@ -5,7 +5,7 @@ use gtk::subclass::prelude::*; use crate::components::wifi::wifiBox; use crate::components::wifi::wifiEntry::WifiEntry; -use crate::components::temp::listEntry::ListEntry; +use crate::components::base::listEntry::ListEntry; #[allow(non_snake_case)] #[derive(Default, CompositeTemplate)] diff --git a/src/components/wifi/wifiEntryImpl.rs b/src/components/wifi/wifiEntryImpl.rs index 926b3b1..6db3dc1 100644 --- a/src/components/wifi/wifiEntryImpl.rs +++ b/src/components/wifi/wifiEntryImpl.rs @@ -1,7 +1,6 @@ use std::cell::RefCell; use gtk::{Button, CompositeTemplate, glib, Image, Label}; use gtk::subclass::prelude::*; -use crate::components::temp::listEntry::ListEntry; use crate::components::wifi::wifiEntry; #[derive(Default, Copy, Clone)] diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs index 2df58fd..6e9fdfa 100644 --- a/src/components/window/handleSidebarClick.rs +++ b/src/components/window/handleSidebarClick.rs @@ -1,8 +1,7 @@ use gtk::{FlowBox, Label}; -use gtk::prelude::WidgetExt; use crate::components::audio::audioBox::AudioBox; use crate::components::bluetooth::bluetoothBox::BluetoothBox; -use crate::components::temp::settingBox::SettingBox; +use crate::components::base::settingBox::SettingBox; use crate::components::wifi::wifiBox::WifiBox; pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) = |resetMain: FlowBox| {