mirror of
https://github.com/Xetibo/ReSet.git
synced 2025-04-04 13:02:01 +02:00
fix: Don't lock UI when turning all audio devices off
This commit is contained in:
parent
7635c96d9f
commit
37742471f4
|
|
@ -457,14 +457,14 @@
|
|||
{
|
||||
"type": "archive",
|
||||
"archive-type": "tar-gzip",
|
||||
"url": "https://static.crates.io/crates/glib/glib-0.18.4.crate",
|
||||
"sha256": "951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e",
|
||||
"dest": "cargo/vendor/glib-0.18.4"
|
||||
"url": "https://static.crates.io/crates/glib/glib-0.18.3.crate",
|
||||
"sha256": "58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6",
|
||||
"dest": "cargo/vendor/glib-0.18.3"
|
||||
},
|
||||
{
|
||||
"type": "inline",
|
||||
"contents": "{\"package\": \"951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/glib-0.18.4",
|
||||
"contents": "{\"package\": \"58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/glib-0.18.3",
|
||||
"dest-filename": ".cargo-checksum.json"
|
||||
},
|
||||
{
|
||||
|
|
@ -808,14 +808,14 @@
|
|||
{
|
||||
"type": "archive",
|
||||
"archive-type": "tar-gzip",
|
||||
"url": "https://static.crates.io/crates/mio/mio-0.8.9.crate",
|
||||
"sha256": "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0",
|
||||
"dest": "cargo/vendor/mio-0.8.9"
|
||||
"url": "https://static.crates.io/crates/mio/mio-0.8.10.crate",
|
||||
"sha256": "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09",
|
||||
"dest": "cargo/vendor/mio-0.8.10"
|
||||
},
|
||||
{
|
||||
"type": "inline",
|
||||
"contents": "{\"package\": \"3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/mio-0.8.9",
|
||||
"contents": "{\"package\": \"8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/mio-0.8.10",
|
||||
"dest-filename": ".cargo-checksum.json"
|
||||
},
|
||||
{
|
||||
|
|
@ -873,14 +873,14 @@
|
|||
{
|
||||
"type": "archive",
|
||||
"archive-type": "tar-gzip",
|
||||
"url": "https://static.crates.io/crates/once_cell/once_cell-1.18.0.crate",
|
||||
"sha256": "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d",
|
||||
"dest": "cargo/vendor/once_cell-1.18.0"
|
||||
"url": "https://static.crates.io/crates/once_cell/once_cell-1.19.0.crate",
|
||||
"sha256": "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92",
|
||||
"dest": "cargo/vendor/once_cell-1.19.0"
|
||||
},
|
||||
{
|
||||
"type": "inline",
|
||||
"contents": "{\"package\": \"dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/once_cell-1.18.0",
|
||||
"contents": "{\"package\": \"3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/once_cell-1.19.0",
|
||||
"dest-filename": ".cargo-checksum.json"
|
||||
},
|
||||
{
|
||||
|
|
@ -964,14 +964,14 @@
|
|||
{
|
||||
"type": "archive",
|
||||
"archive-type": "tar-gzip",
|
||||
"url": "https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-2.0.0.crate",
|
||||
"sha256": "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8",
|
||||
"dest": "cargo/vendor/proc-macro-crate-2.0.0"
|
||||
"url": "https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-2.0.1.crate",
|
||||
"sha256": "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a",
|
||||
"dest": "cargo/vendor/proc-macro-crate-2.0.1"
|
||||
},
|
||||
{
|
||||
"type": "inline",
|
||||
"contents": "{\"package\": \"7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/proc-macro-crate-2.0.0",
|
||||
"contents": "{\"package\": \"97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/proc-macro-crate-2.0.1",
|
||||
"dest-filename": ".cargo-checksum.json"
|
||||
},
|
||||
{
|
||||
|
|
@ -1068,14 +1068,14 @@
|
|||
{
|
||||
"type": "archive",
|
||||
"archive-type": "tar-gzip",
|
||||
"url": "https://static.crates.io/crates/reset_daemon/reset_daemon-0.6.0.crate",
|
||||
"sha256": "11611caa1a9c1c642522228b72ac309502572916924c100b20d06a830b1fad07",
|
||||
"dest": "cargo/vendor/reset_daemon-0.6.0"
|
||||
"url": "https://static.crates.io/crates/reset_daemon/reset_daemon-0.6.1.crate",
|
||||
"sha256": "65079f1d86d15af21811551ea55daf2a05f654c9a27943c918e23d55aa9e4af3",
|
||||
"dest": "cargo/vendor/reset_daemon-0.6.1"
|
||||
},
|
||||
{
|
||||
"type": "inline",
|
||||
"contents": "{\"package\": \"11611caa1a9c1c642522228b72ac309502572916924c100b20d06a830b1fad07\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/reset_daemon-0.6.0",
|
||||
"contents": "{\"package\": \"65079f1d86d15af21811551ea55daf2a05f654c9a27943c918e23d55aa9e4af3\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/reset_daemon-0.6.1",
|
||||
"dest-filename": ".cargo-checksum.json"
|
||||
},
|
||||
{
|
||||
|
|
@ -1302,27 +1302,27 @@
|
|||
{
|
||||
"type": "archive",
|
||||
"archive-type": "tar-gzip",
|
||||
"url": "https://static.crates.io/crates/toml/toml-0.8.8.crate",
|
||||
"sha256": "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35",
|
||||
"dest": "cargo/vendor/toml-0.8.8"
|
||||
"url": "https://static.crates.io/crates/toml/toml-0.8.2.crate",
|
||||
"sha256": "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d",
|
||||
"dest": "cargo/vendor/toml-0.8.2"
|
||||
},
|
||||
{
|
||||
"type": "inline",
|
||||
"contents": "{\"package\": \"a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/toml-0.8.8",
|
||||
"contents": "{\"package\": \"185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/toml-0.8.2",
|
||||
"dest-filename": ".cargo-checksum.json"
|
||||
},
|
||||
{
|
||||
"type": "archive",
|
||||
"archive-type": "tar-gzip",
|
||||
"url": "https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.5.crate",
|
||||
"sha256": "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1",
|
||||
"dest": "cargo/vendor/toml_datetime-0.6.5"
|
||||
"url": "https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.3.crate",
|
||||
"sha256": "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b",
|
||||
"dest": "cargo/vendor/toml_datetime-0.6.3"
|
||||
},
|
||||
{
|
||||
"type": "inline",
|
||||
"contents": "{\"package\": \"3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/toml_datetime-0.6.5",
|
||||
"contents": "{\"package\": \"7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/toml_datetime-0.6.3",
|
||||
"dest-filename": ".cargo-checksum.json"
|
||||
},
|
||||
{
|
||||
|
|
@ -1341,27 +1341,14 @@
|
|||
{
|
||||
"type": "archive",
|
||||
"archive-type": "tar-gzip",
|
||||
"url": "https://static.crates.io/crates/toml_edit/toml_edit-0.20.7.crate",
|
||||
"sha256": "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81",
|
||||
"dest": "cargo/vendor/toml_edit-0.20.7"
|
||||
"url": "https://static.crates.io/crates/toml_edit/toml_edit-0.20.2.crate",
|
||||
"sha256": "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338",
|
||||
"dest": "cargo/vendor/toml_edit-0.20.2"
|
||||
},
|
||||
{
|
||||
"type": "inline",
|
||||
"contents": "{\"package\": \"70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/toml_edit-0.20.7",
|
||||
"dest-filename": ".cargo-checksum.json"
|
||||
},
|
||||
{
|
||||
"type": "archive",
|
||||
"archive-type": "tar-gzip",
|
||||
"url": "https://static.crates.io/crates/toml_edit/toml_edit-0.21.0.crate",
|
||||
"sha256": "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03",
|
||||
"dest": "cargo/vendor/toml_edit-0.21.0"
|
||||
},
|
||||
{
|
||||
"type": "inline",
|
||||
"contents": "{\"package\": \"d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/toml_edit-0.21.0",
|
||||
"contents": "{\"package\": \"396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/toml_edit-0.20.2",
|
||||
"dest-filename": ".cargo-checksum.json"
|
||||
},
|
||||
{
|
||||
|
|
@ -1575,14 +1562,14 @@
|
|||
{
|
||||
"type": "archive",
|
||||
"archive-type": "tar-gzip",
|
||||
"url": "https://static.crates.io/crates/winnow/winnow-0.5.19.crate",
|
||||
"sha256": "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b",
|
||||
"dest": "cargo/vendor/winnow-0.5.19"
|
||||
"url": "https://static.crates.io/crates/winnow/winnow-0.5.26.crate",
|
||||
"sha256": "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff",
|
||||
"dest": "cargo/vendor/winnow-0.5.26"
|
||||
},
|
||||
{
|
||||
"type": "inline",
|
||||
"contents": "{\"package\": \"829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/winnow-0.5.19",
|
||||
"contents": "{\"package\": \"b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff\", \"files\": {}}",
|
||||
"dest": "cargo/vendor/winnow-0.5.26",
|
||||
"dest-filename": ".cargo-checksum.json"
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -296,11 +296,11 @@ pub fn start_bluetooth_listener(listeners: Arc<Listeners>, bluetooth_box: Arc<Bl
|
|||
list_entry.imp().bluetooth_device.borrow_mut();
|
||||
if existing_bluetooth_device.connected != ir.bluetooth_device.connected {
|
||||
if ir.bluetooth_device.connected {
|
||||
imp.reset_bluetooth_connected_devices.add(&**list_entry);
|
||||
imp.reset_bluetooth_available_devices.remove(&**list_entry);
|
||||
imp.reset_bluetooth_connected_devices.add(&**list_entry);
|
||||
} else {
|
||||
imp.reset_bluetooth_available_devices.add(&**list_entry);
|
||||
imp.reset_bluetooth_connected_devices.remove(&**list_entry);
|
||||
imp.reset_bluetooth_available_devices.add(&**list_entry);
|
||||
}
|
||||
}
|
||||
if existing_bluetooth_device.bonded != ir.bluetooth_device.bonded {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
use std::sync::Arc;
|
||||
use std::time::{Duration, SystemTime};
|
||||
|
||||
use crate::components::utils::{create_dropdown_label_factory, set_combo_row_ellipsis, BASE, DBUS_PATH, AUDIO};
|
||||
use crate::components::utils::{
|
||||
create_dropdown_label_factory, set_combo_row_ellipsis, AUDIO, BASE, DBUS_PATH,
|
||||
};
|
||||
use adw::glib;
|
||||
use adw::glib::Object;
|
||||
use adw::prelude::{ButtonExt, ComboRowExt, PreferencesRowExt, RangeExt};
|
||||
|
|
@ -29,6 +31,7 @@ impl OutputStreamEntry {
|
|||
let obj: Self = Object::builder().build();
|
||||
// TODO use event callback for progress bar -> this is the "im speaking" indicator
|
||||
{
|
||||
let index = stream.index;
|
||||
let box_imp = source_box.imp();
|
||||
let imp = obj.imp();
|
||||
let name = stream.application_name.clone() + ": " + stream.name.as_str();
|
||||
|
|
@ -70,16 +73,27 @@ impl OutputStreamEntry {
|
|||
{
|
||||
let list = box_imp.reset_model_list.read().unwrap();
|
||||
imp.reset_source_selection.set_model(Some(&*list));
|
||||
let map = box_imp.reset_source_map.write().unwrap();
|
||||
let mut name = box_imp.reset_default_source.try_borrow();
|
||||
while name.is_err() {
|
||||
name = box_imp.reset_default_source.try_borrow();
|
||||
}
|
||||
let name = name.unwrap();
|
||||
let name = &name.alias;
|
||||
let index = map.get(name);
|
||||
if let Some(index) = index {
|
||||
imp.reset_source_selection.set_selected(index.1);
|
||||
let source_list = box_imp.reset_source_list.read().unwrap();
|
||||
let name = source_list.get(&index);
|
||||
let index = box_imp.reset_model_index.read().unwrap();
|
||||
let model_list = box_imp.reset_model_list.read().unwrap();
|
||||
if let Some(name) = name {
|
||||
for entry in 0..*index {
|
||||
if model_list.string(entry) == Some(name.2.clone().into()) {
|
||||
imp.reset_source_selection.set_selected(entry);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
let mut name = box_imp.reset_default_source.try_borrow();
|
||||
while name.is_err() {
|
||||
name = box_imp.reset_default_source.try_borrow();
|
||||
}
|
||||
let name = name.unwrap();
|
||||
for entry in 0..*index {
|
||||
if model_list.string(entry) == Some(name.alias.clone().into()) {
|
||||
imp.reset_source_selection.set_selected(entry);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
imp.reset_source_selection.connect_selected_notify(
|
||||
|
|
@ -133,11 +147,7 @@ impl OutputStreamEntry {
|
|||
fn set_outputstream_volume(value: f64, index: u32, channels: u16) -> bool {
|
||||
gio::spawn_blocking(move || {
|
||||
let conn = Connection::new_session().unwrap();
|
||||
let proxy = conn.with_proxy(
|
||||
BASE,
|
||||
DBUS_PATH,
|
||||
Duration::from_millis(1000),
|
||||
);
|
||||
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
|
||||
let _: Result<(), Error> = proxy.method_call(
|
||||
AUDIO,
|
||||
"SetOutputStreamVolume",
|
||||
|
|
@ -154,16 +164,8 @@ fn set_outputstream_volume(value: f64, index: u32, channels: u16) -> bool {
|
|||
fn toggle_output_stream_mute(index: u32, muted: bool) -> bool {
|
||||
gio::spawn_blocking(move || {
|
||||
let conn = Connection::new_session().unwrap();
|
||||
let proxy = conn.with_proxy(
|
||||
BASE,
|
||||
DBUS_PATH,
|
||||
Duration::from_millis(1000),
|
||||
);
|
||||
let _: Result<(), Error> = proxy.method_call(
|
||||
AUDIO,
|
||||
"SetOutputStreamMute",
|
||||
(index, muted),
|
||||
);
|
||||
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
|
||||
let _: Result<(), Error> = proxy.method_call(AUDIO, "SetOutputStreamMute", (index, muted));
|
||||
// if res.is_err() {
|
||||
// return false;
|
||||
// }
|
||||
|
|
@ -175,16 +177,9 @@ fn toggle_output_stream_mute(index: u32, muted: bool) -> bool {
|
|||
fn set_source_of_output_stream(stream: u32, source: u32) -> bool {
|
||||
gio::spawn_blocking(move || {
|
||||
let conn = Connection::new_session().unwrap();
|
||||
let proxy = conn.with_proxy(
|
||||
BASE,
|
||||
DBUS_PATH,
|
||||
Duration::from_millis(1000),
|
||||
);
|
||||
let _: Result<(bool,), Error> = proxy.method_call(
|
||||
AUDIO,
|
||||
"SetSourceOfOutputStream",
|
||||
(stream, source),
|
||||
);
|
||||
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
|
||||
let _: Result<(bool,), Error> =
|
||||
proxy.method_call(AUDIO, "SetSourceOfOutputStream", (stream, source));
|
||||
// if res.is_err() {
|
||||
// return false;
|
||||
// }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
use adw::prelude::PreferencesRowExt;
|
||||
use re_set_lib::audio::audio_structures::{Card, OutputStream, Source};
|
||||
use re_set_lib::signals::{OutputStreamChanged, OutputStreamRemoved, OutputStreamAdded, SourceChanged, SourceRemoved, SourceAdded};
|
||||
use re_set_lib::signals::{
|
||||
OutputStreamAdded, OutputStreamChanged, OutputStreamRemoved, SourceAdded, SourceChanged,
|
||||
SourceRemoved,
|
||||
};
|
||||
use std::sync::Arc;
|
||||
use std::time::{Duration, SystemTime};
|
||||
|
||||
|
|
@ -21,7 +24,9 @@ use crate::components::base::card_entry::CardEntry;
|
|||
use crate::components::base::list_entry::ListEntry;
|
||||
use crate::components::input::source_box_impl;
|
||||
use crate::components::input::source_entry::set_source_volume;
|
||||
use crate::components::utils::{create_dropdown_label_factory, set_combo_row_ellipsis, BASE, DBUS_PATH, AUDIO};
|
||||
use crate::components::utils::{
|
||||
create_dropdown_label_factory, set_combo_row_ellipsis, AUDIO, BASE, DBUS_PATH,
|
||||
};
|
||||
|
||||
use super::output_stream_entry::OutputStreamEntry;
|
||||
use super::source_entry::{set_default_source, toggle_source_mute, SourceEntry};
|
||||
|
|
@ -97,9 +102,9 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
|
|||
input_box_imp
|
||||
.reset_default_source
|
||||
.replace(get_default_source());
|
||||
for (i, source) in (0_u32..).zip(sources.iter()) {
|
||||
for source in sources.iter() {
|
||||
list.append(&source.alias);
|
||||
map.insert(source.alias.clone(), (source.index, i, source.name.clone()));
|
||||
map.insert(source.alias.clone(), (source.index, source.name.clone()));
|
||||
*model_index += 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -154,10 +159,14 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
|
|||
}
|
||||
let list = input_box_imp.reset_model_list.read().unwrap();
|
||||
input_box_imp.reset_source_dropdown.set_model(Some(&*list));
|
||||
let map = input_box_imp.reset_source_map.read().unwrap();
|
||||
let name = input_box_imp.reset_default_source.borrow();
|
||||
if let Some(index) = map.get(&name.alias) {
|
||||
input_box_imp.reset_source_dropdown.set_selected(index.1);
|
||||
|
||||
let index = input_box_imp.reset_model_index.read().unwrap();
|
||||
let model_list = input_box_imp.reset_model_list.read().unwrap();
|
||||
for entry in 0..*index {
|
||||
if model_list.string(entry) == Some(name.alias.clone().into()) {
|
||||
input_box_imp.reset_source_dropdown.set_selected(entry);
|
||||
}
|
||||
}
|
||||
input_box_imp.reset_source_dropdown.connect_selected_notify(
|
||||
clone!(@weak input_box_imp => move |dropdown| {
|
||||
|
|
@ -175,7 +184,7 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
|
|||
if source.is_none() {
|
||||
return;
|
||||
}
|
||||
let source = Arc::new(source.unwrap().2.clone());
|
||||
let source = Arc::new(source.unwrap().1.clone());
|
||||
gio::spawn_blocking(move || {
|
||||
let result = set_default_source(source);
|
||||
if result.is_none(){
|
||||
|
|
@ -247,12 +256,12 @@ pub fn refresh_default_source(new_source: Source, input_box: Arc<SourceBox>, ent
|
|||
let entry_imp = entry.unwrap().1.imp();
|
||||
entry_imp.reset_selected_source.set_active(true);
|
||||
} else {
|
||||
let map = imp.reset_source_map.read().unwrap();
|
||||
let entry = map.get(&new_source.alias);
|
||||
if entry.is_none() {
|
||||
return;
|
||||
let model_list = imp.reset_model_list.read().unwrap();
|
||||
for entry in 0..*imp.reset_model_index.read().unwrap() {
|
||||
if model_list.string(entry) == Some(new_source.alias.clone().into()) {
|
||||
imp.reset_source_dropdown.set_selected(entry);
|
||||
}
|
||||
}
|
||||
imp.reset_source_dropdown.set_selected(entry.unwrap().1);
|
||||
}
|
||||
imp.reset_volume_percentage.set_text(&percentage);
|
||||
imp.reset_volume_slider.set_value(volume as f64);
|
||||
|
|
@ -308,11 +317,7 @@ pub fn populate_cards(input_box: Arc<SourceBox>) {
|
|||
|
||||
fn get_output_streams() -> Vec<OutputStream> {
|
||||
let conn = Connection::new_session().unwrap();
|
||||
let proxy = conn.with_proxy(
|
||||
BASE,
|
||||
DBUS_PATH,
|
||||
Duration::from_millis(1000),
|
||||
);
|
||||
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
|
||||
let res: Result<(Vec<OutputStream>,), Error> =
|
||||
proxy.method_call(AUDIO, "ListOutputStreams", ());
|
||||
if res.is_err() {
|
||||
|
|
@ -323,13 +328,8 @@ fn get_output_streams() -> Vec<OutputStream> {
|
|||
|
||||
fn get_sources() -> Vec<Source> {
|
||||
let conn = Connection::new_session().unwrap();
|
||||
let proxy = conn.with_proxy(
|
||||
BASE,
|
||||
DBUS_PATH,
|
||||
Duration::from_millis(1000),
|
||||
);
|
||||
let res: Result<(Vec<Source>,), Error> =
|
||||
proxy.method_call(AUDIO, "ListSources", ());
|
||||
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
|
||||
let res: Result<(Vec<Source>,), Error> = proxy.method_call(AUDIO, "ListSources", ());
|
||||
if res.is_err() {
|
||||
return Vec::new();
|
||||
}
|
||||
|
|
@ -338,13 +338,8 @@ fn get_sources() -> Vec<Source> {
|
|||
|
||||
fn get_cards() -> Vec<Card> {
|
||||
let conn = Connection::new_session().unwrap();
|
||||
let proxy = conn.with_proxy(
|
||||
BASE,
|
||||
DBUS_PATH,
|
||||
Duration::from_millis(1000),
|
||||
);
|
||||
let res: Result<(Vec<Card>,), Error> =
|
||||
proxy.method_call(AUDIO, "ListCards", ());
|
||||
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
|
||||
let res: Result<(Vec<Card>,), Error> = proxy.method_call(AUDIO, "ListCards", ());
|
||||
if res.is_err() {
|
||||
return Vec::new();
|
||||
}
|
||||
|
|
@ -353,13 +348,8 @@ fn get_cards() -> Vec<Card> {
|
|||
|
||||
fn get_default_source_name() -> String {
|
||||
let conn = Connection::new_session().unwrap();
|
||||
let proxy = conn.with_proxy(
|
||||
BASE,
|
||||
DBUS_PATH,
|
||||
Duration::from_millis(1000),
|
||||
);
|
||||
let res: Result<(String,), Error> =
|
||||
proxy.method_call(AUDIO, "GetDefaultSourceName", ());
|
||||
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
|
||||
let res: Result<(String,), Error> = proxy.method_call(AUDIO, "GetDefaultSourceName", ());
|
||||
if res.is_err() {
|
||||
return String::from("");
|
||||
}
|
||||
|
|
@ -368,13 +358,8 @@ fn get_default_source_name() -> String {
|
|||
|
||||
fn get_default_source() -> Source {
|
||||
let conn = Connection::new_session().unwrap();
|
||||
let proxy = conn.with_proxy(
|
||||
BASE,
|
||||
DBUS_PATH,
|
||||
Duration::from_millis(1000),
|
||||
);
|
||||
let res: Result<(Source,), Error> =
|
||||
proxy.method_call(AUDIO, "GetDefaultSource", ());
|
||||
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
|
||||
let res: Result<(Source,), Error> = proxy.method_call(AUDIO, "GetDefaultSource", ());
|
||||
if res.is_err() {
|
||||
return Source::default();
|
||||
}
|
||||
|
|
@ -382,36 +367,21 @@ fn get_default_source() -> Source {
|
|||
}
|
||||
|
||||
pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) -> Connection {
|
||||
let source_added = SourceAdded::match_rule(
|
||||
Some(&BASE.into()),
|
||||
Some(&Path::from(DBUS_PATH)),
|
||||
)
|
||||
.static_clone();
|
||||
let source_removed = SourceRemoved::match_rule(
|
||||
Some(&BASE.into()),
|
||||
Some(&Path::from(DBUS_PATH)),
|
||||
)
|
||||
.static_clone();
|
||||
let source_changed = SourceChanged::match_rule(
|
||||
Some(&BASE.into()),
|
||||
Some(&Path::from(DBUS_PATH)),
|
||||
)
|
||||
.static_clone();
|
||||
let output_stream_added = OutputStreamAdded::match_rule(
|
||||
Some(&BASE.into()),
|
||||
Some(&Path::from(DBUS_PATH)),
|
||||
)
|
||||
.static_clone();
|
||||
let output_stream_removed = OutputStreamRemoved::match_rule(
|
||||
Some(&BASE.into()),
|
||||
Some(&Path::from(DBUS_PATH)),
|
||||
)
|
||||
.static_clone();
|
||||
let output_stream_changed = OutputStreamChanged::match_rule(
|
||||
Some(&BASE.into()),
|
||||
Some(&Path::from(DBUS_PATH)),
|
||||
)
|
||||
.static_clone();
|
||||
let source_added =
|
||||
SourceAdded::match_rule(Some(&BASE.into()), Some(&Path::from(DBUS_PATH))).static_clone();
|
||||
let source_removed =
|
||||
SourceRemoved::match_rule(Some(&BASE.into()), Some(&Path::from(DBUS_PATH))).static_clone();
|
||||
let source_changed =
|
||||
SourceChanged::match_rule(Some(&BASE.into()), Some(&Path::from(DBUS_PATH))).static_clone();
|
||||
let output_stream_added =
|
||||
OutputStreamAdded::match_rule(Some(&BASE.into()), Some(&Path::from(DBUS_PATH)))
|
||||
.static_clone();
|
||||
let output_stream_removed =
|
||||
OutputStreamRemoved::match_rule(Some(&BASE.into()), Some(&Path::from(DBUS_PATH)))
|
||||
.static_clone();
|
||||
let output_stream_changed =
|
||||
OutputStreamChanged::match_rule(Some(&BASE.into()), Some(&Path::from(DBUS_PATH)))
|
||||
.static_clone();
|
||||
|
||||
let source_added_box = source_box.clone();
|
||||
let source_removed_box = source_box.clone();
|
||||
|
|
@ -426,7 +396,6 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
|
|||
glib::idle_add_once(move || {
|
||||
let input_box = source_box.clone();
|
||||
let input_box_imp = input_box.imp();
|
||||
let mut list = input_box_imp.reset_source_list.write().unwrap();
|
||||
let source_index = ir.source.index;
|
||||
let alias = ir.source.alias.clone();
|
||||
let name = ir.source.name.clone();
|
||||
|
|
@ -443,17 +412,25 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
|
|||
let source_clone = source_entry.clone();
|
||||
let entry = Arc::new(ListEntry::new(&*source_entry));
|
||||
entry.set_activatable(false);
|
||||
let mut list = input_box_imp.reset_source_list.write().unwrap();
|
||||
list.insert(source_index, (entry.clone(), source_clone, alias.clone()));
|
||||
input_box_imp.reset_sources.append(&*entry);
|
||||
let mut map = input_box_imp.reset_source_map.write().unwrap();
|
||||
let mut index = input_box_imp.reset_model_index.write().unwrap();
|
||||
input_box_imp
|
||||
.reset_model_list
|
||||
.write()
|
||||
.unwrap()
|
||||
.append(&alias);
|
||||
map.insert(alias, (source_index, *index, name));
|
||||
*index += 1;
|
||||
let model_list = input_box_imp.reset_model_list.write().unwrap();
|
||||
model_list.append(&alias);
|
||||
if model_list.string(*index - 1) == Some("Monitor of Dummy Output".into()) {
|
||||
if alias == "Monitor of Dummy Output" {
|
||||
return;
|
||||
}
|
||||
model_list.append(&alias);
|
||||
model_list.remove(*index - 1);
|
||||
map.insert(alias, (source_index, name));
|
||||
} else {
|
||||
model_list.append(&alias);
|
||||
map.insert(alias, (source_index, name));
|
||||
*index += 1;
|
||||
}
|
||||
});
|
||||
});
|
||||
true
|
||||
|
|
@ -469,25 +446,32 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
|
|||
glib::idle_add_once(move || {
|
||||
let input_box = source_box.clone();
|
||||
let input_box_imp = input_box.imp();
|
||||
let mut list = input_box_imp.reset_source_list.write().unwrap();
|
||||
let entry = list.remove(&ir.index);
|
||||
if entry.is_none() {
|
||||
return;
|
||||
let entry: Option<(Arc<ListEntry>, Arc<SourceEntry>, String)>;
|
||||
{
|
||||
let mut list = input_box_imp.reset_source_list.write().unwrap();
|
||||
entry = list.remove(&ir.index);
|
||||
if entry.is_none() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
input_box_imp
|
||||
.reset_sources
|
||||
.remove(&*entry.clone().unwrap().0);
|
||||
let mut map = input_box_imp.reset_source_map.write().unwrap();
|
||||
let entry_index = map.remove(&entry.unwrap().2);
|
||||
if let Some(entry_index) = entry_index {
|
||||
input_box_imp
|
||||
.reset_model_list
|
||||
.write()
|
||||
.unwrap()
|
||||
.remove(entry_index.1);
|
||||
}
|
||||
let alias = entry.unwrap().2;
|
||||
map.remove(&alias);
|
||||
let mut index = input_box_imp.reset_model_index.write().unwrap();
|
||||
if *index != 0 {
|
||||
let model_list = input_box_imp.reset_model_list.write().unwrap();
|
||||
|
||||
if *index == 1 {
|
||||
model_list.append("Monitor of Dummy Output");
|
||||
}
|
||||
for entry in 0..*index {
|
||||
if model_list.string(entry) == Some(alias.clone().into()) {
|
||||
model_list.remove(entry);
|
||||
}
|
||||
}
|
||||
if *index > 1 {
|
||||
*index -= 1;
|
||||
}
|
||||
});
|
||||
|
|
@ -620,9 +604,12 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
|
|||
let percentage = (fraction).to_string() + "%";
|
||||
imp.reset_volume_percentage.set_text(&percentage);
|
||||
imp.reset_volume_slider.set_value(*volume as f64);
|
||||
let map = input_box_imp.reset_source_map.read().unwrap();
|
||||
if let Some(index) = map.get(&alias) {
|
||||
imp.reset_source_selection.set_selected(index.1);
|
||||
let index = input_box_imp.reset_model_index.read().unwrap();
|
||||
let model_list = input_box_imp.reset_model_list.read().unwrap();
|
||||
for entry in 0..*index {
|
||||
if model_list.string(entry) == Some(alias.clone().into()) {
|
||||
imp.reset_source_selection.set_selected(entry);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ use super::source_entry::SourceEntry;
|
|||
|
||||
type SourceEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<SourceEntry>, String)>>>;
|
||||
type OutputStreamEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<OutputStreamEntry>)>>>;
|
||||
type SourceMap = Arc<RwLock<HashMap<String, (u32, u32, String)>>>;
|
||||
// the key is the alias, the first value u32 is the index of the source, the second is the technical name
|
||||
type SourceMap = Arc<RwLock<HashMap<String, (u32, String)>>>;
|
||||
|
||||
#[derive(Default, CompositeTemplate)]
|
||||
#[template(resource = "/org/Xetibo/ReSet/resetAudioInput.ui")]
|
||||
|
|
@ -50,8 +51,6 @@ pub struct SourceBox {
|
|||
pub reset_output_stream_list: OutputStreamEntryMap,
|
||||
pub reset_model_list: Arc<RwLock<StringList>>,
|
||||
pub reset_model_index: Arc<RwLock<u32>>,
|
||||
// first u32 is the index of the source, the second the index in the model list and the third is
|
||||
// the full name
|
||||
pub reset_source_map: SourceMap,
|
||||
pub volume_time_stamp: RefCell<Option<SystemTime>>,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
use std::sync::Arc;
|
||||
use std::time::{Duration, SystemTime};
|
||||
|
||||
use crate::components::utils::{create_dropdown_label_factory, set_combo_row_ellipsis, BASE, DBUS_PATH, AUDIO};
|
||||
use crate::components::utils::{
|
||||
create_dropdown_label_factory, set_combo_row_ellipsis, AUDIO, BASE, DBUS_PATH,
|
||||
};
|
||||
use adw::glib;
|
||||
use adw::glib::Object;
|
||||
use adw::prelude::{ButtonExt, ComboRowExt, PreferencesRowExt, RangeExt};
|
||||
|
|
@ -79,29 +81,27 @@ impl InputStreamEntry {
|
|||
);
|
||||
{
|
||||
let list = box_imp.reset_model_list.read().unwrap();
|
||||
// while list.is_err() {
|
||||
// list = box_imp.resetModelList.try_borrow();
|
||||
// }
|
||||
// let list = list.unwrap();
|
||||
imp.reset_sink_selection.set_model(Some(&*list));
|
||||
let map = box_imp.reset_sink_map.read().unwrap();
|
||||
let sink_list = box_imp.reset_sink_list.read().unwrap();
|
||||
let name = sink_list.get(&index);
|
||||
let index = box_imp.reset_model_index.read().unwrap();
|
||||
let model_list = box_imp.reset_model_list.read().unwrap();
|
||||
if let Some(name) = name {
|
||||
let name = &name.2;
|
||||
let index = map.get(name);
|
||||
if let Some(index) = index {
|
||||
imp.reset_sink_selection.set_selected(index.1);
|
||||
for entry in 0..*index {
|
||||
if model_list.string(entry) == Some(name.2.clone().into()) {
|
||||
imp.reset_sink_selection.set_selected(entry);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
let mut name = box_imp.reset_default_sink.try_borrow();
|
||||
while name.is_err() {
|
||||
name = box_imp.reset_default_sink.try_borrow();
|
||||
}
|
||||
let name = &name.unwrap().alias;
|
||||
let index = map.get(name);
|
||||
if let Some(index) = index {
|
||||
imp.reset_sink_selection.set_selected(index.1);
|
||||
let name = name.unwrap();
|
||||
for entry in 0..*index {
|
||||
if model_list.string(entry) == Some(name.alias.clone().into()) {
|
||||
imp.reset_sink_selection.set_selected(entry);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -160,11 +160,7 @@ impl InputStreamEntry {
|
|||
fn set_inputstream_volume(value: f64, index: u32, channels: u16) -> bool {
|
||||
gio::spawn_blocking(move || {
|
||||
let conn = Connection::new_session().unwrap();
|
||||
let proxy = conn.with_proxy(
|
||||
BASE,
|
||||
DBUS_PATH,
|
||||
Duration::from_millis(1000),
|
||||
);
|
||||
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
|
||||
let _: Result<(), Error> = proxy.method_call(
|
||||
AUDIO,
|
||||
"SetInputStreamVolume",
|
||||
|
|
@ -181,16 +177,8 @@ fn set_inputstream_volume(value: f64, index: u32, channels: u16) -> bool {
|
|||
fn toggle_input_stream_mute(index: u32, muted: bool) -> bool {
|
||||
gio::spawn_blocking(move || {
|
||||
let conn = Connection::new_session().unwrap();
|
||||
let proxy = conn.with_proxy(
|
||||
BASE,
|
||||
DBUS_PATH,
|
||||
Duration::from_millis(1000),
|
||||
);
|
||||
let _: Result<(), Error> = proxy.method_call(
|
||||
AUDIO,
|
||||
"SetInputStreamMute",
|
||||
(index, muted),
|
||||
);
|
||||
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
|
||||
let _: Result<(), Error> = proxy.method_call(AUDIO, "SetInputStreamMute", (index, muted));
|
||||
// if res.is_err() {
|
||||
// return false;
|
||||
// }
|
||||
|
|
@ -202,16 +190,8 @@ fn toggle_input_stream_mute(index: u32, muted: bool) -> bool {
|
|||
fn set_sink_of_input_stream(stream: u32, sink: u32) -> bool {
|
||||
gio::spawn_blocking(move || {
|
||||
let conn = Connection::new_session().unwrap();
|
||||
let proxy = conn.with_proxy(
|
||||
BASE,
|
||||
DBUS_PATH,
|
||||
Duration::from_millis(1000),
|
||||
);
|
||||
let _: Result<(), Error> = proxy.method_call(
|
||||
AUDIO,
|
||||
"SetSinkOfInputStream",
|
||||
(stream, sink),
|
||||
);
|
||||
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
|
||||
let _: Result<(), Error> = proxy.method_call(AUDIO, "SetSinkOfInputStream", (stream, sink));
|
||||
// if res.is_err() {
|
||||
// return false;
|
||||
// }
|
||||
|
|
|
|||
|
|
@ -106,9 +106,9 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
|
|||
output_box_imp
|
||||
.reset_default_sink
|
||||
.replace(get_default_sink());
|
||||
for (i, sink) in (0_u32..).zip(sinks.iter()) {
|
||||
for sink in sinks.iter() {
|
||||
list.append(&sink.alias);
|
||||
map.insert(sink.alias.clone(), (sink.index, i, sink.name.clone()));
|
||||
map.insert(sink.alias.clone(), (sink.index, sink.name.clone()));
|
||||
*model_index += 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -164,8 +164,13 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
|
|||
output_box_imp.reset_sink_dropdown.set_model(Some(&*list));
|
||||
let map = output_box_imp.reset_sink_map.read().unwrap();
|
||||
let name = output_box_imp.reset_default_sink.borrow();
|
||||
if let Some(index) = map.get(&name.alias) {
|
||||
output_box_imp.reset_sink_dropdown.set_selected(index.1);
|
||||
|
||||
let index = output_box_imp.reset_model_index.read().unwrap();
|
||||
let model_list = output_box_imp.reset_model_list.read().unwrap();
|
||||
for entry in 0..*index {
|
||||
if model_list.string(entry) == Some(name.alias.clone().into()) {
|
||||
output_box_imp.reset_sink_dropdown.set_selected(entry);
|
||||
}
|
||||
}
|
||||
output_box_imp.reset_sink_dropdown.connect_selected_notify(
|
||||
clone!(@weak output_box_imp => move |dropdown| {
|
||||
|
|
@ -183,7 +188,7 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
|
|||
if sink.is_none() {
|
||||
return;
|
||||
}
|
||||
let new_sink_name = Arc::new(sink.unwrap().2.clone());
|
||||
let new_sink_name = Arc::new(sink.unwrap().1.clone());
|
||||
gio::spawn_blocking(move || {
|
||||
let result = set_default_sink(new_sink_name);
|
||||
if result.is_none() {
|
||||
|
|
@ -255,12 +260,13 @@ pub fn refresh_default_sink(new_sink: Sink, output_box: Arc<SinkBox>, entry: boo
|
|||
let entry_imp = entry.unwrap().1.imp();
|
||||
entry_imp.reset_selected_sink.set_active(true);
|
||||
} else {
|
||||
let map = imp.reset_sink_map.read().unwrap();
|
||||
let entry = map.get(&new_sink.alias);
|
||||
if entry.is_none() {
|
||||
return;
|
||||
let index = imp.reset_model_index.read().unwrap();
|
||||
let model_list = imp.reset_model_list.read().unwrap();
|
||||
for entry in 0..*index {
|
||||
if model_list.string(entry) == Some(new_sink.alias.clone().into()) {
|
||||
imp.reset_sink_dropdown.set_selected(entry);
|
||||
}
|
||||
}
|
||||
imp.reset_sink_dropdown.set_selected(entry.unwrap().1);
|
||||
}
|
||||
imp.reset_volume_percentage.set_text(&percentage);
|
||||
imp.reset_volume_slider.set_value(volume as f64);
|
||||
|
|
@ -388,12 +394,12 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
|
|||
let input_stream_changed_box = sink_box.clone();
|
||||
|
||||
let res = conn.add_match(sink_added, move |ir: SinkAdded, _, _| {
|
||||
println!("sink added {}", ir.sink.alias);
|
||||
let sink_box = sink_added_box.clone();
|
||||
glib::spawn_future(async move {
|
||||
glib::idle_add_once(move || {
|
||||
let output_box = sink_box.clone();
|
||||
let output_box_imp = output_box.imp();
|
||||
let mut list = output_box_imp.reset_sink_list.write().unwrap();
|
||||
let sink_index = ir.sink.index;
|
||||
let alias = ir.sink.alias.clone();
|
||||
let name = ir.sink.name.clone();
|
||||
|
|
@ -410,17 +416,24 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
|
|||
let sink_clone = sink_entry.clone();
|
||||
let entry = Arc::new(ListEntry::new(&*sink_entry));
|
||||
entry.set_activatable(false);
|
||||
let mut list = output_box_imp.reset_sink_list.write().unwrap();
|
||||
list.insert(sink_index, (entry.clone(), sink_clone, alias.clone()));
|
||||
output_box_imp.reset_sinks.append(&*entry);
|
||||
let mut map = output_box_imp.reset_sink_map.write().unwrap();
|
||||
let mut index = output_box_imp.reset_model_index.write().unwrap();
|
||||
output_box_imp
|
||||
.reset_model_list
|
||||
.write()
|
||||
.unwrap()
|
||||
.append(&alias);
|
||||
map.insert(alias, (sink_index, *index, name));
|
||||
*index += 1;
|
||||
let model_list = output_box_imp.reset_model_list.write().unwrap();
|
||||
if model_list.string(*index - 1) == Some("Dummy Output".into()) {
|
||||
if alias == "Dummy Output" {
|
||||
return;
|
||||
}
|
||||
model_list.append(&alias);
|
||||
model_list.remove(*index - 1);
|
||||
map.insert(alias, (sink_index, name));
|
||||
} else {
|
||||
model_list.append(&alias);
|
||||
map.insert(alias, (sink_index, name));
|
||||
*index += 1;
|
||||
}
|
||||
});
|
||||
});
|
||||
true
|
||||
|
|
@ -436,25 +449,33 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
|
|||
glib::idle_add_once(move || {
|
||||
let output_box = sink_box.clone();
|
||||
let output_box_imp = output_box.imp();
|
||||
let mut list = output_box_imp.reset_sink_list.write().unwrap();
|
||||
let entry = list.remove(&ir.index);
|
||||
if entry.is_none() {
|
||||
return;
|
||||
|
||||
let entry: Option<(Arc<ListEntry>, Arc<SinkEntry>, String)>;
|
||||
{
|
||||
let mut list = output_box_imp.reset_sink_list.write().unwrap();
|
||||
entry = list.remove(&ir.index);
|
||||
if entry.is_none() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
output_box_imp
|
||||
.reset_sinks
|
||||
.remove(&*entry.clone().unwrap().0);
|
||||
let mut map = output_box_imp.reset_sink_map.write().unwrap();
|
||||
let entry_index = map.remove(&entry.unwrap().2);
|
||||
if let Some(entry_index) = entry_index {
|
||||
output_box_imp
|
||||
.reset_model_list
|
||||
.write()
|
||||
.unwrap()
|
||||
.remove(entry_index.1);
|
||||
}
|
||||
let alias = entry.unwrap().2;
|
||||
map.remove(&alias);
|
||||
let mut index = output_box_imp.reset_model_index.write().unwrap();
|
||||
if *index != 0 {
|
||||
let model_list = output_box_imp.reset_model_list.write().unwrap();
|
||||
|
||||
if *index == 1 {
|
||||
model_list.append("Dummy Output");
|
||||
}
|
||||
for entry in 0..*index {
|
||||
if model_list.string(entry) == Some(alias.clone().into()) {
|
||||
model_list.remove(entry);
|
||||
}
|
||||
}
|
||||
if *index > 1 {
|
||||
*index -= 1;
|
||||
}
|
||||
});
|
||||
|
|
@ -583,9 +604,12 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
|
|||
let percentage = (fraction).to_string() + "%";
|
||||
imp.reset_volume_percentage.set_text(&percentage);
|
||||
imp.reset_volume_slider.set_value(*volume as f64);
|
||||
let map = output_box_imp.reset_sink_map.read().unwrap();
|
||||
if let Some(index) = map.get(&alias) {
|
||||
imp.reset_sink_selection.set_selected(index.1);
|
||||
let index = output_box_imp.reset_model_index.read().unwrap();
|
||||
let model_list = output_box_imp.reset_model_list.read().unwrap();
|
||||
for entry in 0..*index {
|
||||
if model_list.string(entry) == Some(alias.clone().into()) {
|
||||
imp.reset_sink_selection.set_selected(entry);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ type SinkEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<SinkEntry>, Str
|
|||
type InputStreamEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<InputStreamEntry>)>>>;
|
||||
// key is model name -> alias, first u32 is the index of the sink, the second the index in the model list and the third is
|
||||
// the detailed name
|
||||
type SinkMap = Arc<RwLock<HashMap<String, (u32, u32, String)>>>;
|
||||
type SinkMap = Arc<RwLock<HashMap<String, (u32, String)>>>;
|
||||
|
||||
#[derive(Default, CompositeTemplate)]
|
||||
#[template(resource = "/org/Xetibo/ReSet/resetAudioOutput.ui")]
|
||||
|
|
|
|||
|
|
@ -71,12 +71,12 @@ fn setup_callbacks(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) -> Arc<Wif
|
|||
imp.reset_wifi_devices.write().unwrap().clear();
|
||||
*imp.reset_model_list.write().unwrap() = StringList::new(&[]);
|
||||
*imp.reset_model_index.write().unwrap() = 0;
|
||||
let mut map = imp.wifi_entries.lock().unwrap();
|
||||
let mut map = imp.wifi_entries.write().unwrap();
|
||||
for entry in map.iter() {
|
||||
imp.reset_wifi_list.remove(&*(*entry.1));
|
||||
}
|
||||
map.clear();
|
||||
imp.wifi_entries_path.lock().unwrap().clear();
|
||||
imp.wifi_entries_path.write().unwrap().clear();
|
||||
listeners.wifi_listener.store(false, Ordering::SeqCst);
|
||||
} else {
|
||||
start_event_listener(listeners.clone(), wifibox_ref.clone());
|
||||
|
|
@ -96,8 +96,8 @@ pub fn scan_for_wifi(wifi_box: Arc<WifiBox>) {
|
|||
let wifi_entries_path = wifi_box.imp().wifi_entries_path.clone();
|
||||
|
||||
gio::spawn_blocking(move || {
|
||||
let access_points = get_access_points();
|
||||
let devices = get_wifi_devices();
|
||||
let access_points = get_access_points();
|
||||
{
|
||||
let imp = wifibox_ref.imp();
|
||||
let list = imp.reset_model_list.write().unwrap();
|
||||
|
|
@ -119,8 +119,8 @@ pub fn scan_for_wifi(wifi_box: Arc<WifiBox>) {
|
|||
dbus_start_network_events();
|
||||
glib::spawn_future(async move {
|
||||
glib::idle_add_once(move || {
|
||||
let mut wifi_entries = wifi_entries.lock().unwrap();
|
||||
let mut wifi_entries_path = wifi_entries_path.lock().unwrap();
|
||||
let mut wifi_entries = wifi_entries.write().unwrap();
|
||||
let mut wifi_entries_path = wifi_entries_path.write().unwrap();
|
||||
let imp = wifibox_ref.imp();
|
||||
|
||||
let list = imp.reset_model_list.read().unwrap();
|
||||
|
|
@ -286,8 +286,8 @@ pub fn start_event_listener(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) {
|
|||
glib::spawn_future(async move {
|
||||
glib::idle_add_once(move || {
|
||||
let imp = wifi_box.imp();
|
||||
let mut wifi_entries = imp.wifi_entries.lock().unwrap();
|
||||
let mut wifi_entries_path = imp.wifi_entries_path.lock().unwrap();
|
||||
let mut wifi_entries = imp.wifi_entries.write().unwrap();
|
||||
let mut wifi_entries_path = imp.wifi_entries_path.write().unwrap();
|
||||
let ssid = ir.access_point.ssid.clone();
|
||||
let path = ir.access_point.dbus_path.clone();
|
||||
if wifi_entries.get(&ssid).is_some() || ssid.is_empty() {
|
||||
|
|
@ -312,8 +312,8 @@ pub fn start_event_listener(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) {
|
|||
glib::spawn_future(async move {
|
||||
glib::idle_add_once(move || {
|
||||
let imp = wifi_box.imp();
|
||||
let mut wifi_entries = imp.wifi_entries.lock().unwrap();
|
||||
let mut wifi_entries_path = imp.wifi_entries_path.lock().unwrap();
|
||||
let mut wifi_entries = imp.wifi_entries.write().unwrap();
|
||||
let mut wifi_entries_path = imp.wifi_entries_path.write().unwrap();
|
||||
let entry = wifi_entries_path.remove(&ir.access_point);
|
||||
if entry.is_none() {
|
||||
return;
|
||||
|
|
@ -335,7 +335,7 @@ pub fn start_event_listener(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) {
|
|||
glib::spawn_future(async move {
|
||||
glib::idle_add_local_once(move || {
|
||||
let imp = wifi_box.imp();
|
||||
let wifi_entries = imp.wifi_entries.lock().unwrap();
|
||||
let wifi_entries = imp.wifi_entries.read().unwrap();
|
||||
let entry = wifi_entries.get(&ir.access_point.ssid);
|
||||
if entry.is_none() {
|
||||
return;
|
||||
|
|
@ -399,7 +399,7 @@ pub fn start_event_listener(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) {
|
|||
} else {
|
||||
*current_device = ir.wifi_device;
|
||||
}
|
||||
let mut wifi_entries = imp.wifi_entries.lock().unwrap();
|
||||
let mut wifi_entries = imp.wifi_entries.write().unwrap();
|
||||
for entry in wifi_entries.iter_mut() {
|
||||
let imp = entry.1.imp();
|
||||
let mut connected = imp.connected.borrow_mut();
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ use gtk::{prelude::*, StringList};
|
|||
use re_set_lib::network::network_structures::WifiDevice;
|
||||
use std::cell::RefCell;
|
||||
use std::collections::HashMap;
|
||||
use std::sync::{Arc, Mutex, RwLock};
|
||||
use std::sync::{Arc, RwLock};
|
||||
|
||||
use crate::components::base::list_entry::ListEntry;
|
||||
use crate::components::wifi::wifi_entry::WifiEntry;
|
||||
|
|
@ -31,8 +31,8 @@ pub struct WifiBox {
|
|||
pub reset_stored_wifi_list: TemplateChild<PreferencesGroup>,
|
||||
#[template_child]
|
||||
pub reset_available_networks: TemplateChild<ActionRow>,
|
||||
pub wifi_entries: Arc<Mutex<HashMap<Vec<u8>, Arc<WifiEntry>>>>,
|
||||
pub wifi_entries_path: Arc<Mutex<HashMap<Path<'static>, Arc<WifiEntry>>>>,
|
||||
pub wifi_entries: Arc<RwLock<HashMap<Vec<u8>, Arc<WifiEntry>>>>,
|
||||
pub wifi_entries_path: Arc<RwLock<HashMap<Path<'static>, Arc<WifiEntry>>>>,
|
||||
pub reset_wifi_devices: Arc<RwLock<HashMap<String, (WifiDevice, u32)>>>,
|
||||
pub reset_current_wifi_device: Arc<RefCell<WifiDevice>>,
|
||||
pub reset_model_list: Arc<RwLock<StringList>>,
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@
|
|||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">10</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwActionRow" id="reset_source_row">
|
||||
<property name="title">Input Devices</property>
|
||||
|
|
@ -129,6 +132,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwActionRow" id="reset_output_stream_button">
|
||||
<property name="title">Input Streams</property>
|
||||
|
|
@ -173,6 +180,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwActionRow" id="reset_input_cards_back_button">
|
||||
<property name="title">Input Streams</property>
|
||||
|
|
@ -193,6 +204,10 @@
|
|||
</child>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup" id="reset_cards">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<property name="title">Devices</property>
|
||||
</object>
|
||||
</child>
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@
|
|||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">10</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwActionRow" id="reset_sinks_row">
|
||||
<property name="title">Output Devices</property>
|
||||
|
|
@ -130,6 +133,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwActionRow" id="reset_input_stream_button">
|
||||
<property name="title">Output Streams</property>
|
||||
|
|
@ -174,6 +181,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwActionRow" id="reset_input_cards_back_button">
|
||||
<property name="title">Output Streams</property>
|
||||
|
|
@ -194,6 +205,10 @@
|
|||
</child>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup" id="reset_cards">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<property name="title">Devices</property>
|
||||
</object>
|
||||
</child>
|
||||
|
|
|
|||
|
|
@ -39,6 +39,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup" id="reset_bluetooth_details">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwComboRow" id="reset_bluetooth_adapter">
|
||||
<property name="title">Bluetooth Adapter</property>
|
||||
|
|
@ -59,6 +63,15 @@
|
|||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup" id="reset_bluetooth_connected_devices">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<property name="title">Connected Devices</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup" id="reset_bluetooth_available_devices">
|
||||
<property name="header-suffix">
|
||||
|
|
@ -67,17 +80,13 @@
|
|||
<property name="margin-end">15</property>
|
||||
</object>
|
||||
</property>
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">10</property>
|
||||
<property name="title">Available Devices</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup" id="reset_bluetooth_connected_devices">
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<property name="title">Connected Devices</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
|
|
@ -91,6 +100,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwActionRow" id="reset_bluetooth_main_tab">
|
||||
<property name="title">Available Networks</property>
|
||||
|
|
@ -108,6 +121,10 @@
|
|||
</child>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<property name="title">Visibility Settings</property>
|
||||
<child>
|
||||
<object class="AdwSwitchRow" id="reset_bluetooth_pairable_switch">
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@
|
|||
<requires lib="gtk" version="4.12"/>
|
||||
<requires lib="libadwaita" version="1.4"/>
|
||||
<template class="resetInputStreamEntry" parent="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="GtkSeparator">
|
||||
<property name="margin-top">10</property>
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@
|
|||
<requires lib="gtk" version="4.12"/>
|
||||
<requires lib="libadwaita" version="1.4"/>
|
||||
<template class="resetOutputStreamEntry" parent="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="GtkSeparator">
|
||||
<property name="margin-top">10</property>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
</child>
|
||||
<child>
|
||||
<object class="GtkShortcutsShortcut">
|
||||
<property name="accelerator"><Ctrl>A</property>
|
||||
<property name="accelerator"><Ctrl>H</property>
|
||||
<property name="action-name">win.about</property>
|
||||
<property name="icon-set">True</property>
|
||||
<property name="title">Show about window</property>
|
||||
|
|
|
|||
|
|
@ -139,8 +139,8 @@
|
|||
(10,173,"AdwComboRow","reset_bluetooth_adapter",172,None,None,None,None,None),
|
||||
(10,174,"AdwActionRow","reset_visibility",172,None,None,None,1,None),
|
||||
(10,175,"GtkImage",None,174,None,None,None,None,None),
|
||||
(10,204,"AdwPreferencesGroup","reset_bluetooth_available_devices",121,None,None,None,1,None),
|
||||
(10,206,"AdwPreferencesGroup","reset_bluetooth_connected_devices",121,None,None,None,2,None),
|
||||
(10,204,"AdwPreferencesGroup","reset_bluetooth_available_devices",121,None,None,None,2,None),
|
||||
(10,206,"AdwPreferencesGroup","reset_bluetooth_connected_devices",121,None,None,None,1,None),
|
||||
(10,207,"GtkButton","reset_bluetooth_refresh_button",204,None,None,None,-1,None),
|
||||
(10,208,"AdwPreferencesGroup",None,153,None,None,None,None,None),
|
||||
(10,209,"AdwPreferencesGroup",None,153,None,None,None,1,None),
|
||||
|
|
@ -377,6 +377,10 @@
|
|||
(4,184,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
|
||||
(4,184,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,184,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
|
||||
(4,199,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,199,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,199,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,199,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,200,"AdwPreferencesRow","title","WiFi Device",None,None,None,None,None,None,None,None,None),
|
||||
(4,201,"AdwPreferencesRow","title","Saved Networks",None,None,None,None,None,None,None,None,None),
|
||||
(4,202,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -384,12 +388,23 @@
|
|||
(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,204,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,204,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,204,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,204,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,205,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,205,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,205,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,205,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,206,"AdwPreferencesRow","title","Available Networks",None,None,None,None,None,None,None,None,None),
|
||||
(4,207,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
|
||||
(4,207,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
|
||||
(4,207,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
|
||||
(4,207,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,208,"AdwPreferencesGroup","title","Available networks",None,None,None,None,None,None,None,None,None),
|
||||
(4,208,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,208,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,208,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(4,208,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
|
||||
(6,1,"GtkListBoxRow","child",None,None,None,None,None,2,None,None,None,None),
|
||||
(6,1,"GtkWidget","css-classes","resetSidebarEntry",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -399,6 +414,10 @@
|
|||
(6,2,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None),
|
||||
(6,2,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
|
||||
(6,6,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None),
|
||||
(7,14,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(7,14,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(7,14,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(7,14,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(7,15,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
|
||||
(7,15,"AdwPreferencesRow","title","asadf",None,None,None,None,None,None,None,None,None),
|
||||
(7,15,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -454,6 +473,9 @@
|
|||
(8,116,"AdwNavigationPage","title","profileConfiguration",None,None,None,None,None,None,None,None,None),
|
||||
(8,117,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
|
||||
(8,130,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
|
||||
(8,130,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,130,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,130,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,132,"AdwPreferencesRow","title","Output Devices",None,None,None,None,None,None,None,None,None),
|
||||
(8,133,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
|
||||
(8,134,"AdwPreferencesRow","title","Profile Settings",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -461,17 +483,29 @@
|
|||
(8,137,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
|
||||
(8,137,"AdwPreferencesRow","title","Default Output Device",None,None,None,None,None,None,None,None,None),
|
||||
(8,137,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None),
|
||||
(8,138,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,138,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,138,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,138,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,139,"AdwPreferencesRow","title","Output Streams",None,None,None,None,None,None,None,None,None),
|
||||
(8,140,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
|
||||
(8,140,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
|
||||
(8,140,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
|
||||
(8,140,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,141,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,141,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,141,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,141,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,142,"AdwPreferencesRow","title","Output Streams",None,None,None,None,None,None,None,None,None),
|
||||
(8,143,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
|
||||
(8,143,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
|
||||
(8,143,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
|
||||
(8,143,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,144,"AdwPreferencesGroup","title","Devices",None,None,None,None,None,None,None,None,None),
|
||||
(8,144,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,144,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,144,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,144,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,145,"GtkListBoxRow","child",None,None,None,None,None,146,None,None,None,None),
|
||||
(8,146,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(8,146,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -508,6 +542,10 @@
|
|||
(10,144,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,144,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
|
||||
(10,153,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
|
||||
(10,172,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,172,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,172,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,172,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,173,"AdwPreferencesRow","title","Bluetooth Adapter",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),
|
||||
|
|
@ -516,13 +554,26 @@
|
|||
(10,175,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,204,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,207,None,None,None,None),
|
||||
(10,204,"AdwPreferencesGroup","title","Available Devices",None,None,None,None,None,None,None,None,None),
|
||||
(10,204,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,204,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,204,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,204,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
|
||||
(10,206,"AdwPreferencesGroup","title","Connected Devices",None,None,None,None,None,None,None,None,None),
|
||||
(10,206,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,206,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,206,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,206,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,207,"GtkButton","icon-name","view-refresh-symbolic",None,None,None,None,None,None,None,None,None),
|
||||
(10,207,"GtkWidget","margin-end","15",None,None,None,None,None,None,None,None,None),
|
||||
(10,208,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,208,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,208,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,208,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,209,"AdwPreferencesGroup","title","Visibility Settings",None,None,None,None,None,None,None,None,None),
|
||||
(10,209,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,209,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,209,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,209,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,210,"AdwPreferencesRow","title","Pairable",None,None,None,None,None,None,None,None,None),
|
||||
(10,211,"AdwPreferencesRow","title","Discoverable",None,None,None,None,None,None,None,None,None),
|
||||
(10,212,"AdwPreferencesRow","title","Available Networks",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -604,7 +655,14 @@
|
|||
(12,52,"AdwNavigationPage","title","profileConfiguration",None,None,None,None,None,None,None,None,None),
|
||||
(12,53,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
|
||||
(12,66,"AdwPreferencesGroup","title","Devices",None,None,None,None,None,None,None,None,None),
|
||||
(12,66,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,66,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,66,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,66,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,67,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
|
||||
(12,67,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,67,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,67,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,69,"AdwPreferencesRow","title","Input Devices",None,None,None,None,None,None,None,None,None),
|
||||
(12,70,"AdwPreferencesRow","title","Profile Settings",None,None,None,None,None,None,None,None,None),
|
||||
(12,71,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -612,11 +670,19 @@
|
|||
(12,73,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
|
||||
(12,73,"AdwPreferencesRow","title","Default Input Device",None,None,None,None,None,None,None,None,None),
|
||||
(12,73,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None),
|
||||
(12,74,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,74,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,74,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,74,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,75,"AdwPreferencesRow","title","Input Streams",None,None,None,None,None,None,None,None,None),
|
||||
(12,76,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
|
||||
(12,76,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
|
||||
(12,76,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
|
||||
(12,76,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,77,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,77,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,77,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,77,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(12,78,"AdwPreferencesRow","title","Input Streams",None,None,None,None,None,None,None,None,None),
|
||||
(12,79,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
|
||||
(12,79,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -640,6 +706,10 @@
|
|||
(12,85,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
|
||||
(12,85,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
|
||||
(12,85,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
|
||||
(13,22,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(13,22,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(13,22,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(13,22,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(13,23,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
|
||||
(13,23,"AdwPreferencesRow","title","asadf",None,None,None,None,None,None,None,None,None),
|
||||
(13,23,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -748,6 +818,10 @@
|
|||
(21,53,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
|
||||
(21,54,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
|
||||
(21,54,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,55,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,55,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,55,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,55,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,56,"AdwPreferencesRow","title","WiFi Name",None,None,None,None,None,None,None,None,None),
|
||||
(21,56,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
|
||||
(21,57,"AdwPreferencesRow","title","MAC-Address",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -769,14 +843,24 @@
|
|||
(21,66,"GtkLabel","label","General",None,None,None,None,None,None,None,None,None),
|
||||
(21,67,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
|
||||
(21,67,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,68,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,68,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,68,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,68,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,69,"AdwComboRow","model",None,None,None,None,None,70,None,None,None,None),
|
||||
(21,69,"AdwPreferencesRow","title","IPv4 Method",None,None,None,None,None,None,None,None,None),
|
||||
(21,71,"AdwPreferencesRow","title","DNS (separate IP by comma, empty for automatic)",None,None,None,None,None,None,None,None,None),
|
||||
(21,73,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,99,None,None,None,None),
|
||||
(21,73,"AdwPreferencesGroup","title","Addresses",None,None,None,None,None,None,None,None,None),
|
||||
(21,73,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,73,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,73,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,73,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
|
||||
(21,74,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,75,None,None,None,None),
|
||||
(21,74,"AdwPreferencesGroup","title","Routes",None,None,None,None,None,None,None,None,None),
|
||||
(21,74,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,74,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,74,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,74,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
|
||||
(21,76,"GtkLabel","label","Automatic",None,None,None,None,None,None,None,None,None),
|
||||
(21,76,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -784,15 +868,25 @@
|
|||
(21,78,"GtkLabel","label","IPv4",None,None,None,None,None,None,None,None,None),
|
||||
(21,79,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
|
||||
(21,79,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,80,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,80,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,80,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,80,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,81,"AdwComboRow","model",None,None,None,None,None,82,None,None,None,None),
|
||||
(21,81,"AdwPreferencesRow","title","IPv6 Method",None,None,None,None,None,None,None,None,None),
|
||||
(21,83,"AdwPreferencesRow","title","DNS (separate IP by comma, empty for automatic)",None,None,None,None,None,None,None,None,None),
|
||||
(21,84,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
|
||||
(21,85,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,101,None,None,None,None),
|
||||
(21,85,"AdwPreferencesGroup","title","Addresses",None,None,None,None,None,None,None,None,None),
|
||||
(21,85,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,85,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,85,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,85,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
|
||||
(21,86,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,87,None,None,None,None),
|
||||
(21,86,"AdwPreferencesGroup","title","Routes",None,None,None,None,None,None,None,None,None),
|
||||
(21,86,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,86,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,86,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,86,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
|
||||
(21,88,"GtkLabel","label","Automatic",None,None,None,None,None,None,None,None,None),
|
||||
(21,88,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -800,6 +894,10 @@
|
|||
(21,90,"GtkLabel","label","IPv6",None,None,None,None,None,None,None,None,None),
|
||||
(21,91,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
|
||||
(21,91,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,92,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,92,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,92,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,92,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,93,"AdwComboRow","model",None,None,None,None,None,103,None,None,None,None),
|
||||
(21,93,"AdwPreferencesRow","title","Security",None,None,None,None,None,None,None,None,None),
|
||||
(21,96,"AdwPreferencesRow","title","Password",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -818,6 +916,10 @@
|
|||
(21,106,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
|
||||
(21,106,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
|
||||
(21,107,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
|
||||
(21,108,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,108,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,108,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,108,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(21,109,"AdwPreferencesRow","title","Available Networks",None,None,None,None,None,None,None,None,None),
|
||||
(21,110,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
|
||||
(21,110,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -857,7 +959,7 @@
|
|||
(24,5,"GtkShortcutsShortcut","action-name","win.close",None,None,None,None,None,None,None,None,None),
|
||||
(24,5,"GtkShortcutsShortcut","icon-set","True",None,None,None,None,None,None,None,None,None),
|
||||
(24,5,"GtkShortcutsShortcut","title","Close ReSet",None,None,None,None,None,None,None,None,None),
|
||||
(24,6,"GtkShortcutsShortcut","accelerator","<Ctrl>A",None,None,None,None,None,None,None,None,None),
|
||||
(24,6,"GtkShortcutsShortcut","accelerator","<Ctrl>H",None,None,None,None,None,None,None,None,None),
|
||||
(24,6,"GtkShortcutsShortcut","action-name","win.about",None,None,None,None,None,None,None,None,None),
|
||||
(24,6,"GtkShortcutsShortcut","icon-set","True",None,None,None,None,None,None,None,None,None),
|
||||
(24,6,"GtkShortcutsShortcut","title","Show about window",None,None,None,None,None,None,None,None,None)
|
||||
|
|
|
|||
|
|
@ -41,6 +41,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup" id="reset_wifi_details">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwComboRow" id="reset_wifi_device">
|
||||
<property name="title">WiFi Device</property>
|
||||
|
|
@ -63,6 +67,9 @@
|
|||
</child>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup" id="reset_wifi_list">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">10</property>
|
||||
<property name="title">Available networks</property>
|
||||
</object>
|
||||
|
|
@ -80,6 +87,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwActionRow" id="reset_available_networks">
|
||||
<property name="title">Available Networks</property>
|
||||
|
|
@ -97,6 +108,10 @@
|
|||
</child>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup" id="reset_stored_wifi_list">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<property name="title">Saved Networks</property>
|
||||
</object>
|
||||
</child>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwActionRow" id="reset_available_networks">
|
||||
<property name="title">Available Networks</property>
|
||||
|
|
@ -35,6 +39,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwActionRow" id="reset_wifi_name">
|
||||
<property name="css-classes">property</property>
|
||||
|
|
@ -108,6 +116,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwComboRow" id="reset_ip4_method">
|
||||
<property name="model">
|
||||
|
|
@ -138,6 +150,9 @@
|
|||
<property name="icon-name">list-add-symbolic</property>
|
||||
</object>
|
||||
</property>
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">10</property>
|
||||
<property name="title">Addresses</property>
|
||||
<child>
|
||||
|
|
@ -170,6 +185,9 @@
|
|||
</child>
|
||||
</object>
|
||||
</property>
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">10</property>
|
||||
<property name="title">Routes</property>
|
||||
</object>
|
||||
|
|
@ -187,6 +205,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwComboRow" id="reset_ip6_method">
|
||||
<property name="model">
|
||||
|
|
@ -223,6 +245,9 @@
|
|||
<property name="icon-name">list-add-symbolic</property>
|
||||
</object>
|
||||
</property>
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">10</property>
|
||||
<property name="title">Addresses</property>
|
||||
</object>
|
||||
|
|
@ -250,6 +275,9 @@
|
|||
</child>
|
||||
</object>
|
||||
</property>
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">10</property>
|
||||
<property name="title">Routes</property>
|
||||
</object>
|
||||
|
|
@ -267,6 +295,10 @@
|
|||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<property name="margin-bottom">5</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<child>
|
||||
<object class="AdwComboRow" id="reset_wifi_security_dropdown">
|
||||
<property name="model">
|
||||
|
|
|
|||
Loading…
Reference in a new issue