Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-04-17 10:18:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: make all snake_case

Browse source
This commit is contained in:
Fabio Lenherr / DashieTM 2023-12-05 16:15:24 +01:00
parent 391182607d
commit d50ee65bdd
52 changed files with 766 additions and 783 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/base/popup_impl.rs
View file

@ -6,16 +6,15 @@ use gtk::{glib, Button, CompositeTemplate, Label, PasswordEntry, PasswordEntryBu
use super::popup; use super::popup;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetPopup.ui")] #[template(resource = "/org/Xetibo/ReSet/resetPopup.ui")]
pub struct Popup { pub struct Popup {
#[template_child] #[template_child]
pub resetPopupLabel: TemplateChild<Label>, pub reset_popup_label: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetPopupEntry: TemplateChild<PasswordEntry>, pub reset_popup_entry: TemplateChild<PasswordEntry>,
#[template_child] #[template_child]
pub resetPopupButton: TemplateChild<Button>, pub reset_popup_button: TemplateChild<Button>,
pub reset_popup_text: Arc<RefCell<PasswordEntryBuffer>>, pub reset_popup_text: Arc<RefCell<PasswordEntryBuffer>>,
} }

46
src/components/bluetooth/bluetooth_box.rs
View file

@ -45,26 +45,26 @@ fn setup_callbacks(
let bluetooth_box_ref = bluetooth_box.clone(); let bluetooth_box_ref = bluetooth_box.clone();
let imp = bluetooth_box.imp(); let imp = bluetooth_box.imp();
// let bluetooth_box_ref = bluetooth_box.clone(); // let bluetooth_box_ref = bluetooth_box.clone();
imp.resetVisibility.set_activatable(true); imp.reset_visibility.set_activatable(true);
imp.resetVisibility.set_action_name(Some("navigation.push")); imp.reset_visibility.set_action_name(Some("navigation.push"));
imp.resetVisibility imp.reset_visibility
.set_action_target_value(Some(&Variant::from("visibility"))); .set_action_target_value(Some(&Variant::from("visibility")));
imp.resetBluetoothMainTab imp.reset_bluetooth_main_tab
.set_action_name(Some("navigation.pop")); .set_action_name(Some("navigation.pop"));
// TODO add a manual search button here // TODO add a manual search button here
imp.resetBluetoothSwitch.connect_state_set(move |_, state| { imp.reset_bluetooth_switch.connect_state_set(move |_, state| {
if !state { if !state {
let imp = bluetooth_box_ref.imp(); let imp = bluetooth_box_ref.imp();
for x in imp for x in imp
.resetBluetoothConnectedDevices .reset_bluetooth_connected_devices
.observe_children() .observe_children()
.iter::<Object>() .iter::<Object>()
.flatten() .flatten()
{ {
// todo test this // todo test this
if let Some(item) = x.downcast_ref::<Widget>() { if let Some(item) = x.downcast_ref::<Widget>() {
imp.resetBluetoothAvailableDevices.remove(item); imp.reset_bluetooth_available_devices.remove(item);
} }
} }
listeners.bluetooth_listener.store(false, Ordering::SeqCst); listeners.bluetooth_listener.store(false, Ordering::SeqCst);
@ -108,13 +108,13 @@ pub fn populate_conntected_bluetooth_devices(bluetooth_box: Arc<BluetoothBox>) {
let imp = ref_box.imp(); let imp = ref_box.imp();
let list = imp.reset_model_list.read().unwrap(); let list = imp.reset_model_list.read().unwrap();
imp.resetBluetoothAdapter.set_model(Some(&*list)); imp.reset_bluetooth_adapter.set_model(Some(&*list));
let map = imp.reset_bluetooth_adapters.read().unwrap(); let map = imp.reset_bluetooth_adapters.read().unwrap();
let device = imp.reset_current_bluetooth_adapter.borrow(); let device = imp.reset_current_bluetooth_adapter.borrow();
if let Some(index) = map.get(&device.alias) { if let Some(index) = map.get(&device.alias) {
imp.resetBluetoothAdapter.set_selected(index.1); imp.reset_bluetooth_adapter.set_selected(index.1);
} }
imp.resetBluetoothAdapter.connect_selected_notify( imp.reset_bluetooth_adapter.connect_selected_notify(
clone!(@weak imp => move |dropdown| { clone!(@weak imp => move |dropdown| {
let selected = dropdown.selected_item(); let selected = dropdown.selected_item();
if selected.is_none() { if selected.is_none() {
@ -142,9 +142,9 @@ pub fn populate_conntected_bluetooth_devices(bluetooth_box: Arc<BluetoothBox>) {
.borrow_mut() .borrow_mut()
.insert(path, (bluetooth_entry.clone(), entry.clone(), device)); .insert(path, (bluetooth_entry.clone(), entry.clone(), device));
if connected { if connected {
imp.resetBluetoothConnectedDevices.append(&*entry); imp.reset_bluetooth_connected_devices.append(&*entry);
} else { } else {
imp.resetBluetoothAvailableDevices.append(&*entry); imp.reset_bluetooth_available_devices.append(&*entry);
} }
} }
}); });
@ -207,9 +207,9 @@ pub fn start_bluetooth_listener(listeners: Arc<Listeners>, bluetooth_box: Arc<Bl
(bluetooth_entry.clone(), entry.clone(), ir.bluetooth_device), (bluetooth_entry.clone(), entry.clone(), ir.bluetooth_device),
); );
if connected { if connected {
imp.resetBluetoothConnectedDevices.append(&*entry); imp.reset_bluetooth_connected_devices.append(&*entry);
} else { } else {
imp.resetBluetoothAvailableDevices.append(&*entry); imp.reset_bluetooth_available_devices.append(&*entry);
} }
}); });
}); });
@ -228,7 +228,7 @@ pub fn start_bluetooth_listener(listeners: Arc<Listeners>, bluetooth_box: Arc<Bl
let imp = bluetooth_box.imp(); let imp = bluetooth_box.imp();
let map = imp.available_devices.borrow_mut(); let map = imp.available_devices.borrow_mut();
if let Some(list_entry) = map.get(&ir.bluetooth_device) { if let Some(list_entry) = map.get(&ir.bluetooth_device) {
imp.resetBluetoothConnectedDevices.remove(&*list_entry.1); imp.reset_bluetooth_connected_devices.remove(&*list_entry.1);
} }
}); });
}); });
@ -249,18 +249,18 @@ pub fn start_bluetooth_listener(listeners: Arc<Listeners>, bluetooth_box: Arc<Bl
if let Some(list_entry) = map.get(&ir.bluetooth_device.path) { if let Some(list_entry) = map.get(&ir.bluetooth_device.path) {
if list_entry.2.connected != ir.bluetooth_device.connected { if list_entry.2.connected != ir.bluetooth_device.connected {
if ir.bluetooth_device.connected { if ir.bluetooth_device.connected {
imp.resetBluetoothConnectedDevices.append(&*list_entry.1); imp.reset_bluetooth_connected_devices.append(&*list_entry.1);
imp.resetBluetoothAvailableDevices.remove(&*list_entry.1); imp.reset_bluetooth_available_devices.remove(&*list_entry.1);
} else { } else {
imp.resetBluetoothAvailableDevices.append(&*list_entry.1); imp.reset_bluetooth_available_devices.append(&*list_entry.1);
imp.resetBluetoothConnectedDevices.remove(&*list_entry.1); imp.reset_bluetooth_connected_devices.remove(&*list_entry.1);
} }
} }
if list_entry.2.paired != ir.bluetooth_device.paired { if list_entry.2.paired != ir.bluetooth_device.paired {
if ir.bluetooth_device.paired { if ir.bluetooth_device.paired {
list_entry.0.imp().resetBluetoothButton.set_sensitive(true); list_entry.0.imp().reset_bluetooth_button.set_sensitive(true);
} else { } else {
list_entry.0.imp().resetBluetoothButton.set_sensitive(false); list_entry.0.imp().reset_bluetooth_button.set_sensitive(false);
} }
} }
} }
@ -285,13 +285,13 @@ pub fn start_bluetooth_listener(listeners: Arc<Listeners>, bluetooth_box: Arc<Bl
glib::idle_add_once(move || { glib::idle_add_once(move || {
let imp = loop_box.imp(); let imp = loop_box.imp();
for x in imp for x in imp
.resetBluetoothAvailableDevices .reset_bluetooth_available_devices
.observe_children() .observe_children()
.iter::<Object>() .iter::<Object>()
.flatten() .flatten()
{ {
if let Some(item) = x.downcast_ref::<Widget>() { if let Some(item) = x.downcast_ref::<Widget>() {
imp.resetBluetoothAvailableDevices.remove(item); imp.reset_bluetooth_available_devices.remove(item);
} }
} }
}); });

15
src/components/bluetooth/bluetooth_box_impl.rs
View file

@ -15,24 +15,23 @@ use crate::components::bluetooth::bluetooth_entry::BluetoothEntry;
type BluetoothMap = type BluetoothMap =
RefCell<HashMap<Path<'static>, (Arc<BluetoothEntry>, Arc<ListEntry>, BluetoothDevice)>>; RefCell<HashMap<Path<'static>, (Arc<BluetoothEntry>, Arc<ListEntry>, BluetoothDevice)>>;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetBluetooth.ui")] #[template(resource = "/org/Xetibo/ReSet/resetBluetooth.ui")]
pub struct BluetoothBox { pub struct BluetoothBox {
#[template_child] #[template_child]
pub resetBluetoothSwitch: TemplateChild<Switch>, pub reset_bluetooth_switch: TemplateChild<Switch>,
#[template_child] #[template_child]
pub resetBluetoothAvailableDevices: TemplateChild<gtk::Box>, pub reset_bluetooth_available_devices: TemplateChild<gtk::Box>,
#[template_child] #[template_child]
pub resetBluetoothRefreshButton: TemplateChild<Button>, pub reset_bluetooth_refresh_button: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetBluetoothAdapter: TemplateChild<ComboRow>, pub reset_bluetooth_adapter: TemplateChild<ComboRow>,
#[template_child] #[template_child]
pub resetBluetoothConnectedDevices: TemplateChild<gtk::Box>, pub reset_bluetooth_connected_devices: TemplateChild<gtk::Box>,
#[template_child] #[template_child]
pub resetVisibility: TemplateChild<ActionRow>, pub reset_visibility: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetBluetoothMainTab: TemplateChild<ListEntry>, pub reset_bluetooth_main_tab: TemplateChild<ListEntry>,
pub available_devices: BluetoothMap, pub available_devices: BluetoothMap,
pub connected_devices: BluetoothMap, pub connected_devices: BluetoothMap,
pub reset_bluetooth_adapters: Arc<RwLock<HashMap<String, (BluetoothAdapter, u32)>>>, pub reset_bluetooth_adapters: Arc<RwLock<HashMap<String, (BluetoothAdapter, u32)>>>,

14
src/components/bluetooth/bluetooth_entry.rs
View file

@ -24,27 +24,27 @@ impl BluetoothEntry {
pub fn new(device: &BluetoothDevice) -> Self { pub fn new(device: &BluetoothDevice) -> Self {
let entry: BluetoothEntry = Object::builder().build(); let entry: BluetoothEntry = Object::builder().build();
let entry_imp = entry.imp(); let entry_imp = entry.imp();
entry_imp.resetBluetoothLabel.get().set_text(&device.alias); entry_imp.reset_bluetooth_label.get().set_text(&device.alias);
entry_imp entry_imp
.resetBluetoothAddress .reset_bluetooth_address
.get() .get()
.set_text(&device.address); .set_text(&device.address);
if device.icon.is_empty() { if device.icon.is_empty() {
entry_imp entry_imp
.resetBluetoothDeviceType .reset_bluetooth_device_type
.set_icon_name(Some("dialog-question-symbolic")); .set_icon_name(Some("dialog-question-symbolic"));
} else { } else {
entry_imp entry_imp
.resetBluetoothDeviceType .reset_bluetooth_device_type
.set_icon_name(Some(&device.icon)); .set_icon_name(Some(&device.icon));
} }
if device.paired { if device.paired {
entry_imp.resetBluetoothButton.set_sensitive(true); entry_imp.reset_bluetooth_button.set_sensitive(true);
} else { } else {
entry_imp.resetBluetoothButton.set_sensitive(false); entry_imp.reset_bluetooth_button.set_sensitive(false);
} }
let path = Arc::new(device.path.clone()); let path = Arc::new(device.path.clone());
entry_imp.resetBluetoothButton.connect_clicked(move |_| { entry_imp.reset_bluetooth_button.connect_clicked(move |_| {
remove_device_pairing((*path).clone()); remove_device_pairing((*path).clone());
}); });
let gesture = GestureClick::new(); let gesture = GestureClick::new();

9
src/components/bluetooth/bluetooth_entry_impl.rs
View file

@ -3,18 +3,17 @@ use gtk::subclass::prelude::*;
use gtk::{glib, Button, CompositeTemplate, Image, Label}; use gtk::{glib, Button, CompositeTemplate, Image, Label};
use std::cell::RefCell; use std::cell::RefCell;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetBluetoothEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetBluetoothEntry.ui")]
pub struct BluetoothEntry { pub struct BluetoothEntry {
#[template_child] #[template_child]
pub resetBluetoothDeviceType: TemplateChild<Image>, pub reset_bluetooth_device_type: TemplateChild<Image>,
#[template_child] #[template_child]
pub resetBluetoothLabel: TemplateChild<Label>, pub reset_bluetooth_label: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetBluetoothAddress: TemplateChild<Label>, pub reset_bluetooth_address: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetBluetoothButton: TemplateChild<Button>, pub reset_bluetooth_button: TemplateChild<Button>,
pub device_name: RefCell<String>, pub device_name: RefCell<String>,
} }

26
src/components/input/output_stream_entry.rs
View file

@ -32,21 +32,21 @@ impl OutputStreamEntry {
let box_imp = source_box.imp(); let box_imp = source_box.imp();
let imp = obj.imp(); let imp = obj.imp();
let name = stream.application_name.clone() + ": " + stream.name.as_str(); let name = stream.application_name.clone() + ": " + stream.name.as_str();
imp.resetSourceSelection.set_title(name.as_str()); imp.reset_source_selection.set_title(name.as_str());
imp.resetSourceSelection imp.reset_source_selection
.set_factory(Some(&create_dropdown_label_factory())); .set_factory(Some(&create_dropdown_label_factory()));
set_combo_row_ellipsis(imp.resetSourceSelection.get()); set_combo_row_ellipsis(imp.reset_source_selection.get());
let volume = stream.volume.first().unwrap_or(&0_u32); let volume = stream.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round(); let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64); imp.reset_volume_slider.set_value(*volume as f64);
imp.stream.replace(stream); imp.stream.replace(stream);
imp.resetVolumeSlider.connect_change_value( imp.reset_volume_slider.connect_change_value(
clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| { clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| {
let fraction = (value / 655.36).round(); let fraction = (value / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
let mut stream = imp.stream.try_borrow(); let mut stream = imp.stream.try_borrow();
while stream.is_err() { while stream.is_err() {
stream = imp.stream.try_borrow(); stream = imp.stream.try_borrow();
@ -69,7 +69,7 @@ impl OutputStreamEntry {
); );
{ {
let list = box_imp.reset_model_list.read().unwrap(); let list = box_imp.reset_model_list.read().unwrap();
imp.resetSourceSelection.set_model(Some(&*list)); imp.reset_source_selection.set_model(Some(&*list));
let map = box_imp.reset_source_map.write().unwrap(); let map = box_imp.reset_source_map.write().unwrap();
let mut name = box_imp.reset_default_source.try_borrow(); let mut name = box_imp.reset_default_source.try_borrow();
while name.is_err() { while name.is_err() {
@ -79,10 +79,10 @@ impl OutputStreamEntry {
let name = &name.alias; let name = &name.alias;
let index = map.get(name); let index = map.get(name);
if let Some(index) = index { if let Some(index) = index {
imp.resetSourceSelection.set_selected(index.1); imp.reset_source_selection.set_selected(index.1);
} }
} }
imp.resetSourceSelection.connect_selected_notify( imp.reset_source_selection.connect_selected_notify(
clone!(@weak imp, @weak box_imp => move |dropdown| { clone!(@weak imp, @weak box_imp => move |dropdown| {
let selected = dropdown.selected_item(); let selected = dropdown.selected_item();
if selected.is_none() { if selected.is_none() {
@ -105,7 +105,7 @@ impl OutputStreamEntry {
set_source_of_output_stream(stream.index, source); set_source_of_output_stream(stream.index, source);
}), }),
); );
imp.resetSourceMute imp.reset_source_mute
.connect_clicked(clone!(@weak imp => move |_| { .connect_clicked(clone!(@weak imp => move |_| {
let stream = imp.stream.clone(); let stream = imp.stream.clone();
let mut stream = stream.try_borrow_mut(); let mut stream = stream.try_borrow_mut();
@ -117,10 +117,10 @@ impl OutputStreamEntry {
let muted = stream.muted; let muted = stream.muted;
let index = stream.index; let index = stream.index;
if muted { if muted {
imp.resetSourceMute imp.reset_source_mute
.set_icon_name("microphone-disabled-symbolic"); .set_icon_name("microphone-disabled-symbolic");
} else { } else {
imp.resetSourceMute imp.reset_source_mute
.set_icon_name("audio-input-microphone-symbolic"); .set_icon_name("audio-input-microphone-symbolic");
} }
toggle_output_stream_mute(index, muted); toggle_output_stream_mute(index, muted);

11
src/components/input/output_stream_entry_impl.rs
View file

@ -9,20 +9,19 @@ use gtk::subclass::prelude::*;
use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale}; use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale};
use ReSet_Lib::audio::audio::OutputStream; use ReSet_Lib::audio::audio::OutputStream;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetOutputStreamEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetOutputStreamEntry.ui")]
pub struct OutputStreamEntry { pub struct OutputStreamEntry {
#[template_child] #[template_child]
pub resetSourceSelection: TemplateChild<ComboRow>, pub reset_source_selection: TemplateChild<ComboRow>,
#[template_child] #[template_child]
pub resetSourceMute: TemplateChild<Button>, pub reset_source_mute: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetVolumeSlider: TemplateChild<Scale>, pub reset_volume_slider: TemplateChild<Scale>,
#[template_child] #[template_child]
pub resetVolumePercentage: TemplateChild<Label>, pub reset_volume_percentage: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>, pub reset_volume_meter: TemplateChild<ProgressBar>,
pub stream: Arc<RefCell<OutputStream>>, pub stream: Arc<RefCell<OutputStream>>,
pub associated_source: Arc<RefCell<(u32, String)>>, pub associated_source: Arc<RefCell<(u32, String)>>,
pub volume_time_stamp: RefCell<Option<SystemTime>>, pub volume_time_stamp: RefCell<Option<SystemTime>>,

84
src/components/input/source_box.rs
View file

@ -45,35 +45,35 @@ impl SourceBox {
pub fn setup_callbacks(&self) { pub fn setup_callbacks(&self) {
let self_imp = self.imp(); let self_imp = self.imp();
self_imp.resetSourceRow.set_activatable(true); self_imp.reset_source_row.set_activatable(true);
self_imp self_imp
.resetSourceRow .reset_source_row
.set_action_name(Some("navigation.push")); .set_action_name(Some("navigation.push"));
self_imp self_imp
.resetSourceRow .reset_source_row
.set_action_target_value(Some(&Variant::from("sources"))); .set_action_target_value(Some(&Variant::from("sources")));
self_imp.resetCardsRow.set_activatable(true); self_imp.reset_cards_row.set_activatable(true);
self_imp self_imp
.resetCardsRow .reset_cards_row
.set_action_name(Some("navigation.push")); .set_action_name(Some("navigation.push"));
self_imp self_imp
.resetCardsRow .reset_cards_row
.set_action_target_value(Some(&Variant::from("profileConfiguration"))); .set_action_target_value(Some(&Variant::from("profileConfiguration")));
self_imp.resetOutputStreamButton.set_activatable(true); self_imp.reset_output_stream_button.set_activatable(true);
self_imp self_imp
.resetOutputStreamButton .reset_output_stream_button
.set_action_name(Some("navigation.pop")); .set_action_name(Some("navigation.pop"));
self_imp.resetInputCardsBackButton.set_activatable(true); self_imp.reset_input_cards_back_button.set_activatable(true);
self_imp self_imp
.resetInputCardsBackButton .reset_input_cards_back_button
.set_action_name(Some("navigation.pop")); .set_action_name(Some("navigation.pop"));
self_imp self_imp
.resetSourceDropdown .reset_source_dropdown
.set_factory(Some(&create_dropdown_label_factory())); .set_factory(Some(&create_dropdown_label_factory()));
set_combo_row_ellipsis(self_imp.resetSourceDropdown.get()); set_combo_row_ellipsis(self_imp.reset_source_dropdown.get());
} }
} }
@ -116,8 +116,8 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
let volume = source.volume.first().unwrap_or(&0_u32); let volume = source.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round(); let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
output_box_imp.resetVolumePercentage.set_text(&percentage); output_box_imp.reset_volume_percentage.set_text(&percentage);
output_box_imp.resetVolumeSlider.set_value(*volume as f64); output_box_imp.reset_volume_slider.set_value(*volume as f64);
let mut list = output_box_imp.reset_source_list.write().unwrap(); let mut list = output_box_imp.reset_source_list.write().unwrap();
for stream in sources { for stream in sources {
let index = source.index; let index = source.index;
@ -135,16 +135,16 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
let entry = Arc::new(ListEntry::new(&*source_entry)); let entry = Arc::new(ListEntry::new(&*source_entry));
entry.set_activatable(false); entry.set_activatable(false);
list.insert(index, (entry.clone(), source_clone, alias)); list.insert(index, (entry.clone(), source_clone, alias));
output_box_imp.resetSources.append(&*entry); output_box_imp.reset_sources.append(&*entry);
} }
let list = output_box_imp.reset_model_list.read().unwrap(); let list = output_box_imp.reset_model_list.read().unwrap();
output_box_imp.resetSourceDropdown.set_model(Some(&*list)); output_box_imp.reset_source_dropdown.set_model(Some(&*list));
let map = output_box_imp.reset_source_map.read().unwrap(); let map = output_box_imp.reset_source_map.read().unwrap();
let name = output_box_imp.reset_default_source.borrow(); let name = output_box_imp.reset_default_source.borrow();
if let Some(index) = map.get(&name.alias) { if let Some(index) = map.get(&name.alias) {
output_box_imp.resetSourceDropdown.set_selected(index.1); output_box_imp.reset_source_dropdown.set_selected(index.1);
} }
output_box_imp.resetSourceDropdown.connect_selected_notify( output_box_imp.reset_source_dropdown.connect_selected_notify(
clone!(@weak output_box_imp => move |dropdown| { clone!(@weak output_box_imp => move |dropdown| {
let selected = dropdown.selected_item(); let selected = dropdown.selected_item();
if selected.is_none() { if selected.is_none() {
@ -166,12 +166,12 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
} }
output_box_ref output_box_ref
.imp() .imp()
.resetVolumeSlider .reset_volume_slider
.connect_change_value(move |_, _, value| { .connect_change_value(move |_, _, value| {
let imp = output_box_ref_slider.imp(); let imp = output_box_ref_slider.imp();
let fraction = (value / 655.36).round(); let fraction = (value / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
let source = imp.reset_default_source.borrow(); let source = imp.reset_default_source.borrow();
let index = source.index; let index = source.index;
let channels = source.channels; let channels = source.channels;
@ -190,7 +190,7 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
output_box_ref output_box_ref
.imp() .imp()
.resetSourceMute .reset_source_mute
.connect_clicked(move |_| { .connect_clicked(move |_| {
let imp = output_box_ref_mute.imp(); let imp = output_box_ref_mute.imp();
let stream = imp.reset_default_source.clone(); let stream = imp.reset_default_source.clone();
@ -199,10 +199,10 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
let muted = stream.muted; let muted = stream.muted;
let index = stream.index; let index = stream.index;
if muted { if muted {
imp.resetSourceMute imp.reset_source_mute
.set_icon_name("microphone-disabled-symbolic"); .set_icon_name("microphone-disabled-symbolic");
} else { } else {
imp.resetSourceMute imp.reset_source_mute
.set_icon_name("audio-input-microphone-symbolic"); .set_icon_name("audio-input-microphone-symbolic");
} }
toggle_source_mute(index, muted); toggle_source_mute(index, muted);
@ -228,7 +228,7 @@ pub fn populate_outputstreams(input_box: Arc<SourceBox>) {
let entry = Arc::new(ListEntry::new(&*input_stream)); let entry = Arc::new(ListEntry::new(&*input_stream));
entry.set_activatable(false); entry.set_activatable(false);
list.insert(index, (entry.clone(), input_stream_clone)); list.insert(index, (entry.clone(), input_stream_clone));
input_box_imp.resetOutputStreams.append(&*entry); input_box_imp.reset_output_streams.append(&*entry);
} }
}); });
}); });
@ -243,7 +243,7 @@ pub fn populate_cards(input_box: Arc<SourceBox>) {
glib::idle_add_once(move || { glib::idle_add_once(move || {
let imp = output_box_ref.imp(); let imp = output_box_ref.imp();
for card in cards { for card in cards {
imp.resetCards.add(&CardEntry::new(card)); imp.reset_cards.add(&CardEntry::new(card));
} }
}); });
}); });
@ -372,7 +372,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
let entry = Arc::new(ListEntry::new(&*source_entry)); let entry = Arc::new(ListEntry::new(&*source_entry));
entry.set_activatable(false); entry.set_activatable(false);
list.insert(source_index, (entry.clone(), source_clone, alias.clone())); list.insert(source_index, (entry.clone(), source_clone, alias.clone()));
output_box_imp.resetSources.append(&*entry); output_box_imp.reset_sources.append(&*entry);
let mut map = output_box_imp.reset_source_map.write().unwrap(); let mut map = output_box_imp.reset_source_map.write().unwrap();
let mut index = output_box_imp.reset_model_index.write().unwrap(); let mut index = output_box_imp.reset_model_index.write().unwrap();
output_box_imp output_box_imp
@ -403,7 +403,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
if entry.is_none() { if entry.is_none() {
return; return;
} }
output_box_imp.resetSources.remove(&*entry.unwrap().0); output_box_imp.reset_sources.remove(&*entry.unwrap().0);
list.remove(&ir.index); list.remove(&ir.index);
let alias = list.remove(&ir.index); let alias = list.remove(&ir.index);
if alias.is_none() { if alias.is_none() {
@ -449,16 +449,16 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
} }
let imp = entry.unwrap().1.imp(); let imp = entry.unwrap().1.imp();
if is_default { if is_default {
output_box_imp.resetVolumePercentage.set_text(&percentage); output_box_imp.reset_volume_percentage.set_text(&percentage);
output_box_imp.resetVolumeSlider.set_value(*volume as f64); output_box_imp.reset_volume_slider.set_value(*volume as f64);
imp.resetSelectedSource.set_active(true); imp.reset_selected_source.set_active(true);
} else { } else {
imp.resetSelectedSource.set_active(false); imp.reset_selected_source.set_active(false);
} }
imp.resetSourceName imp.reset_source_name
.set_title(ir.source.alias.clone().as_str()); .set_title(ir.source.alias.clone().as_str());
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64); imp.reset_volume_slider.set_value(*volume as f64);
}); });
}); });
true true
@ -481,7 +481,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
let entry = Arc::new(ListEntry::new(&*output_stream)); let entry = Arc::new(ListEntry::new(&*output_stream));
entry.set_activatable(false); entry.set_activatable(false);
list.insert(index, (entry.clone(), output_stream_clone)); list.insert(index, (entry.clone(), output_stream_clone));
output_box_imp.resetOutputStreams.append(&*entry); output_box_imp.reset_output_streams.append(&*entry);
}); });
}); });
true true
@ -520,22 +520,22 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
} }
let imp = entry.imp(); let imp = entry.imp();
if ir.stream.muted { if ir.stream.muted {
imp.resetSourceMute imp.reset_source_mute
.set_icon_name("microphone-disabled-symbolic"); .set_icon_name("microphone-disabled-symbolic");
} else { } else {
imp.resetSourceMute imp.reset_source_mute
.set_icon_name("audio-input-microphone-symbolic"); .set_icon_name("audio-input-microphone-symbolic");
} }
let name = ir.stream.application_name.clone() + ": " + ir.stream.name.as_str(); let name = ir.stream.application_name.clone() + ": " + ir.stream.name.as_str();
imp.resetSourceSelection.set_title(name.as_str()); imp.reset_source_selection.set_title(name.as_str());
let volume = ir.stream.volume.first().unwrap_or(&0_u32); let volume = ir.stream.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round(); let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64); imp.reset_volume_slider.set_value(*volume as f64);
let map = output_box_imp.reset_source_map.read().unwrap(); let map = output_box_imp.reset_source_map.read().unwrap();
if let Some(index) = map.get(&alias) { if let Some(index) = map.get(&alias) {
imp.resetSourceSelection.set_selected(index.1); imp.reset_source_selection.set_selected(index.1);
} }
}); });
}); });
@ -560,7 +560,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
if entry.is_none() { if entry.is_none() {
return; return;
} }
output_box_imp.resetOutputStreams.remove(&*entry.unwrap().0); output_box_imp.reset_output_streams.remove(&*entry.unwrap().0);
}); });
}); });
true true

25
src/components/input/source_box_impl.rs
View file

@ -18,34 +18,33 @@ type SourceEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<SourceEntry>,
type OutputStreamEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<OutputStreamEntry>)>>>; type OutputStreamEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<OutputStreamEntry>)>>>;
type SourceMap = Arc<RwLock<HashMap<String, (u32, u32, String)>>>; type SourceMap = Arc<RwLock<HashMap<String, (u32, u32, String)>>>;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetAudioInput.ui")] #[template(resource = "/org/Xetibo/ReSet/resetAudioInput.ui")]
pub struct SourceBox { pub struct SourceBox {
#[template_child] #[template_child]
pub resetSourceRow: TemplateChild<ActionRow>, pub reset_source_row: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetCardsRow: TemplateChild<ActionRow>, pub reset_cards_row: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetSourceDropdown: TemplateChild<ComboRow>, pub reset_source_dropdown: TemplateChild<ComboRow>,
#[template_child] #[template_child]
pub resetSourceMute: TemplateChild<Button>, pub reset_source_mute: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetVolumeSlider: TemplateChild<Scale>, pub reset_volume_slider: TemplateChild<Scale>,
#[template_child] #[template_child]
pub resetVolumePercentage: TemplateChild<Label>, pub reset_volume_percentage: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>, pub reset_volume_meter: TemplateChild<ProgressBar>,
#[template_child] #[template_child]
pub resetSources: TemplateChild<gtk::Box>, pub reset_sources: TemplateChild<gtk::Box>,
#[template_child] #[template_child]
pub resetOutputStreamButton: TemplateChild<ActionRow>, pub reset_output_stream_button: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetOutputStreams: TemplateChild<gtk::Box>, pub reset_output_streams: TemplateChild<gtk::Box>,
#[template_child] #[template_child]
pub resetInputCardsBackButton: TemplateChild<ActionRow>, pub reset_input_cards_back_button: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetCards: TemplateChild<PreferencesGroup>, pub reset_cards: TemplateChild<PreferencesGroup>,
pub reset_default_check_button: Arc<CheckButton>, pub reset_default_check_button: Arc<CheckButton>,
pub reset_default_source: Arc<RefCell<Source>>, pub reset_default_source: Arc<RefCell<Source>>,
pub reset_source_list: SourceEntryMap, pub reset_source_list: SourceEntryMap,

24
src/components/input/source_entry.rs
View file

@ -28,19 +28,19 @@ impl SourceEntry {
// TODO use event callback for progress bar -> this is the "im speaking" indicator // TODO use event callback for progress bar -> this is the "im speaking" indicator
{ {
let imp = obj.imp(); let imp = obj.imp();
imp.resetSourceName.set_title(stream.alias.clone().as_str()); imp.reset_source_name.set_title(stream.alias.clone().as_str());
let name = Arc::new(stream.name.clone()); let name = Arc::new(stream.name.clone());
let volume = stream.volume.first().unwrap_or(&0_u32); let volume = stream.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round(); let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64); imp.reset_volume_slider.set_value(*volume as f64);
imp.stream.replace(stream); imp.stream.replace(stream);
imp.resetVolumeSlider.connect_change_value( imp.reset_volume_slider.connect_change_value(
clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| { clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| {
let fraction = (value / 655.36).round(); let fraction = (value / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
let source = imp.stream.borrow(); let source = imp.stream.borrow();
let index = source.index; let index = source.index;
let channels = source.channels; let channels = source.channels;
@ -57,19 +57,19 @@ impl SourceEntry {
Propagation::Proceed Propagation::Proceed
}), }),
); );
imp.resetSelectedSource.set_group(Some(&*check_group)); imp.reset_selected_source.set_group(Some(&*check_group));
// check_group.set_group(Some(&*imp.resetSelectedSink)); // check_group.set_group(Some(&*imp.resetSelectedSink));
if is_default { if is_default {
imp.resetSelectedSource.set_active(true); imp.reset_selected_source.set_active(true);
} else { } else {
imp.resetSelectedSource.set_active(false); imp.reset_selected_source.set_active(false);
} }
imp.resetSelectedSource.connect_toggled(move |button| { imp.reset_selected_source.connect_toggled(move |button| {
if button.is_active() { if button.is_active() {
set_default_source(name.clone()); set_default_source(name.clone());
} }
}); });
imp.resetSourceMute imp.reset_source_mute
.connect_clicked(clone!(@weak imp => move |_| { .connect_clicked(clone!(@weak imp => move |_| {
let stream = imp.stream.clone(); let stream = imp.stream.clone();
let mut stream = stream.borrow_mut(); let mut stream = stream.borrow_mut();
@ -77,10 +77,10 @@ impl SourceEntry {
let muted = stream.muted; let muted = stream.muted;
let index = stream.index; let index = stream.index;
if muted { if muted {
imp.resetSourceMute imp.reset_source_mute
.set_icon_name("microphone-disabled-symbolic"); .set_icon_name("microphone-disabled-symbolic");
} else { } else {
imp.resetSourceMute imp.reset_source_mute
.set_icon_name("audio-input-microphone-symbolic"); .set_icon_name("audio-input-microphone-symbolic");
} }
toggle_source_mute(index, muted); toggle_source_mute(index, muted);

13
src/components/input/source_entry_impl.rs
View file

@ -10,22 +10,21 @@ use ReSet_Lib::audio::audio::Source;
use super::source_entry; use super::source_entry;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetSourceEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetSourceEntry.ui")]
pub struct SourceEntry { pub struct SourceEntry {
#[template_child] #[template_child]
pub resetSourceName: TemplateChild<ActionRow>, pub reset_source_name: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetSelectedSource: TemplateChild<CheckButton>, pub reset_selected_source: TemplateChild<CheckButton>,
#[template_child] #[template_child]
pub resetSourceMute: TemplateChild<Button>, pub reset_source_mute: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetVolumeSlider: TemplateChild<Scale>, pub reset_volume_slider: TemplateChild<Scale>,
#[template_child] #[template_child]
pub resetVolumePercentage: TemplateChild<Label>, pub reset_volume_percentage: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>, pub reset_volume_meter: TemplateChild<ProgressBar>,
pub stream: Arc<RefCell<Source>>, pub stream: Arc<RefCell<Source>>,
pub volume_time_stamp: RefCell<Option<SystemTime>>, pub volume_time_stamp: RefCell<Option<SystemTime>>,
} }

32
src/components/output/input_stream_entry.rs
View file

@ -33,32 +33,32 @@ impl InputStreamEntry {
let box_imp = sink_box.imp(); let box_imp = sink_box.imp();
let imp = obj.imp(); let imp = obj.imp();
if stream.muted { if stream.muted {
imp.resetSinkMute imp.reset_sink_mute
.set_icon_name("audio-volume-muted-symbolic"); .set_icon_name("audio-volume-muted-symbolic");
} else { } else {
imp.resetSinkMute imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic"); .set_icon_name("audio-volume-high-symbolic");
} }
let name = stream.application_name.clone() + ": " + stream.name.as_str(); let name = stream.application_name.clone() + ": " + stream.name.as_str();
imp.resetSinkSelection.set_title(name.as_str()); imp.reset_sink_selection.set_title(name.as_str());
imp.resetSinkSelection imp.reset_sink_selection
.set_factory(Some(&create_dropdown_label_factory())); .set_factory(Some(&create_dropdown_label_factory()));
set_combo_row_ellipsis(imp.resetSinkSelection.get()); set_combo_row_ellipsis(imp.reset_sink_selection.get());
let volume = stream.volume.first().unwrap_or(&0_u32); let volume = stream.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round(); let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64); imp.reset_volume_slider.set_value(*volume as f64);
imp.stream.replace(stream); imp.stream.replace(stream);
{ {
let sink = box_imp.reset_default_sink.borrow(); let sink = box_imp.reset_default_sink.borrow();
imp.associated_sink.replace((sink.index, sink.name.clone())); imp.associated_sink.replace((sink.index, sink.name.clone()));
} }
imp.resetVolumeSlider.connect_change_value( imp.reset_volume_slider.connect_change_value(
clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| { clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| {
let fraction = (value / 655.36).round(); let fraction = (value / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
let mut stream = imp.stream.try_borrow(); let mut stream = imp.stream.try_borrow();
while stream.is_err() { while stream.is_err() {
stream = imp.stream.try_borrow(); stream = imp.stream.try_borrow();
@ -83,7 +83,7 @@ impl InputStreamEntry {
// list = box_imp.resetModelList.try_borrow(); // list = box_imp.resetModelList.try_borrow();
// } // }
// let list = list.unwrap(); // let list = list.unwrap();
imp.resetSinkSelection.set_model(Some(&*list)); imp.reset_sink_selection.set_model(Some(&*list));
let map = box_imp.reset_sink_map.read().unwrap(); let map = box_imp.reset_sink_map.read().unwrap();
let sink_list = box_imp.reset_sink_list.read().unwrap(); let sink_list = box_imp.reset_sink_list.read().unwrap();
let name = sink_list.get(&index); let name = sink_list.get(&index);
@ -91,7 +91,7 @@ impl InputStreamEntry {
let name = &name.2; let name = &name.2;
let index = map.get(name); let index = map.get(name);
if let Some(index) = index { if let Some(index) = index {
imp.resetSinkSelection.set_selected(index.1); imp.reset_sink_selection.set_selected(index.1);
} }
} else { } else {
let mut name = box_imp.reset_default_sink.try_borrow(); let mut name = box_imp.reset_default_sink.try_borrow();
@ -101,11 +101,11 @@ impl InputStreamEntry {
let name = &name.unwrap().alias; let name = &name.unwrap().alias;
let index = map.get(name); let index = map.get(name);
if let Some(index) = index { if let Some(index) = index {
imp.resetSinkSelection.set_selected(index.1); imp.reset_sink_selection.set_selected(index.1);
} }
} }
} }
imp.resetSinkSelection.connect_selected_notify( imp.reset_sink_selection.connect_selected_notify(
clone!(@weak imp, @weak box_imp => move |dropdown| { clone!(@weak imp, @weak box_imp => move |dropdown| {
let selected = dropdown.selected_item(); let selected = dropdown.selected_item();
if selected.is_none() { if selected.is_none() {
@ -132,7 +132,7 @@ impl InputStreamEntry {
set_sink_of_input_stream(stream.index, sink); set_sink_of_input_stream(stream.index, sink);
}), }),
); );
imp.resetSinkMute imp.reset_sink_mute
.connect_clicked(clone!(@weak imp => move |_| { .connect_clicked(clone!(@weak imp => move |_| {
let stream = imp.stream.clone(); let stream = imp.stream.clone();
let mut stream = stream.try_borrow_mut(); let mut stream = stream.try_borrow_mut();
@ -144,10 +144,10 @@ impl InputStreamEntry {
let muted = stream.muted; let muted = stream.muted;
let index = stream.index; let index = stream.index;
if muted { if muted {
imp.resetSinkMute imp.reset_sink_mute
.set_icon_name("audio-volume-muted-symbolic"); .set_icon_name("audio-volume-muted-symbolic");
} else { } else {
imp.resetSinkMute imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic"); .set_icon_name("audio-volume-high-symbolic");
} }
toggle_input_stream_mute(index, muted); toggle_input_stream_mute(index, muted);

11
src/components/output/input_stream_entry_impl.rs
View file

@ -10,20 +10,19 @@ use ReSet_Lib::audio::audio::InputStream;
use super::input_stream_entry; use super::input_stream_entry;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetInputStreamEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetInputStreamEntry.ui")]
pub struct InputStreamEntry { pub struct InputStreamEntry {
#[template_child] #[template_child]
pub resetSinkSelection: TemplateChild<ComboRow>, pub reset_sink_selection: TemplateChild<ComboRow>,
#[template_child] #[template_child]
pub resetSinkMute: TemplateChild<Button>, pub reset_sink_mute: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetVolumeSlider: TemplateChild<Scale>, pub reset_volume_slider: TemplateChild<Scale>,
#[template_child] #[template_child]
pub resetVolumePercentage: TemplateChild<Label>, pub reset_volume_percentage: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>, pub reset_volume_meter: TemplateChild<ProgressBar>,
pub stream: Arc<RefCell<InputStream>>, pub stream: Arc<RefCell<InputStream>>,
pub associated_sink: Arc<RefCell<(u32, String)>>, pub associated_sink: Arc<RefCell<(u32, String)>>,
pub volume_time_stamp: RefCell<Option<SystemTime>>, pub volume_time_stamp: RefCell<Option<SystemTime>>,

86
src/components/output/sink_box.rs
View file

@ -49,36 +49,36 @@ impl SinkBox {
pub fn setup_callbacks(&self) { pub fn setup_callbacks(&self) {
let self_imp = self.imp(); let self_imp = self.imp();
self_imp.resetSinksRow.set_activatable(true); self_imp.reset_sinks_row.set_activatable(true);
self_imp self_imp
.resetSinksRow .reset_sinks_row
.set_action_name(Some("navigation.push")); .set_action_name(Some("navigation.push"));
self_imp self_imp
.resetSinksRow .reset_sinks_row
.set_action_target_value(Some(&Variant::from("outputDevices"))); .set_action_target_value(Some(&Variant::from("outputDevices")));
self_imp.resetCardsRow.set_activatable(true); self_imp.reset_cards_row.set_activatable(true);
self_imp self_imp
.resetCardsRow .reset_cards_row
.set_action_name(Some("navigation.push")); .set_action_name(Some("navigation.push"));
self_imp self_imp
.resetCardsRow .reset_cards_row
.set_action_target_value(Some(&Variant::from("profileConfiguration"))); .set_action_target_value(Some(&Variant::from("profileConfiguration")));
self_imp.resetCardsRow.connect_action_name_notify(|_| {}); self_imp.reset_cards_row.connect_action_name_notify(|_| {});
self_imp.resetInputStreamButton.set_activatable(true); self_imp.reset_input_stream_button.set_activatable(true);
self_imp self_imp
.resetInputStreamButton .reset_input_stream_button
.set_action_name(Some("navigation.pop")); .set_action_name(Some("navigation.pop"));
self_imp.resetInputCardsBackButton.set_activatable(true); self_imp.reset_input_cards_back_button.set_activatable(true);
self_imp self_imp
.resetInputCardsBackButton .reset_input_cards_back_button
.set_action_name(Some("navigation.pop")); .set_action_name(Some("navigation.pop"));
self_imp self_imp
.resetSinkDropdown .reset_sink_dropdown
.set_factory(Some(&create_dropdown_label_factory())); .set_factory(Some(&create_dropdown_label_factory()));
set_combo_row_ellipsis(self_imp.resetSinkDropdown.get()); set_combo_row_ellipsis(self_imp.reset_sink_dropdown.get());
} }
} }
@ -120,8 +120,8 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
let volume = sink.volume.first().unwrap_or(&0); let volume = sink.volume.first().unwrap_or(&0);
let fraction = (*volume as f64 / 655.36).round(); let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
output_box_imp.resetVolumePercentage.set_text(&percentage); output_box_imp.reset_volume_percentage.set_text(&percentage);
output_box_imp.resetVolumeSlider.set_value(*volume as f64); output_box_imp.reset_volume_slider.set_value(*volume as f64);
let mut list = output_box_imp.reset_sink_list.write().unwrap(); let mut list = output_box_imp.reset_sink_list.write().unwrap();
for sink in sinks { for sink in sinks {
let index = sink.index; let index = sink.index;
@ -139,18 +139,18 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
let entry = Arc::new(ListEntry::new(&*sink_entry)); let entry = Arc::new(ListEntry::new(&*sink_entry));
entry.set_activatable(false); entry.set_activatable(false);
list.insert(index, (entry.clone(), sink_clone, alias)); list.insert(index, (entry.clone(), sink_clone, alias));
output_box_imp.resetSinks.append(&*entry); output_box_imp.reset_sinks.append(&*entry);
} }
let list = output_box_imp.reset_model_list.read().unwrap(); let list = output_box_imp.reset_model_list.read().unwrap();
output_box_imp.resetSinkDropdown.set_model(Some(&*list)); output_box_imp.reset_sink_dropdown.set_model(Some(&*list));
let map = output_box_imp.reset_sink_map.read().unwrap(); let map = output_box_imp.reset_sink_map.read().unwrap();
let name = output_box_imp.reset_default_sink.borrow(); let name = output_box_imp.reset_default_sink.borrow();
let name = &name.alias; let name = &name.alias;
let index = map.get(name); let index = map.get(name);
if let Some(index) = index { if let Some(index) = index {
output_box_imp.resetSinkDropdown.set_selected(index.1); output_box_imp.reset_sink_dropdown.set_selected(index.1);
} }
output_box_imp.resetSinkDropdown.connect_selected_notify( output_box_imp.reset_sink_dropdown.connect_selected_notify(
clone!(@weak output_box_imp => move |dropdown| { clone!(@weak output_box_imp => move |dropdown| {
let selected = dropdown.selected_item(); let selected = dropdown.selected_item();
if selected.is_none() { if selected.is_none() {
@ -172,12 +172,12 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
} }
output_box_ref output_box_ref
.imp() .imp()
.resetVolumeSlider .reset_volume_slider
.connect_change_value(move |_, _, value| { .connect_change_value(move |_, _, value| {
let imp = output_box_ref_slider.imp(); let imp = output_box_ref_slider.imp();
let fraction = (value / 655.36).round(); let fraction = (value / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
let sink = imp.reset_default_sink.borrow(); let sink = imp.reset_default_sink.borrow();
let index = sink.index; let index = sink.index;
let channels = sink.channels; let channels = sink.channels;
@ -195,7 +195,7 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
}); });
output_box_ref output_box_ref
.imp() .imp()
.resetSinkMute .reset_sink_mute
.connect_clicked(move |_| { .connect_clicked(move |_| {
let imp = output_box_ref_mute.imp(); let imp = output_box_ref_mute.imp();
let stream = imp.reset_default_sink.clone(); let stream = imp.reset_default_sink.clone();
@ -204,10 +204,10 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
let muted = stream.muted; let muted = stream.muted;
let index = stream.index; let index = stream.index;
if muted { if muted {
imp.resetSinkMute imp.reset_sink_mute
.set_icon_name("audio-volume-muted-symbolic"); .set_icon_name("audio-volume-muted-symbolic");
} else { } else {
imp.resetSinkMute imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic"); .set_icon_name("audio-volume-high-symbolic");
} }
toggle_sink_mute(index, muted); toggle_sink_mute(index, muted);
@ -232,7 +232,7 @@ pub fn populate_inputstreams(output_box: Arc<SinkBox>) {
let entry = Arc::new(ListEntry::new(&*input_stream)); let entry = Arc::new(ListEntry::new(&*input_stream));
entry.set_activatable(false); entry.set_activatable(false);
list.insert(index, (entry.clone(), input_stream.clone())); list.insert(index, (entry.clone(), input_stream.clone()));
output_box_imp.resetInputStreams.append(&*entry); output_box_imp.reset_input_streams.append(&*entry);
} }
}); });
}); });
@ -247,7 +247,7 @@ pub fn populate_cards(output_box: Arc<SinkBox>) {
glib::idle_add_once(move || { glib::idle_add_once(move || {
let imp = output_box_ref.imp(); let imp = output_box_ref.imp();
for card in cards { for card in cards {
imp.resetCards.add(&CardEntry::new(card)); imp.reset_cards.add(&CardEntry::new(card));
} }
}); });
}); });
@ -376,7 +376,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
let entry = Arc::new(ListEntry::new(&*sink_entry)); let entry = Arc::new(ListEntry::new(&*sink_entry));
entry.set_activatable(false); entry.set_activatable(false);
list.insert(sink_index, (entry.clone(), sink_clone, alias.clone())); list.insert(sink_index, (entry.clone(), sink_clone, alias.clone()));
output_box_imp.resetSinks.append(&*entry); output_box_imp.reset_sinks.append(&*entry);
let mut map = output_box_imp.reset_sink_map.write().unwrap(); let mut map = output_box_imp.reset_sink_map.write().unwrap();
let mut index = output_box_imp.reset_model_index.write().unwrap(); let mut index = output_box_imp.reset_model_index.write().unwrap();
output_box_imp output_box_imp
@ -406,7 +406,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
if entry.is_none() { if entry.is_none() {
return; return;
} }
output_box_imp.resetSinks.remove(&*entry.unwrap().0); output_box_imp.reset_sinks.remove(&*entry.unwrap().0);
let alias = list.remove(&ir.index); let alias = list.remove(&ir.index);
if alias.is_none() { if alias.is_none() {
return; return;
@ -452,15 +452,15 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
} }
let imp = entry.unwrap().1.imp(); let imp = entry.unwrap().1.imp();
if is_default { if is_default {
output_box_imp.resetVolumePercentage.set_text(&percentage); output_box_imp.reset_volume_percentage.set_text(&percentage);
output_box_imp.resetVolumeSlider.set_value(*volume as f64); output_box_imp.reset_volume_slider.set_value(*volume as f64);
imp.resetSelectedSink.set_active(true); imp.reset_selected_sink.set_active(true);
} else { } else {
imp.resetSelectedSink.set_active(false); imp.reset_selected_sink.set_active(false);
} }
imp.resetSinkName.set_title(ir.sink.alias.clone().as_str()); imp.reset_sink_name.set_title(ir.sink.alias.clone().as_str());
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64); imp.reset_volume_slider.set_value(*volume as f64);
}); });
}); });
true true
@ -482,7 +482,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
let entry = Arc::new(ListEntry::new(&*input_stream)); let entry = Arc::new(ListEntry::new(&*input_stream));
entry.set_activatable(false); entry.set_activatable(false);
list.insert(index, (entry.clone(), input_stream.clone())); list.insert(index, (entry.clone(), input_stream.clone()));
output_box_imp.resetInputStreams.append(&*entry); output_box_imp.reset_input_streams.append(&*entry);
}); });
}); });
true true
@ -520,23 +520,23 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
} }
let imp = entry.imp(); let imp = entry.imp();
if ir.stream.muted { if ir.stream.muted {
imp.resetSinkMute imp.reset_sink_mute
.set_icon_name("audio-volume-muted-symbolic"); .set_icon_name("audio-volume-muted-symbolic");
} else { } else {
imp.resetSinkMute imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic"); .set_icon_name("audio-volume-high-symbolic");
} }
let name = ir.stream.application_name.clone() + ": " + ir.stream.name.as_str(); let name = ir.stream.application_name.clone() + ": " + ir.stream.name.as_str();
imp.resetSinkSelection.set_title(name.as_str()); imp.reset_sink_selection.set_title(name.as_str());
let volume = ir.stream.volume.first().unwrap_or(&0_u32); let volume = ir.stream.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round(); let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64); imp.reset_volume_slider.set_value(*volume as f64);
let map = output_box_imp.reset_sink_map.read().unwrap(); let map = output_box_imp.reset_sink_map.read().unwrap();
let index = map.get(&alias); let index = map.get(&alias);
if let Some(index) = index { if let Some(index) = index {
imp.resetSinkSelection.set_selected(index.1); imp.reset_sink_selection.set_selected(index.1);
} }
}); });
}); });
@ -558,7 +558,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
if entry.is_none() { if entry.is_none() {
return; return;
} }
output_box_imp.resetInputStreams.remove(&*entry.unwrap().0); output_box_imp.reset_input_streams.remove(&*entry.unwrap().0);
list.remove(&ir.index); list.remove(&ir.index);
}); });
}); });

25
src/components/output/sink_box_impl.rs
View file

@ -18,34 +18,33 @@ type SinkEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<SinkEntry>, Str
type InputStreamEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<InputStreamEntry>)>>>; type InputStreamEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<InputStreamEntry>)>>>;
type SinkMap = Arc<RwLock<HashMap<String, (u32, u32, String)>>>; type SinkMap = Arc<RwLock<HashMap<String, (u32, u32, String)>>>;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetAudioOutput.ui")] #[template(resource = "/org/Xetibo/ReSet/resetAudioOutput.ui")]
pub struct SinkBox { pub struct SinkBox {
#[template_child] #[template_child]
pub resetSinksRow: TemplateChild<ActionRow>, pub reset_sinks_row: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetCardsRow: TemplateChild<ActionRow>, pub reset_cards_row: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetSinkDropdown: TemplateChild<ComboRow>, pub reset_sink_dropdown: TemplateChild<ComboRow>,
#[template_child] #[template_child]
pub resetSinkMute: TemplateChild<Button>, pub reset_sink_mute: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetVolumeSlider: TemplateChild<Scale>, pub reset_volume_slider: TemplateChild<Scale>,
#[template_child] #[template_child]
pub resetVolumePercentage: TemplateChild<Label>, pub reset_volume_percentage: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>, pub reset_volume_meter: TemplateChild<ProgressBar>,
#[template_child] #[template_child]
pub resetSinks: TemplateChild<Box>, pub reset_sinks: TemplateChild<Box>,
#[template_child] #[template_child]
pub resetInputStreamButton: TemplateChild<ActionRow>, pub reset_input_stream_button: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetInputStreams: TemplateChild<Box>, pub reset_input_streams: TemplateChild<Box>,
#[template_child] #[template_child]
pub resetInputCardsBackButton: TemplateChild<ActionRow>, pub reset_input_cards_back_button: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetCards: TemplateChild<PreferencesGroup>, pub reset_cards: TemplateChild<PreferencesGroup>,
pub reset_default_check_button: Arc<CheckButton>, pub reset_default_check_button: Arc<CheckButton>,
pub reset_default_sink: Arc<RefCell<Sink>>, pub reset_default_sink: Arc<RefCell<Sink>>,
pub reset_sink_list: SinkEntryMap, pub reset_sink_list: SinkEntryMap,

24
src/components/output/sink_entry.rs
View file

@ -28,19 +28,19 @@ impl SinkEntry {
// TODO use event callback for progress bar -> this is the "im speaking" indicator // TODO use event callback for progress bar -> this is the "im speaking" indicator
{ {
let imp = obj.imp(); let imp = obj.imp();
imp.resetSinkName.set_title(stream.alias.clone().as_str()); imp.reset_sink_name.set_title(stream.alias.clone().as_str());
let name = Arc::new(stream.name.clone()); let name = Arc::new(stream.name.clone());
let volume = stream.volume.first().unwrap_or(&0_u32); let volume = stream.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round(); let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64); imp.reset_volume_slider.set_value(*volume as f64);
imp.stream.replace(stream); imp.stream.replace(stream);
imp.resetVolumeSlider.connect_change_value( imp.reset_volume_slider.connect_change_value(
clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| { clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| {
let fraction = (value / 655.36).round(); let fraction = (value / 655.36).round();
let percentage = (fraction).to_string() + "%"; let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage); imp.reset_volume_percentage.set_text(&percentage);
let sink = imp.stream.borrow(); let sink = imp.stream.borrow();
let index = sink.index; let index = sink.index;
let channels = sink.channels; let channels = sink.channels;
@ -55,18 +55,18 @@ impl SinkEntry {
Propagation::Proceed Propagation::Proceed
}), }),
); );
imp.resetSelectedSink.set_group(Some(&*check_group)); imp.reset_selected_sink.set_group(Some(&*check_group));
if is_default { if is_default {
imp.resetSelectedSink.set_active(true); imp.reset_selected_sink.set_active(true);
} else { } else {
imp.resetSelectedSink.set_active(false); imp.reset_selected_sink.set_active(false);
} }
imp.resetSelectedSink.connect_toggled(move |button| { imp.reset_selected_sink.connect_toggled(move |button| {
if button.is_active() { if button.is_active() {
set_default_sink(name.clone()); set_default_sink(name.clone());
} }
}); });
imp.resetSinkMute imp.reset_sink_mute
.connect_clicked(clone!(@weak imp => move |_| { .connect_clicked(clone!(@weak imp => move |_| {
let stream = imp.stream.clone(); let stream = imp.stream.clone();
let mut stream = stream.borrow_mut(); let mut stream = stream.borrow_mut();
@ -74,10 +74,10 @@ impl SinkEntry {
let muted = stream.muted; let muted = stream.muted;
let index = stream.index; let index = stream.index;
if muted { if muted {
imp.resetSinkMute imp.reset_sink_mute
.set_icon_name("audio-volume-muted-symbolic"); .set_icon_name("audio-volume-muted-symbolic");
} else { } else {
imp.resetSinkMute imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic"); .set_icon_name("audio-volume-high-symbolic");
} }
toggle_sink_mute(index, muted); toggle_sink_mute(index, muted);

13
src/components/output/sink_entry_impl.rs
View file

@ -9,22 +9,21 @@ use gtk::subclass::prelude::*;
use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, ProgressBar, Scale}; use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, ProgressBar, Scale};
use ReSet_Lib::audio::audio::Sink; use ReSet_Lib::audio::audio::Sink;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetSinkEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetSinkEntry.ui")]
pub struct SinkEntry { pub struct SinkEntry {
#[template_child] #[template_child]
pub resetSinkName: TemplateChild<ActionRow>, pub reset_sink_name: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetSelectedSink: TemplateChild<CheckButton>, pub reset_selected_sink: TemplateChild<CheckButton>,
#[template_child] #[template_child]
pub resetSinkMute: TemplateChild<Button>, pub reset_sink_mute: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetVolumeSlider: TemplateChild<Scale>, pub reset_volume_slider: TemplateChild<Scale>,
#[template_child] #[template_child]
pub resetVolumePercentage: TemplateChild<Label>, pub reset_volume_percentage: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>, pub reset_volume_meter: TemplateChild<ProgressBar>,
pub stream: Arc<RefCell<Sink>>, pub stream: Arc<RefCell<Sink>>,
pub volume_time_stamp: RefCell<Option<SystemTime>>, pub volume_time_stamp: RefCell<Option<SystemTime>>,
} }

6
src/components/wifi/saved_wifi_entry.rs
View file

@ -24,7 +24,7 @@ impl SavedWifiEntry {
entry.set_activatable(false); entry.set_activatable(false);
let entry_imp = entry.imp(); let entry_imp = entry.imp();
entry_imp.resetEditSavedWifiButton.connect_clicked( entry_imp.reset_edit_saved_wifi_button.connect_clicked(
clone!(@ weak entry_imp, @ weak wifi_box => move |_| { clone!(@ weak entry_imp, @ weak wifi_box => move |_| {
// TODO accesspoint has to be saved somewhere i guess // TODO accesspoint has to be saved somewhere i guess
// let _option = getConnectionSettings(entryImp.accessPoint.borrow().associated_connection.clone()); // let _option = getConnectionSettings(entryImp.accessPoint.borrow().associated_connection.clone());
@ -32,9 +32,9 @@ impl SavedWifiEntry {
}), }),
); );
entry_imp.resetSavedWifiLabel.set_text(name); entry_imp.reset_saved_wifi_label.set_text(name);
entry_imp.reset_connection_path.set(path); entry_imp.reset_connection_path.set(path);
entry_imp.resetDeleteSavedWifiButton.connect_clicked( entry_imp.reset_delete_saved_wifi_button.connect_clicked(
clone!(@weak entry as entry => move |_| { clone!(@weak entry as entry => move |_| {
delete_connection(entry.imp().reset_connection_path.take()); delete_connection(entry.imp().reset_connection_path.take());
// TODO handle error // TODO handle error

7
src/components/wifi/saved_wifi_entry_impl.rs
View file

@ -10,16 +10,15 @@ use ReSet_Lib::network::network::AccessPoint;
use super::saved_wifi_entry; use super::saved_wifi_entry;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetSavedWifiEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetSavedWifiEntry.ui")]
pub struct SavedWifiEntry { pub struct SavedWifiEntry {
#[template_child] #[template_child]
pub resetDeleteSavedWifiButton: TemplateChild<Button>, pub reset_delete_saved_wifi_button: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetEditSavedWifiButton: TemplateChild<Button>, pub reset_edit_saved_wifi_button: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetSavedWifiLabel: TemplateChild<Label>, pub reset_saved_wifi_label: TemplateChild<Label>,
pub reset_connection_path: RefCell<Path<'static>>, pub reset_connection_path: RefCell<Path<'static>>,
pub access_point: RefCell<AccessPoint>, pub access_point: RefCell<AccessPoint>,
} }

40
src/components/wifi/wifi_address_entry.rs
View file

@ -34,12 +34,12 @@ impl WifiAddressEntry {
let conn = conn.borrow(); let conn = conn.borrow();
let address = unsafe { conn.ipv4.address_data.get_unchecked(address) }; let address = unsafe { conn.ipv4.address_data.get_unchecked(address) };
entry_imp.resetAddressAddress.set_text(&address.address); entry_imp.reset_address_address.set_text(&address.address);
entry_imp entry_imp
.resetAddressPrefix .reset_address_prefix
.set_text(&address.prefix_length.to_string()); .set_text(&address.prefix_length.to_string());
entry_imp entry_imp
.resetAddressRow .reset_address_row
.set_title(&format!("{}/{}", &*address.address, address.prefix_length)); .set_title(&format!("{}/{}", &*address.address, address.prefix_length));
} }
entry_imp.protocol.set(protocol); entry_imp.protocol.set(protocol);
@ -51,13 +51,13 @@ impl WifiAddressEntry {
let self_imp = self.imp(); let self_imp = self.imp();
let conn = connection.clone(); let conn = connection.clone();
self_imp.resetAddressAddress.connect_changed(clone!(@weak self_imp => move |entry| { self_imp.reset_address_address.connect_changed(clone!(@weak self_imp => move |entry| {
let address_input = entry.text(); let address_input = entry.text();
let mut conn = conn.borrow_mut(); let mut conn = conn.borrow_mut();
if address_input.is_empty() { if address_input.is_empty() {
self_imp.resetAddressAddress.remove_css_class("error"); self_imp.reset_address_address.remove_css_class("error");
self_imp.resetAddressRow.set_title("Add new address"); self_imp.reset_address_row.set_title("Add new address");
return; return;
} }
let result = match self_imp.protocol.get() { let result = match self_imp.protocol.get() {
@ -66,7 +66,7 @@ impl WifiAddressEntry {
}; };
match result { match result {
Ok(ip_addr) => { Ok(ip_addr) => {
self_imp.resetAddressAddress.remove_css_class("error"); self_imp.reset_address_address.remove_css_class("error");
let address_data = match self_imp.protocol.get() { let address_data = match self_imp.protocol.get() {
IpProtocol::IPv4 => &mut conn.ipv4.address_data, IpProtocol::IPv4 => &mut conn.ipv4.address_data,
IpProtocol::IPv6 => &mut conn.ipv6.address_data, IpProtocol::IPv6 => &mut conn.ipv6.address_data,
@ -75,7 +75,7 @@ impl WifiAddressEntry {
*self_imp.address.borrow_mut() = (true, ip_addr.to_string()); *self_imp.address.borrow_mut() = (true, ip_addr.to_string());
} }
Err(_) => { Err(_) => {
self_imp.resetAddressAddress.add_css_class("error"); self_imp.reset_address_address.add_css_class("error");
*self_imp.address.borrow_mut() = (false, String::default()); *self_imp.address.borrow_mut() = (false, String::default());
} }
} }
@ -83,16 +83,16 @@ impl WifiAddressEntry {
})); }));
let conn = connection.clone(); let conn = connection.clone();
self_imp.resetAddressPrefix.connect_changed(clone!(@weak self_imp => move |entry| { self_imp.reset_address_prefix.connect_changed(clone!(@weak self_imp => move |entry| {
let prefix_input = entry.text(); let prefix_input = entry.text();
let prefix = prefix_input.parse::<u8>(); let prefix = prefix_input.parse::<u8>();
let mut conn = conn.borrow_mut(); let mut conn = conn.borrow_mut();
let handle_error = || { let handle_error = || {
if self_imp.resetAddressPrefix.text().is_empty() { if self_imp.reset_address_prefix.text().is_empty() {
self_imp.resetAddressPrefix.remove_css_class("error"); self_imp.reset_address_prefix.remove_css_class("error");
} else { } else {
self_imp.resetAddressPrefix.add_css_class("error"); self_imp.reset_address_prefix.add_css_class("error");
} }
self_imp.prefix.set((false, 0)); self_imp.prefix.set((false, 0));
set_row_name(&self_imp); set_row_name(&self_imp);
@ -107,8 +107,8 @@ impl WifiAddressEntry {
match self_imp.protocol.get() { match self_imp.protocol.get() {
IpProtocol::IPv4 if prefix <= 32 => { IpProtocol::IPv4 if prefix <= 32 => {
self_imp.prefix.set((true, prefix as u32)); self_imp.prefix.set((true, prefix as u32));
self_imp.resetAddressPrefix.remove_css_class("error"); self_imp.reset_address_prefix.remove_css_class("error");
if let Ok(address2) = Ipv4Addr::from_str(self_imp.resetAddressAddress.text().as_str()) { if let Ok(address2) = Ipv4Addr::from_str(self_imp.reset_address_address.text().as_str()) {
if let Some(addr) = conn.ipv4.address_data.iter_mut() if let Some(addr) = conn.ipv4.address_data.iter_mut()
.find(|conn_addr| *conn_addr.address == address2.to_string()) { .find(|conn_addr| *conn_addr.address == address2.to_string()) {
addr.prefix_length = prefix as u32; addr.prefix_length = prefix as u32;
@ -117,8 +117,8 @@ impl WifiAddressEntry {
} }
IpProtocol::IPv6 if prefix <= 128 => { IpProtocol::IPv6 if prefix <= 128 => {
self_imp.prefix.set((true, prefix as u32)); self_imp.prefix.set((true, prefix as u32));
self_imp.resetAddressPrefix.remove_css_class("error"); self_imp.reset_address_prefix.remove_css_class("error");
if let Ok(address2) = Ipv6Addr::from_str(self_imp.resetAddressAddress.text().as_str()) { if let Ok(address2) = Ipv6Addr::from_str(self_imp.reset_address_address.text().as_str()) {
if let Some(addr) = conn.ipv6.address_data.iter_mut() if let Some(addr) = conn.ipv6.address_data.iter_mut()
.find(|conn_addr| *conn_addr.address == address2.to_string()) { .find(|conn_addr| *conn_addr.address == address2.to_string()) {
addr.prefix_length = prefix as u32; addr.prefix_length = prefix as u32;
@ -131,9 +131,9 @@ impl WifiAddressEntry {
})); }));
let conn = connection.clone(); let conn = connection.clone();
self_imp.resetAddressRemove.connect_clicked( self_imp.reset_address_remove.connect_clicked(
clone!(@weak self_imp, @weak self as what => move |_| { clone!(@weak self_imp, @weak self as what => move |_| {
let address = self_imp.resetAddressAddress.text(); let address = self_imp.reset_address_address.text();
let mut conn = conn.borrow_mut(); let mut conn = conn.borrow_mut();
conn.ipv4.address_data.retain(|addr| addr.address != address); conn.ipv4.address_data.retain(|addr| addr.address != address);
what.unparent(); what.unparent();
@ -143,7 +143,7 @@ impl WifiAddressEntry {
} }
fn set_row_name(self_imp: &WifiAddressEntryImpl) { fn set_row_name(self_imp: &WifiAddressEntryImpl) {
if self_imp.resetAddressAddress.text().is_empty() { if self_imp.reset_address_address.text().is_empty() {
return; return;
} }
let address = self_imp.address.borrow(); let address = self_imp.address.borrow();
@ -156,5 +156,5 @@ fn set_row_name(self_imp: &WifiAddressEntryImpl) {
(false, true) => "Address wrong".to_string(), (false, true) => "Address wrong".to_string(),
(false, false) => "Address and Prefix wrong".to_string(), (false, false) => "Address and Prefix wrong".to_string(),
}; };
self_imp.resetAddressRow.set_title(&title); self_imp.reset_address_row.set_title(&title);
} }

9
src/components/wifi/wifi_address_entry_impl.rs
View file

@ -5,18 +5,17 @@ use gtk::subclass::prelude::*;
use gtk::{glib, Button, CompositeTemplate}; use gtk::{glib, Button, CompositeTemplate};
use std::cell::{Cell, RefCell}; use std::cell::{Cell, RefCell};
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetWifiAddressEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetWifiAddressEntry.ui")]
pub struct WifiAddressEntryImpl { pub struct WifiAddressEntryImpl {
#[template_child] #[template_child]
pub resetAddressRow: TemplateChild<ExpanderRow>, pub reset_address_row: TemplateChild<ExpanderRow>,
#[template_child] #[template_child]
pub resetAddressAddress: TemplateChild<EntryRow>, pub reset_address_address: TemplateChild<EntryRow>,
#[template_child] #[template_child]
pub resetAddressPrefix: TemplateChild<EntryRow>, pub reset_address_prefix: TemplateChild<EntryRow>,
#[template_child] #[template_child]
pub resetAddressRemove: TemplateChild<Button>, pub reset_address_remove: TemplateChild<Button>,
pub address: RefCell<(bool, String)>, pub address: RefCell<(bool, String)>,
pub prefix: Cell<(bool, u32)>, pub prefix: Cell<(bool, u32)>,
pub protocol: Cell<IpProtocol>, pub protocol: Cell<IpProtocol>,

42
src/components/wifi/wifi_box.rs
View file

@ -50,23 +50,23 @@ impl WifiBox {
fn setup_callbacks(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) -> Arc<WifiBox> { fn setup_callbacks(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) -> Arc<WifiBox> {
let imp = wifi_box.imp(); let imp = wifi_box.imp();
let wifibox_ref = wifi_box.clone(); let wifibox_ref = wifi_box.clone();
imp.resetSavedNetworks.set_activatable(true); imp.reset_saved_networks.set_activatable(true);
imp.resetSavedNetworks imp.reset_saved_networks
.set_action_name(Some("navigation.push")); .set_action_name(Some("navigation.push"));
imp.resetSavedNetworks imp.reset_saved_networks
.set_action_target_value(Some(&Variant::from("saved"))); .set_action_target_value(Some(&Variant::from("saved")));
imp.resetAvailableNetworks.set_activatable(true); imp.reset_available_networks.set_activatable(true);
imp.resetAvailableNetworks imp.reset_available_networks
.set_action_name(Some("navigation.pop")); .set_action_name(Some("navigation.pop"));
set_combo_row_ellipsis(imp.resetWiFiDevice.get()); set_combo_row_ellipsis(imp.reset_wifi_device.get());
imp.resetWifiSwitch.connect_state_set( imp.reset_wifi_switch.connect_state_set(
clone!(@weak imp => @default-return glib::Propagation::Proceed, move |_, value| { clone!(@weak imp => @default-return glib::Propagation::Proceed, move |_, value| {
set_wifi_enabled(value); set_wifi_enabled(value);
if !value { if !value {
let mut map = imp.wifi_entries.lock().unwrap(); let mut map = imp.wifi_entries.lock().unwrap();
for entry in map.iter() { for entry in map.iter() {
imp.resetWifiList.remove(&*(*entry.1)); imp.reset_wifi_list.remove(&*(*entry.1));
} }
map.clear(); map.clear();
imp.wifi_entries_path.lock().unwrap().clear(); imp.wifi_entries_path.lock().unwrap().clear();
@ -114,13 +114,13 @@ pub fn scan_for_wifi(wifi_box: Arc<WifiBox>) {
let imp = wifibox_ref.imp(); let imp = wifibox_ref.imp();
let list = imp.reset_model_list.read().unwrap(); let list = imp.reset_model_list.read().unwrap();
imp.resetWiFiDevice.set_model(Some(&*list)); imp.reset_wifi_device.set_model(Some(&*list));
let map = imp.reset_wifi_devices.read().unwrap(); let map = imp.reset_wifi_devices.read().unwrap();
let device = imp.reset_current_wifi_device.borrow(); let device = imp.reset_current_wifi_device.borrow();
if let Some(index) = map.get(&device.name) { if let Some(index) = map.get(&device.name) {
imp.resetWiFiDevice.set_selected(index.1); imp.reset_wifi_device.set_selected(index.1);
} }
imp.resetWiFiDevice imp.reset_wifi_device
.connect_selected_notify(clone!(@weak imp => move |dropdown| { .connect_selected_notify(clone!(@weak imp => move |dropdown| {
let selected = dropdown.selected_item(); let selected = dropdown.selected_item();
if selected.is_none() { if selected.is_none() {
@ -145,7 +145,7 @@ pub fn scan_for_wifi(wifi_box: Arc<WifiBox>) {
let entry = WifiEntry::new(connected, access_point, imp); let entry = WifiEntry::new(connected, access_point, imp);
wifi_entries.insert(ssid, entry.clone()); wifi_entries.insert(ssid, entry.clone());
wifi_entries_path.insert(path, entry.clone()); wifi_entries_path.insert(path, entry.clone());
imp.resetWifiList.add(&*entry); imp.reset_wifi_list.add(&*entry);
} }
}); });
}); });
@ -164,7 +164,7 @@ pub fn show_stored_connections(wifi_box: Arc<WifiBox>) {
let name = let name =
&String::from_utf8(connection.1).unwrap_or_else(|_| String::from("")); &String::from_utf8(connection.1).unwrap_or_else(|_| String::from(""));
let entry = SavedWifiEntry::new(name, connection.0, self_imp); let entry = SavedWifiEntry::new(name, connection.0, self_imp);
self_imp.resetStoredWifiList.add(&entry); self_imp.reset_stored_wifi_list.add(&entry);
} }
}); });
}); });
@ -302,7 +302,7 @@ pub fn start_event_listener(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) {
let entry = WifiEntry::new(connected, ir.access_point, imp); let entry = WifiEntry::new(connected, ir.access_point, imp);
wifi_entries.insert(ssid, entry.clone()); wifi_entries.insert(ssid, entry.clone());
wifi_entries_path.insert(path, entry.clone()); wifi_entries_path.insert(path, entry.clone());
imp.resetWifiList.add(&*entry); imp.reset_wifi_list.add(&*entry);
}); });
}); });
true true
@ -326,7 +326,7 @@ pub fn start_event_listener(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) {
let entry = entry.unwrap(); let entry = entry.unwrap();
let ssid = entry.imp().access_point.borrow().ssid.clone(); let ssid = entry.imp().access_point.borrow().ssid.clone();
wifi_entries.remove(&ssid); wifi_entries.remove(&ssid);
imp.resetWifiList.remove(&*entry); imp.reset_wifi_list.remove(&*entry);
}); });
}); });
true true
@ -354,11 +354,11 @@ pub fn start_event_listener(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) {
let name_opt = String::from_utf8(ssid).unwrap_or_else(|_| String::from("")); let name_opt = String::from_utf8(ssid).unwrap_or_else(|_| String::from(""));
let name = name_opt.as_str(); let name = name_opt.as_str();
entry_imp.wifi_strength.set(strength); entry_imp.wifi_strength.set(strength);
entry_imp.resetWifiLabel.get().set_text(name); entry_imp.reset_wifi_label.get().set_text(name);
entry_imp.resetWifiEncrypted.set_visible(false); entry_imp.reset_wifi_encrypted.set_visible(false);
// TODO handle encryption thing // TODO handle encryption thing
entry_imp entry_imp
.resetWifiStrength .reset_wifi_strength
.get() .get()
.set_from_icon_name(match strength { .set_from_icon_name(match strength {
WifiStrength::Excellent => { WifiStrength::Excellent => {
@ -369,14 +369,14 @@ pub fn start_event_listener(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) {
WifiStrength::None => Some("network-wireless-signal-none-symbolic"), WifiStrength::None => Some("network-wireless-signal-none-symbolic"),
}); });
if !ir.access_point.stored { if !ir.access_point.stored {
entry_imp.resetWifiEditButton.set_sensitive(false); entry_imp.reset_wifi_edit_button.set_sensitive(false);
} }
if ir.access_point.dbus_path if ir.access_point.dbus_path
== imp.reset_current_wifi_device.borrow().active_access_point == imp.reset_current_wifi_device.borrow().active_access_point
{ {
entry_imp.resetWifiConnected.set_text("Connected"); entry_imp.reset_wifi_connected.set_text("Connected");
} else { } else {
entry_imp.resetWifiConnected.set_text(""); entry_imp.reset_wifi_connected.set_text("");
} }
{ {
let mut wifi_name = entry_imp.wifi_name.borrow_mut(); let mut wifi_name = entry_imp.wifi_name.borrow_mut();

17
src/components/wifi/wifi_box_impl.rs
View file

@ -12,26 +12,25 @@ use ReSet_Lib::network::network::WifiDevice;
use crate::components::base::list_entry::ListEntry; use crate::components::base::list_entry::ListEntry;
use crate::components::wifi::wifi_entry::WifiEntry; use crate::components::wifi::wifi_entry::WifiEntry;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetWiFi.ui")] #[template(resource = "/org/Xetibo/ReSet/resetWiFi.ui")]
pub struct WifiBox { pub struct WifiBox {
#[template_child] #[template_child]
pub resetWifiNavigation: TemplateChild<NavigationView>, pub reset_wifi_navigation: TemplateChild<NavigationView>,
#[template_child] #[template_child]
pub resetWifiDetails: TemplateChild<PreferencesGroup>, pub reset_wifi_details: TemplateChild<PreferencesGroup>,
#[template_child] #[template_child]
pub resetWiFiDevice: TemplateChild<ComboRow>, pub reset_wifi_device: TemplateChild<ComboRow>,
#[template_child] #[template_child]
pub resetSavedNetworks: TemplateChild<ActionRow>, pub reset_saved_networks: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetWifiSwitch: TemplateChild<Switch>, pub reset_wifi_switch: TemplateChild<Switch>,
#[template_child] #[template_child]
pub resetWifiList: TemplateChild<PreferencesGroup>, pub reset_wifi_list: TemplateChild<PreferencesGroup>,
#[template_child] #[template_child]
pub resetStoredWifiList: TemplateChild<PreferencesGroup>, pub reset_stored_wifi_list: TemplateChild<PreferencesGroup>,
#[template_child] #[template_child]
pub resetAvailableNetworks: TemplateChild<ActionRow>, pub reset_available_networks: TemplateChild<ActionRow>,
pub wifi_entries: Arc<Mutex<HashMap<Vec<u8>, Arc<WifiEntry>>>>, pub wifi_entries: Arc<Mutex<HashMap<Vec<u8>, Arc<WifiEntry>>>>,
pub wifi_entries_path: Arc<Mutex<HashMap<Path<'static>, Arc<WifiEntry>>>>, pub wifi_entries_path: Arc<Mutex<HashMap<Path<'static>, Arc<WifiEntry>>>>,
pub saved_wifi_entries: Arc<Mutex<Vec<ListEntry>>>, pub saved_wifi_entries: Arc<Mutex<Vec<ListEntry>>>,

52
src/components/wifi/wifi_entry.rs
View file

@ -37,12 +37,12 @@ impl WifiEntry {
let name_opt = String::from_utf8(ssid).unwrap_or_else(|_| String::from("")); let name_opt = String::from_utf8(ssid).unwrap_or_else(|_| String::from(""));
let name = name_opt.as_str(); let name = name_opt.as_str();
entry_imp.wifi_strength.set(strength); entry_imp.wifi_strength.set(strength);
entry_imp.resetWifiLabel.get().set_text(name); entry_imp.reset_wifi_label.get().set_text(name);
entry_imp.resetWifiEncrypted.set_visible(false); entry_imp.reset_wifi_encrypted.set_visible(false);
entry_imp.connected.set(connected); entry_imp.connected.set(connected);
// TODO handle encryption thing // TODO handle encryption thing
entry_imp entry_imp
.resetWifiStrength .reset_wifi_strength
.get() .get()
.set_from_icon_name(match strength { .set_from_icon_name(match strength {
WifiStrength::Excellent => Some("network-wireless-signal-excellent-symbolic"), WifiStrength::Excellent => Some("network-wireless-signal-excellent-symbolic"),
@ -51,10 +51,10 @@ impl WifiEntry {
WifiStrength::None => Some("network-wireless-signal-none-symbolic"), WifiStrength::None => Some("network-wireless-signal-none-symbolic"),
}); });
if !access_point.stored { if !access_point.stored {
entry_imp.resetWifiEditButton.set_sensitive(false); entry_imp.reset_wifi_edit_button.set_sensitive(false);
} }
if connected { if connected {
entry_imp.resetWifiConnected.set_text("Connected"); entry_imp.reset_wifi_connected.set_text("Connected");
} }
{ {
let mut wifi_name = entry_imp.wifi_name.borrow_mut(); let mut wifi_name = entry_imp.wifi_name.borrow_mut();
@ -79,9 +79,9 @@ impl WifiEntry {
pub fn setup_callbacks(&self, wifi_box: &WifiBox) { pub fn setup_callbacks(&self, wifi_box: &WifiBox) {
let self_imp = self.imp(); let self_imp = self.imp();
self_imp.resetWifiEditButton.connect_clicked(clone!(@ weak self_imp, @ weak wifi_box => move |_| { self_imp.reset_wifi_edit_button.connect_clicked(clone!(@ weak self_imp, @ weak wifi_box => move |_| {
let _option = get_connection_settings(self_imp.access_point.borrow().associated_connection.clone()); let _option = get_connection_settings(self_imp.access_point.borrow().associated_connection.clone());
wifi_box.resetWifiNavigation.push(&*WifiOptions::new(_option, self_imp.access_point.borrow().dbus_path.clone())); wifi_box.reset_wifi_navigation.push(&*WifiOptions::new(_option, self_imp.access_point.borrow().dbus_path.clone()));
})); }));
} }
} }
@ -107,7 +107,7 @@ pub fn click_disconnect(entry: Arc<WifiEntry>) {
imp.connected.replace(false); imp.connected.replace(false);
return; return;
} }
imp.resetWifiConnected.set_text(""); imp.reset_wifi_connected.set_text("");
imp.connected.replace(false); imp.connected.replace(false);
glib::spawn_future(async move { glib::spawn_future(async move {
glib::idle_add_once(move || { glib::idle_add_once(move || {
@ -149,7 +149,7 @@ pub fn click_stored_network(entry: Arc<WifiEntry>) {
return; return;
} }
let imp = entry_ref.imp(); let imp = entry_ref.imp();
imp.resetWifiConnected.set_text("Connected"); imp.reset_wifi_connected.set_text("Connected");
imp.connected.replace(true); imp.connected.replace(true);
}); });
}); });
@ -161,11 +161,11 @@ pub fn click_new_network(entry: Arc<WifiEntry>) {
let connect_new_network = let connect_new_network =
|entry: Arc<WifiEntry>, access_point: AccessPoint, password: String| { |entry: Arc<WifiEntry>, access_point: AccessPoint, password: String| {
let entry_ref = entry.clone(); let entry_ref = entry.clone();
let popup = entry.imp().resetWifiPopup.imp(); let popup = entry.imp().reset_wifi_popup.imp();
popup.resetPopupLabel.set_text("Connecting..."); popup.reset_popup_label.set_text("Connecting...");
popup.resetPopupLabel.set_visible(true); popup.reset_popup_label.set_visible(true);
popup.resetPopupEntry.set_sensitive(false); popup.reset_popup_entry.set_sensitive(false);
popup.resetPopupButton.set_sensitive(false); popup.reset_popup_button.set_sensitive(false);
gio::spawn_blocking(move || { gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap(); let conn = Connection::new_session().unwrap();
@ -183,27 +183,27 @@ pub fn click_new_network(entry: Arc<WifiEntry>) {
glib::idle_add_once(move || { glib::idle_add_once(move || {
if res.is_err() { if res.is_err() {
let imp = entry_ref.imp(); let imp = entry_ref.imp();
imp.resetWifiPopup imp.reset_wifi_popup
.imp() .imp()
.resetPopupLabel .reset_popup_label
.set_text("Could not connect to dbus."); .set_text("Could not connect to dbus.");
imp.connected.replace(false); imp.connected.replace(false);
return; return;
} }
if res.unwrap() == (false,) { if res.unwrap() == (false,) {
let imp = entry_ref.imp(); let imp = entry_ref.imp();
imp.resetWifiPopup imp.reset_wifi_popup
.imp() .imp()
.resetPopupLabel .reset_popup_label
.set_text("Could not connect to access point."); .set_text("Could not connect to access point.");
imp.connected.replace(false); imp.connected.replace(false);
return; return;
} }
println!("worked?"); println!("worked?");
let imp = entry_ref.imp(); let imp = entry_ref.imp();
imp.resetWifiPopup.popdown(); imp.reset_wifi_popup.popdown();
imp.resetWifiEditButton.set_sensitive(true); imp.reset_wifi_edit_button.set_sensitive(true);
imp.resetWifiConnected.set_text("Connected"); imp.reset_wifi_connected.set_text("Connected");
imp.connected.replace(true); imp.connected.replace(true);
}); });
}); });
@ -212,17 +212,17 @@ pub fn click_new_network(entry: Arc<WifiEntry>) {
}; };
let entry_imp = entry.imp(); let entry_imp = entry.imp();
let popup_imp = entry_imp.resetWifiPopup.imp(); let popup_imp = entry_imp.reset_wifi_popup.imp();
popup_imp popup_imp
.resetPopupEntry .reset_popup_entry
.connect_activate(clone!(@weak entry as orig_entry, @weak entry_imp => move |entry| { .connect_activate(clone!(@weak entry as orig_entry, @weak entry_imp => move |entry| {
connect_new_network(orig_entry, entry_imp.access_point.clone().take(), entry.text().to_string()); connect_new_network(orig_entry, entry_imp.access_point.clone().take(), entry.text().to_string());
})); }));
popup_imp.resetPopupButton.connect_clicked( popup_imp.reset_popup_button.connect_clicked(
clone!(@weak entry as orig_entry,@weak entry_imp, @weak popup_imp => move |_| { clone!(@weak entry as orig_entry,@weak entry_imp, @weak popup_imp => move |_| {
let entry = entry_imp.resetWifiPopup.imp().resetPopupEntry.text().to_string(); let entry = entry_imp.reset_wifi_popup.imp().reset_popup_entry.text().to_string();
connect_new_network(orig_entry, entry_imp.access_point.clone().take(), entry); connect_new_network(orig_entry, entry_imp.access_point.clone().take(), entry);
}), }),
); );
entry_imp.resetWifiPopup.popup(); entry_imp.reset_wifi_popup.popup();
} }

13
src/components/wifi/wifi_entry_impl.rs
View file

@ -8,22 +8,21 @@ use gtk::{glib, Button, CompositeTemplate, Image, Label};
use std::cell::RefCell; use std::cell::RefCell;
use ReSet_Lib::network::network::{AccessPoint, WifiStrength}; use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetWifiEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetWifiEntry.ui")]
pub struct WifiEntry { pub struct WifiEntry {
#[template_child] #[template_child]
pub resetWifiStrength: TemplateChild<Image>, pub reset_wifi_strength: TemplateChild<Image>,
#[template_child] #[template_child]
pub resetWifiEncrypted: TemplateChild<Image>, pub reset_wifi_encrypted: TemplateChild<Image>,
#[template_child] #[template_child]
pub resetWifiLabel: TemplateChild<Label>, pub reset_wifi_label: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetWifiEditButton: TemplateChild<Button>, pub reset_wifi_edit_button: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetWifiConnected: TemplateChild<Label>, pub reset_wifi_connected: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetWifiPopup: TemplateChild<Popup>, pub reset_wifi_popup: TemplateChild<Popup>,
pub wifi_name: RefCell<String>, pub wifi_name: RefCell<String>,
pub wifi_strength: RefCell<WifiStrength>, pub wifi_strength: RefCell<WifiStrength>,
pub access_point: RefCell<AccessPoint>, pub access_point: RefCell<AccessPoint>,

170
src/components/wifi/wifi_options.rs
View file

@ -52,36 +52,36 @@ impl WifiOptions {
// General // General
self_imp self_imp
.resetWifiAutoConnect .reset_wifi_auto_connect
.set_active(conn.settings.autoconnect); .set_active(conn.settings.autoconnect);
self_imp self_imp
.resetWifiMetered .reset_wifi_metered
.set_active(conn.settings.metered != -1); .set_active(conn.settings.metered != -1);
match &conn.device { match &conn.device {
TypeSettings::WIFI(wifi) => { TypeSettings::WIFI(wifi) => {
self_imp.resetWifiLinkSpeed.set_visible(false); self_imp.reset_wifi_link_speed.set_visible(false);
self_imp.resetWifiIP4Addr.set_visible(false); self_imp.reset_wifi_ip4_addr.set_visible(false);
self_imp.resetWifiIP6Addr.set_visible(false); self_imp.reset_wifi_ip6_addr.set_visible(false);
self_imp.resetWifiDNS.set_visible(false); self_imp.reset_wifi_dns.set_visible(false);
self_imp.resetWifiGateway.set_visible(false); self_imp.reset_wifi_gateway.set_visible(false);
self_imp.resetWifiLastUsed.set_visible(true); self_imp.reset_wifi_last_used.set_visible(true);
self_imp.resetWifiMac.set_subtitle(&wifi.cloned_mac_address); self_imp.reset_wifi_mac.set_subtitle(&wifi.cloned_mac_address);
self_imp self_imp
.resetWifiName .reset_wifi_name
.set_subtitle(&String::from_utf8(wifi.ssid.clone()).unwrap_or_default()); .set_subtitle(&String::from_utf8(wifi.ssid.clone()).unwrap_or_default());
} }
TypeSettings::ETHERNET(ethernet) => { TypeSettings::ETHERNET(ethernet) => {
self_imp.resetWifiLinkSpeed.set_visible(true); self_imp.reset_wifi_link_speed.set_visible(true);
self_imp.resetWifiIP4Addr.set_visible(true); self_imp.reset_wifi_ip4_addr.set_visible(true);
self_imp.resetWifiIP6Addr.set_visible(true); self_imp.reset_wifi_ip6_addr.set_visible(true);
self_imp.resetWifiDNS.set_visible(true); self_imp.reset_wifi_dns.set_visible(true);
self_imp.resetWifiGateway.set_visible(true); self_imp.reset_wifi_gateway.set_visible(true);
self_imp.resetWifiLastUsed.set_visible(false); self_imp.reset_wifi_last_used.set_visible(false);
self_imp self_imp
.resetWifiMac .reset_wifi_mac
.set_subtitle(&ethernet.cloned_mac_address); .set_subtitle(&ethernet.cloned_mac_address);
self_imp self_imp
.resetWifiLinkSpeed .reset_wifi_link_speed
.set_subtitle(&ethernet.speed.to_string()); .set_subtitle(&ethernet.speed.to_string());
} }
TypeSettings::VPN(_vpn) => {} TypeSettings::VPN(_vpn) => {}
@ -89,7 +89,7 @@ impl WifiOptions {
}; };
// IPv4 // IPv4
self_imp self_imp
.resetIP4Method .reset_ip4_method
.set_selected(conn.ipv4.dns_method.to_i32() as u32); .set_selected(conn.ipv4.dns_method.to_i32() as u32);
self.set_ip4_visibility(conn.ipv4.dns_method.to_i32() as u32); self.set_ip4_visibility(conn.ipv4.dns_method.to_i32() as u32);
@ -104,11 +104,11 @@ impl WifiOptions {
.join(".") .join(".")
}) })
.collect(); .collect();
self_imp.resetIP4DNS.set_text(&ipv4_dns.join(", ")); self_imp.reset_ip4_dns.set_text(&ipv4_dns.join(", "));
self_imp.resetIP4Gateway.set_text(&conn.ipv4.gateway); self_imp.reset_ip4_gateway.set_text(&conn.ipv4.gateway);
// IPv6 // IPv6
self_imp self_imp
.resetIP6Method .reset_ip6_method
.set_selected(conn.ipv6.dns_method.to_i32() as u32); .set_selected(conn.ipv6.dns_method.to_i32() as u32);
self.set_ip6_visibility(conn.ipv6.dns_method.to_i32() as u32); self.set_ip6_visibility(conn.ipv6.dns_method.to_i32() as u32);
@ -123,22 +123,22 @@ impl WifiOptions {
.join(":") .join(":")
}) })
.collect(); .collect();
self_imp.resetIP6DNS.set_text(&ipv6_dns.join(", ")); self_imp.reset_ip6_dns.set_text(&ipv6_dns.join(", "));
self_imp.resetIP6Gateway.set_text(&conn.ipv6.gateway); self_imp.reset_ip6_gateway.set_text(&conn.ipv6.gateway);
// Security // Security
if let TypeSettings::WIFI(wifi) = &conn.device { if let TypeSettings::WIFI(wifi) = &conn.device {
match wifi.security_settings.key_management.as_str() { match wifi.security_settings.key_management.as_str() {
"none" => { "none" => {
self_imp.resetWifiSecurityDropdown.set_selected(0); self_imp.reset_wifi_security_dropdown.set_selected(0);
self_imp.resetWifiPassword.set_visible(false); self_imp.reset_wifi_password.set_visible(false);
self_imp.resetWifiPassword.set_text(""); self_imp.reset_wifi_password.set_text("");
} }
"wpa-psk" => { "wpa-psk" => {
self_imp.resetWifiSecurityDropdown.set_selected(1); self_imp.reset_wifi_security_dropdown.set_selected(1);
self_imp.resetWifiPassword.set_visible(true); self_imp.reset_wifi_password.set_visible(true);
self_imp self_imp
.resetWifiPassword .reset_wifi_password
.set_text(&wifi.security_settings.psk); .set_text(&wifi.security_settings.psk);
} }
_ => {} _ => {}
@ -148,32 +148,32 @@ impl WifiOptions {
// IPv4 // IPv4
for i in 0..ip4_address_length { for i in 0..ip4_address_length {
let address = &WifiAddressEntry::new(Some(i), self_imp.connection.clone(), IPv4); let address = &WifiAddressEntry::new(Some(i), self_imp.connection.clone(), IPv4);
self_imp.resetIP4AddressGroup.add(address); self_imp.reset_ip4_address_group.add(address);
} }
let address = &WifiAddressEntry::new(None, self_imp.connection.clone(), IPv4); let address = &WifiAddressEntry::new(None, self_imp.connection.clone(), IPv4);
self_imp.resetIP4AddressGroup.add(address); self_imp.reset_ip4_address_group.add(address);
for i in 0..ip4_route_length { for i in 0..ip4_route_length {
let route = &WifiRouteEntry::new(Some(i), self_imp.connection.clone(), IPv4); let route = &WifiRouteEntry::new(Some(i), self_imp.connection.clone(), IPv4);
self_imp.resetIP4RoutesGroup.add(route) self_imp.reset_ip4_routes_group.add(route)
} }
let route = &WifiRouteEntry::new(None, self_imp.connection.clone(), IPv4); let route = &WifiRouteEntry::new(None, self_imp.connection.clone(), IPv4);
self_imp.resetIP4RoutesGroup.add(route); self_imp.reset_ip4_routes_group.add(route);
// IPv6 // IPv6
for i in 0..ip6_address_length { for i in 0..ip6_address_length {
let address = &WifiAddressEntry::new(Some(i), self_imp.connection.clone(), IPv6); let address = &WifiAddressEntry::new(Some(i), self_imp.connection.clone(), IPv6);
self_imp.resetIP6AddressGroup.add(address); self_imp.reset_ip6_address_group.add(address);
} }
let address = &WifiAddressEntry::new(None, self_imp.connection.clone(), IPv6); let address = &WifiAddressEntry::new(None, self_imp.connection.clone(), IPv6);
self_imp.resetIP6AddressGroup.add(address); self_imp.reset_ip6_address_group.add(address);
for i in 0..ip6_route_length { for i in 0..ip6_route_length {
let route = &WifiRouteEntry::new(Some(i), self_imp.connection.clone(), IPv6); let route = &WifiRouteEntry::new(Some(i), self_imp.connection.clone(), IPv6);
self_imp.resetIP6RoutesGroup.add(route); self_imp.reset_ip6_routes_group.add(route);
} }
let route = &WifiRouteEntry::new(None, self_imp.connection.clone(), IPv6); let route = &WifiRouteEntry::new(None, self_imp.connection.clone(), IPv6);
self_imp.resetIP6RoutesGroup.add(route); self_imp.reset_ip6_routes_group.add(route);
// Security // Security
} }
@ -182,20 +182,20 @@ impl WifiOptions {
match method { match method {
0 => { 0 => {
// auto // auto
self_imp.resetIP4AddressGroup.set_visible(false); self_imp.reset_ip4_address_group.set_visible(false);
self_imp.resetIP4RoutesGroup.set_visible(true); self_imp.reset_ip4_routes_group.set_visible(true);
self_imp.resetIP4Gateway.set_visible(false); self_imp.reset_ip4_gateway.set_visible(false);
} }
1 => { 1 => {
// manual // manual
self_imp.resetIP4AddressGroup.set_visible(true); self_imp.reset_ip4_address_group.set_visible(true);
self_imp.resetIP4RoutesGroup.set_visible(true); self_imp.reset_ip4_routes_group.set_visible(true);
self_imp.resetIP4Gateway.set_visible(true); self_imp.reset_ip4_gateway.set_visible(true);
} }
_ => { _ => {
self_imp.resetIP4AddressGroup.set_visible(false); self_imp.reset_ip4_address_group.set_visible(false);
self_imp.resetIP4RoutesGroup.set_visible(false); self_imp.reset_ip4_routes_group.set_visible(false);
self_imp.resetIP4Gateway.set_visible(false); self_imp.reset_ip4_gateway.set_visible(false);
} }
} }
} }
@ -205,20 +205,20 @@ impl WifiOptions {
match method { match method {
0 | 1 => { 0 | 1 => {
// auto, dhcp // auto, dhcp
self_imp.resetIP6AddressGroup.set_visible(false); self_imp.reset_ip6_address_group.set_visible(false);
self_imp.resetIP6RoutesGroup.set_visible(true); self_imp.reset_ip6_routes_group.set_visible(true);
self_imp.resetIP6Gateway.set_visible(false); self_imp.reset_ip6_gateway.set_visible(false);
} }
2 => { 2 => {
// manual // manual
self_imp.resetIP6AddressGroup.set_visible(true); self_imp.reset_ip6_address_group.set_visible(true);
self_imp.resetIP6RoutesGroup.set_visible(true); self_imp.reset_ip6_routes_group.set_visible(true);
self_imp.resetIP6Gateway.set_visible(true); self_imp.reset_ip6_gateway.set_visible(true);
} }
_ => { _ => {
self_imp.resetIP6AddressGroup.set_visible(false); self_imp.reset_ip6_address_group.set_visible(false);
self_imp.resetIP6RoutesGroup.set_visible(false); self_imp.reset_ip6_routes_group.set_visible(false);
self_imp.resetIP6Gateway.set_visible(false); self_imp.reset_ip6_gateway.set_visible(false);
} }
} }
} }
@ -228,22 +228,22 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
let imp = wifi_options.imp(); let imp = wifi_options.imp();
// General // General
imp.resetWifiAutoConnect imp.reset_wifi_auto_connect
.connect_active_notify(clone!(@weak imp => move |x| { .connect_active_notify(clone!(@weak imp => move |x| {
imp.connection.borrow_mut().settings.autoconnect = x.is_active(); imp.connection.borrow_mut().settings.autoconnect = x.is_active();
})); }));
imp.resetWifiMetered imp.reset_wifi_metered
.connect_active_notify(clone!(@weak imp => move |x| { .connect_active_notify(clone!(@weak imp => move |x| {
imp.connection.borrow_mut().settings.metered = if x.is_active() { 1 } else { 2 }; imp.connection.borrow_mut().settings.metered = if x.is_active() { 1 } else { 2 };
})); }));
imp.wifiOptionsApplyButton imp.wifi_options_apply_button
.connect_clicked(clone!(@weak imp => move |_| { .connect_clicked(clone!(@weak imp => move |_| {
let prop = imp.connection.borrow().convert_to_propmap(); let prop = imp.connection.borrow().convert_to_propmap();
set_connection_settings(path.clone(), prop); set_connection_settings(path.clone(), prop);
})); }));
// IPv4 // IPv4
let wifi_options_ip4 = wifi_options.clone(); let wifi_options_ip4 = wifi_options.clone();
imp.resetIP4Method imp.reset_ip4_method
.connect_selected_notify(clone!(@weak imp => move |dropdown| { .connect_selected_notify(clone!(@weak imp => move |dropdown| {
let selected = dropdown.selected(); let selected = dropdown.selected();
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();
@ -251,49 +251,49 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
wifi_options_ip4.set_ip4_visibility(selected); wifi_options_ip4.set_ip4_visibility(selected);
})); }));
imp.resetIP4DNS imp.reset_ip4_dns
.connect_changed(clone!(@weak imp => move |entry| { .connect_changed(clone!(@weak imp => move |entry| {
let dns_input = entry.text(); let dns_input = entry.text();
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();
conn.ipv4.dns.clear(); conn.ipv4.dns.clear();
if dns_input.is_empty() { if dns_input.is_empty() {
imp.resetIP4DNS.remove_css_class("error"); imp.reset_ip4_dns.remove_css_class("error");
return; return;
} }
for dns_entry in dns_input.as_str().split(',').map(|s| s.trim()) { for dns_entry in dns_input.as_str().split(',').map(|s| s.trim()) {
if let Ok(addr) = Ipv4Addr::from_str(dns_entry) { if let Ok(addr) = Ipv4Addr::from_str(dns_entry) {
imp.resetIP4DNS.remove_css_class("error"); imp.reset_ip4_dns.remove_css_class("error");
conn.ipv4.dns.push(addr.octets().to_vec()); conn.ipv4.dns.push(addr.octets().to_vec());
} else { } else {
imp.resetIP4DNS.add_css_class("error"); imp.reset_ip4_dns.add_css_class("error");
} }
} }
})); }));
imp.resetIP4AddressAddButton imp.reset_ip4_address_add_button
.connect_clicked(clone!(@weak imp => move |_| { .connect_clicked(clone!(@weak imp => move |_| {
let address = &WifiAddressEntry::new(None, imp.connection.clone(), IpProtocol::IPv4); let address = &WifiAddressEntry::new(None, imp.connection.clone(), IpProtocol::IPv4);
imp.resetIP4AddressGroup.add(address); imp.reset_ip4_address_group.add(address);
})); }));
imp.resetIP4Gateway imp.reset_ip4_gateway
.connect_changed(clone!(@weak imp => move |entry| { .connect_changed(clone!(@weak imp => move |entry| {
let gateway_input = entry.text(); let gateway_input = entry.text();
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();
conn.ipv4.gateway.clear(); conn.ipv4.gateway.clear();
if gateway_input.is_empty() { if gateway_input.is_empty() {
imp.resetIP4Gateway.remove_css_class("error"); imp.reset_ip4_gateway.remove_css_class("error");
return; return;
} }
if Ipv4Addr::from_str(gateway_input.as_str()).is_ok() { if Ipv4Addr::from_str(gateway_input.as_str()).is_ok() {
imp.resetIP4Gateway.remove_css_class("error"); imp.reset_ip4_gateway.remove_css_class("error");
conn.ipv4.gateway = gateway_input.to_string(); conn.ipv4.gateway = gateway_input.to_string();
} else { } else {
imp.resetIP4Gateway.add_css_class("error"); imp.reset_ip4_gateway.add_css_class("error");
} }
})); }));
// IPv6 // IPv6
let wifi_options_ip6 = wifi_options.clone(); let wifi_options_ip6 = wifi_options.clone();
imp.resetIP6Method imp.reset_ip6_method
.connect_selected_notify(clone!(@weak imp => move |dropdown| { .connect_selected_notify(clone!(@weak imp => move |dropdown| {
let selected = dropdown.selected(); let selected = dropdown.selected();
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();
@ -301,61 +301,61 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
wifi_options_ip6.set_ip6_visibility(selected); wifi_options_ip6.set_ip6_visibility(selected);
})); }));
imp.resetIP6DNS imp.reset_ip6_dns
.connect_changed(clone!(@weak imp => move |entry| { .connect_changed(clone!(@weak imp => move |entry| {
let dns_input = entry.text(); let dns_input = entry.text();
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();
conn.ipv6.dns.clear(); conn.ipv6.dns.clear();
if dns_input.is_empty() { if dns_input.is_empty() {
imp.resetIP6DNS.remove_css_class("error"); imp.reset_ip6_dns.remove_css_class("error");
return; return;
} }
for dns_entry in dns_input.as_str().split(',').map(|s| s.trim()) { for dns_entry in dns_input.as_str().split(',').map(|s| s.trim()) {
if let Ok(addr) = Ipv6Addr::from_str(dns_entry) { if let Ok(addr) = Ipv6Addr::from_str(dns_entry) {
imp.resetIP6DNS.remove_css_class("error"); imp.reset_ip6_dns.remove_css_class("error");
conn.ipv6.dns.push(addr.octets().to_vec()); conn.ipv6.dns.push(addr.octets().to_vec());
} else { } else {
imp.resetIP6DNS.add_css_class("error"); imp.reset_ip6_dns.add_css_class("error");
} }
} }
})); }));
imp.resetIP6AddressAddButton imp.reset_ip6_address_add_button
.connect_clicked(clone!(@weak imp => move |_| { .connect_clicked(clone!(@weak imp => move |_| {
let address = &WifiAddressEntry::new(None, imp.connection.clone(), IpProtocol::IPv4); let address = &WifiAddressEntry::new(None, imp.connection.clone(), IpProtocol::IPv4);
imp.resetIP6AddressGroup.add(address); imp.reset_ip6_address_group.add(address);
})); }));
imp.resetIP6Gateway imp.reset_ip6_gateway
.connect_changed(clone!(@weak imp => move |entry| { .connect_changed(clone!(@weak imp => move |entry| {
let gateway_input = entry.text(); let gateway_input = entry.text();
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();
conn.ipv6.gateway.clear(); conn.ipv6.gateway.clear();
if gateway_input.is_empty() { if gateway_input.is_empty() {
imp.resetIP6Gateway.remove_css_class("error"); imp.reset_ip6_gateway.remove_css_class("error");
return; return;
} }
if Ipv6Addr::from_str(gateway_input.as_str()).is_ok() { if Ipv6Addr::from_str(gateway_input.as_str()).is_ok() {
imp.resetIP6Gateway.remove_css_class("error"); imp.reset_ip6_gateway.remove_css_class("error");
conn.ipv6.gateway = gateway_input.to_string(); conn.ipv6.gateway = gateway_input.to_string();
} else { } else {
imp.resetIP6Gateway.add_css_class("error"); imp.reset_ip6_gateway.add_css_class("error");
} }
})); }));
// Security // Security
imp.resetWifiSecurityDropdown imp.reset_wifi_security_dropdown
.connect_selected_notify(clone!(@weak imp => move |dropdown| { .connect_selected_notify(clone!(@weak imp => move |dropdown| {
let selected = dropdown.selected(); let selected = dropdown.selected();
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();
match (selected, &mut conn.device) { match (selected, &mut conn.device) {
(0 , TypeSettings::WIFI(wifi)) => { // None (0 , TypeSettings::WIFI(wifi)) => { // None
imp.resetWifiPassword.set_visible(false); imp.reset_wifi_password.set_visible(false);
wifi.security_settings.key_management = String::from("none"); wifi.security_settings.key_management = String::from("none");
wifi.security_settings.authentication_algorithm = String::from("open"); wifi.security_settings.authentication_algorithm = String::from("open");
}, },
(1 , TypeSettings::WIFI(wifi)) => { // WPA/WPA2 Personal (1 , TypeSettings::WIFI(wifi)) => { // WPA/WPA2 Personal
imp.resetWifiPassword.set_visible(true); imp.reset_wifi_password.set_visible(true);
wifi.security_settings.key_management = String::from("wpa-psk"); wifi.security_settings.key_management = String::from("wpa-psk");
wifi.security_settings.authentication_algorithm = String::from(""); wifi.security_settings.authentication_algorithm = String::from("");
}, },
@ -363,7 +363,7 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
} }
})); }));
imp.resetWifiPassword imp.reset_wifi_password
.connect_changed(clone!(@weak imp => move |entry| { .connect_changed(clone!(@weak imp => move |entry| {
let password_input = entry.text(); let password_input = entry.text();
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();

55
src/components/wifi/wifi_options_impl.rs
View file

@ -9,69 +9,68 @@ use std::cell::RefCell;
use std::rc::Rc; use std::rc::Rc;
use ReSet_Lib::network::connection::Connection; use ReSet_Lib::network::connection::Connection;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetWifiOptions.ui")] #[template(resource = "/org/Xetibo/ReSet/resetWifiOptions.ui")]
pub struct WifiOptions { pub struct WifiOptions {
// General // General
#[template_child] #[template_child]
pub resetWifiName: TemplateChild<ActionRow>, pub reset_wifi_name: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetWifiMac: TemplateChild<ActionRow>, pub reset_wifi_mac: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetWifiLinkSpeed: TemplateChild<ActionRow>, pub reset_wifi_link_speed: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetWifiIP4Addr: TemplateChild<ActionRow>, pub reset_wifi_ip4_addr: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetWifiIP6Addr: TemplateChild<ActionRow>, pub reset_wifi_ip6_addr: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetWifiGateway: TemplateChild<ActionRow>, pub reset_wifi_gateway: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetWifiDNS: TemplateChild<ActionRow>, pub reset_wifi_dns: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetWifiLastUsed: TemplateChild<ActionRow>, pub reset_wifi_last_used: TemplateChild<ActionRow>,
#[template_child] #[template_child]
pub resetWifiAutoConnect: TemplateChild<SwitchRow>, pub reset_wifi_auto_connect: TemplateChild<SwitchRow>,
#[template_child] #[template_child]
pub resetWifiMetered: TemplateChild<SwitchRow>, pub reset_wifi_metered: TemplateChild<SwitchRow>,
// IPv4 // IPv4
#[template_child] #[template_child]
pub resetIP4Method: TemplateChild<ComboRow>, pub reset_ip4_method: TemplateChild<ComboRow>,
#[template_child] #[template_child]
pub resetIP4DNS: TemplateChild<EntryRow>, pub reset_ip4_dns: TemplateChild<EntryRow>,
#[template_child] #[template_child]
pub resetIP4Gateway: TemplateChild<EntryRow>, pub reset_ip4_gateway: TemplateChild<EntryRow>,
#[template_child] #[template_child]
pub resetIP4AddressGroup: TemplateChild<PreferencesGroup>, pub reset_ip4_address_group: TemplateChild<PreferencesGroup>,
#[template_child] #[template_child]
pub resetIP4AddressAddButton: TemplateChild<Button>, pub reset_ip4_address_add_button: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetIP4RoutesGroup: TemplateChild<PreferencesGroup>, pub reset_ip4_routes_group: TemplateChild<PreferencesGroup>,
#[template_child] #[template_child]
pub resetIP4RouteAddButton: TemplateChild<Button>, pub reset_ip4_route_add_button: TemplateChild<Button>,
// IPv6 // IPv6
#[template_child] #[template_child]
pub resetIP6Method: TemplateChild<ComboRow>, pub reset_ip6_method: TemplateChild<ComboRow>,
#[template_child] #[template_child]
pub resetIP6DNS: TemplateChild<EntryRow>, pub reset_ip6_dns: TemplateChild<EntryRow>,
#[template_child] #[template_child]
pub resetIP6Gateway: TemplateChild<EntryRow>, pub reset_ip6_gateway: TemplateChild<EntryRow>,
#[template_child] #[template_child]
pub resetIP6AddressGroup: TemplateChild<PreferencesGroup>, pub reset_ip6_address_group: TemplateChild<PreferencesGroup>,
#[template_child] #[template_child]
pub resetIP6AddressAddButton: TemplateChild<Button>, pub reset_ip6_address_add_button: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetIP6RoutesGroup: TemplateChild<PreferencesGroup>, pub reset_ip6_routes_group: TemplateChild<PreferencesGroup>,
#[template_child] #[template_child]
pub resetIP6RouteAddButton: TemplateChild<Button>, pub reset_ip6_route_add_button: TemplateChild<Button>,
// Security // Security
#[template_child] #[template_child]
pub resetWifiSecurityDropdown: TemplateChild<ComboRow>, pub reset_wifi_security_dropdown: TemplateChild<ComboRow>,
#[template_child] #[template_child]
pub resetWifiPassword: TemplateChild<PasswordEntryRow>, pub reset_wifi_password: TemplateChild<PasswordEntryRow>,
// Misc // Misc
#[template_child] #[template_child]
pub wifiOptionsApplyButton: TemplateChild<Button>, pub wifi_options_apply_button: TemplateChild<Button>,
pub connection: Rc<RefCell<Connection>>, pub connection: Rc<RefCell<Connection>>,
} }

62
src/components/wifi/wifi_route_entry.rs
View file

@ -33,18 +33,18 @@ impl WifiRouteEntry {
let conn = conn.borrow(); let conn = conn.borrow();
let address = unsafe { conn.ipv4.route_data.get_unchecked(address) }; let address = unsafe { conn.ipv4.route_data.get_unchecked(address) };
entry_imp.resetRouteAddress.set_text(&address.address); entry_imp.reset_route_address.set_text(&address.address);
entry_imp entry_imp
.resetRoutePrefix .reset_route_prefix
.set_text(&address.prefix_length.to_string()); .set_text(&address.prefix_length.to_string());
if let Some(gateway) = &address.gateway { if let Some(gateway) = &address.gateway {
entry_imp.resetRouteGateway.set_text(gateway); entry_imp.reset_route_gateway.set_text(gateway);
} }
if let Some(metric) = address.metric { if let Some(metric) = address.metric {
entry_imp.resetRouteMetric.set_text(&metric.to_string()); entry_imp.reset_route_metric.set_text(&metric.to_string());
} }
entry_imp entry_imp
.resetRouteRow .reset_route_row
.set_title(&format!("{}/{}", &*address.address, address.prefix_length)); .set_title(&format!("{}/{}", &*address.address, address.prefix_length));
} }
entry_imp.protocol.set(protocol); entry_imp.protocol.set(protocol);
@ -56,13 +56,13 @@ impl WifiRouteEntry {
let self_imp = self.imp(); let self_imp = self.imp();
let conn = connection.clone(); let conn = connection.clone();
self_imp.resetRouteAddress.connect_changed(clone!(@weak self_imp => move |entry| { self_imp.reset_route_address.connect_changed(clone!(@weak self_imp => move |entry| {
let address_input = entry.text(); let address_input = entry.text();
let mut conn = conn.borrow_mut(); let mut conn = conn.borrow_mut();
if address_input.is_empty() { if address_input.is_empty() {
self_imp.resetRouteAddress.remove_css_class("error"); self_imp.reset_route_address.remove_css_class("error");
self_imp.resetRouteRow.set_title("Add new address"); self_imp.reset_route_row.set_title("Add new address");
return; return;
} }
let result = match self_imp.protocol.get() { let result = match self_imp.protocol.get() {
@ -71,7 +71,7 @@ impl WifiRouteEntry {
}; };
match result { match result {
Ok(ip_addr) => { Ok(ip_addr) => {
self_imp.resetRouteAddress.remove_css_class("error"); self_imp.reset_route_address.remove_css_class("error");
let address_data = match self_imp.protocol.get() { let address_data = match self_imp.protocol.get() {
IpProtocol::IPv4 => &mut conn.ipv4.route_data, IpProtocol::IPv4 => &mut conn.ipv4.route_data,
IpProtocol::IPv6 => &mut conn.ipv6.route_data, IpProtocol::IPv6 => &mut conn.ipv6.route_data,
@ -80,7 +80,7 @@ impl WifiRouteEntry {
*self_imp.address.borrow_mut() = (true, ip_addr.to_string()); *self_imp.address.borrow_mut() = (true, ip_addr.to_string());
} }
Err(_) => { Err(_) => {
self_imp.resetRouteAddress.add_css_class("error"); self_imp.reset_route_address.add_css_class("error");
*self_imp.address.borrow_mut() = (false, String::default()); *self_imp.address.borrow_mut() = (false, String::default());
} }
} }
@ -88,16 +88,16 @@ impl WifiRouteEntry {
})); }));
let conn = connection.clone(); let conn = connection.clone();
self_imp.resetRoutePrefix.connect_changed(clone!(@weak self_imp => move |entry| { self_imp.reset_route_prefix.connect_changed(clone!(@weak self_imp => move |entry| {
let prefix_input = entry.text(); let prefix_input = entry.text();
let prefix = prefix_input.parse::<u8>(); let prefix = prefix_input.parse::<u8>();
let mut conn = conn.borrow_mut(); let mut conn = conn.borrow_mut();
let handle_error = || { let handle_error = || {
if self_imp.resetRoutePrefix.text().is_empty() { if self_imp.reset_route_prefix.text().is_empty() {
self_imp.resetRoutePrefix.remove_css_class("error"); self_imp.reset_route_prefix.remove_css_class("error");
} else { } else {
self_imp.resetRoutePrefix.add_css_class("error"); self_imp.reset_route_prefix.add_css_class("error");
} }
self_imp.prefix.set((false, 0)); self_imp.prefix.set((false, 0));
set_row_title(&self_imp); set_row_title(&self_imp);
@ -112,8 +112,8 @@ impl WifiRouteEntry {
match self_imp.protocol.get() { match self_imp.protocol.get() {
IpProtocol::IPv4 if prefix <= 32 => { IpProtocol::IPv4 if prefix <= 32 => {
self_imp.prefix.set((true, prefix as u32)); self_imp.prefix.set((true, prefix as u32));
self_imp.resetRoutePrefix.remove_css_class("error"); self_imp.reset_route_prefix.remove_css_class("error");
if let Ok(address2) = Ipv4Addr::from_str(self_imp.resetRouteAddress.text().as_str()) { if let Ok(address2) = Ipv4Addr::from_str(self_imp.reset_route_address.text().as_str()) {
if let Some(addr) = conn.ipv4.route_data.iter_mut() if let Some(addr) = conn.ipv4.route_data.iter_mut()
.find(|conn_addr| *conn_addr.address == address2.to_string()) { .find(|conn_addr| *conn_addr.address == address2.to_string()) {
addr.prefix_length = prefix as u32; addr.prefix_length = prefix as u32;
@ -122,8 +122,8 @@ impl WifiRouteEntry {
} }
IpProtocol::IPv6 if prefix <= 128 => { IpProtocol::IPv6 if prefix <= 128 => {
self_imp.prefix.set((true, prefix as u32)); self_imp.prefix.set((true, prefix as u32));
self_imp.resetRoutePrefix.remove_css_class("error"); self_imp.reset_route_prefix.remove_css_class("error");
if let Ok(address2) = Ipv6Addr::from_str(self_imp.resetRouteAddress.text().as_str()) { if let Ok(address2) = Ipv6Addr::from_str(self_imp.reset_route_address.text().as_str()) {
if let Some(addr) = conn.ipv6.route_data.iter_mut() if let Some(addr) = conn.ipv6.route_data.iter_mut()
.find(|conn_addr| *conn_addr.address == address2.to_string()) { .find(|conn_addr| *conn_addr.address == address2.to_string()) {
addr.prefix_length = prefix as u32; addr.prefix_length = prefix as u32;
@ -137,13 +137,13 @@ impl WifiRouteEntry {
let conn = connection.clone(); let conn = connection.clone();
self_imp self_imp
.resetRouteGateway .reset_route_gateway
.connect_changed(clone!(@weak self_imp => move |entry| { .connect_changed(clone!(@weak self_imp => move |entry| {
let gateway_input = entry.text(); let gateway_input = entry.text();
let mut conn = conn.borrow_mut(); let mut conn = conn.borrow_mut();
if gateway_input.is_empty() { if gateway_input.is_empty() {
self_imp.resetRouteGateway.remove_css_class("error"); self_imp.reset_route_gateway.remove_css_class("error");
*self_imp.gateway.borrow_mut() = None; *self_imp.gateway.borrow_mut() = None;
set_row_subtitle(&self_imp); set_row_subtitle(&self_imp);
return; return;
@ -154,19 +154,19 @@ impl WifiRouteEntry {
}; };
match result { match result {
Ok(ip_addr) => { Ok(ip_addr) => {
self_imp.resetRouteGateway.remove_css_class("error"); self_imp.reset_route_gateway.remove_css_class("error");
let address_data = match self_imp.protocol.get() { let address_data = match self_imp.protocol.get() {
IpProtocol::IPv4 => &mut conn.ipv4.route_data, IpProtocol::IPv4 => &mut conn.ipv4.route_data,
IpProtocol::IPv6 => &mut conn.ipv6.route_data, IpProtocol::IPv6 => &mut conn.ipv6.route_data,
}; };
if let Some(address) = address_data.iter_mut() if let Some(address) = address_data.iter_mut()
.find(|conn_addr| *conn_addr.address == self_imp.resetRouteAddress.text()) { .find(|conn_addr| *conn_addr.address == self_imp.reset_route_address.text()) {
address.gateway = Some(ip_addr.to_string()); address.gateway = Some(ip_addr.to_string());
} }
*self_imp.gateway.borrow_mut() = Some(ip_addr.to_string()); *self_imp.gateway.borrow_mut() = Some(ip_addr.to_string());
} }
Err(_) => { Err(_) => {
self_imp.resetRouteGateway.add_css_class("error"); self_imp.reset_route_gateway.add_css_class("error");
*self_imp.gateway.borrow_mut() = None; *self_imp.gateway.borrow_mut() = None;
} }
} }
@ -175,13 +175,13 @@ impl WifiRouteEntry {
let conn = connection.clone(); let conn = connection.clone();
self_imp self_imp
.resetRouteMetric .reset_route_metric
.connect_changed(clone!(@weak self_imp => move |entry| { .connect_changed(clone!(@weak self_imp => move |entry| {
let metric_input = entry.text(); let metric_input = entry.text();
let mut conn = conn.borrow_mut(); let mut conn = conn.borrow_mut();
if metric_input.is_empty() { if metric_input.is_empty() {
self_imp.resetRouteMetric.remove_css_class("error"); self_imp.reset_route_metric.remove_css_class("error");
self_imp.metric.set(None); self_imp.metric.set(None);
set_row_subtitle(&self_imp); set_row_subtitle(&self_imp);
return; return;
@ -189,19 +189,19 @@ impl WifiRouteEntry {
let result = metric_input.parse::<u32>(); let result = metric_input.parse::<u32>();
match result { match result {
Ok(metric) => { Ok(metric) => {
self_imp.resetRouteMetric.remove_css_class("error"); self_imp.reset_route_metric.remove_css_class("error");
let address_data = match self_imp.protocol.get() { let address_data = match self_imp.protocol.get() {
IpProtocol::IPv4 => &mut conn.ipv4.route_data, IpProtocol::IPv4 => &mut conn.ipv4.route_data,
IpProtocol::IPv6 => &mut conn.ipv6.route_data, IpProtocol::IPv6 => &mut conn.ipv6.route_data,
}; };
if let Some(address) = address_data.iter_mut() if let Some(address) = address_data.iter_mut()
.find(|conn_addr| *conn_addr.address == self_imp.resetRouteAddress.text()) { .find(|conn_addr| *conn_addr.address == self_imp.reset_route_address.text()) {
address.metric = Some(metric); address.metric = Some(metric);
} }
self_imp.metric.set(Some(metric)); self_imp.metric.set(Some(metric));
} }
Err(_) => { Err(_) => {
self_imp.resetRouteMetric.add_css_class("error"); self_imp.reset_route_metric.add_css_class("error");
self_imp.metric.set(None); self_imp.metric.set(None);
} }
} }
@ -211,7 +211,7 @@ impl WifiRouteEntry {
} }
fn set_row_title(self_imp: &WifiRouteEntryImpl) { fn set_row_title(self_imp: &WifiRouteEntryImpl) {
if self_imp.resetRouteAddress.text().is_empty() { if self_imp.reset_route_address.text().is_empty() {
return; return;
} }
let address = self_imp.address.borrow(); let address = self_imp.address.borrow();
@ -224,7 +224,7 @@ fn set_row_title(self_imp: &WifiRouteEntryImpl) {
(false, true) => "Address wrong".to_string(), (false, true) => "Address wrong".to_string(),
(false, false) => "Address and Prefix wrong".to_string(), (false, false) => "Address and Prefix wrong".to_string(),
}; };
self_imp.resetRouteRow.set_title(&title); self_imp.reset_route_row.set_title(&title);
} }
fn set_row_subtitle(self_imp: &WifiRouteEntryImpl) { fn set_row_subtitle(self_imp: &WifiRouteEntryImpl) {
@ -238,5 +238,5 @@ fn set_row_subtitle(self_imp: &WifiRouteEntryImpl) {
(None, Some(metric)) => metric.to_string(), (None, Some(metric)) => metric.to_string(),
(None, None) => String::default(), (None, None) => String::default(),
}; };
self_imp.resetRouteRow.set_subtitle(&title); self_imp.reset_route_row.set_subtitle(&title);
} }

13
src/components/wifi/wifi_route_entry_impl.rs
View file

@ -5,22 +5,21 @@ use gtk::subclass::prelude::*;
use gtk::{glib, Button, CompositeTemplate}; use gtk::{glib, Button, CompositeTemplate};
use std::cell::{Cell, RefCell}; use std::cell::{Cell, RefCell};
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetWifiRouteEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetWifiRouteEntry.ui")]
pub struct WifiRouteEntryImpl { pub struct WifiRouteEntryImpl {
#[template_child] #[template_child]
pub resetRouteRow: TemplateChild<ExpanderRow>, pub reset_route_row: TemplateChild<ExpanderRow>,
#[template_child] #[template_child]
pub resetRouteAddress: TemplateChild<EntryRow>, pub reset_route_address: TemplateChild<EntryRow>,
#[template_child] #[template_child]
pub resetRoutePrefix: TemplateChild<EntryRow>, pub reset_route_prefix: TemplateChild<EntryRow>,
#[template_child] #[template_child]
pub resetRouteGateway: TemplateChild<EntryRow>, pub reset_route_gateway: TemplateChild<EntryRow>,
#[template_child] #[template_child]
pub resetRouteMetric: TemplateChild<EntryRow>, pub reset_route_metric: TemplateChild<EntryRow>,
#[template_child] #[template_child]
pub resetRouteRemove: TemplateChild<Button>, pub reset_route_remove: TemplateChild<Button>,
pub address: RefCell<(bool, String)>, pub address: RefCell<(bool, String)>,
pub prefix: Cell<(bool, u32)>, pub prefix: Cell<(bool, u32)>,
pub gateway: RefCell<Option<String>>, pub gateway: RefCell<Option<String>>,

50
src/components/window/reset_window.rs
View file

@ -29,28 +29,28 @@ impl ReSetWindow {
pub fn setup_callback(&self) { pub fn setup_callback(&self) {
let self_imp = self.imp(); let self_imp = self.imp();
self_imp.resetSearchEntry.connect_search_changed( self_imp.reset_search_entry.connect_search_changed(
clone!(@ weak self as window => move |_| { clone!(@ weak self as window => move |_| {
window.filter_list(); window.filter_list();
}), }),
); );
self_imp self_imp
.resetSideBarToggle .reset_sidebar_toggle
.connect_clicked(clone!(@ weak self as window => move |_| { .connect_clicked(clone!(@ weak self as window => move |_| {
window.toggle_sidebar(); window.toggle_sidebar();
})); }));
self_imp.resetSidebarList.connect_row_activated( self_imp.reset_sidebar_list.connect_row_activated(
clone!(@ weak self_imp as flowbox => move |_, y| { clone!(@ weak self_imp as flowbox => move |_, y| {
let result = y.downcast_ref::<SidebarEntry>().unwrap(); let result = y.downcast_ref::<SidebarEntry>().unwrap();
let click_event = result.imp().on_click_event.borrow().on_click_event; let click_event = result.imp().on_click_event.borrow().on_click_event;
(click_event)(flowbox.listeners.clone(), flowbox.resetMain.get()); (click_event)(flowbox.listeners.clone(), flowbox.reset_main.get());
}), }),
); );
self_imp self_imp
.resetClose .reset_close
.connect_clicked(clone!(@ weak self as window => move |_| { .connect_clicked(clone!(@ weak self as window => move |_| {
window.close(); window.close();
})); }));
@ -64,22 +64,22 @@ impl ReSetWindow {
pub fn handle_dynamic_sidebar(&self) { pub fn handle_dynamic_sidebar(&self) {
let self_imp = self.imp(); let self_imp = self.imp();
self_imp self_imp
.resetSidebarBreakpoint .reset_sidebar_breakpoint
.set_condition(BreakpointCondition::parse("max-width: 700sp").as_ref().ok()); .set_condition(BreakpointCondition::parse("max-width: 700sp").as_ref().ok());
self_imp.resetSidebarBreakpoint.add_setter( self_imp.reset_sidebar_breakpoint.add_setter(
&Object::from(self_imp.resetOverlaySplitView.get()), &Object::from(self_imp.reset_overlay_split_view.get()),
"collapsed", "collapsed",
&true.to_value(), &true.to_value(),
); );
self_imp.resetSidebarBreakpoint.add_setter( self_imp.reset_sidebar_breakpoint.add_setter(
&Object::from(self_imp.resetSideBarToggle.get()), &Object::from(self_imp.reset_sidebar_toggle.get()),
"visible", "visible",
&true.to_value(), &true.to_value(),
); );
} }
pub fn filter_list(&self) { pub fn filter_list(&self) {
let text = self.imp().resetSearchEntry.text().to_string(); let text = self.imp().reset_search_entry.text().to_string();
for (main_entry, sub_entriess) in self.imp().sidebar_entries.borrow().iter() { for (main_entry, sub_entriess) in self.imp().sidebar_entries.borrow().iter() {
if text.is_empty() { if text.is_empty() {
main_entry.set_visible(true); main_entry.set_visible(true);
@ -117,10 +117,10 @@ impl ReSetWindow {
} }
pub fn toggle_sidebar(&self) { pub fn toggle_sidebar(&self) {
if self.imp().resetOverlaySplitView.shows_sidebar() { if self.imp().reset_overlay_split_view.shows_sidebar() {
self.imp().resetOverlaySplitView.set_show_sidebar(false); self.imp().reset_overlay_split_view.set_show_sidebar(false);
} else { } else {
self.imp().resetOverlaySplitView.set_show_sidebar(true); self.imp().reset_overlay_split_view.set_show_sidebar(true);
} }
} }
@ -227,28 +227,28 @@ impl ReSetWindow {
// )); // ));
self_imp self_imp
.resetSidebarList .reset_sidebar_list
.connect_row_activated(clone!(@ weak self_imp => move |_, _| { .connect_row_activated(clone!(@ weak self_imp => move |_, _| {
self_imp.resetSearchEntry.set_text(""); self_imp.reset_search_entry.set_text("");
})); }));
for (main_entry, sub_entries) in sidebar_entries.iter() { for (main_entry, sub_entries) in sidebar_entries.iter() {
self_imp.resetSidebarList.append(main_entry); self_imp.reset_sidebar_list.append(main_entry);
for sub_entry in sub_entries { for sub_entry in sub_entries {
self_imp.resetSidebarList.append(sub_entry); self_imp.reset_sidebar_list.append(sub_entry);
} }
let separator = ListBoxRow::new(); let separator = ListBoxRow::new();
separator.set_child(Some(&gtk::Separator::new(Orientation::Horizontal))); separator.set_child(Some(&gtk::Separator::new(Orientation::Horizontal)));
separator.set_selectable(false); separator.set_selectable(false);
separator.set_activatable(false); separator.set_activatable(false);
self_imp.resetSidebarList.append(&separator); self_imp.reset_sidebar_list.append(&separator);
} }
} }
pub fn setup_popover_buttons(&self) { pub fn setup_popover_buttons(&self) {
let self_imp = self.imp(); let self_imp = self.imp();
self_imp self_imp
.resetAboutButton .reset_about_button
.connect_clicked(clone!(@ weak self as window => move |_| { .connect_clicked(clone!(@ weak self as window => move |_| {
let dialog = adw::AboutWindow::builder() let dialog = adw::AboutWindow::builder()
.application_name("ReSet") .application_name("ReSet")
@ -265,21 +265,21 @@ impl ReSetWindow {
.developers(vec!["DashieTM".to_string(), "Takotori".to_string()]) .developers(vec!["DashieTM".to_string(), "Takotori".to_string()])
.designers(vec!["DashieTM".to_string(), "Takotori".to_string()]) .designers(vec!["DashieTM".to_string(), "Takotori".to_string()])
.build(); .build();
window.imp().resetPopoverMenu.popdown(); window.imp().reset_popover_menu.popdown();
dialog.present(); dialog.present();
})); }));
self_imp self_imp
.resetPreferenceButton .reset_preference_button
.connect_clicked(clone!(@weak self as window => move |_| { .connect_clicked(clone!(@weak self as window => move |_| {
let preferences = adw::PreferencesWindow::builder().build(); let preferences = adw::PreferencesWindow::builder().build();
window.imp().resetPopoverMenu.popdown(); window.imp().reset_popover_menu.popdown();
preferences.present(); preferences.present();
})); }));
self_imp self_imp
.resetShortcutsButton .reset_shortcuts_button
.connect_clicked(clone!(@weak self as window => move |_| { .connect_clicked(clone!(@weak self as window => move |_| {
let shortcuts = gtk::ShortcutsWindow::builder().build(); let shortcuts = gtk::ShortcutsWindow::builder().build();
window.imp().resetPopoverMenu.popdown(); window.imp().reset_popover_menu.popdown();
shortcuts.present(); shortcuts.present();
})); }));
} }

23
src/components/window/reset_window_impl.rs
View file

@ -13,32 +13,31 @@ use crate::components::wifi::wifi_box::WifiBox;
use crate::components::window::reset_window; use crate::components::window::reset_window;
use crate::components::window::sidebar_entry::SidebarEntry; use crate::components::window::sidebar_entry::SidebarEntry;
#[allow(non_snake_case)]
#[derive(CompositeTemplate, Default)] #[derive(CompositeTemplate, Default)]
#[template(resource = "/org/Xetibo/ReSet/resetMainWindow.ui")] #[template(resource = "/org/Xetibo/ReSet/resetMainWindow.ui")]
pub struct ReSetWindow { pub struct ReSetWindow {
#[template_child] #[template_child]
pub resetMain: TemplateChild<FlowBox>, pub reset_main: TemplateChild<FlowBox>,
#[template_child] #[template_child]
pub resetSidebarBreakpoint: TemplateChild<Breakpoint>, pub reset_sidebar_breakpoint: TemplateChild<Breakpoint>,
#[template_child] #[template_child]
pub resetOverlaySplitView: TemplateChild<OverlaySplitView>, pub reset_overlay_split_view: TemplateChild<OverlaySplitView>,
#[template_child] #[template_child]
pub resetSearchEntry: TemplateChild<SearchEntry>, pub reset_search_entry: TemplateChild<SearchEntry>,
#[template_child] #[template_child]
pub resetSidebarList: TemplateChild<ListBox>, pub reset_sidebar_list: TemplateChild<ListBox>,
#[template_child] #[template_child]
pub resetSideBarToggle: TemplateChild<Button>, pub reset_sidebar_toggle: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetPopoverMenu: TemplateChild<PopoverMenu>, pub reset_popover_menu: TemplateChild<PopoverMenu>,
#[template_child] #[template_child]
pub resetClose: TemplateChild<Button>, pub reset_close: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetAboutButton: TemplateChild<Button>, pub reset_about_button: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetPreferenceButton: TemplateChild<Button>, pub reset_preference_button: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetShortcutsButton: TemplateChild<Button>, pub reset_shortcuts_button: TemplateChild<Button>,
pub sidebar_entries: RefCell<Vec<(SidebarEntry, Vec<SidebarEntry>)>>, pub sidebar_entries: RefCell<Vec<(SidebarEntry, Vec<SidebarEntry>)>>,
pub listeners: Arc<Listeners>, pub listeners: Arc<Listeners>,
} }

4
src/components/window/sidebar_entry.rs
View file

@ -24,9 +24,9 @@ impl SidebarEntry {
) -> Self { ) -> Self {
let entry: SidebarEntry = Object::builder().build(); let entry: SidebarEntry = Object::builder().build();
let entry_imp = entry.imp(); let entry_imp = entry.imp();
entry_imp.resetSidebarLabel.get().set_text(entry_name); entry_imp.reset_sidebar_label.get().set_text(entry_name);
entry_imp entry_imp
.resetSidebarImage .reset_sidebar_image
.set_from_icon_name(Some(icon_name)); .set_from_icon_name(Some(icon_name));
entry_imp.category.set(category); entry_imp.category.set(category);
entry_imp.is_subcategory.set(is_subcategory); entry_imp.is_subcategory.set(is_subcategory);

5
src/components/window/sidebar_entry_impl.rs
View file

@ -18,14 +18,13 @@ pub enum Categories {
Misc, Misc,
} }
#[allow(non_snake_case)]
#[derive(CompositeTemplate, Default)] #[derive(CompositeTemplate, Default)]
#[template(resource = "/org/Xetibo/ReSet/resetSidebarEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetSidebarEntry.ui")]
pub struct SidebarEntry { pub struct SidebarEntry {
#[template_child] #[template_child]
pub resetSidebarLabel: TemplateChild<Label>, pub reset_sidebar_label: TemplateChild<Label>,
#[template_child] #[template_child]
pub resetSidebarImage: TemplateChild<Image>, pub reset_sidebar_image: TemplateChild<Image>,
pub category: Cell<Categories>, pub category: Cell<Categories>,
pub is_subcategory: Cell<bool>, pub is_subcategory: Cell<bool>,
pub on_click_event: RefCell<SidebarAction>, pub on_click_event: RefCell<SidebarAction>,

24
src/resources/resetAudioInput.ui
View file

@ -26,7 +26,7 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwActionRow" id="resetSourceRow"> <object class="AdwActionRow" id="reset_source_row">
<property name="title">Input Devices</property> <property name="title">Input Devices</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -36,7 +36,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow" id="resetCardsRow"> <object class="AdwActionRow" id="reset_cards_row">
<property name="title">Profile Settings</property> <property name="title">Profile Settings</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -46,7 +46,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwComboRow" id="resetSourceDropdown"> <object class="AdwComboRow" id="reset_source_dropdown">
<property name="title">Default Input Device</property> <property name="title">Default Input Device</property>
<property name="use-subtitle">True</property> <property name="use-subtitle">True</property>
</object> </object>
@ -65,14 +65,14 @@
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="margin-top">5</property> <property name="margin-top">5</property>
<child> <child>
<object class="GtkButton" id="resetSourceMute"> <object class="GtkButton" id="reset_source_mute">
<property name="icon-name">audio-input-microphone-symbolic</property> <property name="icon-name">audio-input-microphone-symbolic</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkScale" id="resetVolumeSlider"> <object class="GtkScale" id="reset_volume_slider">
<property name="adjustment"> <property name="adjustment">
<object class="GtkAdjustment"> <object class="GtkAdjustment">
<property name="page-increment">2005.4016</property> <property name="page-increment">2005.4016</property>
@ -89,7 +89,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="resetVolumePercentage"> <object class="GtkLabel" id="reset_volume_percentage">
<property name="label">100%</property> <property name="label">100%</property>
<property name="lines">1</property> <property name="lines">1</property>
<property name="width-request">40</property> <property name="width-request">40</property>
@ -98,7 +98,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkProgressBar" id="resetVolumeMeter"> <object class="GtkProgressBar" id="reset_volume_meter">
<property name="margin-top">5</property> <property name="margin-top">5</property>
</object> </object>
</child> </child>
@ -108,7 +108,7 @@
<object class="GtkSeparator"/> <object class="GtkSeparator"/>
</child> </child>
<child> <child>
<object class="GtkBox" id="resetOutputStreams"> <object class="GtkBox" id="reset_output_streams">
<property name="margin-top">10</property> <property name="margin-top">10</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
@ -133,7 +133,7 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwActionRow" id="resetOutputStreamButton"> <object class="AdwActionRow" id="reset_output_stream_button">
<property name="title">Input Streams</property> <property name="title">Input Streams</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -148,7 +148,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="resetSources"> <object class="GtkBox" id="reset_sources">
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-top">10</property> <property name="margin-top">10</property>
@ -175,7 +175,7 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwActionRow" id="resetInputCardsBackButton"> <object class="AdwActionRow" id="reset_input_cards_back_button">
<property name="title">Input Streams</property> <property name="title">Input Streams</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -193,7 +193,7 @@
<object class="GtkLabel"/> <object class="GtkLabel"/>
</child> </child>
<child> <child>
<object class="AdwPreferencesGroup" id="resetCards"> <object class="AdwPreferencesGroup" id="reset_cards">
<property name="title">Devices</property> <property name="title">Devices</property>
</object> </object>
</child> </child>

24
src/resources/resetAudioOutput.ui
View file

@ -26,7 +26,7 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwActionRow" id="resetSinksRow"> <object class="AdwActionRow" id="reset_sinks_row">
<property name="title">Output Devices</property> <property name="title">Output Devices</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -36,7 +36,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow" id="resetCardsRow"> <object class="AdwActionRow" id="reset_cards_row">
<property name="title">Profile Settings</property> <property name="title">Profile Settings</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -46,7 +46,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwComboRow" id="resetSinkDropdown"> <object class="AdwComboRow" id="reset_sink_dropdown">
<property name="title">Default Output Device</property> <property name="title">Default Output Device</property>
<property name="use-subtitle">True</property> <property name="use-subtitle">True</property>
</object> </object>
@ -65,14 +65,14 @@
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="margin-top">5</property> <property name="margin-top">5</property>
<child> <child>
<object class="GtkButton" id="resetSinkMute"> <object class="GtkButton" id="reset_sink_mute">
<property name="icon-name">audio-volume-high-symbolic</property> <property name="icon-name">audio-volume-high-symbolic</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkScale" id="resetVolumeSlider"> <object class="GtkScale" id="reset_volume_slider">
<property name="adjustment"> <property name="adjustment">
<object class="GtkAdjustment"> <object class="GtkAdjustment">
<property name="page-increment">2005.4016</property> <property name="page-increment">2005.4016</property>
@ -89,7 +89,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="resetVolumePercentage"> <object class="GtkLabel" id="reset_volume_percentage">
<property name="label">100%</property> <property name="label">100%</property>
<property name="lines">1</property> <property name="lines">1</property>
<property name="width-request">40</property> <property name="width-request">40</property>
@ -98,7 +98,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkProgressBar" id="resetVolumeMeter"> <object class="GtkProgressBar" id="reset_volume_meter">
<property name="margin-top">5</property> <property name="margin-top">5</property>
</object> </object>
</child> </child>
@ -108,7 +108,7 @@
<object class="GtkSeparator"/> <object class="GtkSeparator"/>
</child> </child>
<child> <child>
<object class="GtkBox" id="resetInputStreams"> <object class="GtkBox" id="reset_input_streams">
<property name="margin-top">10</property> <property name="margin-top">10</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
@ -133,7 +133,7 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwActionRow" id="resetInputStreamButton"> <object class="AdwActionRow" id="reset_input_stream_button">
<property name="title">Output Streams</property> <property name="title">Output Streams</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -151,7 +151,7 @@
<object class="GtkLabel"/> <object class="GtkLabel"/>
</child> </child>
<child> <child>
<object class="GtkBox" id="resetSinks"> <object class="GtkBox" id="reset_sinks">
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-top">10</property> <property name="margin-top">10</property>
@ -178,7 +178,7 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwActionRow" id="resetInputCardsBackButton"> <object class="AdwActionRow" id="reset_input_cards_back_button">
<property name="title">Output Streams</property> <property name="title">Output Streams</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -196,7 +196,7 @@
<object class="GtkLabel"/> <object class="GtkLabel"/>
</child> </child>
<child> <child>
<object class="AdwPreferencesGroup" id="resetCards"> <object class="AdwPreferencesGroup" id="reset_cards">
<property name="title">Devices</property> <property name="title">Devices</property>
</object> </object>
</child> </child>

16
src/resources/resetBluetooth.ui
View file

@ -17,7 +17,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSwitch" id="resetBluetoothSwitch"> <object class="GtkSwitch" id="reset_bluetooth_switch">
<property name="active">True</property> <property name="active">True</property>
<property name="halign">end</property> <property name="halign">end</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
@ -37,14 +37,14 @@
<object class="GtkBox"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="AdwPreferencesGroup" id="resetBluetoothDetails"> <object class="AdwPreferencesGroup" id="reset_bluetooth_details">
<child> <child>
<object class="AdwComboRow" id="resetBluetoothAdapter"> <object class="AdwComboRow" id="reset_bluetooth_adapter">
<property name="title">Bluetooth Adapter</property> <property name="title">Bluetooth Adapter</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow" id="resetVisibility"> <object class="AdwActionRow" id="reset_visibility">
<property name="title">Visibility Settings</property> <property name="title">Visibility Settings</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -61,7 +61,7 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<property name="header-suffix"> <property name="header-suffix">
<object class="GtkButton" id="resetBluetoothRefreshButton"> <object class="GtkButton" id="reset_bluetooth_refresh_button">
<property name="icon-name">view-refresh-symbolic</property> <property name="icon-name">view-refresh-symbolic</property>
</object> </object>
</property> </property>
@ -74,7 +74,7 @@
<child> <child>
<object class="GtkViewport"> <object class="GtkViewport">
<child> <child>
<object class="GtkBox" id="resetBluetoothAvailableDevices"> <object class="GtkBox" id="reset_bluetooth_available_devices">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
</object> </object>
</child> </child>
@ -94,7 +94,7 @@
<child> <child>
<object class="GtkViewport"> <object class="GtkViewport">
<child> <child>
<object class="GtkBox" id="resetBluetoothConnectedDevices"> <object class="GtkBox" id="reset_bluetooth_connected_devices">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
</object> </object>
</child> </child>
@ -125,7 +125,7 @@
<property name="show-separators">True</property> <property name="show-separators">True</property>
<property name="valign">start</property> <property name="valign">start</property>
<child> <child>
<object class="resetListBoxRow" id="resetBluetoothMainTab"> <object class="resetListBoxRow" id="reset_bluetooth_main_tab">
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="height-request">40</property> <property name="height-request">40</property>

8
src/resources/resetBluetoothEntry.ui
View file

@ -5,7 +5,7 @@
<template class="resetBluetoothEntry" parent="GtkBox"> <template class="resetBluetoothEntry" parent="GtkBox">
<property name="margin-start">5</property> <property name="margin-start">5</property>
<child> <child>
<object class="GtkImage" id="resetBluetoothDeviceType"> <object class="GtkImage" id="reset_bluetooth_device_type">
<property name="icon-name">input-mouse-symbolic</property> <property name="icon-name">input-mouse-symbolic</property>
<property name="margin-end">15</property> <property name="margin-end">15</property>
</object> </object>
@ -14,7 +14,7 @@
<object class="GtkBox"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel" id="resetBluetoothLabel"> <object class="GtkLabel" id="reset_bluetooth_label">
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="hexpand-set">True</property> <property name="hexpand-set">True</property>
@ -28,7 +28,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="resetBluetoothAddress"> <object class="GtkLabel" id="reset_bluetooth_address">
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="label">LoremIpsum Wireless Mouse</property> <property name="label">LoremIpsum Wireless Mouse</property>
@ -42,7 +42,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetBluetoothButton"> <object class="GtkButton" id="reset_bluetooth_button">
<property name="has-frame">False</property> <property name="has-frame">False</property>
<property name="icon-name">emblem-system-symbolic</property> <property name="icon-name">emblem-system-symbolic</property>
</object> </object>

2
src/resources/resetCardEntry.ui
View file

@ -2,7 +2,7 @@
<!-- Created with Cambalache 0.17.0 --> <!-- Created with Cambalache 0.17.0 -->
<interface> <interface>
<requires lib="libadwaita" version="1.4"/> <requires lib="libadwaita" version="1.4"/>
<object class="AdwComboRow" id="resetCardEntry"> <object class="AdwComboRow" id="reset_card_entry">
<property name="use-subtitle">True</property> <property name="use-subtitle">True</property>
</object> </object>
</interface> </interface>

10
src/resources/resetInputStreamEntry.ui
View file

@ -11,7 +11,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwComboRow" id="resetSinkSelection"> <object class="AdwComboRow" id="reset_sink_selection">
<property name="css-classes">audioRow</property> <property name="css-classes">audioRow</property>
<property name="title">asadf</property> <property name="title">asadf</property>
<property name="use-subtitle">True</property> <property name="use-subtitle">True</property>
@ -27,14 +27,14 @@
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="margin-top">5</property> <property name="margin-top">5</property>
<child> <child>
<object class="GtkButton" id="resetSinkMute"> <object class="GtkButton" id="reset_sink_mute">
<property name="icon-name">audio-input-microphone-symbolic</property> <property name="icon-name">audio-input-microphone-symbolic</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkScale" id="resetVolumeSlider"> <object class="GtkScale" id="reset_volume_slider">
<property name="adjustment"> <property name="adjustment">
<object class="GtkAdjustment"> <object class="GtkAdjustment">
<property name="page-increment">2005.4016</property> <property name="page-increment">2005.4016</property>
@ -51,7 +51,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="resetVolumePercentage"> <object class="GtkLabel" id="reset_volume_percentage">
<property name="label">100%</property> <property name="label">100%</property>
<property name="lines">1</property> <property name="lines">1</property>
<property name="width-request">40</property> <property name="width-request">40</property>
@ -60,7 +60,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkProgressBar" id="resetVolumeMeter"> <object class="GtkProgressBar" id="reset_volume_meter">
<property name="margin-top">5</property> <property name="margin-top">5</property>
</object> </object>
</child> </child>

22
src/resources/resetMainWindow.ui
View file

@ -12,7 +12,7 @@
<object class="GtkWindowHandle"/> <object class="GtkWindowHandle"/>
</child> </child>
<child> <child>
<object class="AdwOverlaySplitView" id="resetOverlaySplitView"> <object class="AdwOverlaySplitView" id="reset_overlay_split_view">
<property name="content"> <property name="content">
<object class="GtkBox"> <object class="GtkBox">
<property name="margin-end">5</property> <property name="margin-end">5</property>
@ -25,7 +25,7 @@
<object class="GtkBox"> <object class="GtkBox">
<property name="valign">start</property> <property name="valign">start</property>
<child> <child>
<object class="GtkButton" id="resetSideBarToggle"> <object class="GtkButton" id="reset_sidebar_toggle">
<property name="icon-name">sidebar-show-symbolic</property> <property name="icon-name">sidebar-show-symbolic</property>
<property name="visible">False</property> <property name="visible">False</property>
</object> </object>
@ -39,24 +39,24 @@
<property name="hexpand-set">True</property> <property name="hexpand-set">True</property>
<property name="icon-name">open-menu-symbolic</property> <property name="icon-name">open-menu-symbolic</property>
<property name="popover"> <property name="popover">
<object class="GtkPopoverMenu" id="resetPopoverMenu"> <object class="GtkPopoverMenu" id="reset_popover_menu">
<property name="child"> <property name="child">
<object class="GtkBox"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkButton" id="resetShortcutsButton"> <object class="GtkButton" id="reset_shortcuts_button">
<property name="has-frame">False</property> <property name="has-frame">False</property>
<property name="label">Shortcuts</property> <property name="label">Shortcuts</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetPreferenceButton"> <object class="GtkButton" id="reset_preference_button">
<property name="has-frame">False</property> <property name="has-frame">False</property>
<property name="label">Preferences</property> <property name="label">Preferences</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetAboutButton"> <object class="GtkButton" id="reset_about_button">
<property name="has-frame">False</property> <property name="has-frame">False</property>
<property name="label">About</property> <property name="label">About</property>
</object> </object>
@ -70,7 +70,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetClose"> <object class="GtkButton" id="reset_close">
<property name="css-classes">resetClose</property> <property name="css-classes">resetClose</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="has-frame">False</property> <property name="has-frame">False</property>
@ -88,7 +88,7 @@
<child> <child>
<object class="GtkViewport"> <object class="GtkViewport">
<child> <child>
<object class="GtkFlowBox" id="resetMain"> <object class="GtkFlowBox" id="reset_main">
<property name="column-spacing">25</property> <property name="column-spacing">25</property>
<property name="halign">center</property> <property name="halign">center</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
@ -117,7 +117,7 @@
<object class="GtkWindowHandle"> <object class="GtkWindowHandle">
<property name="valign">start</property> <property name="valign">start</property>
<child> <child>
<object class="GtkSearchEntry" id="resetSearchEntry"> <object class="GtkSearchEntry" id="reset_search_entry">
<property name="placeholder-text">Search</property> <property name="placeholder-text">Search</property>
<property name="valign">start</property> <property name="valign">start</property>
</object> </object>
@ -131,7 +131,7 @@
<child> <child>
<object class="GtkViewport"> <object class="GtkViewport">
<child> <child>
<object class="GtkListBox" id="resetSidebarList"> <object class="GtkListBox" id="reset_sidebar_list">
<property name="css-name">resetList</property> <property name="css-name">resetList</property>
<property name="width-request">150</property> <property name="width-request">150</property>
<style> <style>
@ -150,7 +150,7 @@
</child> </child>
<!-- Custom fragments --> <!-- Custom fragments -->
<child> <child>
<object id="resetSidebarBreakpoint" class="AdwBreakpoint"> <object id="reset_sidebar_breakpoint" class="AdwBreakpoint">
</object> </object>
</child> </child>
</template> </template>

10
src/resources/resetOutputStreamEntry.ui
View file

@ -10,7 +10,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwComboRow" id="resetSourceSelection"> <object class="AdwComboRow" id="reset_source_selection">
<property name="css-classes">audioRow</property> <property name="css-classes">audioRow</property>
<property name="title">asadf</property> <property name="title">asadf</property>
<property name="use-subtitle">True</property> <property name="use-subtitle">True</property>
@ -26,14 +26,14 @@
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="margin-top">5</property> <property name="margin-top">5</property>
<child> <child>
<object class="GtkButton" id="resetSourceMute"> <object class="GtkButton" id="reset_source_mute">
<property name="icon-name">audio-input-microphone-symbolic</property> <property name="icon-name">audio-input-microphone-symbolic</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkScale" id="resetVolumeSlider"> <object class="GtkScale" id="reset_volume_slider">
<property name="adjustment"> <property name="adjustment">
<object class="GtkAdjustment"> <object class="GtkAdjustment">
<property name="page-increment">2005.4016</property> <property name="page-increment">2005.4016</property>
@ -50,7 +50,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="resetVolumePercentage"> <object class="GtkLabel" id="reset_volume_percentage">
<property name="label">100%</property> <property name="label">100%</property>
<property name="lines">1</property> <property name="lines">1</property>
<property name="width-request">40</property> <property name="width-request">40</property>
@ -59,7 +59,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkProgressBar" id="resetVolumeMeter"> <object class="GtkProgressBar" id="reset_volume_meter">
<property name="margin-top">5</property> <property name="margin-top">5</property>
</object> </object>
</child> </child>

6
src/resources/resetPopup.ui
View file

@ -8,14 +8,14 @@
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel" id="resetPopupLabel"> <object class="GtkLabel" id="reset_popup_label">
<property name="visible">False</property> <property name="visible">False</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<child> <child>
<object class="GtkPasswordEntry" id="resetPopupEntry"> <object class="GtkPasswordEntry" id="reset_popup_entry">
<property name="activates-default">True</property> <property name="activates-default">True</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
@ -26,7 +26,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetPopupButton"> <object class="GtkButton" id="reset_popup_button">
<property name="label">connect</property> <property name="label">connect</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>

6
src/resources/resetSavedWifiEntry.ui
View file

@ -8,7 +8,7 @@
<property name="child"> <property name="child">
<object class="GtkBox"> <object class="GtkBox">
<child> <child>
<object class="GtkLabel" id="resetSavedWifiLabel"> <object class="GtkLabel" id="reset_saved_wifi_label">
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="label">LoremIpsumInternet</property> <property name="label">LoremIpsumInternet</property>
@ -19,7 +19,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetEditSavedWifiButton"> <object class="GtkButton" id="reset_edit_saved_wifi_button">
<property name="halign">end</property> <property name="halign">end</property>
<property name="has-frame">False</property> <property name="has-frame">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
@ -27,7 +27,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetDeleteSavedWifiButton"> <object class="GtkButton" id="reset_delete_saved_wifi_button">
<property name="halign">start</property> <property name="halign">start</property>
<property name="has-frame">False</property> <property name="has-frame">False</property>
<property name="icon-name">user-trash-symbolic</property> <property name="icon-name">user-trash-symbolic</property>

4
src/resources/resetSidebarEntry.ui
View file

@ -9,12 +9,12 @@
<property name="margin-start">10</property> <property name="margin-start">10</property>
<property name="margin-top">10</property> <property name="margin-top">10</property>
<child> <child>
<object class="GtkImage" id="resetSidebarImage"> <object class="GtkImage" id="reset_sidebar_image">
<property name="margin-end">10</property> <property name="margin-end">10</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="resetSidebarLabel"/> <object class="GtkLabel" id="reset_sidebar_label"/>
</child> </child>
</object> </object>
</property> </property>

12
src/resources/resetSinkEntry.ui
View file

@ -5,12 +5,12 @@
<requires lib="libadwaita" version="1.3"/> <requires lib="libadwaita" version="1.3"/>
<template class="resetSinkEntry" parent="AdwPreferencesGroup"> <template class="resetSinkEntry" parent="AdwPreferencesGroup">
<child> <child>
<object class="AdwActionRow" id="resetSinkName"> <object class="AdwActionRow" id="reset_sink_name">
<property name="css-classes">audioRow</property> <property name="css-classes">audioRow</property>
<property name="title">aaaaaaaaaaaaaaa</property> <property name="title">aaaaaaaaaaaaaaa</property>
<property name="title-lines">3</property> <property name="title-lines">3</property>
<child> <child>
<object class="GtkCheckButton" id="resetSelectedSink"> <object class="GtkCheckButton" id="reset_selected_sink">
<property name="halign">end</property> <property name="halign">end</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="hexpand-set">True</property> <property name="hexpand-set">True</property>
@ -28,14 +28,14 @@
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="margin-top">5</property> <property name="margin-top">5</property>
<child> <child>
<object class="GtkButton" id="resetSinkMute"> <object class="GtkButton" id="reset_sink_mute">
<property name="icon-name">audio-input-microphone-symbolic</property> <property name="icon-name">audio-input-microphone-symbolic</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkScale" id="resetVolumeSlider"> <object class="GtkScale" id="reset_volume_slider">
<property name="adjustment"> <property name="adjustment">
<object class="GtkAdjustment"> <object class="GtkAdjustment">
<property name="page-increment">2005.4016</property> <property name="page-increment">2005.4016</property>
@ -52,7 +52,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="resetVolumePercentage"> <object class="GtkLabel" id="reset_volume_percentage">
<property name="label">100%</property> <property name="label">100%</property>
<property name="lines">1</property> <property name="lines">1</property>
<property name="width-request">40</property> <property name="width-request">40</property>
@ -61,7 +61,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkProgressBar" id="resetVolumeMeter"> <object class="GtkProgressBar" id="reset_volume_meter">
<property name="margin-top">5</property> <property name="margin-top">5</property>
</object> </object>
</child> </child>

12
src/resources/resetSourceEntry.ui
View file

@ -5,12 +5,12 @@
<requires lib="libadwaita" version="1.3"/> <requires lib="libadwaita" version="1.3"/>
<template class="resetSourceEntry" parent="AdwPreferencesGroup"> <template class="resetSourceEntry" parent="AdwPreferencesGroup">
<child> <child>
<object class="AdwActionRow" id="resetSourceName"> <object class="AdwActionRow" id="reset_source_name">
<property name="css-classes">audioRow</property> <property name="css-classes">audioRow</property>
<property name="title">text</property> <property name="title">text</property>
<property name="title-lines">3</property> <property name="title-lines">3</property>
<child> <child>
<object class="GtkCheckButton" id="resetSelectedSource"> <object class="GtkCheckButton" id="reset_selected_source">
<property name="halign">end</property> <property name="halign">end</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="hexpand-set">True</property> <property name="hexpand-set">True</property>
@ -28,14 +28,14 @@
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="margin-top">5</property> <property name="margin-top">5</property>
<child> <child>
<object class="GtkButton" id="resetSourceMute"> <object class="GtkButton" id="reset_source_mute">
<property name="icon-name">audio-input-microphone-symbolic</property> <property name="icon-name">audio-input-microphone-symbolic</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkScale" id="resetVolumeSlider"> <object class="GtkScale" id="reset_volume_slider">
<property name="adjustment"> <property name="adjustment">
<object class="GtkAdjustment"> <object class="GtkAdjustment">
<property name="page-increment">2005.4016</property> <property name="page-increment">2005.4016</property>
@ -52,7 +52,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="resetVolumePercentage"> <object class="GtkLabel" id="reset_volume_percentage">
<property name="label">100%</property> <property name="label">100%</property>
<property name="lines">1</property> <property name="lines">1</property>
<property name="width-request">40</property> <property name="width-request">40</property>
@ -61,7 +61,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkProgressBar" id="resetVolumeMeter"> <object class="GtkProgressBar" id="reset_volume_meter">
<property name="margin-top">5</property> <property name="margin-top">5</property>
</object> </object>
</child> </child>

258
src/resources/resetUI.cmb
View file

@ -29,70 +29,70 @@
(21,"libadwaita","1.4",None) (21,"libadwaita","1.4",None)
</ui_library> </ui_library>
<object> <object>
(3,1,"AdwApplicationWindow","resetUI",None,None,None,None,-1," &lt;child&gt;\n &lt;object id=\"resetSidebarBreakpoint\" class=\"AdwBreakpoint\"&gt;\n &lt;/object&gt;\n &lt;/child&gt;"), (3,1,"AdwApplicationWindow","resetUI",None,None,None,None,-1," &lt;child&gt;\n &lt;object id=\"reset_sidebar_breakpoint\" class=\"AdwBreakpoint\"&gt;\n &lt;/object&gt;\n &lt;/child&gt;"),
(3,2,"AdwOverlaySplitView","resetOverlaySplitView",1,None,None,None,2,""), (3,2,"AdwOverlaySplitView","reset_overlay_split_view",1,None,None,None,2,""),
(3,3,"GtkBox",None,2,None,None,None,None,None), (3,3,"GtkBox",None,2,None,None,None,None,None),
(3,17,"GtkWindowHandle",None,1,None,None,None,1,None), (3,17,"GtkWindowHandle",None,1,None,None,None,1,None),
(3,18,"GtkBox",None,2,None,None,None,-1,None), (3,18,"GtkBox",None,2,None,None,None,-1,None),
(3,19,"GtkWindowHandle",None,18,None,None,None,None,None), (3,19,"GtkWindowHandle",None,18,None,None,None,None,None),
(3,20,"GtkSearchEntry","resetSearchEntry",19,None,None,None,None,None), (3,20,"GtkSearchEntry","reset_search_entry",19,None,None,None,None,None),
(3,24,"GtkWindowHandle",None,3,None,None,None,None,None), (3,24,"GtkWindowHandle",None,3,None,None,None,None,None),
(3,25,"GtkBox",None,24,None,None,None,None,None), (3,25,"GtkBox",None,24,None,None,None,None,None),
(3,26,"GtkButton","resetSideBarToggle",25,None,None,None,None,None), (3,26,"GtkButton","reset_sidebar_toggle",25,None,None,None,None,None),
(3,31,"GtkButton","resetClose",25,None,None,None,2,None), (3,31,"GtkButton","reset_close",25,None,None,None,2,None),
(3,33,"GtkMenuButton",None,25,None,None,None,1,None), (3,33,"GtkMenuButton",None,25,None,None,None,1,None),
(3,35,"GtkPopoverMenu","resetPopoverMenu",33,None,None,None,-1,None), (3,35,"GtkPopoverMenu","reset_popover_menu",33,None,None,None,-1,None),
(3,36,"GtkBox",None,35,None,None,None,-1,None), (3,36,"GtkBox",None,35,None,None,None,-1,None),
(3,38,"GtkButton","resetPreferenceButton",36,None,None,None,1,None), (3,38,"GtkButton","reset_preference_button",36,None,None,None,1,None),
(3,39,"GtkButton","resetAboutButton",36,None,None,None,2,None), (3,39,"GtkButton","reset_about_button",36,None,None,None,2,None),
(3,40,"GtkScrolledWindow",None,18,None,None,None,1,None), (3,40,"GtkScrolledWindow",None,18,None,None,None,1,None),
(3,41,"GtkViewport",None,40,None,None,None,None,None), (3,41,"GtkViewport",None,40,None,None,None,None,None),
(3,42,"GtkListBox","resetSidebarList",41,None,None,None,None,None), (3,42,"GtkListBox","reset_sidebar_list",41,None,None,None,None,None),
(3,43,"GtkScrolledWindow",None,3,None,None,None,1,None), (3,43,"GtkScrolledWindow",None,3,None,None,None,1,None),
(3,44,"GtkViewport",None,43,None,None,None,None,None), (3,44,"GtkViewport",None,43,None,None,None,None,None),
(3,45,"GtkFlowBox","resetMain",44,None,None,None,None,None), (3,45,"GtkFlowBox","reset_main",44,None,None,None,None,None),
(3,51,"GtkButton","resetShortcutsButton",36,None,None,None,None,None), (3,51,"GtkButton","reset_shortcuts_button",36,None,None,None,None,None),
(4,7,"GtkBox","resetWifi",None,None,None,None,None,None), (4,7,"GtkBox","resetWifi",None,None,None,None,None,None),
(4,152,"AdwNavigationView","resetWifiNavigation",7,None,None,None,1,None), (4,152,"AdwNavigationView","reset_wifi_navigation",7,None,None,None,1,None),
(4,153,"AdwNavigationPage",None,152,None,None,None,None,None), (4,153,"AdwNavigationPage",None,152,None,None,None,None,None),
(4,154,"GtkBox",None,153,None,None,None,1,None), (4,154,"GtkBox",None,153,None,None,None,1,None),
(4,174,"AdwNavigationPage",None,152,None,None,None,2,None), (4,174,"AdwNavigationPage",None,152,None,None,None,2,None),
(4,175,"GtkBox",None,174,None,None,None,None,None), (4,175,"GtkBox",None,174,None,None,None,None,None),
(4,182,"GtkBox",None,7,None,None,None,None,None), (4,182,"GtkBox",None,7,None,None,None,None,None),
(4,183,"GtkLabel",None,182,None,None,None,None,None), (4,183,"GtkLabel",None,182,None,None,None,None,None),
(4,184,"GtkSwitch","resetWifiSwitch",182,None,None,None,1,None), (4,184,"GtkSwitch","reset_wifi_switch",182,None,None,None,1,None),
(4,199,"AdwPreferencesGroup","resetWifiDetails",154,None,None,None,None,None), (4,199,"AdwPreferencesGroup","reset_wifi_details",154,None,None,None,None,None),
(4,200,"AdwComboRow","resetWiFiDevice",199,None,None,None,-1,None), (4,200,"AdwComboRow","reset_wifi_device",199,None,None,None,-1,None),
(4,201,"AdwActionRow","resetSavedNetworks",199,None,None,None,-1,None), (4,201,"AdwActionRow","reset_saved_networks",199,None,None,None,-1,None),
(4,202,"GtkImage",None,201,None,None,None,None,None), (4,202,"GtkImage",None,201,None,None,None,None,None),
(4,204,"AdwPreferencesGroup","resetStoredWifiList",175,None,None,None,2,None), (4,204,"AdwPreferencesGroup","reset_stored_wifi_list",175,None,None,None,2,None),
(4,205,"AdwPreferencesGroup",None,175,None,None,None,None,None), (4,205,"AdwPreferencesGroup",None,175,None,None,None,None,None),
(4,206,"AdwActionRow","resetAvailableNetworks",205,None,None,None,-1,None), (4,206,"AdwActionRow","reset_available_networks",205,None,None,None,-1,None),
(4,207,"GtkImage",None,206,None,None,None,None,None), (4,207,"GtkImage",None,206,None,None,None,None,None),
(4,208,"AdwPreferencesGroup","resetWifiList",154,None,None,None,1,None), (4,208,"AdwPreferencesGroup","reset_wifi_list",154,None,None,None,1,None),
(5,12,"AdwActionRow","resetWifiEntry",None,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,13,"GtkBox",None,12,None,None,None,None,None),
(5,14,"GtkBox",None,13,None,None,None,None,None), (5,14,"GtkBox",None,13,None,None,None,None,None),
(5,15,"GtkImage","resetWifiStrength",14,None,None,None,None,None), (5,15,"GtkImage","reset_wifi_strength",14,None,None,None,None,None),
(5,16,"GtkImage","resetWifiEncrypted",14,None,None,None,1,None), (5,16,"GtkImage","reset_wifi_encrypted",14,None,None,None,1,None),
(5,18,"GtkLabel","resetWifiLabel",13,None,None,None,1,None), (5,18,"GtkLabel","reset_wifi_label",13,None,None,None,1,None),
(5,20,"GtkButton","resetWifiEditButton",13,None,None,None,3,None), (5,20,"GtkButton","reset_wifi_edit_button",13,None,None,None,3,None),
(5,21,"resetPopup","resetWifiPopup",13,None,None,None,4,None), (5,21,"resetPopup","reset_wifi_popup",13,None,None,None,4,None),
(5,22,"GtkLabel","resetWifiConnected",13,None,None,None,2,None), (5,22,"GtkLabel","reset_wifi_connected",13,None,None,None,2,None),
(6,1,"GtkListBoxRow","resetSidebarEntry",None,None,None,None,None,None), (6,1,"GtkListBoxRow","resetSidebarEntry",None,None,None,None,None,None),
(6,2,"GtkBox",None,1,None,None,None,-1,None), (6,2,"GtkBox",None,1,None,None,None,-1,None),
(6,6,"GtkImage","resetSidebarImage",2,None,None,None,None,None), (6,6,"GtkImage","reset_sidebar_image",2,None,None,None,None,None),
(6,7,"GtkLabel","resetSidebarLabel",2,None,None,None,1,None), (6,7,"GtkLabel","reset_sidebar_label",2,None,None,None,1,None),
(7,14,"AdwPreferencesGroup","resetInputStreamEntry",None,None,None,None,None,None), (7,14,"AdwPreferencesGroup","resetInputStreamEntry",None,None,None,None,None,None),
(7,15,"AdwComboRow","resetSinkSelection",14,None,None,None,None,None), (7,15,"AdwComboRow","reset_sink_selection",14,None,None,None,None,None),
(7,16,"AdwActionRow",None,14,None,None,None,1,None), (7,16,"AdwActionRow",None,14,None,None,None,1,None),
(7,17,"GtkBox",None,16,None,None,None,None,None), (7,17,"GtkBox",None,16,None,None,None,None,None),
(7,18,"GtkBox",None,17,None,None,None,None,None), (7,18,"GtkBox",None,17,None,None,None,None,None),
(7,19,"GtkButton","resetSinkMute",18,None,None,None,None,None), (7,19,"GtkButton","reset_sink_mute",18,None,None,None,None,None),
(7,20,"GtkScale","resetVolumeSlider",18,None,None,None,1,None), (7,20,"GtkScale","reset_volume_slider",18,None,None,None,1,None),
(7,21,"GtkAdjustment",None,20,None,None,None,None,None), (7,21,"GtkAdjustment",None,20,None,None,None,None,None),
(7,22,"GtkLabel","resetVolumePercentage",18,None,None,None,2,None), (7,22,"GtkLabel","reset_volume_percentage",18,None,None,None,2,None),
(7,23,"GtkProgressBar","resetVolumeMeter",17,None,None,None,1,None), (7,23,"GtkProgressBar","reset_volume_meter",17,None,None,None,1,None),
(7,24,"GtkSeparator",None,14,None,None,None,-1,None), (7,24,"GtkSeparator",None,14,None,None,None,-1,None),
(8,1,"GtkBox","resetAudioOutput",None,None,None,None,None,None), (8,1,"GtkBox","resetAudioOutput",None,None,None,None,None,None),
(8,53,"GtkLabel",None,1,None,None,None,None,None), (8,53,"GtkLabel",None,1,None,None,None,None,None),
@ -102,34 +102,34 @@
(8,71,"AdwNavigationPage",None,54,None,None,None,1,None), (8,71,"AdwNavigationPage",None,54,None,None,None,1,None),
(8,72,"GtkBox",None,71,None,None,None,None,None), (8,72,"GtkBox",None,71,None,None,None,None,None),
(8,81,"GtkLabel",None,72,None,None,None,2,None), (8,81,"GtkLabel",None,72,None,None,None,2,None),
(8,85,"GtkBox","resetInputStreams",56,None,None,None,4,None), (8,85,"GtkBox","reset_input_streams",56,None,None,None,4,None),
(8,86,"GtkLabel",None,85,None,None,None,None,None), (8,86,"GtkLabel",None,85,None,None,None,None,None),
(8,89,"GtkBox","resetSinks",72,None,None,None,3,None), (8,89,"GtkBox","reset_sinks",72,None,None,None,3,None),
(8,90,"GtkLabel",None,89,None,None,None,None,None), (8,90,"GtkLabel",None,89,None,None,None,None,None),
(8,93,"GtkBox",None,56,None,None,None,2,None), (8,93,"GtkBox",None,56,None,None,None,2,None),
(8,97,"GtkBox",None,93,None,None,None,None,None), (8,97,"GtkBox",None,93,None,None,None,None,None),
(8,98,"GtkButton","resetSinkMute",97,None,None,None,None,None), (8,98,"GtkButton","reset_sink_mute",97,None,None,None,None,None),
(8,99,"GtkScale","resetVolumeSlider",97,None,None,None,1,None), (8,99,"GtkScale","reset_volume_slider",97,None,None,None,1,None),
(8,101,"GtkLabel","resetVolumePercentage",97,None,None,None,2,None), (8,101,"GtkLabel","reset_volume_percentage",97,None,None,None,2,None),
(8,102,"GtkProgressBar","resetVolumeMeter",93,None,None,None,1,None), (8,102,"GtkProgressBar","reset_volume_meter",93,None,None,None,1,None),
(8,103,"GtkSeparator",None,56,None,None,None,3,None), (8,103,"GtkSeparator",None,56,None,None,None,3,None),
(8,115,"GtkAdjustment",None,99,None,None,None,-1,None), (8,115,"GtkAdjustment",None,99,None,None,None,-1,None),
(8,116,"AdwNavigationPage",None,54,None,None,None,2,None), (8,116,"AdwNavigationPage",None,54,None,None,None,2,None),
(8,117,"GtkBox",None,116,None,None,None,None,None), (8,117,"GtkBox",None,116,None,None,None,None,None),
(8,123,"GtkLabel",None,117,None,None,None,2,None), (8,123,"GtkLabel",None,117,None,None,None,2,None),
(8,130,"AdwPreferencesGroup",None,56,None,None,None,None,None), (8,130,"AdwPreferencesGroup",None,56,None,None,None,None,None),
(8,132,"AdwActionRow","resetSinksRow",130,None,None,None,1,None), (8,132,"AdwActionRow","reset_sinks_row",130,None,None,None,1,None),
(8,133,"GtkImage",None,132,None,None,None,None,None), (8,133,"GtkImage",None,132,None,None,None,None,None),
(8,134,"AdwActionRow","resetCardsRow",130,None,None,None,2,None), (8,134,"AdwActionRow","reset_cards_row",130,None,None,None,2,None),
(8,135,"GtkImage",None,134,None,None,None,None,None), (8,135,"GtkImage",None,134,None,None,None,None,None),
(8,137,"AdwComboRow","resetSinkDropdown",130,None,None,None,2,None), (8,137,"AdwComboRow","reset_sink_dropdown",130,None,None,None,2,None),
(8,138,"AdwPreferencesGroup",None,72,None,None,None,None,None), (8,138,"AdwPreferencesGroup",None,72,None,None,None,None,None),
(8,139,"AdwActionRow","resetInputStreamButton",138,None,None,None,None,None), (8,139,"AdwActionRow","reset_input_stream_button",138,None,None,None,None,None),
(8,140,"GtkImage",None,139,None,None,None,None,None), (8,140,"GtkImage",None,139,None,None,None,None,None),
(8,141,"AdwPreferencesGroup",None,117,None,None,None,None,None), (8,141,"AdwPreferencesGroup",None,117,None,None,None,None,None),
(8,142,"AdwActionRow","resetInputCardsBackButton",141,None,None,None,None,None), (8,142,"AdwActionRow","reset_input_cards_back_button",141,None,None,None,None,None),
(8,143,"GtkImage",None,142,None,None,None,None,None), (8,143,"GtkImage",None,142,None,None,None,None,None),
(8,144,"AdwPreferencesGroup","resetCards",117,None,None,None,2,None), (8,144,"AdwPreferencesGroup","reset_cards",117,None,None,None,2,None),
(10,1,"GtkBox","resetBluetooth",None,None,None,None,None,None), (10,1,"GtkBox","resetBluetooth",None,None,None,None,None,None),
(10,119,"AdwNavigationView",None,1,None,None,None,1,None), (10,119,"AdwNavigationView",None,1,None,None,None,1,None),
(10,120,"AdwNavigationPage",None,119,None,None,None,None,None), (10,120,"AdwNavigationPage",None,119,None,None,None,None,None),
@ -137,33 +137,33 @@
(10,138,"AdwNavigationPage",None,119,None,None,None,1,None), (10,138,"AdwNavigationPage",None,119,None,None,None,1,None),
(10,142,"GtkBox",None,1,None,None,None,None,None), (10,142,"GtkBox",None,1,None,None,None,None,None),
(10,143,"GtkLabel",None,142,None,None,None,None,None), (10,143,"GtkLabel",None,142,None,None,None,None,None),
(10,144,"GtkSwitch","resetBluetoothSwitch",142,None,None,None,1,None), (10,144,"GtkSwitch","reset_bluetooth_switch",142,None,None,None,1,None),
(10,153,"GtkBox",None,138,None,None,None,None,None), (10,153,"GtkBox",None,138,None,None,None,None,None),
(10,154,"GtkListBox",None,153,None,None,None,None,None), (10,154,"GtkListBox",None,153,None,None,None,None,None),
(10,155,"resetListBoxRow","resetBluetoothMainTab",154,None,None,None,None,None), (10,155,"resetListBoxRow","reset_bluetooth_main_tab",154,None,None,None,None,None),
(10,156,"GtkBox",None,155,None,None,None,None,None), (10,156,"GtkBox",None,155,None,None,None,None,None),
(10,157,"GtkLabel",None,156,None,None,None,None,None), (10,157,"GtkLabel",None,156,None,None,None,None,None),
(10,158,"GtkImage",None,156,None,None,None,1,None), (10,158,"GtkImage",None,156,None,None,None,1,None),
(10,159,"GtkLabel",None,153,None,None,None,1,None), (10,159,"GtkLabel",None,153,None,None,None,1,None),
(10,172,"AdwPreferencesGroup","resetBluetoothDetails",121,None,None,None,None,None), (10,172,"AdwPreferencesGroup","reset_bluetooth_details",121,None,None,None,None,None),
(10,173,"AdwComboRow","resetBluetoothAdapter",172,None,None,None,None,None), (10,173,"AdwComboRow","reset_bluetooth_adapter",172,None,None,None,None,None),
(10,174,"AdwActionRow","resetVisibility",172,None,None,None,1,None), (10,174,"AdwActionRow","reset_visibility",172,None,None,None,1,None),
(10,175,"GtkImage",None,174,None,None,None,None,None), (10,175,"GtkImage",None,174,None,None,None,None,None),
(10,176,"AdwPreferencesGroup",None,121,None,None,None,1,None), (10,176,"AdwPreferencesGroup",None,121,None,None,None,1,None),
(10,177,"GtkButton","resetBluetoothRefreshButton",176,None,None,None,None,None), (10,177,"GtkButton","reset_bluetooth_refresh_button",176,None,None,None,None,None),
(10,178,"GtkScrolledWindow",None,176,None,None,None,None,None), (10,178,"GtkScrolledWindow",None,176,None,None,None,None,None),
(10,179,"GtkViewport",None,178,None,None,None,None,None), (10,179,"GtkViewport",None,178,None,None,None,None,None),
(10,180,"GtkBox","resetBluetoothAvailableDevices",179,None,None,None,None,None), (10,180,"GtkBox","reset_bluetooth_available_devices",179,None,None,None,None,None),
(10,181,"AdwPreferencesGroup",None,121,None,None,None,2,None), (10,181,"AdwPreferencesGroup",None,121,None,None,None,2,None),
(10,183,"GtkScrolledWindow",None,181,None,None,None,None,None), (10,183,"GtkScrolledWindow",None,181,None,None,None,None,None),
(10,184,"GtkViewport",None,183,None,None,None,None,None), (10,184,"GtkViewport",None,183,None,None,None,None,None),
(10,185,"GtkBox","resetBluetoothConnectedDevices",184,None,None,None,None,None), (10,185,"GtkBox","reset_bluetooth_connected_devices",184,None,None,None,None,None),
(11,2,"GtkBox","resetBluetoothEntry",None,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,3,"GtkImage","reset_bluetooth_device_type",2,None,None,None,None,None),
(11,5,"GtkButton","resetBluetoothButton",2,None,None,None,3,None), (11,5,"GtkButton","reset_bluetooth_button",2,None,None,None,3,None),
(11,6,"GtkBox",None,2,None,None,None,2,None), (11,6,"GtkBox",None,2,None,None,None,2,None),
(11,7,"GtkLabel","resetBluetoothLabel",6,None,None,None,None,None), (11,7,"GtkLabel","reset_bluetooth_label",6,None,None,None,None,None),
(11,8,"GtkLabel","resetBluetoothAddress",6,None,None,None,1,None), (11,8,"GtkLabel","reset_bluetooth_address",6,None,None,None,1,None),
(12,11,"GtkBox","resetAudioInput",None,None,None,None,None,None), (12,11,"GtkBox","resetAudioInput",None,None,None,None,None,None),
(12,12,"GtkLabel",None,11,None,None,None,None,None), (12,12,"GtkLabel",None,11,None,None,None,None,None),
(12,13,"AdwNavigationView",None,11,None,None,None,1,None), (12,13,"AdwNavigationView",None,11,None,None,None,1,None),
@ -171,149 +171,149 @@
(12,15,"GtkBox",None,14,None,None,None,None,None), (12,15,"GtkBox",None,14,None,None,None,None,None),
(12,22,"GtkBox",None,15,None,None,None,2,None), (12,22,"GtkBox",None,15,None,None,None,2,None),
(12,23,"GtkBox",None,22,None,None,None,None,None), (12,23,"GtkBox",None,22,None,None,None,None,None),
(12,24,"GtkButton","resetSourceMute",23,None,None,None,None,None), (12,24,"GtkButton","reset_source_mute",23,None,None,None,None,None),
(12,25,"GtkScale","resetVolumeSlider",23,None,None,None,1,None), (12,25,"GtkScale","reset_volume_slider",23,None,None,None,1,None),
(12,27,"GtkLabel","resetVolumePercentage",23,None,None,None,2,None), (12,27,"GtkLabel","reset_volume_percentage",23,None,None,None,2,None),
(12,28,"GtkProgressBar","resetVolumeMeter",22,None,None,None,1,None), (12,28,"GtkProgressBar","reset_volume_meter",22,None,None,None,1,None),
(12,29,"GtkSeparator",None,15,None,None,None,3,None), (12,29,"GtkSeparator",None,15,None,None,None,3,None),
(12,30,"GtkBox","resetOutputStreams",15,None,None,None,4,None), (12,30,"GtkBox","reset_output_streams",15,None,None,None,4,None),
(12,31,"GtkLabel",None,30,None,None,None,None,None), (12,31,"GtkLabel",None,30,None,None,None,None,None),
(12,34,"AdwNavigationPage",None,13,None,None,None,1,None), (12,34,"AdwNavigationPage",None,13,None,None,None,1,None),
(12,42,"GtkBox",None,34,None,None,None,1,None), (12,42,"GtkBox",None,34,None,None,None,1,None),
(12,49,"GtkBox","resetSources",42,None,None,None,2,None), (12,49,"GtkBox","reset_sources",42,None,None,None,2,None),
(12,50,"GtkLabel",None,49,None,None,None,None,None), (12,50,"GtkLabel",None,49,None,None,None,None,None),
(12,51,"GtkAdjustment",None,25,None,None,None,-1,None), (12,51,"GtkAdjustment",None,25,None,None,None,-1,None),
(12,52,"AdwNavigationPage",None,13,None,None,None,2,None), (12,52,"AdwNavigationPage",None,13,None,None,None,2,None),
(12,53,"GtkBox",None,52,None,None,None,None,None), (12,53,"GtkBox",None,52,None,None,None,None,None),
(12,59,"GtkLabel",None,53,None,None,None,2,None), (12,59,"GtkLabel",None,53,None,None,None,2,None),
(12,66,"AdwPreferencesGroup","resetCards",53,None,None,None,3,None), (12,66,"AdwPreferencesGroup","reset_cards",53,None,None,None,3,None),
(12,67,"AdwPreferencesGroup",None,15,None,None,None,None,None), (12,67,"AdwPreferencesGroup",None,15,None,None,None,None,None),
(12,69,"AdwActionRow","resetSourceRow",67,None,None,None,-1,None), (12,69,"AdwActionRow","reset_source_row",67,None,None,None,-1,None),
(12,70,"AdwActionRow","resetCardsRow",67,None,None,None,2,None), (12,70,"AdwActionRow","reset_cards_row",67,None,None,None,2,None),
(12,71,"GtkImage",None,69,None,None,None,-1,None), (12,71,"GtkImage",None,69,None,None,None,-1,None),
(12,72,"GtkImage",None,70,None,None,None,None,None), (12,72,"GtkImage",None,70,None,None,None,None,None),
(12,73,"AdwComboRow","resetSourceDropdown",67,None,None,None,2,None), (12,73,"AdwComboRow","reset_source_dropdown",67,None,None,None,2,None),
(12,74,"AdwPreferencesGroup",None,42,None,None,None,None,None), (12,74,"AdwPreferencesGroup",None,42,None,None,None,None,None),
(12,75,"AdwActionRow","resetOutputStreamButton",74,None,None,None,None,None), (12,75,"AdwActionRow","reset_output_stream_button",74,None,None,None,None,None),
(12,76,"GtkImage",None,75,None,None,None,None,None), (12,76,"GtkImage",None,75,None,None,None,None,None),
(12,77,"AdwPreferencesGroup",None,53,None,None,None,None,None), (12,77,"AdwPreferencesGroup",None,53,None,None,None,None,None),
(12,78,"AdwActionRow","resetInputCardsBackButton",77,None,None,None,None,None), (12,78,"AdwActionRow","reset_input_cards_back_button",77,None,None,None,None,None),
(12,79,"GtkImage",None,78,None,None,None,None,None), (12,79,"GtkImage",None,78,None,None,None,None,None),
(13,22,"AdwPreferencesGroup","resetOutputStreamEntry",None,None,None,None,None,None), (13,22,"AdwPreferencesGroup","resetOutputStreamEntry",None,None,None,None,None,None),
(13,23,"AdwComboRow","resetSourceSelection",22,None,None,None,None,None), (13,23,"AdwComboRow","reset_source_selection",22,None,None,None,None,None),
(13,26,"AdwActionRow",None,22,None,None,None,1,None), (13,26,"AdwActionRow",None,22,None,None,None,1,None),
(13,27,"GtkBox",None,26,None,None,None,None,None), (13,27,"GtkBox",None,26,None,None,None,None,None),
(13,36,"GtkBox",None,27,None,None,None,None,None), (13,36,"GtkBox",None,27,None,None,None,None,None),
(13,37,"GtkButton","resetSourceMute",36,None,None,None,None,None), (13,37,"GtkButton","reset_source_mute",36,None,None,None,None,None),
(13,38,"GtkScale","resetVolumeSlider",36,None,None,None,1,None), (13,38,"GtkScale","reset_volume_slider",36,None,None,None,1,None),
(13,39,"GtkAdjustment",None,38,None,None,None,None,None), (13,39,"GtkAdjustment",None,38,None,None,None,None,None),
(13,40,"GtkLabel","resetVolumePercentage",36,None,None,None,2,None), (13,40,"GtkLabel","reset_volume_percentage",36,None,None,None,2,None),
(13,41,"GtkProgressBar","resetVolumeMeter",27,None,None,None,1,None), (13,41,"GtkProgressBar","reset_volume_meter",27,None,None,None,1,None),
(13,42,"GtkSeparator",None,22,None,None,None,-1,None), (13,42,"GtkSeparator",None,22,None,None,None,-1,None),
(14,3,"GtkBox","resetSettingBox",None,None,None,None,-1,None), (14,3,"GtkBox","resetSettingBox",None,None,None,None,-1,None),
(15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None), (15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None),
(16,6,"GtkPopover","resetPopup",None,None,None,None,-1,None), (16,6,"GtkPopover","resetPopup",None,None,None,None,-1,None),
(16,7,"GtkBox",None,6,None,None,None,None,None), (16,7,"GtkBox",None,6,None,None,None,None,None),
(16,10,"GtkBox",None,7,None,None,None,1,None), (16,10,"GtkBox",None,7,None,None,None,1,None),
(16,11,"GtkPasswordEntry","resetPopupEntry",10,None,None,None,None,None), (16,11,"GtkPasswordEntry","reset_popup_entry",10,None,None,None,None,None),
(16,12,"GtkButton","resetPopupButton",10,None,None,None,1,None), (16,12,"GtkButton","reset_popup_button",10,None,None,None,1,None),
(16,13,"GtkLabel","resetPopupLabel",7,None,None,None,None,None), (16,13,"GtkLabel","reset_popup_label",7,None,None,None,None,None),
(17,5,"AdwActionRow","resetSavedWifiEntry",None,None,None,None,None,None), (17,5,"AdwActionRow","resetSavedWifiEntry",None,None,None,None,None,None),
(17,7,"GtkBox",None,5,None,None,None,None,None), (17,7,"GtkBox",None,5,None,None,None,None,None),
(17,11,"GtkLabel","resetSavedWifiLabel",7,None,None,None,None,None), (17,11,"GtkLabel","reset_saved_wifi_label",7,None,None,None,None,None),
(17,12,"GtkButton","resetDeleteSavedWifiButton",7,None,None,None,2,None), (17,12,"GtkButton","reset_delete_saved_wifi_button",7,None,None,None,2,None),
(17,14,"GtkButton","resetEditSavedWifiButton",7,None,None,None,1,None), (17,14,"GtkButton","reset_edit_saved_wifi_button",7,None,None,None,1,None),
(18,13,"AdwPreferencesGroup","resetSinkEntry",None,None,None,None,None,None), (18,13,"AdwPreferencesGroup","resetSinkEntry",None,None,None,None,None,None),
(18,14,"AdwActionRow","resetSinkName",13,None,None,None,None,None), (18,14,"AdwActionRow","reset_sink_name",13,None,None,None,None,None),
(18,15,"GtkCheckButton","resetSelectedSink",14,None,None,None,None,None), (18,15,"GtkCheckButton","reset_selected_sink",14,None,None,None,None,None),
(18,16,"AdwActionRow",None,13,None,None,None,1,None), (18,16,"AdwActionRow",None,13,None,None,None,1,None),
(18,17,"GtkBox",None,16,None,None,None,None,None), (18,17,"GtkBox",None,16,None,None,None,None,None),
(18,18,"GtkBox",None,17,None,None,None,None,None), (18,18,"GtkBox",None,17,None,None,None,None,None),
(18,19,"GtkButton","resetSinkMute",18,None,None,None,None,None), (18,19,"GtkButton","reset_sink_mute",18,None,None,None,None,None),
(18,20,"GtkScale","resetVolumeSlider",18,None,None,None,1,None), (18,20,"GtkScale","reset_volume_slider",18,None,None,None,1,None),
(18,21,"GtkAdjustment",None,20,None,None,None,None,None), (18,21,"GtkAdjustment",None,20,None,None,None,None,None),
(18,22,"GtkLabel","resetVolumePercentage",18,None,None,None,2,None), (18,22,"GtkLabel","reset_volume_percentage",18,None,None,None,2,None),
(18,23,"GtkProgressBar","resetVolumeMeter",17,None,None,None,1,None), (18,23,"GtkProgressBar","reset_volume_meter",17,None,None,None,1,None),
(18,24,"GtkSeparator",None,13,None,None,None,2,None), (18,24,"GtkSeparator",None,13,None,None,None,2,None),
(19,13,"AdwPreferencesGroup","resetSourceEntry",None,None,None,None,None,None), (19,13,"AdwPreferencesGroup","resetSourceEntry",None,None,None,None,None,None),
(19,14,"AdwActionRow","resetSourceName",13,None,None,None,None,None), (19,14,"AdwActionRow","reset_source_name",13,None,None,None,None,None),
(19,15,"GtkCheckButton","resetSelectedSource",14,None,None,None,None,None), (19,15,"GtkCheckButton","reset_selected_source",14,None,None,None,None,None),
(19,16,"AdwActionRow",None,13,None,None,None,1,None), (19,16,"AdwActionRow",None,13,None,None,None,1,None),
(19,17,"GtkBox",None,16,None,None,None,None,None), (19,17,"GtkBox",None,16,None,None,None,None,None),
(19,18,"GtkBox",None,17,None,None,None,None,None), (19,18,"GtkBox",None,17,None,None,None,None,None),
(19,19,"GtkButton","resetSourceMute",18,None,None,None,None,None), (19,19,"GtkButton","reset_source_mute",18,None,None,None,None,None),
(19,20,"GtkScale","resetVolumeSlider",18,None,None,None,1,None), (19,20,"GtkScale","reset_volume_slider",18,None,None,None,1,None),
(19,21,"GtkAdjustment",None,20,None,None,None,None,None), (19,21,"GtkAdjustment",None,20,None,None,None,None,None),
(19,22,"GtkLabel","resetVolumePercentage",18,None,None,None,2,None), (19,22,"GtkLabel","reset_volume_percentage",18,None,None,None,2,None),
(19,23,"GtkProgressBar","resetVolumeMeter",17,None,None,None,1,None), (19,23,"GtkProgressBar","reset_volume_meter",17,None,None,None,1,None),
(19,24,"GtkSeparator",None,13,None,None,None,2,None), (19,24,"GtkSeparator",None,13,None,None,None,2,None),
(20,2,"AdwComboRow","resetCardEntry",None,None,None,None,None,None), (20,2,"AdwComboRow","reset_card_entry",None,None,None,None,None,None),
(21,1,"AdwNavigationPage","resetWifiOptions",None,None,None,None,-1,None), (21,1,"AdwNavigationPage","resetWifiOptions",None,None,None,None,-1,None),
(21,52,"GtkBox",None,1,None,None,None,-1,None), (21,52,"GtkBox",None,1,None,None,None,-1,None),
(21,53,"GtkNotebook",None,52,None,None,None,None,None), (21,53,"GtkNotebook",None,52,None,None,None,None,None),
(21,54,"GtkBox",None,53,None,None,None,None,None), (21,54,"GtkBox",None,53,None,None,None,None,None),
(21,55,"AdwPreferencesGroup",None,54,None,None,None,None,None), (21,55,"AdwPreferencesGroup",None,54,None,None,None,None,None),
(21,56,"AdwActionRow","resetWifiName",55,None,None,None,None,None), (21,56,"AdwActionRow","reset_wifi_name",55,None,None,None,None,None),
(21,57,"AdwActionRow","resetWifiMac",55,None,None,None,1,None), (21,57,"AdwActionRow","reset_wifi_mac",55,None,None,None,1,None),
(21,58,"AdwActionRow","resetWifiLinkSpeed",55,None,None,None,2,None), (21,58,"AdwActionRow","reset_wifi_link_speed",55,None,None,None,2,None),
(21,59,"AdwActionRow","resetWifiIP4Addr",55,None,None,None,3,None), (21,59,"AdwActionRow","reset_wifi_ip4_addr",55,None,None,None,3,None),
(21,60,"AdwActionRow","resetWifiIP6Addr",55,None,None,None,4,None), (21,60,"AdwActionRow","reset_wifi_ip6_addr",55,None,None,None,4,None),
(21,61,"AdwActionRow","resetWifiGateway",55,None,None,None,5,None), (21,61,"AdwActionRow","reset_wifi_gateway",55,None,None,None,5,None),
(21,62,"AdwActionRow","resetWifiDNS",55,None,None,None,6,None), (21,62,"AdwActionRow","reset_wifi_dns",55,None,None,None,6,None),
(21,63,"AdwActionRow","resetWifiLastUsed",55,None,None,None,7,None), (21,63,"AdwActionRow","reset_wifi_last_used",55,None,None,None,7,None),
(21,64,"AdwSwitchRow","resetWifiAutoConnect",55,None,None,None,8,None), (21,64,"AdwSwitchRow","reset_wifi_auto_connect",55,None,None,None,8,None),
(21,65,"AdwSwitchRow","resetWifiMetered",55,None,None,None,9,None), (21,65,"AdwSwitchRow","reset_wifi_metered",55,None,None,None,9,None),
(21,66,"GtkLabel",None,53,None,"tab",None,1,None), (21,66,"GtkLabel",None,53,None,"tab",None,1,None),
(21,67,"GtkBox",None,53,None,None,None,2,None), (21,67,"GtkBox",None,53,None,None,None,2,None),
(21,68,"AdwPreferencesGroup",None,67,None,None,None,None,None), (21,68,"AdwPreferencesGroup",None,67,None,None,None,None,None),
(21,69,"AdwComboRow","resetIP4Method",68,None,None,None,None,None), (21,69,"AdwComboRow","reset_ip4_method",68,None,None,None,None,None),
(21,70,"GtkStringList",None,69,None,None,None,None,None), (21,70,"GtkStringList",None,69,None,None,None,None,None),
(21,71,"AdwEntryRow","resetIP4DNS",68,None,None,None,1,None), (21,71,"AdwEntryRow","reset_ip4_dns",68,None,None,None,1,None),
(21,72,"AdwEntryRow","resetIP4Gateway",68,None,None,None,2,None), (21,72,"AdwEntryRow","reset_ip4_gateway",68,None,None,None,2,None),
(21,73,"AdwPreferencesGroup","resetIP4AddressGroup",67,None,None,None,1,None), (21,73,"AdwPreferencesGroup","reset_ip4_address_group",67,None,None,None,1,None),
(21,74,"AdwPreferencesGroup","resetIP4RoutesGroup",67,None,None,None,2,None), (21,74,"AdwPreferencesGroup","reset_ip4_routes_group",67,None,None,None,2,None),
(21,75,"GtkBox",None,74,None,None,None,None,None), (21,75,"GtkBox",None,74,None,None,None,None,None),
(21,76,"GtkLabel",None,75,None,None,None,None,None), (21,76,"GtkLabel",None,75,None,None,None,None,None),
(21,77,"GtkSwitch",None,75,None,None,None,1,None), (21,77,"GtkSwitch",None,75,None,None,None,1,None),
(21,78,"GtkLabel",None,53,None,"tab",None,3,None), (21,78,"GtkLabel",None,53,None,"tab",None,3,None),
(21,79,"GtkBox",None,53,None,None,None,4,None), (21,79,"GtkBox",None,53,None,None,None,4,None),
(21,80,"AdwPreferencesGroup",None,79,None,None,None,None,None), (21,80,"AdwPreferencesGroup",None,79,None,None,None,None,None),
(21,81,"AdwComboRow","resetIP6Method",80,None,None,None,None,None), (21,81,"AdwComboRow","reset_ip6_method",80,None,None,None,None,None),
(21,82,"GtkStringList",None,81,None,None,None,None,None), (21,82,"GtkStringList",None,81,None,None,None,None,None),
(21,83,"AdwEntryRow","resetIP6DNS",80,None,None,None,1,None), (21,83,"AdwEntryRow","reset_ip6_dns",80,None,None,None,1,None),
(21,84,"AdwEntryRow","resetIP6Gateway",80,None,None,None,2,None), (21,84,"AdwEntryRow","reset_ip6_gateway",80,None,None,None,2,None),
(21,85,"AdwPreferencesGroup","resetIP6AddressGroup",79,None,None,None,1,None), (21,85,"AdwPreferencesGroup","reset_ip6_address_group",79,None,None,None,1,None),
(21,86,"AdwPreferencesGroup","resetIP6RoutesGroup",79,None,None,None,2,None), (21,86,"AdwPreferencesGroup","reset_ip6_routes_group",79,None,None,None,2,None),
(21,87,"GtkBox",None,86,None,None,None,None,None), (21,87,"GtkBox",None,86,None,None,None,None,None),
(21,88,"GtkLabel",None,87,None,None,None,None,None), (21,88,"GtkLabel",None,87,None,None,None,None,None),
(21,89,"GtkSwitch",None,87,None,None,None,1,None), (21,89,"GtkSwitch",None,87,None,None,None,1,None),
(21,90,"GtkLabel",None,53,None,"tab",None,5,None), (21,90,"GtkLabel",None,53,None,"tab",None,5,None),
(21,91,"GtkBox",None,53,None,None,None,6,None), (21,91,"GtkBox",None,53,None,None,None,6,None),
(21,92,"AdwPreferencesGroup",None,91,None,None,None,None,None), (21,92,"AdwPreferencesGroup",None,91,None,None,None,None,None),
(21,93,"AdwComboRow","resetWifiSecurityDropdown",92,None,None,None,None,None), (21,93,"AdwComboRow","reset_wifi_security_dropdown",92,None,None,None,None,None),
(21,96,"AdwPasswordEntryRow","resetWifiPassword",92,None,None,None,1,None), (21,96,"AdwPasswordEntryRow","reset_wifi_password",92,None,None,None,1,None),
(21,97,"GtkLabel",None,53,None,"tab",None,7,None), (21,97,"GtkLabel",None,53,None,"tab",None,7,None),
(21,98,"GtkButton","wifiOptionsApplyButton",52,None,None,None,1,None), (21,98,"GtkButton","wifi_options_apply_button",52,None,None,None,1,None),
(21,99,"GtkButton","resetIP4AddressAddButton",73,None,None,None,-1,None), (21,99,"GtkButton","reset_ip4_address_add_button",73,None,None,None,-1,None),
(21,100,"GtkButton","resetIP4RouteAddButton",75,None,None,None,2,None), (21,100,"GtkButton","reset_ip4_route_add_button",75,None,None,None,2,None),
(21,101,"GtkButton","resetIP6AddressAddButton",85,None,None,None,-1,None), (21,101,"GtkButton","reset_ip6_address_add_button",85,None,None,None,-1,None),
(21,102,"GtkButton","resetIP6RouteAddButton",87,None,None,None,2,None), (21,102,"GtkButton","reset_ip6_route_add_button",87,None,None,None,2,None),
(21,103,"GtkStringList",None,93,None,None,None,-1,None), (21,103,"GtkStringList",None,93,None,None,None,-1,None),
(22,1,"GtkBox","resetWifiAddressEntry",None,None,None,None,-1,None), (22,1,"GtkBox","resetWifiAddressEntry",None,None,None,None,-1,None),
(22,2,"AdwExpanderRow","resetAddressRow",1,None,None,None,-1,None), (22,2,"AdwExpanderRow","reset_address_row",1,None,None,None,-1,None),
(22,5,"GtkButton","resetAddressRemove",1,None,None,None,-1,None), (22,5,"GtkButton","reset_address_remove",1,None,None,None,-1,None),
(22,6,"GtkBox",None,2,None,None,None,None,None), (22,6,"GtkBox",None,2,None,None,None,None,None),
(22,7,"AdwEntryRow","resetAddressAddress",6,None,None,None,None,None), (22,7,"AdwEntryRow","reset_address_address",6,None,None,None,None,None),
(22,8,"AdwEntryRow","resetAddressPrefix",6,None,None,None,1,None), (22,8,"AdwEntryRow","reset_address_prefix",6,None,None,None,1,None),
(23,1,"GtkBox","resetWifiRouteEntry",None,None,None,None,None,None), (23,1,"GtkBox","resetWifiRouteEntry",None,None,None,None,None,None),
(23,2,"AdwExpanderRow","resetRouteRow",1,None,None,None,None,None), (23,2,"AdwExpanderRow","reset_route_row",1,None,None,None,None,None),
(23,5,"GtkButton","resetRouteRemove",1,None,None,None,1,None), (23,5,"GtkButton","reset_route_remove",1,None,None,None,1,None),
(23,6,"GtkBox",None,2,None,None,None,1,None), (23,6,"GtkBox",None,2,None,None,None,1,None),
(23,7,"AdwEntryRow","resetRouteGateway",6,None,None,None,None,None), (23,7,"AdwEntryRow","reset_route_gateway",6,None,None,None,None,None),
(23,8,"AdwEntryRow","resetRouteMetric",6,None,None,None,1,None), (23,8,"AdwEntryRow","reset_route_metric",6,None,None,None,1,None),
(23,9,"GtkBox",None,2,None,None,None,None,None), (23,9,"GtkBox",None,2,None,None,None,None,None),
(23,10,"AdwEntryRow","resetRouteAddress",9,None,None,None,None,None), (23,10,"AdwEntryRow","reset_route_address",9,None,None,None,None,None),
(23,11,"AdwEntryRow","resetRoutePrefix",9,None,None,None,1,None), (23,11,"AdwEntryRow","reset_route_prefix",9,None,None,None,1,None),
(24,1,"AdwPreferencesGroup",None,None,None,None,None,-1,None), (24,1,"AdwPreferencesGroup",None,None,None,None,None,-1,None),
(24,4,"GtkButton",None,1,None,None,None,-1,None), (24,4,"GtkButton",None,1,None,None,None,-1,None),
(24,5,"GtkScrolledWindow",None,1,None,None,None,None,None), (24,5,"GtkScrolledWindow",None,1,None,None,None,None,None),

16
src/resources/resetWiFi.ui
View file

@ -19,7 +19,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSwitch" id="resetWifiSwitch"> <object class="GtkSwitch" id="reset_wifi_switch">
<property name="active">True</property> <property name="active">True</property>
<property name="halign">end</property> <property name="halign">end</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
@ -30,7 +30,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwNavigationView" id="resetWifiNavigation"> <object class="AdwNavigationView" id="reset_wifi_navigation">
<child> <child>
<object class="AdwNavigationPage"> <object class="AdwNavigationPage">
<property name="tag">main</property> <property name="tag">main</property>
@ -39,14 +39,14 @@
<object class="GtkBox"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="AdwPreferencesGroup" id="resetWifiDetails"> <object class="AdwPreferencesGroup" id="reset_wifi_details">
<child> <child>
<object class="AdwComboRow" id="resetWiFiDevice"> <object class="AdwComboRow" id="reset_wifi_device">
<property name="title">WiFi Device</property> <property name="title">WiFi Device</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow" id="resetSavedNetworks"> <object class="AdwActionRow" id="reset_saved_networks">
<property name="title">Saved Networks</property> <property name="title">Saved Networks</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -61,7 +61,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwPreferencesGroup" id="resetWifiList"> <object class="AdwPreferencesGroup" id="reset_wifi_list">
<property name="margin-top">10</property> <property name="margin-top">10</property>
<property name="title">Available networks</property> <property name="title">Available networks</property>
</object> </object>
@ -80,7 +80,7 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwActionRow" id="resetAvailableNetworks"> <object class="AdwActionRow" id="reset_available_networks">
<property name="title">Available Networks</property> <property name="title">Available Networks</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -95,7 +95,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwPreferencesGroup" id="resetStoredWifiList"> <object class="AdwPreferencesGroup" id="reset_stored_wifi_list">
<property name="title">Saved Networks</property> <property name="title">Saved Networks</property>
</object> </object>
</child> </child>

8
src/resources/resetWifiAddressEntry.ui
View file

@ -7,19 +7,19 @@
<property name="margin-bottom">2</property> <property name="margin-bottom">2</property>
<property name="margin-top">2</property> <property name="margin-top">2</property>
<child> <child>
<object class="AdwExpanderRow" id="resetAddressRow"> <object class="AdwExpanderRow" id="reset_address_row">
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="title">Add new Address</property> <property name="title">Add new Address</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<child> <child>
<object class="AdwEntryRow" id="resetAddressAddress"> <object class="AdwEntryRow" id="reset_address_address">
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="title">Address</property> <property name="title">Address</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwEntryRow" id="resetAddressPrefix"> <object class="AdwEntryRow" id="reset_address_prefix">
<property name="max-width-chars">5</property> <property name="max-width-chars">5</property>
<property name="title">Prefix</property> <property name="title">Prefix</property>
</object> </object>
@ -29,7 +29,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetAddressRemove"> <object class="GtkButton" id="reset_address_remove">
<property name="height-request">55</property> <property name="height-request">55</property>
<property name="icon-name">edit-delete-symbolic</property> <property name="icon-name">edit-delete-symbolic</property>
<property name="valign">start</property> <property name="valign">start</property>

12
src/resources/resetWifiEntry.ui
View file

@ -11,12 +11,12 @@
<object class="GtkBox"> <object class="GtkBox">
<property name="width-request">35</property> <property name="width-request">35</property>
<child> <child>
<object class="GtkImage" id="resetWifiStrength"> <object class="GtkImage" id="reset_wifi_strength">
<property name="icon-name">network-wireless-signal-excellent-symbolic</property> <property name="icon-name">network-wireless-signal-excellent-symbolic</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkImage" id="resetWifiEncrypted"> <object class="GtkImage" id="reset_wifi_encrypted">
<property name="halign">start</property> <property name="halign">start</property>
<property name="icon-name">system-lock-screen-symbolic</property> <property name="icon-name">system-lock-screen-symbolic</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">6</property>
@ -27,7 +27,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="resetWifiLabel"> <object class="GtkLabel" id="reset_wifi_label">
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="label">LoremIpsumInternet</property> <property name="label">LoremIpsumInternet</property>
@ -38,7 +38,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="resetWifiConnected"> <object class="GtkLabel" id="reset_wifi_connected">
<property name="halign">end</property> <property name="halign">end</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="justify">right</property> <property name="justify">right</property>
@ -49,7 +49,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetWifiEditButton"> <object class="GtkButton" id="reset_wifi_edit_button">
<property name="halign">start</property> <property name="halign">start</property>
<property name="has-frame">False</property> <property name="has-frame">False</property>
<property name="icon-name">document-edit-symbolic</property> <property name="icon-name">document-edit-symbolic</property>
@ -57,7 +57,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="resetPopup" id="resetWifiPopup"/> <object class="resetPopup" id="reset_wifi_popup"/>
</child> </child>
</object> </object>
</property> </property>

54
src/resources/resetWifiOptions.ui
View file

@ -18,60 +18,60 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwActionRow" id="resetWifiName"> <object class="AdwActionRow" id="reset_wifi_name">
<property name="css-classes">property</property> <property name="css-classes">property</property>
<property name="title">WiFi Name</property> <property name="title">WiFi Name</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow" id="resetWifiMac"> <object class="AdwActionRow" id="reset_wifi_mac">
<property name="css-classes">property</property> <property name="css-classes">property</property>
<property name="title">MAC-Address</property> <property name="title">MAC-Address</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow" id="resetWifiLinkSpeed"> <object class="AdwActionRow" id="reset_wifi_link_speed">
<property name="css-classes">property</property> <property name="css-classes">property</property>
<property name="title">Link Speed</property> <property name="title">Link Speed</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow" id="resetWifiIP4Addr"> <object class="AdwActionRow" id="reset_wifi_ip4_addr">
<property name="css-classes">property</property> <property name="css-classes">property</property>
<property name="title">IPv4 Address</property> <property name="title">IPv4 Address</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow" id="resetWifiIP6Addr"> <object class="AdwActionRow" id="reset_wifi_ip6_addr">
<property name="css-classes">property</property> <property name="css-classes">property</property>
<property name="title">IPv6 Address</property> <property name="title">IPv6 Address</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow" id="resetWifiGateway"> <object class="AdwActionRow" id="reset_wifi_gateway">
<property name="css-classes">property</property> <property name="css-classes">property</property>
<property name="title">Gateway</property> <property name="title">Gateway</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow" id="resetWifiDNS"> <object class="AdwActionRow" id="reset_wifi_dns">
<property name="css-classes">property</property> <property name="css-classes">property</property>
<property name="title">DNS</property> <property name="title">DNS</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow" id="resetWifiLastUsed"> <object class="AdwActionRow" id="reset_wifi_last_used">
<property name="css-classes">property</property> <property name="css-classes">property</property>
<property name="title">Last Used</property> <property name="title">Last Used</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwSwitchRow" id="resetWifiAutoConnect"> <object class="AdwSwitchRow" id="reset_wifi_auto_connect">
<property name="title">Connect automatically</property> <property name="title">Connect automatically</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwSwitchRow" id="resetWifiMetered"> <object class="AdwSwitchRow" id="reset_wifi_metered">
<property name="title">Metered Connection</property> <property name="title">Metered Connection</property>
</object> </object>
</child> </child>
@ -91,7 +91,7 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwComboRow" id="resetIP4Method"> <object class="AdwComboRow" id="reset_ip4_method">
<property name="model"> <property name="model">
<object class="GtkStringList"> <object class="GtkStringList">
<items> <items>
@ -107,21 +107,21 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwEntryRow" id="resetIP4DNS"> <object class="AdwEntryRow" id="reset_ip4_dns">
<property name="title">DNS (separate IP by comma, empty for automatic)</property> <property name="title">DNS (separate IP by comma, empty for automatic)</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwEntryRow" id="resetIP4Gateway"> <object class="AdwEntryRow" id="reset_ip4_gateway">
<property name="title">Gateway</property> <property name="title">Gateway</property>
</object> </object>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwPreferencesGroup" id="resetIP4AddressGroup"> <object class="AdwPreferencesGroup" id="reset_ip4_address_group">
<property name="header-suffix"> <property name="header-suffix">
<object class="GtkButton" id="resetIP4AddressAddButton"> <object class="GtkButton" id="reset_ip4_address_add_button">
<property name="icon-name">list-add-symbolic</property> <property name="icon-name">list-add-symbolic</property>
</object> </object>
</property> </property>
@ -130,7 +130,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwPreferencesGroup" id="resetIP4RoutesGroup"> <object class="AdwPreferencesGroup" id="reset_ip4_routes_group">
<property name="header-suffix"> <property name="header-suffix">
<object class="GtkBox"> <object class="GtkBox">
<child> <child>
@ -145,7 +145,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetIP4RouteAddButton"> <object class="GtkButton" id="reset_ip4_route_add_button">
<property name="icon-name">list-add-symbolic</property> <property name="icon-name">list-add-symbolic</property>
<property name="margin-start">10</property> <property name="margin-start">10</property>
</object> </object>
@ -170,7 +170,7 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwComboRow" id="resetIP6Method"> <object class="AdwComboRow" id="reset_ip6_method">
<property name="model"> <property name="model">
<object class="GtkStringList"> <object class="GtkStringList">
<items> <items>
@ -187,21 +187,21 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwEntryRow" id="resetIP6DNS"> <object class="AdwEntryRow" id="reset_ip6_dns">
<property name="title">DNS (separate IP by comma, empty for automatic)</property> <property name="title">DNS (separate IP by comma, empty for automatic)</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwEntryRow" id="resetIP6Gateway"> <object class="AdwEntryRow" id="reset_ip6_gateway">
<property name="title">Gateway</property> <property name="title">Gateway</property>
</object> </object>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwPreferencesGroup" id="resetIP6AddressGroup"> <object class="AdwPreferencesGroup" id="reset_ip6_address_group">
<property name="header-suffix"> <property name="header-suffix">
<object class="GtkButton" id="resetIP6AddressAddButton"> <object class="GtkButton" id="reset_ip6_address_add_button">
<property name="icon-name">list-add-symbolic</property> <property name="icon-name">list-add-symbolic</property>
</object> </object>
</property> </property>
@ -210,7 +210,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwPreferencesGroup" id="resetIP6RoutesGroup"> <object class="AdwPreferencesGroup" id="reset_ip6_routes_group">
<property name="header-suffix"> <property name="header-suffix">
<object class="GtkBox"> <object class="GtkBox">
<child> <child>
@ -225,7 +225,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetIP6RouteAddButton"> <object class="GtkButton" id="reset_ip6_route_add_button">
<property name="icon-name">list-add-symbolic</property> <property name="icon-name">list-add-symbolic</property>
<property name="margin-start">10</property> <property name="margin-start">10</property>
</object> </object>
@ -250,7 +250,7 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwComboRow" id="resetWifiSecurityDropdown"> <object class="AdwComboRow" id="reset_wifi_security_dropdown">
<property name="model"> <property name="model">
<object class="GtkStringList"> <object class="GtkStringList">
<items> <items>
@ -263,7 +263,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="AdwPasswordEntryRow" id="resetWifiPassword"> <object class="AdwPasswordEntryRow" id="reset_wifi_password">
<property name="title">Password</property> <property name="title">Password</property>
</object> </object>
</child> </child>
@ -279,7 +279,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="wifiOptionsApplyButton"> <object class="GtkButton" id="wifi_options_apply_button">
<property name="halign">end</property> <property name="halign">end</property>
<property name="label">Apply</property> <property name="label">Apply</property>
<property name="margin-top">10</property> <property name="margin-top">10</property>

12
src/resources/resetWifiRouteEntry.ui
View file

@ -5,19 +5,19 @@
<requires lib="libadwaita" version="1.2"/> <requires lib="libadwaita" version="1.2"/>
<template class="resetWifiRouteEntry" parent="GtkBox"> <template class="resetWifiRouteEntry" parent="GtkBox">
<child> <child>
<object class="AdwExpanderRow" id="resetRouteRow"> <object class="AdwExpanderRow" id="reset_route_row">
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="title">Add new Route</property> <property name="title">Add new Route</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<child> <child>
<object class="AdwEntryRow" id="resetRouteAddress"> <object class="AdwEntryRow" id="reset_route_address">
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="title">Address</property> <property name="title">Address</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwEntryRow" id="resetRoutePrefix"> <object class="AdwEntryRow" id="reset_route_prefix">
<property name="max-width-chars">5</property> <property name="max-width-chars">5</property>
<property name="title">Prefix</property> <property name="title">Prefix</property>
</object> </object>
@ -27,13 +27,13 @@
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<child> <child>
<object class="AdwEntryRow" id="resetRouteGateway"> <object class="AdwEntryRow" id="reset_route_gateway">
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="title">Gateway</property> <property name="title">Gateway</property>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwEntryRow" id="resetRouteMetric"> <object class="AdwEntryRow" id="reset_route_metric">
<property name="max-width-chars">5</property> <property name="max-width-chars">5</property>
<property name="title">Metric</property> <property name="title">Metric</property>
</object> </object>
@ -43,7 +43,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="resetRouteRemove"> <object class="GtkButton" id="reset_route_remove">
<property name="height-request">55</property> <property name="height-request">55</property>
<property name="icon-name">edit-delete-symbolic</property> <property name="icon-name">edit-delete-symbolic</property>
<property name="valign">start</property> <property name="valign">start</property>