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: Fix warning

Browse source
This commit is contained in:
dashie 2023-12-11 22:01:20 +00:00
parent 445c4d06fe
commit b9ed39f85b
6 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ use std::time::SystemTime;
use crate::components::input::output_stream_entry; use crate::components::input::output_stream_entry;
use gtk::subclass::prelude::*; use gtk::subclass::prelude::*;
use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale}; use gtk::{glib, Button, CompositeTemplate, Label, Scale};
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetOutputStreamEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetOutputStreamEntry.ui")]

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

@ -9,7 +9,7 @@ use crate::components::base::list_entry::ListEntry;
use crate::components::input::source_box; use crate::components::input::source_box;
use gtk::subclass::prelude::*; use gtk::subclass::prelude::*;
use gtk::{glib, CheckButton, CompositeTemplate, StringList, TemplateChild}; use gtk::{glib, CheckButton, CompositeTemplate, StringList, TemplateChild};
use gtk::{prelude::*, Button, Label, ProgressBar, Scale}; use gtk::{prelude::*, Button, Label, Scale};
use super::output_stream_entry::OutputStreamEntry; use super::output_stream_entry::OutputStreamEntry;
use super::source_entry::SourceEntry; use super::source_entry::SourceEntry;

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

@ -6,7 +6,7 @@ use std::sync::Arc;
use std::time::SystemTime; use std::time::SystemTime;
use gtk::subclass::prelude::*; use gtk::subclass::prelude::*;
use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale}; use gtk::{glib, Button, CompositeTemplate, Label, Scale};
use super::input_stream_entry; use super::input_stream_entry;

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

@ -9,7 +9,7 @@ use crate::components::base::list_entry::ListEntry;
use crate::components::output::input_stream_entry::InputStreamEntry; use crate::components::output::input_stream_entry::InputStreamEntry;
use gtk::subclass::prelude::*; use gtk::subclass::prelude::*;
use gtk::{glib, Box, Button, CheckButton, CompositeTemplate, Label, StringList, TemplateChild}; use gtk::{glib, Box, Button, CheckButton, CompositeTemplate, Label, StringList, TemplateChild};
use gtk::{prelude::*, ProgressBar, Scale}; use gtk::{prelude::*, Scale};
use super::sink_box; use super::sink_box;
use super::sink_entry::SinkEntry; use super::sink_entry::SinkEntry;

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

@ -7,7 +7,7 @@ use std::time::SystemTime;
use crate::components::output::sink_entry; use crate::components::output::sink_entry;
use gtk::subclass::prelude::*; use gtk::subclass::prelude::*;
use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, ProgressBar, Scale}; use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, Scale};
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetSinkEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetSinkEntry.ui")]

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

@ -130,7 +130,7 @@ impl WifiOptions {
self_imp.reset_ip6_gateway.set_text(&conn.ipv6.gateway); self_imp.reset_ip6_gateway.set_text(&conn.ipv6.gateway);
// Security // Security
if let TypeSettings::WIFI(wifi, wifi_security) = &conn.device { if let TypeSettings::WIFI(_, wifi_security) = &conn.device {
match wifi_security.key_management { match wifi_security.key_management {
KeyManagement::NONE => { KeyManagement::NONE => {
self_imp.reset_wifi_security_dropdown.set_selected(0); self_imp.reset_wifi_security_dropdown.set_selected(0);
@ -353,12 +353,12 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
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, wifi_security)) => { // None (0 , TypeSettings::WIFI(_, wifi_security)) => { // None
imp.reset_wifi_password.set_visible(false); imp.reset_wifi_password.set_visible(false);
wifi_security.key_management = KeyManagement::NONE; wifi_security.key_management = KeyManagement::NONE;
wifi_security.authentication_algorithm = String::from("none"); wifi_security.authentication_algorithm = String::from("none");
}, },
(1 , TypeSettings::WIFI(wifi, wifi_security)) => { // WPA/WPA2 Personal (1 , TypeSettings::WIFI(_, wifi_security)) => { // WPA/WPA2 Personal
imp.reset_wifi_password.set_visible(true); imp.reset_wifi_password.set_visible(true);
wifi_security.key_management = KeyManagement::WPAPSK; wifi_security.key_management = KeyManagement::WPAPSK;
wifi_security.authentication_algorithm = String::from("none"); wifi_security.authentication_algorithm = String::from("none");
@ -371,7 +371,7 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
.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();
if let TypeSettings::WIFI(wifi, wifi_security) = &mut conn.device { if let TypeSettings::WIFI(_, wifi_security) = &mut conn.device {
wifi_security.psk = password_input.to_string(); wifi_security.psk = password_input.to_string();
} }
})); }));
@ -385,11 +385,10 @@ fn set_connection_settings(path: Path<'static>, prop: HashMap<String, PropMap>)
"/org/Xetibo/ReSetDaemon", "/org/Xetibo/ReSetDaemon",
Duration::from_millis(1000), Duration::from_millis(1000),
); );
let asdf: Result<(bool,), Error> = proxy.method_call( let _: Result<(bool,), Error> = proxy.method_call(
"org.Xetibo.ReSetWireless", "org.Xetibo.ReSetWireless",
"SetConnectionSettings", "SetConnectionSettings",
(path, prop), (path, prop),
); );
dbg!(asdf);
}); });
} }