mirror of
https://github.com/feschber/lan-mouse.git
synced 2026-04-11 19:11:29 +03:00
Gtk frontend rework (#276)
client configuration now applies immediately instead of after enabling / disabling clients. Also fixes a potential feedback loop when changing settings.
This commit is contained in:
committed by
GitHub
parent
f247300f8c
commit
50a778452e
@@ -3,11 +3,14 @@ use std::cell::RefCell;
|
||||
use adw::subclass::prelude::*;
|
||||
use adw::{prelude::*, ActionRow, ComboRow};
|
||||
use glib::{subclass::InitializingObject, Binding};
|
||||
use gtk::glib::clone;
|
||||
use gtk::glib::subclass::Signal;
|
||||
use gtk::{glib, Button, CompositeTemplate, Switch};
|
||||
use gtk::glib::{clone, SignalHandlerId};
|
||||
use gtk::{glib, Button, CompositeTemplate, Entry, Switch};
|
||||
use lan_mouse_ipc::Position;
|
||||
use std::sync::OnceLock;
|
||||
|
||||
use crate::client_object::ClientObject;
|
||||
|
||||
#[derive(CompositeTemplate, Default)]
|
||||
#[template(resource = "/de/feschber/LanMouse/client_row.ui")]
|
||||
pub struct ClientRow {
|
||||
@@ -28,6 +31,11 @@ pub struct ClientRow {
|
||||
#[template_child]
|
||||
pub dns_loading_indicator: TemplateChild<gtk::Spinner>,
|
||||
pub bindings: RefCell<Vec<Binding>>,
|
||||
hostname_change_handler: RefCell<Option<SignalHandlerId>>,
|
||||
port_change_handler: RefCell<Option<SignalHandlerId>>,
|
||||
position_change_handler: RefCell<Option<SignalHandlerId>>,
|
||||
set_state_handler: RefCell<Option<SignalHandlerId>>,
|
||||
pub client_object: RefCell<Option<ClientObject>>,
|
||||
}
|
||||
|
||||
#[glib::object_subclass]
|
||||
@@ -59,17 +67,61 @@ impl ObjectImpl for ClientRow {
|
||||
row.handle_client_delete(button);
|
||||
}
|
||||
));
|
||||
let handler = self.hostname.connect_changed(clone!(
|
||||
#[weak(rename_to = row)]
|
||||
self,
|
||||
move |entry| {
|
||||
row.handle_hostname_changed(entry);
|
||||
}
|
||||
));
|
||||
self.hostname_change_handler.replace(Some(handler));
|
||||
let handler = self.port.connect_changed(clone!(
|
||||
#[weak(rename_to = row)]
|
||||
self,
|
||||
move |entry| {
|
||||
row.handle_port_changed(entry);
|
||||
}
|
||||
));
|
||||
self.port_change_handler.replace(Some(handler));
|
||||
let handler = self.position.connect_selected_notify(clone!(
|
||||
#[weak(rename_to = row)]
|
||||
self,
|
||||
move |position| {
|
||||
row.handle_position_changed(position);
|
||||
}
|
||||
));
|
||||
self.position_change_handler.replace(Some(handler));
|
||||
let handler = self.enable_switch.connect_state_set(clone!(
|
||||
#[weak(rename_to = row)]
|
||||
self,
|
||||
#[upgrade_or]
|
||||
glib::Propagation::Proceed,
|
||||
move |switch, state| {
|
||||
row.handle_activate_switch(state, switch);
|
||||
glib::Propagation::Proceed
|
||||
}
|
||||
));
|
||||
self.set_state_handler.replace(Some(handler));
|
||||
}
|
||||
|
||||
fn signals() -> &'static [glib::subclass::Signal] {
|
||||
static SIGNALS: OnceLock<Vec<Signal>> = OnceLock::new();
|
||||
SIGNALS.get_or_init(|| {
|
||||
vec![
|
||||
Signal::builder("request-dns").build(),
|
||||
Signal::builder("request-update")
|
||||
Signal::builder("request-activate")
|
||||
.param_types([bool::static_type()])
|
||||
.build(),
|
||||
Signal::builder("request-delete").build(),
|
||||
Signal::builder("request-dns").build(),
|
||||
Signal::builder("request-hostname-change")
|
||||
.param_types([String::static_type()])
|
||||
.build(),
|
||||
Signal::builder("request-port-change")
|
||||
.param_types([u32::static_type()])
|
||||
.build(),
|
||||
Signal::builder("request-position-change")
|
||||
.param_types([u32::static_type()])
|
||||
.build(),
|
||||
]
|
||||
})
|
||||
}
|
||||
@@ -78,22 +130,97 @@ impl ObjectImpl for ClientRow {
|
||||
#[gtk::template_callbacks]
|
||||
impl ClientRow {
|
||||
#[template_callback]
|
||||
fn handle_client_set_state(&self, state: bool, _switch: &Switch) -> bool {
|
||||
log::debug!("state change -> requesting update");
|
||||
self.obj().emit_by_name::<()>("request-update", &[&state]);
|
||||
fn handle_activate_switch(&self, state: bool, _switch: &Switch) -> bool {
|
||||
self.obj().emit_by_name::<()>("request-activate", &[&state]);
|
||||
true // dont run default handler
|
||||
}
|
||||
|
||||
#[template_callback]
|
||||
fn handle_request_dns(&self, _: Button) {
|
||||
fn handle_request_dns(&self, _: &Button) {
|
||||
self.obj().emit_by_name::<()>("request-dns", &[]);
|
||||
}
|
||||
|
||||
#[template_callback]
|
||||
fn handle_client_delete(&self, _button: &Button) {
|
||||
log::debug!("delete button pressed -> requesting delete");
|
||||
self.obj().emit_by_name::<()>("request-delete", &[]);
|
||||
}
|
||||
|
||||
fn handle_port_changed(&self, port_entry: &Entry) {
|
||||
if let Ok(port) = port_entry.text().parse::<u16>() {
|
||||
self.obj()
|
||||
.emit_by_name::<()>("request-port-change", &[&(port as u32)]);
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_hostname_changed(&self, hostname_entry: &Entry) {
|
||||
self.obj()
|
||||
.emit_by_name::<()>("request-hostname-change", &[&hostname_entry.text()]);
|
||||
}
|
||||
|
||||
fn handle_position_changed(&self, position: &ComboRow) {
|
||||
self.obj()
|
||||
.emit_by_name("request-position-change", &[&position.selected()])
|
||||
}
|
||||
|
||||
pub(super) fn set_hostname(&self, hostname: Option<String>) {
|
||||
let position = self.hostname.position();
|
||||
let handler = self.hostname_change_handler.borrow();
|
||||
let handler = handler.as_ref().expect("signal handler");
|
||||
self.hostname.block_signal(handler);
|
||||
self.client_object
|
||||
.borrow_mut()
|
||||
.as_mut()
|
||||
.expect("client object")
|
||||
.set_property("hostname", hostname);
|
||||
self.hostname.unblock_signal(handler);
|
||||
self.hostname.set_position(position);
|
||||
}
|
||||
|
||||
pub(super) fn set_port(&self, port: u16) {
|
||||
let position = self.port.position();
|
||||
let handler = self.port_change_handler.borrow();
|
||||
let handler = handler.as_ref().expect("signal handler");
|
||||
self.port.block_signal(handler);
|
||||
self.client_object
|
||||
.borrow_mut()
|
||||
.as_mut()
|
||||
.expect("client object")
|
||||
.set_port(port as u32);
|
||||
self.port.unblock_signal(handler);
|
||||
self.port.set_position(position);
|
||||
}
|
||||
|
||||
pub(super) fn set_pos(&self, pos: Position) {
|
||||
let handler = self.position_change_handler.borrow();
|
||||
let handler = handler.as_ref().expect("signal handler");
|
||||
self.position.block_signal(handler);
|
||||
self.client_object
|
||||
.borrow_mut()
|
||||
.as_mut()
|
||||
.expect("client object")
|
||||
.set_position(pos.to_string());
|
||||
self.position.unblock_signal(handler);
|
||||
}
|
||||
|
||||
pub(super) fn set_active(&self, active: bool) {
|
||||
let handler = self.set_state_handler.borrow();
|
||||
let handler = handler.as_ref().expect("signal handler");
|
||||
self.enable_switch.block_signal(handler);
|
||||
self.client_object
|
||||
.borrow_mut()
|
||||
.as_mut()
|
||||
.expect("client object")
|
||||
.set_active(active);
|
||||
self.enable_switch.unblock_signal(handler);
|
||||
}
|
||||
|
||||
pub(super) fn set_dns_state(&self, resolved: bool) {
|
||||
if resolved {
|
||||
self.dns_button.set_css_classes(&["success"])
|
||||
} else {
|
||||
self.dns_button.set_css_classes(&["warning"])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl WidgetImpl for ClientRow {}
|
||||
|
||||
Reference in New Issue
Block a user