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

make ui a better place

Browse source
This commit is contained in:
takotori 2023-12-03 14:11:59 +01:00
parent cee96a0678
commit 3de2fa8600
9 changed files with 109 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/wifi/wifiBox.rs
View file

@ -17,7 +17,7 @@ use dbus::Path;
use glib::PropertySet;
use gtk::gio;
use gtk::glib::Variant;
use gtk::prelude::{ActionableExt, WidgetExt};
use gtk::prelude::{ActionableExt, BoxExt, WidgetExt};
use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
use ReSet_Lib::signals::AccessPointAdded;
use ReSet_Lib::signals::{AccessPointChanged, AccessPointRemoved};
@ -270,12 +270,9 @@ pub fn start_event_listener(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) {
entryImp.resetWifiEditButton.set_sensitive(false);
}
if ir.access_point.connected {
entryImp
.resetWifiConnected
.get()
.set_from_icon_name(Some("network-wireless-connected-symbolic"));
entryImp.resetWifiConnected.set_text("Connected")
} else {
entryImp.resetWifiConnected.get().set_from_icon_name(None);
entryImp.resetWifiConnected.set_text("");
}
{
let mut wifiName = entryImp.wifiName.borrow_mut();

15
src/components/wifi/wifiEntry.rs
View file

@ -54,10 +54,7 @@ impl WifiEntry {
entryImp.resetWifiEditButton.set_sensitive(false);
}
if access_point.connected {
entryImp
.resetWifiConnected
.get()
.set_from_icon_name(Some("network-wireless-connected-symbolic"));
entryImp.resetWifiConnected.set_text("Connected");
}
{
let mut wifiName = entryImp.wifiName.borrow_mut();
@ -109,7 +106,7 @@ pub fn click_disconnect(entry: Arc<WifiEntry>) {
return;
}
let imp = entry_ref.imp();
imp.resetWifiConnected.get().set_from_icon_name(None);
imp.resetWifiConnected.set_text("");
imp.accessPoint.borrow_mut().connected = false;
println!("disconnect worked");
});
@ -147,9 +144,7 @@ pub fn click_stored_network(entry: Arc<WifiEntry>) {
}
let imp = entry_ref.imp();
println!("wateroni");
imp.resetWifiConnected
.get()
.set_from_icon_name(Some("network-wireless-connected-symbolic"));
imp.resetWifiConnected.set_text("Connected");
imp.accessPoint.borrow_mut().connected = true;
result.store(true, std::sync::atomic::Ordering::SeqCst);
});
@ -210,9 +205,7 @@ pub fn click_new_network(entry: Arc<WifiEntry>) {
let imp = entry_ref.imp();
imp.resetWifiPopup.popdown();
imp.resetWifiEditButton.set_sensitive(true);
imp.resetWifiConnected
.get()
.set_from_icon_name(Some("network-wireless-connected-symbolic"));
imp.resetWifiConnected.set_text("Connected");
result.store(true, std::sync::atomic::Ordering::SeqCst);
});
});

2
src/components/wifi/wifiEntryImpl.rs
View file

@ -21,7 +21,7 @@ pub struct WifiEntry {
#[template_child]
pub resetWifiEditButton: TemplateChild<Button>,
#[template_child]
pub resetWifiConnected: TemplateChild<Image>,
pub resetWifiConnected: TemplateChild<Label>,
#[template_child]
pub resetWifiPopup: TemplateChild<Popup>,
pub wifiName: RefCell<String>,