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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -6,7 +6,7 @@ description = "A wip universal Linux settings application."
[dependencies]
reset_daemon = "0.1.9"
ReSet-Lib = "0.3.8"
ReSet-Lib = "0.4.0"
adw = { version = "0.5.3", package = "libadwaita", features = ["v1_4"] }
dbus = "0.9.7"
gtk = { version = "0.7.3", package = "gtk4", features = ["v4_12"] }

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>,

392
src/resources/resetUI.cmb
View file

@ -18,11 +18,15 @@
(17,1,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None),
(18,1,None,"resetSinkEntry.ui",None,None,None,None,None,None,None),
(19,1,None,"resetSourceEntry.ui",None,None,None,None,None,None,None),
(20,8,None,"resetWifiOptions.ui",None,None,None,None,None,None,None),
(21,1,None,"resetCardEntry.ui",None,None,None,None,None,None,None)
(20,1,None,"resetCardEntry.ui",None,None,None,None,None,None,None),
(21,1,None,"resetWifiOptions.ui",None,None,None,None,None,None,None),
(22,1,None,"resetWifiAddressEntry.ui",None,None,None,None,None,None,None),
(23,1,None,"resetWifiRouteEntry.ui",None,None,None,None,None,None,None)
</ui>
<ui_library>
(21,"gtk","4.12",None),
(21,"libadwaita","1.4",None)
</ui_library>
<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,2,"AdwOverlaySplitView","resetOverlaySplitView",1,None,None,None,2,""),
@ -278,81 +282,69 @@
(19,9,"GtkLabel","resetVolumePercentage",5,None,None,None,2,None),
(19,10,"GtkProgressBar","resetVolumeMeter",1,None,None,None,2,None),
(19,12,"GtkAdjustment",None,7,None,None,None,-1,None),
(20,8,"AdwNavigationPage","resetWifiOptions",None,None,None,None,-1,None),
(20,9,"GtkNotebook",None,8,None,None,None,None,None),
(20,10,"GtkBox",None,9,None,None,None,None,None),
(20,11,"GtkLabel",None,9,None,"tab",None,1,None),
(20,15,"GtkBox",None,9,None,None,None,4,None),
(20,16,"GtkBox",None,9,None,None,None,6,None),
(20,18,"GtkLabel",None,9,None,"tab",None,5,None),
(20,19,"GtkLabel",None,9,None,"tab",None,7,None),
(20,29,"AdwPreferencesGroup",None,10,None,None,None,-1,None),
(20,30,"AdwActionRow","resetWifiName",29,None,None,None,None,None),
(20,32,"AdwActionRow","resetWifiMac",29,None,None,None,2,None),
(20,37,"AdwSwitchRow","resetWifiAutoConnect",29,None,None,None,3,None),
(20,38,"AdwSwitchRow","resetWifiMetered",29,None,None,None,4,None),
(20,137,"AdwPreferencesGroup",None,15,None,None,None,None,None),
(20,138,"AdwComboRow","resetIP6Method",137,None,None,None,None,None),
(20,139,"GtkStringList",None,138,None,None,None,None,None),
(20,140,"AdwPreferencesGroup","resetIP6AddressGroup",15,None,None,None,1,None),
(20,155,"AdwPreferencesGroup","resetIP6RoutesGroup",15,None,None,None,2,None),
(20,182,"AdwPreferencesGroup",None,16,None,None,None,None,None),
(20,183,"AdwComboRow",None,182,None,None,None,None,None),
(20,184,"GtkStringList",None,183,None,None,None,None,None),
(20,185,"AdwPasswordEntryRow",None,182,None,None,None,2,None),
(20,192,"GtkBox",None,9,None,None,None,2,None),
(20,193,"AdwPreferencesGroup",None,192,None,None,None,None,None),
(20,194,"AdwComboRow","resetIP4Method",193,None,None,None,None,None),
(20,195,"GtkStringList",None,194,None,None,None,None,None),
(20,196,"AdwPreferencesGroup","resetIP4AddressGroup",192,None,None,None,1,None),
(20,214,"AdwPreferencesGroup","resetIP4RoutesGroup",192,None,None,None,2,None),
(20,229,"GtkLabel",None,9,None,"tab",None,3,None),
(20,230,"AdwEntryRow","resetIP4DNS",193,None,None,None,1,None),
(20,231,"AdwEntryRow","resetIP4Gateway",193,None,None,None,2,None),
(20,232,"AdwEntryRow","resetIP6DNS",137,None,None,None,1,None),
(20,233,"AdwEntryRow","resetIP6Gateway",137,None,None,None,2,None),
(20,273,"GtkBox",None,140,None,None,None,-1,None),
(20,274,"GtkBox",None,155,None,None,None,-1,None),
(20,275,"AdwExpanderRow",None,274,None,None,None,None,None),
(20,276,"AdwEntryRow",None,275,None,None,None,None,None),
(20,277,"AdwEntryRow",None,275,None,None,None,1,None),
(20,278,"GtkBox",None,275,None,None,None,2,None),
(20,279,"AdwEntryRow",None,278,None,None,None,None,None),
(20,280,"AdwEntryRow",None,278,None,None,None,1,None),
(20,281,"AdwExpanderRow",None,273,None,None,None,None,None),
(20,282,"AdwEntryRow",None,281,None,None,None,None,None),
(20,283,"AdwEntryRow",None,281,None,None,None,1,None),
(20,284,"GtkButton",None,273,None,None,None,1,None),
(20,285,"GtkButton",None,274,None,None,None,1,None),
(20,286,"AdwComboRow",None,182,None,None,None,3,None),
(20,288,"AdwComboRow",None,182,None,None,None,4,None),
(20,289,"GtkStringList",None,286,None,None,None,-1,None),
(20,290,"GtkStringList",None,288,None,None,None,-1,None),
(20,291,"AdwEntryRow",None,182,None,None,None,1,None),
(20,292,"GtkBox",None,214,None,None,None,-1,None),
(20,294,"GtkSwitch",None,292,None,None,None,1,None),
(20,295,"GtkLabel",None,292,None,None,None,None,None),
(20,296,"GtkBox",None,155,None,None,None,-1,None),
(20,297,"GtkLabel",None,296,None,None,None,None,None),
(20,298,"GtkSwitch",None,296,None,None,None,1,None),
(21,1,"GtkBox","resetCardEntry",None,None,None,None,None,None),
(21,2,"GtkBox",None,1,None,None,None,None,None),
(21,3,"GtkLabel","resetCardName",2,None,None,None,None,None),
(21,5,"GtkDropDown","resetCardDropdown",2,None,None,None,1,None),
(21,6,"GtkStringList","resetCardList",5,None,None,None,-1,None)
(22,1,"GtkBox","resetWifiAddressEntry",None,None,None,None,None,None),
(22,2,"AdwExpanderRow","resetAddressRow",1,None,None,None,None,None),
(22,3,"AdwEntryRow","resetAddressAddress",2,None,None,None,None,None),
(20,1,"GtkBox","resetCardEntry",None,None,None,None,None,None),
(20,2,"GtkBox",None,1,None,None,None,None,None),
(20,3,"GtkLabel","resetCardName",2,None,None,None,None,None),
(20,5,"GtkDropDown","resetCardDropdown",2,None,None,None,1,None),
(20,6,"GtkStringList","resetCardList",5,None,None,None,-1,None),
(21,1,"AdwNavigationPage","resetWifiOptions",None,None,None,None,-1,None),
(21,2,"GtkNotebook",None,1,None,None,None,-1,None),
(21,5,"GtkBox",None,2,None,None,None,None,None),
(21,6,"GtkLabel",None,2,None,"tab",None,1,None),
(21,7,"GtkBox",None,2,None,None,None,2,None),
(21,8,"GtkLabel",None,2,None,"tab",None,3,None),
(21,9,"GtkLabel",None,2,None,"tab",None,5,None),
(21,10,"GtkLabel",None,2,None,"tab",None,7,None),
(21,11,"GtkBox",None,2,None,None,None,4,None),
(21,12,"GtkBox",None,2,None,None,None,6,None),
(21,13,"AdwPreferencesGroup",None,5,None,None,None,-1,None),
(21,14,"AdwActionRow","resetWifiName",13,None,None,None,None,None),
(21,16,"AdwActionRow","resetWifiMac",13,None,None,None,1,None),
(21,17,"AdwSwitchRow","resetWifiAutoConnect",13,None,None,None,7,None),
(21,18,"AdwSwitchRow","resetWifiMetered",13,None,None,None,8,None),
(21,19,"AdwPreferencesGroup",None,7,None,None,None,None,None),
(21,20,"AdwComboRow","resetIP4Method",19,None,None,None,-1,None),
(21,21,"AdwEntryRow","resetIP4DNS",19,None,None,None,-1,None),
(21,22,"AdwEntryRow","resetIP4Gateway",19,None,None,None,2,None),
(21,23,"AdwPreferencesGroup","resetIP4AddressGroup",7,None,None,None,1,None),
(21,24,"AdwPreferencesGroup","resetIP4RoutesGroup",7,None,None,None,2,None),
(21,25,"GtkStringList",None,20,None,None,None,-1,None),
(21,26,"GtkBox",None,24,None,None,None,-1,None),
(21,27,"GtkLabel",None,26,None,None,None,-1,None),
(21,28,"GtkSwitch",None,26,None,None,None,-1,None),
(21,29,"AdwPreferencesGroup",None,11,None,None,None,None,None),
(21,30,"AdwComboRow","resetIP6Method",29,None,None,None,None,None),
(21,31,"GtkStringList",None,30,None,None,None,None,None),
(21,32,"AdwEntryRow","resetIP6DNS",29,None,None,None,1,None),
(21,33,"AdwEntryRow","resetIP6Gateway",29,None,None,None,2,None),
(21,34,"AdwPreferencesGroup","resetIP6AddressGroup",11,None,None,None,1,None),
(21,35,"AdwPreferencesGroup","resetIP6RoutesGroup",11,None,None,None,2,None),
(21,36,"GtkBox",None,35,None,None,None,None,None),
(21,37,"GtkLabel",None,36,None,None,None,None,None),
(21,38,"GtkSwitch",None,36,None,None,None,1,None),
(21,39,"AdwPreferencesGroup",None,12,None,None,None,None,None),
(21,40,"AdwComboRow",None,39,None,None,None,None,None),
(21,41,"GtkStringList",None,40,None,None,None,None,None),
(21,42,"AdwEntryRow",None,39,None,None,None,1,None),
(21,44,"AdwPasswordEntryRow",None,39,None,None,None,2,None),
(21,45,"AdwActionRow","resetWifiLinkSpeed",13,None,None,None,2,None),
(21,46,"AdwActionRow","resetWifiIP4Addr",13,None,None,None,3,None),
(21,47,"AdwActionRow","resetWifiIP6Addr",13,None,None,None,4,None),
(21,48,"AdwActionRow","resetWifiGateway",13,None,None,None,5,None),
(21,49,"AdwActionRow","resetWifiDNS",13,None,None,None,6,None),
(22,1,"GtkBox","resetWifiAddressEntry",None,None,None,None,-1,None),
(22,2,"AdwExpanderRow","resetAddressRow",1,None,None,None,-1,None),
(22,3,"AdwEntryRow","resetAddressAddress",2,None,None,None,-1,None),
(22,4,"AdwEntryRow","resetAddressNetmask",2,None,None,None,1,None),
(22,5,"GtkButton","resetAddressRemove",1,None,None,None,1,None),
(22,5,"GtkButton","resetAddressRemove",1,None,None,None,-1,None),
(23,1,"GtkBox","resetWifiRouteEntry",None,None,None,None,None,None),
(23,2,"AdwExpanderRow","resetRouteRow",1,None,None,None,None,None),
(23,3,"AdwEntryRow","resetRouteAddress",2,None,None,None,None,None),
(23,4,"AdwEntryRow","resetRouteNetmask",2,None,None,None,1,None),
(23,5,"GtkBox",None,2,None,None,None,2,None),
(23,6,"AdwEntryRow","resetRouteGateway",5,None,None,None,None,None),
(23,7,"AdwEntryRow","resetRouteMetric",5,None,None,None,1,None),
(23,8,"GtkButton","resetRouteRemove",1,None,None,None,1,None)
(23,5,"GtkButton","resetRouteRemove",1,None,None,None,1,None),
(23,6,"GtkBox",None,2,None,None,None,2,None),
(23,7,"AdwEntryRow","resetRouteGateway",6,None,None,None,None,None),
(23,8,"AdwEntryRow","resetRouteMetric",6,None,None,None,1,None)
</object>
<object_property>
(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
@ -974,164 +966,130 @@
(19,12,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
(19,12,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
(19,12,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
(20,9,"GtkNotebook","page","0",None,None,None,None,None,None,None,None,None),
(20,9,"GtkNotebook","scrollable","True",None,None,None,None,None,None,None,None,None),
(20,9,"GtkNotebook","show-border","False",None,None,None,None,None,None,None,None,None),
(20,10,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(20,11,"GtkLabel","label","General",None,None,None,None,None,None,None,None,None),
(20,15,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(20,15,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
(20,16,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(20,18,"GtkLabel","label","IPv6",None,None,None,None,None,None,None,None,None),
(20,19,"GtkLabel","label","Security",None,None,None,None,None,None,None,None,None),
(20,30,"AdwActionRow","subtitle","asdf",None,None,None,None,None,None,None,None,None),
(20,30,"AdwPreferencesRow","title","WiFi Name",None,None,None,None,None,None,None,None,None),
(20,30,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
(20,30,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
(20,30,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
(20,30,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
(20,30,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
(20,32,"AdwActionRow","subtitle","AA:BB:CC:DD:EE:FF",None,None,None,None,None,None,None,None,None),
(20,32,"AdwPreferencesRow","title","MAC-Address",None,None,None,None,None,None,None,None,None),
(20,32,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
(20,37,"AdwPreferencesRow","title","Connect automatically",None,None,None,None,None,None,None,None,None),
(20,38,"AdwPreferencesRow","title","Metered Connection",None,None,None,None,None,None,None,None,None),
(20,138,"AdwComboRow","model",None,None,None,None,None,139,None,None,None,None),
(20,138,"AdwPreferencesRow","title","IPv6 Method",None,None,None,None,None,None,None,None,None),
(20,140,"AdwPreferencesGroup","title","Addresses",None,None,None,None,None,None,None,None,None),
(20,140,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
(20,155,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,296,None,None,None,None),
(20,155,"AdwPreferencesGroup","title","Routes",None,None,None,None,None,None,None,None,None),
(20,155,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
(20,183,"AdwComboRow","model",None,None,None,None,None,184,None,None,None,None),
(20,183,"AdwPreferencesRow","title","Security",None,None,None,None,None,None,None,None,None),
(20,185,"AdwPreferencesRow","title","Password",None,None,None,None,None,None,None,None,None),
(20,192,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(20,192,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
(20,194,"AdwComboRow","model",None,None,None,None,None,195,None,None,None,None),
(20,194,"AdwPreferencesRow","title","IPv4 Method",None,None,None,None,None,None,None,None,None),
(20,196,"AdwPreferencesGroup","title","Addresses",None,None,None,None,None,None,None,None,None),
(20,196,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
(20,214,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,292,None,None,None,None),
(20,214,"AdwPreferencesGroup","title","Routes",None,None,None,None,None,None,None,None,None),
(20,214,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
(20,229,"GtkLabel","label","IPv4",None,None,None,None,None,None,None,None,None),
(20,230,"AdwPreferencesRow","title","DNS (separate IP by comma, empty for automatic)",None,None,None,None,None,None,None,None,None),
(20,231,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
(20,232,"AdwPreferencesRow","title","DNS (separate IP by comma, empty for automatic)",None,None,None,None,None,None,None,None,None),
(20,233,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
(20,275,"AdwPreferencesRow","title","192.168.1.100, 255.255.255.0, 192.68.1.1, 1",None,None,None,None,None,None,None,None,None),
(20,275,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
(20,276,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None),
(20,277,"AdwPreferencesRow","title","Netmask",None,None,None,None,None,None,None,None,None),
(20,279,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
(20,279,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
(20,280,"AdwPreferencesRow","title","Metric",None,None,None,None,None,None,None,None,None),
(20,280,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None),
(20,281,"AdwPreferencesRow","title","192.168.1.100, 255.255.255.0",None,None,None,None,None,None,None,None,None),
(20,281,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
(20,282,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None),
(20,283,"AdwPreferencesRow","title","Netmask",None,None,None,None,None,None,None,None,None),
(20,284,"GtkButton","icon-name","edit-delete-symbolic",None,None,None,None,None,None,None,None,None),
(20,284,"GtkWidget","height-request","55",None,None,None,None,None,None,None,None,None),
(20,284,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
(20,285,"GtkButton","icon-name","edit-delete-symbolic",None,None,None,None,None,None,None,None,None),
(20,285,"GtkWidget","height-request","55",None,None,None,None,None,None,None,None,None),
(20,285,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
(20,286,"AdwComboRow","model",None,None,None,None,None,289,None,None,None,None),
(20,286,"AdwPreferencesRow","title","WEP Index",None,None,None,None,None,None,None,None,None),
(20,288,"AdwComboRow","model",None,None,None,None,None,290,None,None,None,None),
(20,288,"AdwPreferencesRow","title","Authentication",None,None,None,None,None,None,None,None,None),
(20,291,"AdwPreferencesRow","title","Username",None,None,None,None,None,None,None,None,None),
(20,294,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
(20,295,"GtkLabel","label","Automatic",None,None,None,None,None,None,None,None,None),
(20,295,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
(20,297,"GtkLabel","label","Automatic",None,None,None,None,None,None,None,None,None),
(20,297,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
(20,298,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
(21,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(21,1,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
(21,1,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
(21,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
(21,1,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
(21,2,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
(21,3,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
(21,3,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None),
(21,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
(21,5,"GtkDropDown","model",None,None,None,None,None,6,None,None,None,None),
(21,5,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
(21,5,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
(21,5,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None)
(20,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(20,1,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
(20,1,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
(20,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
(20,1,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
(20,2,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
(20,3,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
(20,3,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None),
(20,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
(20,5,"GtkDropDown","model",None,None,None,None,None,6,None,None,None,None),
(20,5,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
(20,5,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
(20,5,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
(21,2,"GtkNotebook","scrollable","True",None,None,None,None,None,None,None,None,None),
(21,2,"GtkNotebook","show-border","False",None,None,None,None,None,None,None,None,None),
(21,5,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(21,6,"GtkLabel","label","General",None,None,None,None,None,None,None,None,None),
(21,7,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(21,8,"GtkLabel","label","IPv4",None,None,None,None,None,None,None,None,None),
(21,9,"GtkLabel","label","IPv6",None,None,None,None,None,None,None,None,None),
(21,10,"GtkLabel","label","Security",None,None,None,None,None,None,None,None,None),
(21,11,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(21,12,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(21,14,"AdwPreferencesRow","title","WiFi Name",None,None,None,None,None,None,None,None,None),
(21,14,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
(21,16,"AdwPreferencesRow","title","MAC-Address",None,None,None,None,None,None,None,None,None),
(21,16,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
(21,17,"AdwPreferencesRow","title","Connect automatically",None,None,None,None,None,None,None,None,None),
(21,18,"AdwPreferencesRow","title","Metered Connection",None,None,None,None,None,None,None,None,None),
(21,20,"AdwComboRow","model",None,None,None,None,None,25,None,None,None,None),
(21,20,"AdwPreferencesRow","title","IPv4 Method",None,None,None,None,None,None,None,None,None),
(21,21,"AdwPreferencesRow","title","DNS (separate IP by comma, empty for automatic)",None,None,None,None,None,None,None,None,None),
(21,22,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
(21,23,"AdwPreferencesGroup","title","Addresses",None,None,None,None,None,None,None,None,None),
(21,23,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
(21,24,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,26,None,None,None,None),
(21,24,"AdwPreferencesGroup","title","Routes",None,None,None,None,None,None,None,None,None),
(21,24,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
(21,27,"GtkLabel","label","Automatic",None,None,None,None,None,None,None,None,None),
(21,27,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
(21,28,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
(21,30,"AdwComboRow","model",None,None,None,None,None,31,None,None,None,None),
(21,30,"AdwPreferencesRow","title","IPv6 Method",None,None,None,None,None,None,None,None,None),
(21,32,"AdwPreferencesRow","title","DNS (separate IP by comma, empty for automatic)",None,None,None,None,None,None,None,None,None),
(21,33,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
(21,34,"AdwPreferencesGroup","title","Addresses",None,None,None,None,None,None,None,None,None),
(21,34,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
(21,35,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,36,None,None,None,None),
(21,35,"AdwPreferencesGroup","title","Routes",None,None,None,None,None,None,None,None,None),
(21,35,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
(21,37,"GtkLabel","label","Automatic",None,None,None,None,None,None,None,None,None),
(21,37,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
(21,38,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
(21,40,"AdwComboRow","model",None,None,None,None,None,41,None,None,None,None),
(21,40,"AdwPreferencesRow","title","Security",None,None,None,None,None,None,None,None,None),
(21,42,"AdwPreferencesRow","title","Username",None,None,None,None,None,None,None,None,None),
(21,44,"AdwPreferencesRow","title","Password",None,None,None,None,None,None,None,None,None),
(21,45,"AdwPreferencesRow","title","Link Speed",None,None,None,None,None,None,None,None,None),
(21,45,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
(21,46,"AdwPreferencesRow","title","IPv4 Address",None,None,None,None,None,None,None,None,None),
(21,46,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
(21,47,"AdwPreferencesRow","title","IPv6 Address",None,None,None,None,None,None,None,None,None),
(21,47,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
(21,48,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
(21,48,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
(21,49,"AdwPreferencesRow","title","DNS",None,None,None,None,None,None,None,None,None),
(21,49,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
(22,2,"AdwPreferencesRow","title","Add new Address",None,None,None,None,None,None,None,None,None),
(22,2,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
(22,3,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None),
(22,4,"AdwPreferencesRow","title","Netmask",None,None,None,None,None,None,None,None,None),
(22,5,"GtkButton","icon-name","edit-delete-symbolic",None,None,None,None,None,None,None,None,None),
(22,5,"GtkWidget","height-request","55",None,None,None,None,None,None,None,None,None),
(22,5,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
(23,2,"AdwPreferencesRow","title","Add new Route",None,None,None,None,None,None,None,None,None),
(23,2,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
(23,3,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None),
(23,4,"AdwPreferencesRow","title","Netmask",None,None,None,None,None,None,None,None,None),
(23,6,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
(23,6,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
(23,7,"AdwPreferencesRow","title","Metric",None,None,None,None,None,None,None,None,None),
(23,7,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None),
(23,8,"GtkButton","icon-name","edit-delete-symbolic",None,None,None,None,None,None,None,None,None),
(23,8,"GtkWidget","height-request","55",None,None,None,None,None,None,None,None,None),
(23,8,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None)
(23,5,"GtkButton","icon-name","edit-delete-symbolic",None,None,None,None,None,None,None,None,None),
(23,5,"GtkWidget","height-request","55",None,None,None,None,None,None,None,None,None),
(23,5,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
(23,7,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
(23,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
(23,8,"AdwPreferencesRow","title","Metric",None,None,None,None,None,None,None,None,None),
(23,8,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None)
</object_property>
<object_data>
(3,42,"GtkWidget",1,1,None,None,None,None,None,None),
(3,42,"GtkWidget",2,2,None,1,None,None,None,None),
(7,9,"GtkScale",1,1,None,None,None,None,None,None),
(7,9,"GtkScale",2,2,"100%",1,None,None,None,None),
(8,99,"GtkScale",1,1,None,None,None,None,None,None),
(8,99,"GtkScale",2,2,"100%",1,None,None,None,None),
(12,25,"GtkScale",1,1,None,None,None,None,None,None),
(12,25,"GtkScale",2,2,"100%",1,None,None,None,None),
(13,17,"GtkScale",1,1,None,None,None,None,None,None),
(13,17,"GtkScale",2,2,"100%",1,None,None,None,None),
(18,7,"GtkScale",1,1,None,None,None,None,None,None),
(18,7,"GtkScale",2,2,"100%",1,None,None,None,None),
(19,7,"GtkScale",1,1,None,None,None,None,None,None),
(19,7,"GtkScale",2,2,"100%",1,None,None,None,None)
(20,139,"GtkStringList",1,1,None,None,None,None,None,None),
(20,139,"GtkStringList",2,2,"Automatic",1,None,None,None,None),
(20,139,"GtkStringList",2,3,"Automatic (DHCP only)",1,None,None,None,None),
(20,139,"GtkStringList",2,4,"Manual",1,None,None,None,None),
(20,139,"GtkStringList",2,5,"Shared to other computers",1,None,None,None,None),
(20,139,"GtkStringList",2,6,"Link-Local Only",1,None,None,None,None),
(20,139,"GtkStringList",2,7,"Disabled",1,None,None,None,None),
(20,184,"GtkStringList",2,10,"WPA3 Personal",1,None,None,None,None),
(20,184,"GtkStringList",2,9,"WPA &amp; WPA2 Enterprise",1,None,None,None,None),
(20,184,"GtkStringList",2,8,"WPA &amp; WPA2 Personal",1,None,None,None,None),
(20,184,"GtkStringList",2,7,"Dynamic WEP (802.1X)",1,None,None,None,None),
(20,184,"GtkStringList",1,1,None,None,None,None,None,None),
(20,184,"GtkStringList",2,2,"None",1,None,None,None,None),
(20,184,"GtkStringList",2,3,"Enhanced Open",1,None,None,None,None),
(20,184,"GtkStringList",2,4,"WEP 40/128-bit Key (Hex or ASCII)",1,None,None,None,None),
(20,184,"GtkStringList",2,5,"WEP 128-bit Passphrase",1,None,None,None,None),
(20,184,"GtkStringList",2,6,"LEAP",1,None,None,None,None),
(20,195,"GtkStringList",1,1,None,None,None,None,None,None),
(20,195,"GtkStringList",2,2,"Automatic (DHCP)",1,None,None,None,None),
(20,195,"GtkStringList",2,3,"Manual",1,None,None,None,None),
(20,195,"GtkStringList",2,4,"Link-Local Only",1,None,None,None,None),
(20,195,"GtkStringList",2,5,"Shared to other computers",1,None,None,None,None),
(20,195,"GtkStringList",2,6,"Disabled",1,None,None,None,None),
(20,139,"GtkStringList",2,7,"Disabled",1,None,None,None,None),
(20,139,"GtkStringList",2,6,"Shared to other computers",1,None,None,None,None),
(20,139,"GtkStringList",2,5,"Link-Local Only",1,None,None,None,None),
(20,139,"GtkStringList",2,4,"Manual",1,None,None,None,None),
(20,139,"GtkStringList",2,3,"Automatic (DHCP)",1,None,None,None,None),
(20,139,"GtkStringList",2,2,"Automatic",1,None,None,None,None),
(20,139,"GtkStringList",1,1,None,None,None,None,None,None),
(20,289,"GtkStringList",1,1,None,None,None,None,None,None),
(20,289,"GtkStringList",2,2,"1 (Default)",1,None,None,None,None),
(20,289,"GtkStringList",2,3,"2",1,None,None,None,None),
(20,289,"GtkStringList",2,4,"3",1,None,None,None,None),
(20,289,"GtkStringList",2,5,"4",1,None,None,None,None),
(20,290,"GtkStringList",1,1,None,None,None,None,None,None),
(20,290,"GtkStringList",2,2,"Open System",1,None,None,None,None),
(20,290,"GtkStringList",2,3,"Shared Key",1,None,None,None,None)
(7,9,"GtkScale",1,1,None,None,None,None,None,None),
(7,9,"GtkScale",2,2,"100%",1,None,None,None,None),
(8,99,"GtkScale",1,1,None,None,None,None,None,None),
(8,99,"GtkScale",2,2,"100%",1,None,None,None,None),
(12,25,"GtkScale",1,1,None,None,None,None,None,None),
(12,25,"GtkScale",2,2,"100%",1,None,None,None,None),
(13,17,"GtkScale",1,1,None,None,None,None,None,None),
(13,17,"GtkScale",2,2,"100%",1,None,None,None,None),
(18,7,"GtkScale",1,1,None,None,None,None,None,None),
(18,7,"GtkScale",2,2,"100%",1,None,None,None,None),
(19,7,"GtkScale",1,1,None,None,None,None,None,None),
(19,7,"GtkScale",2,2,"100%",1,None,None,None,None),
(21,25,"GtkStringList",1,1,None,None,None,None,None,None),
(21,25,"GtkStringList",2,2,"Automatic (DHCP)",1,None,None,None,None),
(21,25,"GtkStringList",2,3,"Manual",1,None,None,None,None),
(21,25,"GtkStringList",2,4,"Link-Local Only",1,None,None,None,None),
(21,25,"GtkStringList",2,5,"Shared to other computers",1,None,None,None,None),
(21,25,"GtkStringList",2,6,"Disabled",1,None,None,None,None),
(21,31,"GtkStringList",1,1,None,None,None,None,None,None),
(21,31,"GtkStringList",2,2,"Automatic",1,None,None,None,None),
(21,31,"GtkStringList",2,3,"Automatic (DHCP)",1,None,None,None,None),
(21,31,"GtkStringList",2,4,"Manual",1,None,None,None,None),
(21,31,"GtkStringList",2,5,"Link-Local Only",1,None,None,None,None),
(21,31,"GtkStringList",2,6,"Shared to other computers",1,None,None,None,None),
(21,31,"GtkStringList",2,7,"Disabled",1,None,None,None,None),
(21,41,"GtkStringList",1,1,None,None,None,None,None,None),
(21,41,"GtkStringList",2,2,"None",1,None,None,None,None),
(21,41,"GtkStringList",2,3,"Enhanced Open",1,None,None,None,None),
(21,41,"GtkStringList",2,4,"WEP 40/128-bit Key (Hex or ASCII)",1,None,None,None,None),
(21,41,"GtkStringList",2,5,"WEP 128-bit Passphrase",1,None,None,None,None),
(21,41,"GtkStringList",2,6,"LEAP",1,None,None,None,None),
(21,41,"GtkStringList",2,7,"Dynamic WEP (802.1X)",1,None,None,None,None),
(21,41,"GtkStringList",2,8,"WPA &amp; WPA2 Personal",1,None,None,None,None),
(21,41,"GtkStringList",2,9,"WPA &amp; WPA2 Enterprise",1,None,None,None,None),
(21,41,"GtkStringList",2,10,"WPA3 Personal",1,None,None,None,None)
</object_data>
<object_data_arg>
(7,9,"GtkScale",2,2,"value","65536.0"),

1
src/resources/resetWifiAddressEntry.ui
View file

@ -7,6 +7,7 @@
<child>
<object class="AdwExpanderRow" id="resetAddressRow">
<property name="hexpand">True</property>
<property name="title">Add new Address</property>
<child>
<object class="AdwEntryRow" id="resetAddressAddress">
<property name="title">Address</property>

137
src/resources/resetWifiOptions.ui
View file

@ -6,7 +6,6 @@
<template class="resetWifiOptions" parent="AdwNavigationPage">
<child>
<object class="GtkNotebook">
<property name="page">0</property>
<property name="scrollable">True</property>
<property name="show-border">False</property>
<child>
@ -17,21 +16,45 @@
<child>
<object class="AdwActionRow" id="resetWifiName">
<property name="css-classes">property</property>
<property name="margin-bottom">5</property>
<property name="margin-end">5</property>
<property name="margin-start">5</property>
<property name="margin-top">5</property>
<property name="subtitle">asdf</property>
<property name="title">WiFi Name</property>
</object>
</child>
<child>
<object class="AdwActionRow" id="resetWifiMac">
<property name="css-classes">property</property>
<property name="subtitle">AA:BB:CC:DD:EE:FF</property>
<property name="title">MAC-Address</property>
</object>
</child>
<child>
<object class="AdwActionRow" id="resetWifiLinkSpeed">
<property name="css-classes">property</property>
<property name="title">Link Speed</property>
</object>
</child>
<child>
<object class="AdwActionRow" id="resetWifiIP4Addr">
<property name="css-classes">property</property>
<property name="title">IPv4 Address</property>
</object>
</child>
<child>
<object class="AdwActionRow" id="resetWifiIP6Addr">
<property name="css-classes">property</property>
<property name="title">IPv6 Address</property>
</object>
</child>
<child>
<object class="AdwActionRow" id="resetWifiGateway">
<property name="css-classes">property</property>
<property name="title">Gateway</property>
</object>
</child>
<child>
<object class="AdwActionRow" id="resetWifiDNS">
<property name="css-classes">property</property>
<property name="title">DNS</property>
</object>
</child>
<child>
<object class="AdwSwitchRow" id="resetWifiAutoConnect">
<property name="title">Connect automatically</property>
@ -54,7 +77,6 @@
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="width-request">500</property>
<child>
<object class="AdwPreferencesGroup">
<child>
@ -122,7 +144,6 @@
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="width-request">500</property>
<child>
<object class="AdwPreferencesGroup">
<child>
@ -158,33 +179,6 @@
<object class="AdwPreferencesGroup" id="resetIP6AddressGroup">
<property name="margin-top">10</property>
<property name="title">Addresses</property>
<child>
<object class="GtkBox">
<child>
<object class="AdwExpanderRow">
<property name="hexpand">True</property>
<property name="title">192.168.1.100, 255.255.255.0</property>
<child>
<object class="AdwEntryRow">
<property name="title">Address</property>
</object>
</child>
<child>
<object class="AdwEntryRow">
<property name="title">Netmask</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton">
<property name="height-request">55</property>
<property name="icon-name">edit-delete-symbolic</property>
<property name="valign">start</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
@ -206,49 +200,6 @@
</property>
<property name="margin-top">10</property>
<property name="title">Routes</property>
<child>
<object class="GtkBox">
<child>
<object class="AdwExpanderRow">
<property name="hexpand">True</property>
<property name="title">192.168.1.100, 255.255.255.0, 192.68.1.1, 1</property>
<child>
<object class="AdwEntryRow">
<property name="title">Address</property>
</object>
</child>
<child>
<object class="AdwEntryRow">
<property name="title">Netmask</property>
</object>
</child>
<child>
<object class="GtkBox">
<child>
<object class="AdwEntryRow">
<property name="hexpand">True</property>
<property name="title">Gateway</property>
</object>
</child>
<child>
<object class="AdwEntryRow">
<property name="max-width-chars">5</property>
<property name="title">Metric</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton">
<property name="height-request">55</property>
<property name="icon-name">edit-delete-symbolic</property>
<property name="valign">start</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
@ -293,34 +244,6 @@
<property name="title">Password</property>
</object>
</child>
<child>
<object class="AdwComboRow">
<property name="model">
<object class="GtkStringList">
<items>
<item>1 (Default)</item>
<item>2</item>
<item>3</item>
<item>4</item>
</items>
</object>
</property>
<property name="title">WEP Index</property>
</object>
</child>
<child>
<object class="AdwComboRow">
<property name="model">
<object class="GtkStringList">
<items>
<item>Open System</item>
<item>Shared Key</item>
</items>
</object>
</property>
<property name="title">Authentication</property>
</object>
</child>
</object>
</child>
</object>

1
src/resources/resetWifiRouteEntry.ui
View file

@ -7,6 +7,7 @@
<child>
<object class="AdwExpanderRow" id="resetRouteRow">
<property name="hexpand">True</property>
<property name="title">Add new Route</property>
<child>
<object class="AdwEntryRow" id="resetRouteAddress">
<property name="title">Address</property>