From db501b2e93e05fb3dc1030e9271a194cd0ce9ac7 Mon Sep 17 00:00:00 2001 From: takotori Date: Thu, 14 Dec 2023 15:53:56 +0100 Subject: [PATCH] improve ui --- Cargo.toml | 4 +- src/components/input/source_entry.rs | 2 + src/components/output/sink_entry.rs | 2 + src/components/utils.rs | 36 ++-- src/components/window/reset_window.rs | 2 +- src/resources/resetAudioInput.ui | 86 +++++---- src/resources/resetAudioOutput.ui | 90 ++++----- src/resources/resetBluetooth.ui | 7 +- src/resources/resetInputStreamEntry.ui | 4 +- src/resources/resetOutputStreamEntry.ui | 4 +- src/resources/resetSinkEntry.ui | 8 +- src/resources/resetSourceEntry.ui | 8 +- src/resources/resetUI.cmb | 237 +++++++++++++----------- src/resources/resetWiFi.ui | 1 + src/resources/resetWifiAddressEntry.ui | 30 +-- src/resources/resetWifiRouteEntry.ui | 56 +++--- src/resources/style/style.css | 3 + 17 files changed, 320 insertions(+), 260 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 23d16a5..6aba55a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,8 +7,8 @@ repository = "https://github.com/Xetibo/ReSet" license = "GPL-3.0-only" [dependencies] -reset_daemon = "0.5.7" -re_set-lib = "0.8.4" +reset_daemon = "0.6.0" +re_set-lib = "0.8.5" adw = { version = "0.5.3", package = "libadwaita", features = ["v1_4"] } dbus = "0.9.7" gtk = { version = "0.7.3", package = "gtk4", features = ["v4_12"] } diff --git a/src/components/input/source_entry.rs b/src/components/input/source_entry.rs index 6b5bfc3..d822596 100644 --- a/src/components/input/source_entry.rs +++ b/src/components/input/source_entry.rs @@ -10,6 +10,7 @@ use glib::subclass::types::ObjectSubclassIsExt; use glib::{clone, Propagation}; use gtk::{gio, CheckButton}; use re_set_lib::audio::audio_structures::Source; +use crate::components::utils::set_action_row_ellipsis; use crate::components::utils::{BASE, DBUS_PATH, AUDIO}; @@ -98,6 +99,7 @@ impl SourceEntry { } toggle_source_mute(source.index, source.muted); })); + set_action_row_ellipsis(imp.reset_source_name.get()); } obj } diff --git a/src/components/output/sink_entry.rs b/src/components/output/sink_entry.rs index 040ce21..d8ccdf6 100644 --- a/src/components/output/sink_entry.rs +++ b/src/components/output/sink_entry.rs @@ -10,6 +10,7 @@ use glib::subclass::types::ObjectSubclassIsExt; use glib::{clone, Propagation}; use gtk::{gio, CheckButton}; use re_set_lib::audio::audio_structures::Sink; +use crate::components::utils::set_action_row_ellipsis; use crate::components::utils::{AUDIO, DBUS_PATH, BASE}; @@ -96,6 +97,7 @@ impl SinkEntry { } toggle_sink_mute(stream.index, stream.muted); })); + set_action_row_ellipsis(imp.reset_sink_name.get()); } obj } diff --git a/src/components/utils.rs b/src/components/utils.rs index 3ab1dd4..a5b08c9 100644 --- a/src/components/utils.rs +++ b/src/components/utils.rs @@ -1,9 +1,9 @@ +use adw::{ActionRow, ComboRow}; use adw::gdk::pango::EllipsizeMode; use adw::prelude::ListModelExtManual; -use adw::ComboRow; use glib::{Cast, Object}; -use gtk::prelude::{GObjectPropertyExpressionExt, ListBoxRowExt, ListItemExt, WidgetExt}; use gtk::{Align, SignalListItemFactory, StringObject}; +use gtk::prelude::{GObjectPropertyExpressionExt, ListBoxRowExt, ListItemExt, WidgetExt}; pub const DBUS_PATH: &str = "/org/Xetibo/ReSet/Daemon"; pub const WIRELESS: &str = "org.Xetibo.ReSet.Wireless"; @@ -17,22 +17,14 @@ pub fn create_dropdown_label_factory() -> SignalListItemFactory { let item = item.downcast_ref::().unwrap(); let label = gtk::Label::new(None); label.set_halign(Align::Start); - item.property_expression("item") - .chain_property::("string") - .bind(&label, "label", gtk::Widget::NONE); + item.property_expression("item").chain_property::("string").bind(&label, "label", gtk::Widget::NONE); item.set_child(Some(&label)); }); factory } pub fn set_combo_row_ellipsis(element: ComboRow) { - for (i, child) in element - .child() - .unwrap() - .observe_children() - .iter::() - .enumerate() - { + for (i, child) in element.child().unwrap().observe_children().iter::().enumerate() { if i == 2 { if let Ok(object) = child { if let Some(item) = object.downcast_ref::() { @@ -47,3 +39,23 @@ pub fn set_combo_row_ellipsis(element: ComboRow) { } } } + +pub fn set_action_row_ellipsis(element: ActionRow) { + let option = element.first_child(); + if let Some(first_box) = option { + for (i, child) in first_box.observe_children().iter::().enumerate() { + if i == 2 { + if let Ok(object) = child { + if let Some(item) = object.downcast_ref::() { + if let Some(widget) = item.first_child() { + if let Some(label) = widget.downcast_ref::() { + label.set_ellipsize(EllipsizeMode::End); + label.set_max_width_chars(1); + } + } + } + } + } + } + } +} diff --git a/src/components/window/reset_window.rs b/src/components/window/reset_window.rs index cc342b8..50d5c6a 100644 --- a/src/components/window/reset_window.rs +++ b/src/components/window/reset_window.rs @@ -3,7 +3,7 @@ use adw::subclass::prelude::ObjectSubclassIsExt; use adw::BreakpointCondition; use glib::Object; use gtk::gio::ActionEntry; -use gtk::{gio, glib, Application, ListBoxRow, Orientation}; +use gtk::{gio, glib, Application, ListBoxRow, Orientation, AccessibleRole}; use gtk::{prelude::*, DirectionType}; use crate::components::window::handle_sidebar_click::*; diff --git a/src/resources/resetAudioInput.ui b/src/resources/resetAudioInput.ui index b853c34..38e3c09 100644 --- a/src/resources/resetAudioInput.ui +++ b/src/resources/resetAudioInput.ui @@ -11,6 +11,7 @@ resetSettingLabel start Input + 10 5 @@ -25,6 +26,7 @@ vertical + 10 Input Devices @@ -47,54 +49,52 @@ + audioRow Default Input Device True - - - - - 10 - 5 - 5 - 10 - vertical - - 5 - 5 - - - audio-input-microphone-symbolic - 5 - center - - - - - - - 2005.4016 - 2005.4016 - 100270.08 + + + + 5 + 10 + 10 + + + audio-input-microphone-symbolic + 5 + center - - True - center - bottom - - 100% - + + + + + + 2005.4016 + 2005.4016 + 100270.08 + + + True + 15 + center + bottom + + 100% + + + + + + 100% + 1 + 40 + + - - - - 100% - 1 - 40 - - + @@ -108,8 +108,10 @@ vertical + heading start Input Streams + 15 @@ -150,8 +152,10 @@ vertical + heading start Input Devices + 15 diff --git a/src/resources/resetAudioOutput.ui b/src/resources/resetAudioOutput.ui index 53807c2..3e6bfa6 100644 --- a/src/resources/resetAudioOutput.ui +++ b/src/resources/resetAudioOutput.ui @@ -11,6 +11,7 @@ resetSettingLabel start Output + 10 5 @@ -25,6 +26,7 @@ vertical + 10 Output Devices @@ -47,54 +49,52 @@ + audioRow Default Output Device True - - - - - 10 - 5 - 5 - 10 - vertical - - 5 - 5 - - - audio-volume-high-symbolic - 5 - center - - - - - - - 2005.4016 - 2005.4016 - 100270.08 + + + + 5 + 10 + 10 + + + audio-volume-high-symbolic + 5 + center - - True - center - bottom - - 100% - + + + + + + 2005.4016 + 2005.4016 + 100270.08 + + + True + 15 + center + bottom + + 100% + + + + + + 100% + 1 + 40 + + - - - - 100% - 1 - 40 - - + @@ -108,8 +108,11 @@ vertical + heading + start Output Streams + 15 @@ -142,9 +145,6 @@ - - - 5 @@ -153,8 +153,10 @@ vertical + heading start Output Devices + 15 diff --git a/src/resources/resetBluetooth.ui b/src/resources/resetBluetooth.ui index a2762a5..e745362 100644 --- a/src/resources/resetBluetooth.ui +++ b/src/resources/resetBluetooth.ui @@ -9,6 +9,7 @@ 40 + 10 resetSettingLabel @@ -63,18 +64,16 @@ view-refresh-symbolic + 15 - 5 - 5 - 5 + 10 Available Devices 5 - 5 5 Connected Devices diff --git a/src/resources/resetInputStreamEntry.ui b/src/resources/resetInputStreamEntry.ui index ca13274..8b6f4fc 100644 --- a/src/resources/resetInputStreamEntry.ui +++ b/src/resources/resetInputStreamEntry.ui @@ -25,7 +25,8 @@ 5 - 5 + 10 + 10 audio-input-microphone-symbolic @@ -43,6 +44,7 @@ True + 15 center bottom diff --git a/src/resources/resetOutputStreamEntry.ui b/src/resources/resetOutputStreamEntry.ui index 3152406..16acd7f 100644 --- a/src/resources/resetOutputStreamEntry.ui +++ b/src/resources/resetOutputStreamEntry.ui @@ -24,7 +24,8 @@ 5 - 5 + 10 + 10 audio-input-microphone-symbolic @@ -42,6 +43,7 @@ True + 15 center bottom diff --git a/src/resources/resetSinkEntry.ui b/src/resources/resetSinkEntry.ui index 1f572bc..67fd3b8 100644 --- a/src/resources/resetSinkEntry.ui +++ b/src/resources/resetSinkEntry.ui @@ -26,7 +26,8 @@ 5 - 5 + 10 + 10 audio-input-microphone-symbolic @@ -44,6 +45,7 @@ True + 15 center bottom @@ -68,8 +70,8 @@ - 5 - 5 + 10 + 10 diff --git a/src/resources/resetSourceEntry.ui b/src/resources/resetSourceEntry.ui index ce35bf1..fd78aad 100644 --- a/src/resources/resetSourceEntry.ui +++ b/src/resources/resetSourceEntry.ui @@ -26,7 +26,8 @@ 5 - 5 + 10 + 10 audio-input-microphone-symbolic @@ -44,6 +45,7 @@ True + 15 center bottom @@ -68,8 +70,8 @@ - 5 - 5 + 10 + 10 diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb index f967f7c..c02086d 100644 --- a/src/resources/resetUI.cmb +++ b/src/resources/resetUI.cmb @@ -99,25 +99,18 @@ (8,56,"GtkBox",None,55,None,None,None,None,None), (8,71,"AdwNavigationPage",None,54,None,None,None,1,None), (8,72,"GtkBox",None,71,None,None,None,None,None), - (8,81,"GtkLabel",None,72,None,None,None,2,None), - (8,85,"GtkBox","reset_input_streams",56,None,None,None,4,None), + (8,85,"GtkBox","reset_input_streams",56,None,None,None,3,None), (8,86,"GtkLabel",None,85,None,None,None,None,None), (8,89,"GtkBox","reset_sinks",72,None,None,None,3,None), (8,90,"GtkLabel",None,89,None,None,None,None,None), - (8,93,"GtkBox",None,56,None,None,None,2,None), - (8,97,"GtkBox",None,93,None,None,None,None,None), - (8,98,"GtkButton","reset_sink_mute",97,None,None,None,None,None), - (8,99,"GtkScale","reset_volume_slider",97,None,None,None,1,None), - (8,101,"GtkLabel","reset_volume_percentage",97,None,None,None,2,None), - (8,103,"GtkSeparator",None,56,None,None,None,3,None), - (8,115,"GtkAdjustment",None,99,None,None,None,-1,None), + (8,103,"GtkSeparator",None,56,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,123,"GtkLabel",None,117,None,None,None,2,None), (8,130,"AdwPreferencesGroup",None,56,None,None,None,None,None), - (8,132,"AdwActionRow","reset_sinks_row",130,None,None,None,1,None), + (8,132,"AdwActionRow","reset_sinks_row",130,None,None,None,None,None), (8,133,"GtkImage",None,132,None,None,None,None,None), - (8,134,"AdwActionRow","reset_cards_row",130,None,None,None,2,None), + (8,134,"AdwActionRow","reset_cards_row",130,None,None,None,1,None), (8,135,"GtkImage",None,134,None,None,None,None,None), (8,137,"AdwComboRow","reset_sink_dropdown",130,None,None,None,2,None), (8,138,"AdwPreferencesGroup",None,72,None,None,None,None,None), @@ -127,6 +120,12 @@ (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,144,"AdwPreferencesGroup","reset_cards",117,None,None,None,2,None), + (8,145,"AdwActionRow",None,130,None,None,None,3,None), + (8,146,"GtkBox",None,145,None,None,None,-1,None), + (8,147,"GtkButton","reset_sink_mute",146,None,None,None,None,None), + (8,148,"GtkScale","reset_volume_slider",146,None,None,None,1,None), + (8,149,"GtkAdjustment",None,148,None,None,None,None,None), + (8,150,"GtkLabel","reset_volume_percentage",146,None,None,None,2,None), (10,1,"GtkBox","resetBluetooth",None,None,None,None,None,None), (10,119,"AdwNavigationView",None,1,None,None,None,1,None), (10,120,"AdwNavigationPage",None,119,None,None,None,None,None), @@ -155,11 +154,6 @@ (12,13,"AdwNavigationView",None,11,None,None,None,1,None), (12,14,"AdwNavigationPage",None,13,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,23,"GtkBox",None,22,None,None,None,None,None), - (12,24,"GtkButton","reset_source_mute",23,None,None,None,None,None), - (12,25,"GtkScale","reset_volume_slider",23,None,None,None,1,None), - (12,27,"GtkLabel","reset_volume_percentage",23,None,None,None,2,None), (12,29,"GtkSeparator",None,15,None,None,None,3,None), (12,30,"GtkBox","reset_output_streams",15,None,None,None,4,None), (12,31,"GtkLabel",None,30,None,None,None,None,None), @@ -167,14 +161,13 @@ (12,42,"GtkBox",None,34,None,None,None,1,None), (12,49,"GtkBox","reset_sources",42,None,None,None,2,None), (12,50,"GtkLabel",None,49,None,None,None,None,None), - (12,51,"GtkAdjustment",None,25,None,None,None,-1,None), (12,52,"AdwNavigationPage",None,13,None,None,None,2,None), (12,53,"GtkBox",None,52,None,None,None,None,None), (12,59,"GtkLabel",None,53,None,None,None,2,None), (12,66,"AdwPreferencesGroup","reset_cards",53,None,None,None,3,None), (12,67,"AdwPreferencesGroup",None,15,None,None,None,None,None), - (12,69,"AdwActionRow","reset_source_row",67,None,None,None,-1,None), - (12,70,"AdwActionRow","reset_cards_row",67,None,None,None,2,None), + (12,69,"AdwActionRow","reset_source_row",67,None,None,None,None,None), + (12,70,"AdwActionRow","reset_cards_row",67,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,73,"AdwComboRow","reset_source_dropdown",67,None,None,None,2,None), @@ -184,6 +177,12 @@ (12,77,"AdwPreferencesGroup",None,53,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,80,"AdwActionRow",None,67,None,None,None,3,None), + (12,81,"GtkBox",None,80,None,None,None,-1,None), + (12,82,"GtkButton","reset_source_mute",81,None,None,None,None,None), + (12,83,"GtkScale","reset_volume_slider",81,None,None,None,1,None), + (12,84,"GtkAdjustment",None,83,None,None,None,None,None), + (12,85,"GtkLabel","reset_volume_percentage",81,None,None,None,2,None), (13,22,"AdwPreferencesGroup","resetOutputStreamEntry",None,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), @@ -283,20 +282,22 @@ (21,109,"AdwActionRow","reset_available_networks",108,None,None,None,None,None), (21,110,"GtkImage",None,109,None,None,None,None,None), (22,1,"GtkBox","resetWifiAddressEntry",None,None,None,None,-1,None), - (22,2,"AdwExpanderRow","reset_address_row",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,7,"AdwEntryRow","reset_address_address",6,None,None,None,None,None), - (22,8,"AdwEntryRow","reset_address_prefix",6,None,None,None,1,None), + (22,5,"GtkButton","reset_address_remove",1,None,None,None,1,None), + (22,9,"AdwPreferencesGroup","reset_address_group",1,None,None,None,None,None), + (22,10,"AdwExpanderRow","reset_address_row",9,None,None,None,None,None), + (22,11,"GtkBox",None,10,None,None,None,None,None), + (22,12,"AdwEntryRow","reset_address_address",11,None,None,None,None,None), + (22,13,"AdwEntryRow","reset_address_prefix",11,None,None,None,1,None), (23,1,"GtkBox","resetWifiRouteEntry",None,None,None,None,None,None), - (23,2,"AdwExpanderRow","reset_route_row",1,None,None,None,None,None), (23,5,"GtkButton","reset_route_remove",1,None,None,None,1,None), - (23,6,"GtkBox",None,2,None,None,None,1,None), - (23,7,"AdwEntryRow","reset_route_gateway",6,None,None,None,None,None), - (23,8,"AdwEntryRow","reset_route_metric",6,None,None,None,1,None), - (23,9,"GtkBox",None,2,None,None,None,None,None), - (23,10,"AdwEntryRow","reset_route_address",9,None,None,None,None,None), - (23,11,"AdwEntryRow","reset_route_prefix",9,None,None,None,1,None), + (23,12,"AdwPreferencesGroup","reset_route_group",1,None,None,None,None,None), + (23,13,"AdwExpanderRow","reset_route_row",12,None,None,None,None,None), + (23,14,"GtkBox",None,13,None,None,None,None,None), + (23,15,"AdwEntryRow","reset_route_address",14,None,None,None,None,None), + (23,16,"AdwEntryRow","reset_route_prefix",14,None,None,None,1,None), + (23,17,"GtkBox",None,13,None,None,None,1,None), + (23,18,"AdwEntryRow","reset_route_gateway",17,None,None,None,None,None), + (23,19,"AdwEntryRow","reset_route_metric",17,None,None,None,1,None), (24,1,"GtkShortcutsWindow","help_overlay",None,None,None,None,-1,None), (24,2,"GtkShortcutsSection",None,1,None,None,None,-1,None), (24,3,"GtkShortcutsGroup",None,2,None,None,None,-1,None), @@ -367,6 +368,7 @@ (4,174,"AdwNavigationPage","title","saved",None,None,None,None,None,None,None,None,None), (4,175,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (4,182,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None), + (4,182,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), (4,183,"GtkLabel","label","WiFi",None,None,None,None,None,None,None,None,None), (4,183,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None), (4,183,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), @@ -405,13 +407,15 @@ (7,16,"GtkWidget","css-classes","audioRow\n",None,None,None,None,None,None,None,None,None), (7,17,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (7,18,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), - (7,18,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (7,18,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None), + (7,18,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None), (7,19,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None), (7,19,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (7,19,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), (7,20,"GtkRange","adjustment",None,None,None,None,None,21,None,None,None,None), (7,20,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None), (7,20,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (7,20,"GtkWidget","margin-top","15",None,None,None,None,None,None,None,None,None), (7,20,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), (7,21,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None), (7,21,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None), @@ -425,6 +429,7 @@ (8,53,"GtkLabel","label","Output",None,None,None,None,None,None,None,None,None), (8,53,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None), (8,53,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), + (8,53,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), (8,53,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), (8,55,"AdwNavigationPage","tag","output",None,None,None,None,None,None,None,None,None), (8,55,"AdwNavigationPage","title","output",None,None,None,None,None,None,None,None,None), @@ -435,42 +440,28 @@ (8,85,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (8,85,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None), (8,86,"GtkLabel","label","Output Streams",None,None,None,None,None,None,None,None,None), + (8,86,"GtkWidget","css-classes","heading\n",None,None,None,None,None,None,None,None,None), (8,86,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), + (8,86,"GtkWidget","margin-bottom","15",None,None,None,None,None,None,None,None,None), (8,89,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (8,89,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (8,89,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), (8,89,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None), (8,90,"GtkLabel","label","Output Devices",None,None,None,None,None,None,None,None,None), + (8,90,"GtkWidget","css-classes","heading",None,None,None,None,None,None,None,None,None), (8,90,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), - (8,93,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), - (8,93,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), - (8,93,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), - (8,93,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), - (8,93,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None), - (8,97,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), - (8,97,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), - (8,98,"GtkButton","icon-name","audio-volume-high-symbolic",None,None,None,None,None,None,None,None,None), - (8,98,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), - (8,98,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), - (8,99,"GtkRange","adjustment",None,None,None,None,None,115,None,None,None,None), - (8,99,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None), - (8,99,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (8,99,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), - (8,101,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None), - (8,101,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None), - (8,101,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None), - (8,115,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None), - (8,115,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None), - (8,115,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None), + (8,90,"GtkWidget","margin-bottom","15",None,None,None,None,None,None,None,None,None), (8,116,"AdwNavigationPage","tag","profileConfiguration",None,None,None,None,None,None,None,None,None), (8,116,"AdwNavigationPage","title","profileConfiguration",None,None,None,None,None,None,None,None,None), (8,117,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), + (8,130,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), (8,132,"AdwPreferencesRow","title","Output Devices",None,None,None,None,None,None,None,None,None), (8,133,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None), (8,134,"AdwPreferencesRow","title","Profile Settings",None,None,None,None,None,None,None,None,None), (8,135,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None), (8,137,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None), (8,137,"AdwPreferencesRow","title","Default Output Device",None,None,None,None,None,None,None,None,None), + (8,137,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None), (8,139,"AdwPreferencesRow","title","Output Streams",None,None,None,None,None,None,None,None,None), (8,140,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None), (8,140,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None), @@ -482,6 +473,24 @@ (8,143,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), (8,143,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (8,144,"AdwPreferencesGroup","title","Devices",None,None,None,None,None,None,None,None,None), + (8,145,"GtkListBoxRow","child",None,None,None,None,None,146,None,None,None,None), + (8,146,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), + (8,146,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None), + (8,146,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None), + (8,147,"GtkButton","icon-name","audio-volume-high-symbolic",None,None,None,None,None,None,None,None,None), + (8,147,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), + (8,147,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (8,148,"GtkRange","adjustment",None,None,None,None,None,149,None,None,None,None), + (8,148,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None), + (8,148,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (8,148,"GtkWidget","margin-top","15",None,None,None,None,None,None,None,None,None), + (8,148,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (8,149,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None), + (8,149,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None), + (8,149,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None), + (8,150,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None), + (8,150,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None), + (8,150,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None), (10,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (10,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None), (10,120,"AdwNavigationPage","tag","main",None,None,None,None,None,None,None,None,None), @@ -490,6 +499,7 @@ (10,138,"AdwNavigationPage","tag","visibility",None,None,None,None,None,None,None,None,None), (10,138,"AdwNavigationPage","title","visibility",None,None,None,None,None,None,None,None,None), (10,142,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None), + (10,142,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), (10,143,"GtkLabel","label","Bluetooth",None,None,None,None,None,None,None,None,None), (10,143,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None), (10,143,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), @@ -507,14 +517,12 @@ (10,175,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (10,204,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,207,None,None,None,None), (10,204,"AdwPreferencesGroup","title","Available Devices",None,None,None,None,None,None,None,None,None), - (10,204,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), - (10,204,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), - (10,204,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (10,204,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None), (10,206,"AdwPreferencesGroup","title","Connected Devices",None,None,None,None,None,None,None,None,None), (10,206,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), - (10,206,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), (10,206,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), (10,207,"GtkButton","icon-name","view-refresh-symbolic",None,None,None,None,None,None,None,None,None), + (10,207,"GtkWidget","margin-end","15",None,None,None,None,None,None,None,None,None), (10,209,"AdwPreferencesGroup","title","Visibility Settings",None,None,None,None,None,None,None,None,None), (10,210,"AdwPreferencesRow","title","Pairable",None,None,None,None,None,None,None,None,None), (10,211,"AdwPreferencesRow","title","Discoverable",None,None,None,None,None,None,None,None,None), @@ -571,31 +579,17 @@ (12,12,"GtkLabel","label","Input",None,None,None,None,None,None,None,None,None), (12,12,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None), (12,12,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), + (12,12,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), (12,12,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), (12,14,"AdwNavigationPage","tag","output",None,None,None,None,None,None,None,None,None), (12,14,"AdwNavigationPage","title","output",None,None,None,None,None,None,None,None,None), (12,15,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), - (12,22,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), - (12,22,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), - (12,22,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), - (12,22,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), - (12,22,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None), - (12,23,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), - (12,23,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), - (12,24,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None), - (12,24,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), - (12,24,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), - (12,25,"GtkRange","adjustment",None,None,None,None,None,51,None,None,None,None), - (12,25,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None), - (12,25,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (12,25,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), - (12,27,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None), - (12,27,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None), - (12,27,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None), (12,30,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (12,30,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None), (12,31,"GtkLabel","label","Input Streams",None,None,None,None,None,None,None,None,None), + (12,31,"GtkWidget","css-classes","heading",None,None,None,None,None,None,None,None,None), (12,31,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), + (12,31,"GtkWidget","margin-bottom","15",None,None,None,None,None,None,None,None,None), (12,34,"AdwNavigationPage","tag","sources",None,None,None,None,None,None,None,None,None), (12,34,"AdwNavigationPage","title","sources",None,None,None,None,None,None,None,None,None), (12,42,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), @@ -604,20 +598,21 @@ (12,49,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), (12,49,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None), (12,50,"GtkLabel","label","Input Devices",None,None,None,None,None,None,None,None,None), + (12,50,"GtkWidget","css-classes","heading",None,None,None,None,None,None,None,None,None), (12,50,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), - (12,51,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None), - (12,51,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None), - (12,51,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None), + (12,50,"GtkWidget","margin-bottom","15",None,None,None,None,None,None,None,None,None), (12,52,"AdwNavigationPage","tag","profileConfiguration",None,None,None,None,None,None,None,None,None), (12,52,"AdwNavigationPage","title","profileConfiguration",None,None,None,None,None,None,None,None,None), (12,53,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (12,66,"AdwPreferencesGroup","title","Devices",None,None,None,None,None,None,None,None,None), + (12,67,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), (12,69,"AdwPreferencesRow","title","Input Devices",None,None,None,None,None,None,None,None,None), (12,70,"AdwPreferencesRow","title","Profile Settings",None,None,None,None,None,None,None,None,None), (12,71,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None), (12,72,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None), (12,73,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None), (12,73,"AdwPreferencesRow","title","Default Input Device",None,None,None,None,None,None,None,None,None), + (12,73,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None), (12,75,"AdwPreferencesRow","title","Input Streams",None,None,None,None,None,None,None,None,None), (12,76,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None), (12,76,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None), @@ -628,6 +623,24 @@ (12,79,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None), (12,79,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), (12,79,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), + (12,80,"GtkListBoxRow","child",None,None,None,None,None,81,None,None,None,None), + (12,81,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), + (12,81,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None), + (12,81,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None), + (12,82,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None), + (12,82,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), + (12,82,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (12,83,"GtkRange","adjustment",None,None,None,None,None,84,None,None,None,None), + (12,83,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None), + (12,83,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (12,83,"GtkWidget","margin-top","15",None,None,None,None,None,None,None,None,None), + (12,83,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (12,84,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None), + (12,84,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None), + (12,84,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None), + (12,85,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None), + (12,85,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None), + (12,85,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None), (13,23,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None), (13,23,"AdwPreferencesRow","title","asadf",None,None,None,None,None,None,None,None,None), (13,23,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None), @@ -635,13 +648,15 @@ (13,26,"GtkWidget","css-classes","audioRow\n",None,None,None,None,None,None,None,None,None), (13,27,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (13,36,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), - (13,36,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (13,36,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None), + (13,36,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None), (13,37,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None), (13,37,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (13,37,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), (13,38,"GtkRange","adjustment",None,None,None,None,None,39,None,None,None,None), (13,38,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None), (13,38,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (13,38,"GtkWidget","margin-top","15",None,None,None,None,None,None,None,None,None), (13,38,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), (13,39,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None), (13,39,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None), @@ -681,13 +696,15 @@ (18,16,"GtkWidget","css-classes","audioRow\n",None,None,None,None,None,None,None,None,None), (18,17,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (18,18,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), - (18,18,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (18,18,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None), + (18,18,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None), (18,19,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None), (18,19,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (18,19,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), (18,20,"GtkRange","adjustment",None,None,None,None,None,21,None,None,None,None), (18,20,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None), (18,20,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (18,20,"GtkWidget","margin-top","15",None,None,None,None,None,None,None,None,None), (18,20,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), (18,21,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None), (18,21,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None), @@ -695,8 +712,8 @@ (18,22,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None), (18,22,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None), (18,22,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None), - (18,24,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), - (18,24,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (18,24,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), + (18,24,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None), (19,14,"AdwActionRow","title-lines","3",None,None,None,None,None,None,None,None,None), (19,14,"AdwPreferencesRow","title","text",None,None,None,None,None,None,None,None,None), (19,14,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None), @@ -707,13 +724,15 @@ (19,16,"GtkWidget","css-classes","audioRow\n",None,None,None,None,None,None,None,None,None), (19,17,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (19,18,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), - (19,18,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (19,18,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None), + (19,18,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None), (19,19,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None), (19,19,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (19,19,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), (19,20,"GtkRange","adjustment",None,None,None,None,None,21,None,None,None,None), (19,20,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None), (19,20,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (19,20,"GtkWidget","margin-top","15",None,None,None,None,None,None,None,None,None), (19,20,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), (19,21,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None), (19,21,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None), @@ -721,8 +740,8 @@ (19,22,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None), (19,22,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None), (19,22,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None), - (19,24,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), - (19,24,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), + (19,24,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), + (19,24,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None), (20,2,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None), (21,52,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (21,53,"GtkNotebook","scrollable","True",None,None,None,None,None,None,None,None,None), @@ -807,28 +826,28 @@ (21,110,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (22,1,"GtkWidget","margin-bottom","2",None,None,None,None,None,None,None,None,None), (22,1,"GtkWidget","margin-top","2",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,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), - (22,7,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None), - (22,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (22,8,"AdwPreferencesRow","title","Prefix",None,None,None,None,None,None,None,None,None), - (22,8,"GtkEditable","max-width-chars","5",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), + (22,10,"AdwPreferencesRow","title","Add new Address",None,None,None,None,None,None,None,None,None), + (22,10,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (22,12,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None), + (22,12,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (22,13,"AdwPreferencesRow","title","Prefix",None,None,None,None,None,None,None,None,None), + (22,13,"GtkEditable","max-width-chars","5",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), - (23,10,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None), - (23,10,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (23,11,"AdwPreferencesRow","title","Prefix",None,None,None,None,None,None,None,None,None), - (23,11,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None), + (23,13,"AdwPreferencesRow","title","Add new Route",None,None,None,None,None,None,None,None,None), + (23,13,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (23,15,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None), + (23,15,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (23,16,"AdwPreferencesRow","title","Prefix",None,None,None,None,None,None,None,None,None), + (23,16,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None), + (23,18,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None), + (23,18,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (23,19,"AdwPreferencesRow","title","Metric",None,None,None,None,None,None,None,None,None), + (23,19,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None), (24,4,"GtkShortcutsShortcut","accelerator","<Ctrl>F",None,None,None,None,None,None,None,None,None), (24,4,"GtkShortcutsShortcut","action-name","win.search",None,None,None,None,None,None,None,None,None), (24,4,"GtkShortcutsShortcut","icon-set","True",None,None,None,None,None,None,None,None,None), @@ -845,10 +864,6 @@ (3,42,"GtkWidget",1,1,None,None,None,None,None,None), (3,42,"GtkWidget",2,2,None,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,38,"GtkScale",1,1,None,None,None,None,None,None), (13,38,"GtkScale",2,2,"100%",1,None,None,None,None), (7,20,"GtkScale",1,1,None,None,None,None,None,None), @@ -872,14 +887,14 @@ (21,82,"GtkStringList",2,7,"Disabled",1,None,None,None,None), (21,103,"GtkStringList",1,1,None,None,None,None,None,None), (21,103,"GtkStringList",2,2,"None",1,None,None,None,None), - (21,103,"GtkStringList",2,3,"WPA & WPA2 Personal",1,None,None,None,None) + (21,103,"GtkStringList",2,3,"WPA & WPA2 Personal",1,None,None,None,None), + (8,148,"GtkScale",1,1,None,None,None,None,None,None), + (8,148,"GtkScale",2,2,"100%",1,None,None,None,None), + (12,83,"GtkScale",1,1,None,None,None,None,None,None), + (12,83,"GtkScale",2,2,"100%",1,None,None,None,None) (3,42,"GtkWidget",2,2,"name","b"), - (8,99,"GtkScale",2,2,"position","bottom"), - (8,99,"GtkScale",2,2,"value","65536.0"), - (12,25,"GtkScale",2,2,"value","65536.0"), - (12,25,"GtkScale",2,2,"position","bottom"), (13,38,"GtkScale",2,2,"position","bottom"), (13,38,"GtkScale",2,2,"value","65536.0"), (7,20,"GtkScale",2,2,"position","bottom"), @@ -887,6 +902,10 @@ (18,20,"GtkScale",2,2,"position","bottom"), (18,20,"GtkScale",2,2,"value","65536.0"), (19,20,"GtkScale",2,2,"position","bottom"), - (19,20,"GtkScale",2,2,"value","65536.0") + (19,20,"GtkScale",2,2,"value","65536.0"), + (8,148,"GtkScale",2,2,"position","bottom"), + (8,148,"GtkScale",2,2,"value","65536.0"), + (12,83,"GtkScale",2,2,"position","bottom"), + (12,83,"GtkScale",2,2,"value","65536.0") diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui index 5d1ebd2..68f96f9 100644 --- a/src/resources/resetWiFi.ui +++ b/src/resources/resetWiFi.ui @@ -11,6 +11,7 @@ 40 + 10 resetSettingLabel diff --git a/src/resources/resetWifiAddressEntry.ui b/src/resources/resetWifiAddressEntry.ui index 2a4e182..6c48d98 100644 --- a/src/resources/resetWifiAddressEntry.ui +++ b/src/resources/resetWifiAddressEntry.ui @@ -7,21 +7,25 @@ 2 2 - - True - Add new Address + - + + True + Add new Address - - True - Address - - - - - 5 - Prefix + + + + True + Address + + + + + 5 + Prefix + + diff --git a/src/resources/resetWifiRouteEntry.ui b/src/resources/resetWifiRouteEntry.ui index f4d474f..9ca3675 100644 --- a/src/resources/resetWifiRouteEntry.ui +++ b/src/resources/resetWifiRouteEntry.ui @@ -5,37 +5,41 @@