From e89de26b6785a796faa5744a2e27476fc9ee756c Mon Sep 17 00:00:00 2001 From: takotori Date: Mon, 11 Dec 2023 17:22:00 +0100 Subject: [PATCH] make bluetooth visibility settings consistent with other settingss --- src/components/bluetooth/bluetooth_box.rs | 15 ++-- .../bluetooth/bluetooth_box_impl.rs | 8 +- src/components/wifi/saved_wifi_entry_impl.rs | 2 +- src/resources/resetBluetooth.ui | 73 ++++--------------- src/resources/resetUI.cmb | 57 ++++----------- 5 files changed, 40 insertions(+), 115 deletions(-) diff --git a/src/components/bluetooth/bluetooth_box.rs b/src/components/bluetooth/bluetooth_box.rs index f4246c5..292e72b 100644 --- a/src/components/bluetooth/bluetooth_box.rs +++ b/src/components/bluetooth/bluetooth_box.rs @@ -54,6 +54,7 @@ fn setup_callbacks( imp.reset_visibility .set_action_target_value(Some(&Variant::from("visibility"))); + imp.reset_bluetooth_main_tab.set_activatable(true); imp.reset_bluetooth_main_tab .set_action_name(Some("navigation.pop")); @@ -67,15 +68,13 @@ fn setup_callbacks( }); imp.reset_bluetooth_discoverable_switch - .connect_state_set(clone!(@weak imp => @default-return glib::Propagation::Proceed,move |_, state| { - set_bluetooth_adapter_visibility(imp.reset_current_bluetooth_adapter.borrow().path.clone(), state); - glib::Propagation::Proceed + .connect_active_notify(clone!(@weak imp => move |state| { + set_bluetooth_adapter_visibility(imp.reset_current_bluetooth_adapter.borrow().path.clone(), state.is_active()); })); imp.reset_bluetooth_pairable_switch - .connect_state_set(clone!(@weak imp => @default-return glib::Propagation::Proceed,move |_, state| { - set_bluetooth_adapter_pairability(imp.reset_current_bluetooth_adapter.borrow().path.clone(), state); - glib::Propagation::Proceed + .connect_active_notify(clone!(@weak imp => move |state| { + set_bluetooth_adapter_pairability(imp.reset_current_bluetooth_adapter.borrow().path.clone(), state.is_active()); })); imp.reset_bluetooth_switch @@ -151,11 +150,11 @@ pub fn populate_conntected_bluetooth_devices(bluetooth_box: Arc) { imp.reset_bluetooth_switch .set_active(current_adapter.powered); imp.reset_bluetooth_discoverable_switch - .set_state(current_adapter.discoverable); + .set_active(current_adapter.discoverable); imp.reset_bluetooth_discoverable_switch .set_active(current_adapter.discoverable); imp.reset_bluetooth_pairable_switch - .set_state(current_adapter.pairable); + .set_active(current_adapter.pairable); imp.reset_bluetooth_pairable_switch .set_active(current_adapter.pairable); } diff --git a/src/components/bluetooth/bluetooth_box_impl.rs b/src/components/bluetooth/bluetooth_box_impl.rs index 220a60a..40a3080 100644 --- a/src/components/bluetooth/bluetooth_box_impl.rs +++ b/src/components/bluetooth/bluetooth_box_impl.rs @@ -1,4 +1,4 @@ -use adw::{ActionRow, ComboRow, PreferencesGroup}; +use adw::{ActionRow, ComboRow, PreferencesGroup, SwitchRow}; use dbus::Path; use gtk::subclass::prelude::*; use gtk::{glib, Button, CompositeTemplate, Switch}; @@ -30,11 +30,11 @@ pub struct BluetoothBox { #[template_child] pub reset_visibility: TemplateChild, #[template_child] - pub reset_bluetooth_main_tab: TemplateChild, + pub reset_bluetooth_main_tab: TemplateChild, #[template_child] - pub reset_bluetooth_discoverable_switch: TemplateChild, + pub reset_bluetooth_discoverable_switch: TemplateChild, #[template_child] - pub reset_bluetooth_pairable_switch: TemplateChild, + pub reset_bluetooth_pairable_switch: TemplateChild, pub available_devices: BluetoothMap, pub connected_devices: BluetoothMap, pub reset_bluetooth_adapters: Arc>>, diff --git a/src/components/wifi/saved_wifi_entry_impl.rs b/src/components/wifi/saved_wifi_entry_impl.rs index 6317fd9..9c310d3 100644 --- a/src/components/wifi/saved_wifi_entry_impl.rs +++ b/src/components/wifi/saved_wifi_entry_impl.rs @@ -6,7 +6,7 @@ use std::cell::RefCell; use dbus::Path; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CompositeTemplate, Label}; +use gtk::{glib, CompositeTemplate}; use super::saved_wifi_entry; diff --git a/src/resources/resetBluetooth.ui b/src/resources/resetBluetooth.ui index c5ef16d..a2762a5 100644 --- a/src/resources/resetBluetooth.ui +++ b/src/resources/resetBluetooth.ui @@ -91,33 +91,16 @@ vertical - - boxed-list - 10 - 5 - 5 - 5 - True - start + - + + Available Networks - - 40 - - - Main - 5 - - - - - end - True - go-previous-symbolic - 5 - - + + end + True + go-previous-symbolic + 5 @@ -125,46 +108,18 @@ - - start - Visibility Settings - 5 - - - - - 5 - 5 - 5 + + Visibility Settings - - start - True - True - Pairable + + Pairable - - - - - - - 5 - 5 - 5 - - - start - True - True - Discoverable + + Discoverable - - - diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb index 1da4d0e..07ab7d9 100644 --- a/src/resources/resetUI.cmb +++ b/src/resources/resetUI.cmb @@ -132,25 +132,19 @@ (10,143,"GtkLabel",None,142,None,None,None,None,None), (10,144,"GtkSwitch","reset_bluetooth_switch",142,None,None,None,1,None), (10,153,"GtkBox",None,138,None,None,None,None,None), - (10,154,"GtkListBox",None,153,None,None,None,None,None), - (10,155,"resetListBoxRow","reset_bluetooth_main_tab",154,None,None,None,1,None), - (10,156,"GtkBox",None,155,None,None,None,None,None), - (10,157,"GtkLabel",None,156,None,None,None,None,None), - (10,158,"GtkImage",None,156,None,None,None,1,None), - (10,159,"GtkLabel",None,153,None,None,None,1,None), (10,172,"AdwPreferencesGroup","reset_bluetooth_details",121,None,None,None,None,None), (10,173,"AdwComboRow","reset_bluetooth_adapter",172,None,None,None,None,None), (10,174,"AdwActionRow","reset_visibility",172,None,None,None,1,None), (10,175,"GtkImage",None,174,None,None,None,None,None), - (10,188,"GtkBox",None,153,None,None,None,4,None), - (10,193,"GtkLabel",None,188,None,None,None,None,None), - (10,196,"GtkSwitch","reset_bluetooth_discoverable_switch",188,None,None,None,1,None), - (10,197,"GtkBox",None,153,None,None,None,3,None), - (10,198,"GtkLabel",None,197,None,None,None,None,None), - (10,199,"GtkSwitch","reset_bluetooth_pairable_switch",197,None,None,None,1,None), (10,204,"AdwPreferencesGroup","reset_bluetooth_available_devices",121,None,None,None,1,None), (10,206,"AdwPreferencesGroup","reset_bluetooth_connected_devices",121,None,None,None,2,None), (10,207,"GtkButton","reset_bluetooth_refresh_button",204,None,None,None,-1,None), + (10,208,"AdwPreferencesGroup",None,153,None,None,None,None,None), + (10,209,"AdwPreferencesGroup",None,153,None,None,None,1,None), + (10,210,"AdwSwitchRow","reset_bluetooth_pairable_switch",209,None,None,None,-1,None), + (10,211,"AdwSwitchRow","reset_bluetooth_discoverable_switch",209,None,None,None,-1,None), + (10,212,"AdwActionRow","reset_bluetooth_main_tab",208,None,None,None,None,None), + (10,213,"GtkImage",None,212,None,None,None,None,None), (11,1,"AdwActionRow","resetBluetoothEntry",None,None,None,None,None,None), (12,11,"GtkBox","resetAudioInput",None,None,None,None,None,None), (12,12,"GtkLabel",None,11,None,None,None,None,None), @@ -504,43 +498,12 @@ (10,144,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (10,144,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), (10,153,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), - (10,154,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None), - (10,154,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None), - (10,154,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None), - (10,154,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), - (10,154,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), - (10,154,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), - (10,154,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None), - (10,156,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None), - (10,157,"GtkLabel","label","Main",None,None,None,None,None,None,None,None,None), - (10,157,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), - (10,158,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None), - (10,158,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None), - (10,158,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (10,158,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), - (10,159,"GtkLabel","label","Visibility Settings",None,None,None,None,None,None,None,None,None), - (10,159,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), - (10,159,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), (10,173,"AdwPreferencesRow","title","Bluetooth Adapter",None,None,None,None,None,None,None,None,None), (10,174,"AdwPreferencesRow","title","Visibility Settings",None,None,None,None,None,None,None,None,None), (10,175,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None), (10,175,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None), (10,175,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), (10,175,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), - (10,188,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), - (10,188,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), - (10,188,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), - (10,193,"GtkLabel","label","Discoverable",None,None,None,None,None,None,None,None,None), - (10,193,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), - (10,193,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (10,193,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None), - (10,197,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None), - (10,197,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), - (10,197,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), - (10,198,"GtkLabel","label","Pairable",None,None,None,None,None,None,None,None,None), - (10,198,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), - (10,198,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (10,198,"GtkWidget","hexpand-set","True",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), @@ -551,6 +514,14 @@ (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,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), + (10,212,"AdwPreferencesRow","title","Available Networks",None,None,None,None,None,None,None,None,None), + (10,213,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None), + (10,213,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None), + (10,213,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (10,213,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None), (11,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), (11,32,"GtkListBoxRow","child",None,None,None,None,None,39,None,None,None,None), (11,32,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),