diff --git a/Cargo.toml b/Cargo.toml index 8c5eede..6cbd864 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" description = "A wip universal Linux settings application." [dependencies] -reset_daemon = "0.1.9" +reset_daemon = "0.2.3" ReSet-Lib = "0.4.0" adw = { version = "0.5.3", package = "libadwaita", features = ["v1_4"] } dbus = "0.9.7" diff --git a/src/components/base/utils.rs b/src/components/base/utils.rs index 8920b88..6e12d15 100644 --- a/src/components/base/utils.rs +++ b/src/components/base/utils.rs @@ -434,3 +434,4 @@ fn stop_dbus_audio_listener(conn: Connection) { ); let _: Result<(), Error> = proxy.method_call("org.xetibo.ReSet", "StopAudioListener", ()); } + diff --git a/src/components/bluetooth/bluetoothBox.rs b/src/components/bluetooth/bluetoothBox.rs index a39b044..f2e0872 100644 --- a/src/components/bluetooth/bluetoothBox.rs +++ b/src/components/bluetooth/bluetoothBox.rs @@ -11,7 +11,7 @@ use dbus::message::SignalArgs; use dbus::{Error, Path}; use gtk::gio; use gtk::glib::Variant; -use gtk::prelude::ActionableExt; +use gtk::prelude::{ActionableExt, ListBoxRowExt}; use ReSet_Lib::signals::{BluetoothDeviceAdded, BluetoothDeviceRemoved}; use crate::components::base::listEntry::ListEntry; @@ -36,6 +36,7 @@ impl BluetoothBox { pub fn setupCallbacks(&self) { let selfImp = self.imp(); + selfImp.resetVisibility.set_activatable(true); selfImp .resetVisibility .set_action_name(Some("navigation.push")); diff --git a/src/components/bluetooth/bluetoothBoxImpl.rs b/src/components/bluetooth/bluetoothBoxImpl.rs index 9659793..0df46af 100644 --- a/src/components/bluetooth/bluetoothBoxImpl.rs +++ b/src/components/bluetooth/bluetoothBoxImpl.rs @@ -5,6 +5,7 @@ use gtk::{glib, CompositeTemplate, ListBox, Switch}; use std::cell::RefCell; use std::collections::HashMap; use std::sync::Arc; +use adw::ActionRow; use crate::components::base::listEntry::ListEntry; use crate::components::bluetooth::bluetoothBox; @@ -21,7 +22,7 @@ pub struct BluetoothBox { #[template_child] pub resetBluetoothConnectedDevices: TemplateChild, #[template_child] - pub resetVisibility: TemplateChild, + pub resetVisibility: TemplateChild, #[template_child] pub resetBluetoothMainTab: TemplateChild, pub availableDevices: RefCell, (Arc, Arc)>>, diff --git a/src/components/input/sourceBox.rs b/src/components/input/sourceBox.rs index 8bb606d..f1cfc85 100644 --- a/src/components/input/sourceBox.rs +++ b/src/components/input/sourceBox.rs @@ -10,7 +10,7 @@ use dbus::message::SignalArgs; use glib::{Cast, clone, Propagation, Variant}; use glib::subclass::prelude::ObjectSubclassIsExt; use gtk::{Align, gio, SignalListItemFactory, StringObject}; -use gtk::prelude::{ActionableExt, GObjectPropertyExpressionExt, WidgetExt, ListItemExt}; +use gtk::prelude::{ActionableExt, GObjectPropertyExpressionExt, ListItemExt, WidgetExt}; use ReSet_Lib::audio::audio::{Card, OutputStream, Source}; use crate::components::base::cardEntry::CardEntry; @@ -23,7 +23,7 @@ use crate::components::input::sourceBoxImpl; use crate::components::input::sourceEntry::set_source_volume; use super::outputStreamEntry::OutputStreamEntry; -use super::sourceEntry::{set_default_source, toggle_source_mute, SourceEntry}; +use super::sourceEntry::{set_default_source, SourceEntry, toggle_source_mute}; glib::wrapper! { pub struct SourceBox(ObjectSubclass) @@ -440,25 +440,27 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc) -> glib::idle_add_once(move || { let output_box = source_box.clone(); let output_box_imp = output_box.imp(); + let is_default = ir.source.name == default_source.name; + let volume = ir.source.volume.first().unwrap_or_else(|| &(0 as u32)); + let fraction = (*volume as f64 / 655.36).round(); + let percentage = (fraction).to_string() + "%"; let list = output_box_imp.resetSourceList.read().unwrap(); let entry = list.get(&ir.source.index); if entry.is_none() { return; } let imp = entry.unwrap().1.imp(); - let is_default = ir.source.name == default_source.name; - imp.resetSourceName - .set_text(ir.source.alias.clone().as_str()); - let volume = ir.source.volume.first().unwrap_or_else(|| &(0 as u32)); - let fraction = (*volume as f64 / 655.36).round(); - let percentage = (fraction).to_string() + "%"; - imp.resetVolumePercentage.set_text(&percentage); - imp.resetVolumeSlider.set_value(*volume as f64); if is_default { + output_box_imp.resetVolumePercentage.set_text(&percentage); + output_box_imp.resetVolumeSlider.set_value(*volume as f64); imp.resetSelectedSource.set_active(true); } else { imp.resetSelectedSource.set_active(false); } + imp.resetSourceName.set_text(ir.source.alias.clone().as_str()); + imp.resetVolumePercentage.set_text(&percentage); + imp.resetVolumeSlider.set_value(*volume as f64); + }); }); true diff --git a/src/components/output/sinkBox.rs b/src/components/output/sinkBox.rs index 505b423..3dbcebd 100644 --- a/src/components/output/sinkBox.rs +++ b/src/components/output/sinkBox.rs @@ -444,24 +444,27 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc) -> Co glib::idle_add_once(move || { let output_box = sink_box.clone(); let output_box_imp = output_box.imp(); + let is_default = ir.sink.name == default_sink.name; + let volume = ir.sink.volume.first().unwrap_or_else(|| &(0 as u32)); + let fraction = (*volume as f64 / 655.36).round(); + let percentage = (fraction).to_string() + "%"; + let list = output_box_imp.resetSinkList.read().unwrap(); let entry = list.get(&ir.sink.index); if entry.is_none() { return; } let imp = entry.unwrap().1.imp(); - let is_default = ir.sink.name == default_sink.name; - imp.resetSinkName.set_text(ir.sink.alias.clone().as_str()); - let volume = ir.sink.volume.first().unwrap_or_else(|| &(0 as u32)); - let fraction = (*volume as f64 / 655.36).round(); - let percentage = (fraction).to_string() + "%"; - imp.resetVolumePercentage.set_text(&percentage); - imp.resetVolumeSlider.set_value(*volume as f64); if is_default { + output_box_imp.resetVolumePercentage.set_text(&percentage); + output_box_imp.resetVolumeSlider.set_value(*volume as f64); imp.resetSelectedSink.set_active(true); } else { imp.resetSelectedSink.set_active(false); } + imp.resetSinkName.set_text(ir.sink.alias.clone().as_str()); + imp.resetVolumePercentage.set_text(&percentage); + imp.resetVolumeSlider.set_value(*volume as f64); }); }); true diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs index f84ee7b..5352c31 100644 --- a/src/components/window/handleSidebarClick.rs +++ b/src/components/window/handleSidebarClick.rs @@ -1,5 +1,6 @@ use gtk::prelude::FrameExt; use std::sync::Arc; +use std::sync::atomic::Ordering; use crate::components::base::settingBox::SettingBox; use crate::components::base::utils::{start_audio_listener, Listeners}; @@ -89,6 +90,7 @@ pub const HANDLE_VOLUME_CLICK: fn(Arc, FlowBox) = listeners.stop_bluetooth_listener(); let audioOutput = Arc::new(SinkBox::new()); start_audio_listener(listeners.clone(), Some(audioOutput.clone()), None); + while !listeners.pulse_listener.load(Ordering::SeqCst) {} populate_sinks(audioOutput.clone()); let audioFrame = wrapInFrame(SettingBox::new(&*audioOutput)); resetMain.remove_all(); diff --git a/src/resources/resetBluetooth.ui b/src/resources/resetBluetooth.ui index 1539afd..642187c 100644 --- a/src/resources/resetBluetooth.ui +++ b/src/resources/resetBluetooth.ui @@ -37,55 +37,21 @@ vertical - - boxed-list - 10 - 5 - 5 - 5 - True - start + - - - - 40 - 5 - - - Bluetooth Device - - - - - end - True - center - - - - + + Bluetooth Device - + + Visibility Settings - - 40 - - - Visibility Settings - 5 - - - - - end - True - go-previous-symbolic-rtl - 5 - - + + end + True + go-previous-symbolic-rtl + 5 @@ -94,6 +60,7 @@ + 10 vertical diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb index 7771d27..38bd91b 100644 --- a/src/resources/resetUI.cmb +++ b/src/resources/resetUI.cmb @@ -21,7 +21,8 @@ (20,None,None,"resetCardEntry.ui",None,None,None,None,None,None,None), (21,1,None,"resetWifiOptions.ui",None,None,None,None,None,None,None), (22,1,None,"resetWifiAddressEntry.ui",None,None,None,None,None,None,None), - (23,1,None,"resetWifiRouteEntry.ui",None,None,None,None,None,None,None) + (23,1,None,"resetWifiRouteEntry.ui",None,None,None,None,None,None,None), + (24,None,None,None,None,None,None,None,None,None,None) (21,"gtk","4.12",None), @@ -55,7 +56,7 @@ (4,152,"AdwNavigationView","resetWifiNavigation",7,None,None,None,1,None), (4,153,"AdwNavigationPage",None,152,None,None,None,None,None), (4,154,"GtkBox",None,153,None,None,None,None,None), - (4,164,"GtkBox",None,154,None,None,None,2,None), + (4,164,"GtkBox",None,154,None,None,None,1,None), (4,165,"GtkLabel",None,164,None,None,None,None,None), (4,166,"GtkScrolledWindow",None,164,None,None,None,1,None), (4,167,"GtkViewport",None,166,None,None,None,None,None), @@ -75,6 +76,35 @@ (4,202,"GtkImage",None,201,None,None,None,None,None), (4,203,"AdwPreferencesGroup","resetWifiList",167,None,None,None,-1,None), (4,204,"AdwPreferencesGroup","resetStoredWifiList",175,None,None,None,1,None), + (4,205,"AdwPreferencesGroup",None,154,None,None,None,2,None), + (4,206,"AdwComboRow",None,205,None,None,None,None,None), + (4,207,"GtkLabel",None,206,None,None,None,None,None), + (4,208,"GtkStringList",None,206,None,None,None,None,None), + (4,209,"AdwActionRow",None,205,None,None,None,1,None), + (4,210,"GtkBox",None,209,None,None,None,None,None), + (4,211,"GtkBox",None,210,None,None,None,None,None), + (4,212,"GtkBox","resetOutputStreamEntry",211,None,None,None,None,None), + (4,213,"GtkBox",None,212,None,None,None,None,None), + (4,214,"GtkButton","resetSourceMute",213,None,None,None,None,None), + (4,215,"GtkScale","resetVolumeSlider",213,None,None,None,1,None), + (4,216,"GtkAdjustment",None,215,None,None,None,None,None), + (4,217,"GtkLabel","resetVolumePercentage",213,None,None,None,2,None), + (4,218,"GtkProgressBar","resetVolumeMeter",212,None,None,None,1,None), + (4,233,"GtkSeparator",None,154,None,None,None,3,None), + (4,234,"AdwPreferencesGroup",None,154,None,None,None,4,None), + (4,235,"AdwComboRow",None,234,None,None,None,None,None), + (4,236,"GtkLabel",None,235,None,None,None,None,None), + (4,237,"GtkStringList",None,235,None,None,None,None,None), + (4,238,"AdwActionRow",None,234,None,None,None,1,None), + (4,239,"GtkBox",None,238,None,None,None,None,None), + (4,240,"GtkBox",None,239,None,None,None,None,None), + (4,241,"GtkBox","resetOutputStreamEn2try",240,None,None,None,None,None), + (4,242,"GtkBox",None,241,None,None,None,None,None), + (4,243,"GtkButton","resetSou2rceMute",242,None,None,None,None,None), + (4,244,"GtkScale","resetVolum2eSlider",242,None,None,None,1,None), + (4,245,"GtkAdjustment",None,244,None,None,None,None,None), + (4,246,"GtkLabel","resetVolum2ePercentage",242,None,None,None,2,None), + (4,247,"GtkProgressBar","resetVolu2meMeter",241,None,None,None,1,None), (5,12,"AdwActionRow","resetWifiEntry",None,None,None,None,-1,None), (5,13,"GtkBox",None,12,None,None,None,None,None), (5,14,"GtkBox",None,13,None,None,None,None,None), @@ -142,13 +172,12 @@ (10,119,"AdwNavigationView",None,1,None,None,None,1,None), (10,120,"AdwNavigationPage",None,119,None,None,None,None,None), (10,121,"GtkBox",None,120,None,None,None,None,None), - (10,122,"GtkListBox","resetBluetoothDetails",121,None,None,None,1,None), - (10,127,"GtkBox",None,121,None,None,None,2,None), + (10,127,"GtkBox",None,121,None,None,None,1,None), (10,128,"GtkLabel",None,127,None,None,None,None,None), (10,129,"GtkScrolledWindow",None,127,None,None,None,1,None), (10,130,"GtkViewport",None,129,None,None,None,None,None), (10,131,"GtkListBox","resetBluetoothAvailableDevices",130,None,None,None,None,None), - (10,132,"GtkBox",None,121,None,None,None,3,None), + (10,132,"GtkBox",None,121,None,None,None,2,None), (10,133,"GtkLabel",None,132,None,None,None,None,None), (10,134,"GtkScrolledWindow",None,132,None,None,None,1,None), (10,135,"GtkViewport",None,134,None,None,None,None,None), @@ -164,14 +193,10 @@ (10,157,"GtkLabel",None,156,None,None,None,None,None), (10,158,"GtkImage",None,156,None,None,None,1,None), (10,159,"GtkLabel",None,153,None,None,None,1,None), - (10,164,"resetListBoxRow",None,122,None,None,None,1,None), - (10,165,"GtkBox",None,164,None,None,None,None,None), - (10,166,"GtkLabel",None,165,None,None,None,None,None), - (10,167,"GtkDropDown","resetBluetoothDevice",165,None,None,None,1,None), - (10,168,"resetListBoxRow","resetVisibility",122,None,None,None,1,None), - (10,169,"GtkBox",None,168,None,None,None,None,None), - (10,170,"GtkLabel",None,169,None,None,None,None,None), - (10,171,"GtkImage",None,169,None,None,None,1,None), + (10,172,"AdwPreferencesGroup","resetBluetoothDetails",121,None,None,None,None,None), + (10,173,"AdwComboRow","resetBluetoothDevice",172,None,None,None,None,None), + (10,174,"AdwActionRow","resetVisibility",172,None,None,None,1,None), + (10,175,"GtkImage",None,174,None,None,None,None,None), (11,2,"GtkBox","resetBluetoothEntry",None,None,None,None,None,None), (11,3,"GtkImage","resetBluetoothDeviceType",2,None,None,None,None,None), (11,5,"GtkButton","resetBluetoothButton",2,None,None,None,3,None), @@ -318,7 +343,21 @@ (23,5,"GtkButton","resetRouteRemove",1,None,None,None,1,None), (23,6,"GtkBox",None,2,None,None,None,2,None), (23,7,"AdwEntryRow","resetRouteGateway",6,None,None,None,None,None), - (23,8,"AdwEntryRow","resetRouteMetric",6,None,None,None,1,None) + (23,8,"AdwEntryRow","resetRouteMetric",6,None,None,None,1,None), + (24,13,"AdwPreferencesGroup",None,None,None,None,None,-1,None), + (24,14,"AdwComboRow",None,13,None,None,None,None,None), + (24,26,"GtkLabel",None,14,None,None,None,-1,None), + (24,27,"GtkStringList",None,14,None,None,None,-1,None), + (24,37,"AdwActionRow",None,13,None,None,None,1,None), + (24,38,"GtkBox",None,37,None,None,None,-1,None), + (24,39,"GtkBox",None,38,None,None,None,None,None), + (24,40,"GtkBox","resetOutputStreamEntry",39,None,None,None,None,None), + (24,41,"GtkBox",None,40,None,None,None,None,None), + (24,42,"GtkButton","resetSourceMute",41,None,None,None,None,None), + (24,43,"GtkScale","resetVolumeSlider",41,None,None,None,1,None), + (24,44,"GtkAdjustment",None,43,None,None,None,None,None), + (24,45,"GtkLabel","resetVolumePercentage",41,None,None,None,2,None), + (24,46,"GtkProgressBar","resetVolumeMeter",40,None,None,None,1,None) (3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None), @@ -426,6 +465,60 @@ (4,202,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), (4,202,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (4,204,"AdwPreferencesGroup","title","Saved Networks",None,None,None,None,None,None,None,None,None), + (4,206,"AdwActionRow","activatable-widget",None,None,None,None,None,207,None,None,None,None), + (4,206,"AdwComboRow","model",None,None,None,None,None,208,None,None,None,None), + (4,206,"AdwPreferencesRow","title","asadf",None,None,None,None,None,None,None,None,None), + (4,209,"GtkListBoxRow","child",None,None,None,None,None,210,None,None,None,None), + (4,211,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), + (4,211,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (4,212,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), + (4,212,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), + (4,212,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), + (4,212,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), + (4,212,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (4,213,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), + (4,213,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (4,214,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None), + (4,214,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), + (4,214,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (4,215,"GtkRange","adjustment",None,None,None,None,None,216,None,None,None,None), + (4,215,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None), + (4,215,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (4,215,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (4,216,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None), + (4,216,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None), + (4,216,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None), + (4,217,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None), + (4,217,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None), + (4,217,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None), + (4,218,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (4,235,"AdwActionRow","activatable-widget",None,None,None,None,None,236,None,None,None,None), + (4,235,"AdwComboRow","model",None,None,None,None,None,237,None,None,None,None), + (4,235,"AdwPreferencesRow","title","asadf",None,None,None,None,None,None,None,None,None), + (4,238,"GtkListBoxRow","child",None,None,None,None,None,239,None,None,None,None), + (4,240,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), + (4,240,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (4,241,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), + (4,241,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), + (4,241,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), + (4,241,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), + (4,241,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (4,242,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), + (4,242,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (4,243,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None), + (4,243,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), + (4,243,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (4,244,"GtkRange","adjustment",None,None,None,None,None,245,None,None,None,None), + (4,244,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None), + (4,244,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (4,244,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (4,245,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None), + (4,245,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None), + (4,245,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None), + (4,246,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None), + (4,246,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None), + (4,246,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None), + (4,247,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), (5,12,"GtkListBoxRow","child",None,None,None,None,None,13,None,None,None,None), (5,13,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), (5,14,"GtkWidget","width-request","35",None,None,None,None,None,None,None,None,None), @@ -568,14 +661,8 @@ (10,120,"AdwNavigationPage","tag","main",None,None,None,None,None,None,None,None,None), (10,120,"AdwNavigationPage","title","main",None,None,None,None,None,None,None,None,None), (10,121,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), - (10,122,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None), - (10,122,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None), - (10,122,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), - (10,122,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), - (10,122,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), - (10,122,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), - (10,122,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None), (10,127,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), + (10,127,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None), (10,128,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None), (10,128,"GtkLabel","label","Available devices",None,None,None,None,None,None,None,None,None), (10,128,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), @@ -631,19 +718,12 @@ (10,159,"GtkLabel","label","Visibility Settings",None,None,None,None,None,None,None,None,None), (10,159,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), (10,159,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), - (10,165,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None), - (10,165,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), - (10,166,"GtkLabel","label","Bluetooth Device",None,None,None,None,None,None,None,None,None), - (10,167,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None), - (10,167,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (10,167,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), - (10,169,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None), - (10,170,"GtkLabel","label","Visibility Settings",None,None,None,None,None,None,None,None,None), - (10,170,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), - (10,171,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None), - (10,171,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None), - (10,171,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (10,171,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), + (10,173,"AdwPreferencesRow","title","Bluetooth Device",None,None,None,None,None,None,None,None,None), + (10,174,"AdwPreferencesRow","title","Visibility Settings",None,None,None,None,None,None,None,None,None), + (10,175,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None), + (10,175,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None), + (10,175,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (10,175,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (11,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), (11,3,"GtkImage","icon-name","input-mouse-symbolic",None,None,None,None,None,None,None,None,None), (11,3,"GtkWidget","margin-end","15",None,None,None,None,None,None,None,None,None), @@ -942,7 +1022,35 @@ (23,7,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None), (23,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), (23,8,"AdwPreferencesRow","title","Metric",None,None,None,None,None,None,None,None,None), - (23,8,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None) + (23,8,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None), + (24,14,"AdwActionRow","activatable-widget",None,None,None,None,None,26,None,None,None,None), + (24,14,"AdwComboRow","model",None,None,None,None,None,27,None,None,None,None), + (24,14,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None), + (24,14,"AdwPreferencesRow","title","asadf",None,None,None,None,None,None,None,None,None), + (24,37,"GtkListBoxRow","child",None,None,None,None,None,38,None,None,None,None), + (24,39,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), + (24,39,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (24,40,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), + (24,40,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), + (24,40,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), + (24,40,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), + (24,40,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (24,41,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), + (24,41,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (24,42,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None), + (24,42,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), + (24,42,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (24,43,"GtkRange","adjustment",None,None,None,None,None,44,None,None,None,None), + (24,43,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None), + (24,43,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (24,43,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (24,44,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None), + (24,44,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None), + (24,44,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None), + (24,45,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None), + (24,45,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None), + (24,45,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None), + (24,46,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None) (3,42,"GtkWidget",1,1,None,None,None,None,None,None), @@ -981,7 +1089,22 @@ (21,41,"GtkStringList",2,7,"Dynamic WEP (802.1X)",1,None,None,None,None), (21,41,"GtkStringList",2,8,"WPA & WPA2 Personal",1,None,None,None,None), (21,41,"GtkStringList",2,9,"WPA & WPA2 Enterprise",1,None,None,None,None), - (21,41,"GtkStringList",2,10,"WPA3 Personal",1,None,None,None,None) + (21,41,"GtkStringList",2,10,"WPA3 Personal",1,None,None,None,None), + (24,27,"GtkStringList",2,3,"dsfds",1,None,None,None,None), + (24,27,"GtkStringList",2,2,"asdf",1,None,None,None,None), + (24,27,"GtkStringList",1,1,None,None,None,None,None,None), + (24,43,"GtkScale",1,1,None,None,None,None,None,None), + (24,43,"GtkScale",2,2,"100%",1,None,None,None,None), + (4,208,"GtkStringList",1,1,None,None,None,None,None,None), + (4,208,"GtkStringList",2,2,"asdf",1,None,None,None,None), + (4,208,"GtkStringList",2,3,"dsfds",1,None,None,None,None), + (4,215,"GtkScale",1,1,None,None,None,None,None,None), + (4,215,"GtkScale",2,2,"100%",1,None,None,None,None), + (4,237,"GtkStringList",1,1,None,None,None,None,None,None), + (4,237,"GtkStringList",2,2,"asdf",1,None,None,None,None), + (4,237,"GtkStringList",2,3,"dsfds",1,None,None,None,None), + (4,244,"GtkScale",1,1,None,None,None,None,None,None), + (4,244,"GtkScale",2,2,"100%",1,None,None,None,None) (7,9,"GtkScale",2,2,"value","65536.0"), @@ -996,6 +1119,12 @@ (18,7,"GtkScale",2,2,"position","bottom"), (18,7,"GtkScale",2,2,"value","65536.0"), (19,7,"GtkScale",2,2,"position","bottom"), - (19,7,"GtkScale",2,2,"value","65536.0") + (19,7,"GtkScale",2,2,"value","65536.0"), + (24,43,"GtkScale",2,2,"position","bottom"), + (24,43,"GtkScale",2,2,"value","65536.0"), + (4,215,"GtkScale",2,2,"position","bottom"), + (4,215,"GtkScale",2,2,"value","65536.0"), + (4,244,"GtkScale",2,2,"position","bottom"), + (4,244,"GtkScale",2,2,"value","65536.0") diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui index 687cbcc..783d5bb 100644 --- a/src/resources/resetWiFi.ui +++ b/src/resources/resetWiFi.ui @@ -1,7 +1,7 @@ - +