Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-07-01 15:57:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix cmb

Browse source 
Add new fields in general wifi options
This commit is contained in:
takotori 2023-11-21 10:47:08 +01:00
parent ed7b814e62
commit ba48f5ba33
7 changed files with 225 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/wifi/wifiOptions.rs
View file

@ -7,7 +7,7 @@ use adw::subclass::prelude::ObjectSubclassIsExt;
use dbus::arg::PropMap;
use glib::{PropertySet, Cast, ObjectExt, clone};
use gtk::prelude::{EditableExt, WidgetExt};
use ReSet_Lib::network::connection::{Connection, Enum};
use ReSet_Lib::network::connection::{Connection, Enum, TypeSettings};
use crate::components::wifi::wifiAddressEntry::WifiAddressEntry;
use crate::components::wifi::wifiOptionsImpl;
@ -34,6 +34,12 @@ impl WifiOptions {
selfImp.resetWifiName.set_subtitle(&*conn.settings.name);
selfImp.resetWifiAutoConnect.set_active(conn.settings.autoconnect);
selfImp.resetWifiMetered.set_active(if conn.settings.metered != -1 { true } else { false });
// match conn.device.borrow() {
// TypeSettings::WIFI(wifi) => {}
// TypeSettings::ETHERNET(ethernet) => {}
// TypeSettings::VPN(vpn) => {}
// TypeSettings::None => {}
// };
// IPv4
selfImp.resetIP4Method.set_selected(conn.ipv4.dns_method.to_i32() as u32);
self.setIP4Visibility(conn.ipv4.dns_method.to_i32() as u32);
@ -98,8 +104,6 @@ impl WifiOptions {
dbg!(conn);
}
pub fn setIP4Visibility(&self, method: u32) {
let selfImp = self.imp();
match method {

10
src/components/wifi/wifiOptionsImpl.rs
View file

@ -17,6 +17,16 @@ pub struct WifiOptions {
#[template_child]
pub resetWifiMac: TemplateChild<ActionRow>,
#[template_child]
pub resetWifiLinkSpeed: TemplateChild<ActionRow>,
#[template_child]
pub resetWifiIP4Addr: TemplateChild<ActionRow>,
#[template_child]
pub resetWifiIP6Addr: TemplateChild<ActionRow>,
#[template_child]
pub resetWifiGateway: TemplateChild<ActionRow>,
#[template_child]
pub resetWifiDNS: TemplateChild<ActionRow>,
#[template_child]
pub resetWifiAutoConnect: TemplateChild<SwitchRow>,
#[template_child]
pub resetWifiMetered: TemplateChild<SwitchRow>,