From 35c58e2fcd4676b48d1da860b16fbc6dd744bd73 Mon Sep 17 00:00:00 2001 From: takotori Date: Sun, 12 Nov 2023 17:43:01 +0100 Subject: [PATCH] Implement Microphone UI Improve Audio UI You won't believe what happened (gone sexual) --- src/components/base/settingBox.rs | 10 +- src/components/base/settingBoxImpl.rs | 11 +- src/components/bluetooth/bluetoothBox.rs | 10 + src/components/bluetooth/bluetoothBoxImpl.rs | 5 + src/components/bluetooth/bluetoothEntry.rs | 2 +- .../audioBox.rs => input/inputStreamEntry.rs} | 6 +- src/components/input/inputStreamEntryImpl.rs | 40 ++ src/components/input/mod.rs | 5 + src/components/input/sourceBox.rs | 26 + src/components/input/sourceBoxImpl.rs | 52 ++ src/components/mod.rs | 5 +- src/components/output/audioBox.rs | 27 + .../{audio => output}/audioBoxImpl.rs | 19 +- .../{audio => output}/audioSource.rs | 2 +- .../{audio => output}/audioSourceImpl.rs | 8 +- src/components/{audio => output}/mod.rs | 0 src/components/wifi/wifiBox.rs | 45 +- src/components/wifi/wifiBoxImpl.rs | 9 +- src/components/wifi/wifiEntry.rs | 25 +- src/components/wifi/wifiEntryImpl.rs | 5 +- src/components/window/handleSidebarClick.rs | 50 +- src/components/window/window.rs | 4 +- src/resources/resetAudio.ui | 226 +++++-- src/resources/resetAudioSourceEntry.ui | 2 +- src/resources/resetBluetooth.ui | 111 +++- src/resources/resetInputStreamEntry.ui | 68 +++ src/resources/resetMainWindow.ui | 12 +- src/resources/resetMicrophone.ui | 224 +++++-- src/resources/resetOutputStreamEntry.ui | 68 +++ src/resources/resetSavedWifiEntry.ui | 22 +- src/resources/resetSettingBox.ui | 9 +- src/resources/resetUI.cmb | 578 ++++++++++++------ src/resources/resetWiFi.ui | 85 ++- src/resources/resetWifiEntry.ui | 2 +- src/resources/resources.gresource.xml | 4 +- src/resources/style/style.css | 2 +- 36 files changed, 1380 insertions(+), 399 deletions(-) rename src/components/{audio/audioBox.rs => input/inputStreamEntry.rs} (60%) create mode 100644 src/components/input/inputStreamEntryImpl.rs create mode 100644 src/components/input/mod.rs create mode 100644 src/components/input/sourceBox.rs create mode 100644 src/components/input/sourceBoxImpl.rs create mode 100644 src/components/output/audioBox.rs rename src/components/{audio => output}/audioBoxImpl.rs (61%) rename src/components/{audio => output}/audioSource.rs (88%) rename src/components/{audio => output}/audioSourceImpl.rs (81%) rename src/components/{audio => output}/mod.rs (100%) create mode 100644 src/resources/resetInputStreamEntry.ui create mode 100644 src/resources/resetOutputStreamEntry.ui diff --git a/src/components/base/settingBox.rs b/src/components/base/settingBox.rs index bffe624..30b309c 100644 --- a/src/components/base/settingBox.rs +++ b/src/components/base/settingBox.rs @@ -1,21 +1,19 @@ use crate::components::base::settingBoxImpl; use adw::glib; use adw::glib::{IsA, Object}; -use glib::subclass::prelude::ObjectSubclassIsExt; -use gtk::prelude::FrameExt; +use gtk::prelude::BoxExt; use gtk::Widget; glib::wrapper! { pub struct SettingBox(ObjectSubclass) - @extends gtk::Frame, gtk::Widget, + @extends gtk::Box, gtk::Widget, @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget; } impl SettingBox { - pub fn new(child: &impl IsA, title: &str) -> Self { + pub fn new(child: &impl IsA) -> Self { let entry: SettingBox = Object::builder().build(); - entry.set_child(Some(child)); - entry.imp().resetSettingLabel.set_text(title); + entry.append(child); entry } } \ No newline at end of file diff --git a/src/components/base/settingBoxImpl.rs b/src/components/base/settingBoxImpl.rs index e895ab5..b0009f1 100644 --- a/src/components/base/settingBoxImpl.rs +++ b/src/components/base/settingBoxImpl.rs @@ -5,16 +5,13 @@ use crate::components::base::settingBox; #[allow(non_snake_case)] #[derive(Default, CompositeTemplate)] #[template(resource = "/org/Xetibo/ReSet/resetSettingBox.ui")] -pub struct SettingBox { - #[template_child] - pub resetSettingLabel: TemplateChild