IntenseWebs/LACT
3
0
Fork 0
mirror of https://github.com/ilya-zlobintsev/LACT.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

interactively show fan controls

Browse Source
This commit is contained in:
Ilya Zlobintsev 2023-01-30 21:21:11 +02:00
parent d86cf8da50
commit 0ccaa8d325
3 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lact-gui/src/app/mod.rs
View File

@ -349,7 +349,7 @@ fn show_error(parent: &ApplicationWindow, err: anyhow::Error) {
.message_type(MessageType::Error)
.text(&text)
.buttons(ButtonsType::Close)
.transient_for(&*parent)
.transient_for(parent)
.build();
diag.run_async(|diag, _| {
diag.hide();

16
lact-gui/src/app/root_stack/thermals_page/fan_curve_frame.rs
View File

@ -57,15 +57,15 @@ impl FanCurveFrame {
curve
}*/
pub fn show(&self) {
debug!("Manual fan control enaged, showing fan curve");
self.container.set_visible(true);
}
// pub fn show(&self) {
// debug!("Manual fan control enaged, showing fan curve");
// self.container.set_visible(true);
// }
pub fn hide(&self) {
debug!("Manual fan control disenaged, hiding fan curve");
self.container.set_visible(false);
}
// pub fn hide(&self) {
// debug!("Manual fan control disenaged, hiding fan curve");
// self.container.set_visible(false);
// }
/*pub fn connect_adjusted<F: Fn() + 'static + Clone>(&self, f: F) {
let adjustments = [

44
lact-gui/src/app/root_stack/thermals_page/mod.rs
View File

@ -4,7 +4,7 @@ use fan_curve_frame::FanCurveFrame;
use glib::clone;
use gtk::prelude::*;
use gtk::*;
use lact_client::schema::{default_fan_curve, DeviceStats};
use lact_client::schema::DeviceStats;
use std::collections::BTreeMap;
pub struct ThermalsSettings {
@ -93,32 +93,22 @@ impl ThermalsPage {
container.prepend(&grid);
let fan_curve_frame = FanCurveFrame::new();
fan_curve_frame.set_curve(&default_fan_curve());
container.append(&fan_curve_frame.container);
/*// Show/hide fan curve when the switch is toggled
// Show/hide fan curve when the switch is toggled
{
let fan_curve_frame = fan_curve_frame.clone();
fan_control_enabled_switch.connect_changed_active(move |switch| {
trace!("Fan control switch toggled");
if switch.state() {
{
glib::idle_add(|| {
let diag = MessageDialog::new(None::<&Window>, DialogFlags::empty(), MessageType::Warning, ButtonsType::Ok,
"Warning! Due to a driver bug, a reboot may be required for fan control to properly switch back to automatic.");
diag.run();
diag.hide();
glib::Continue(false)
});
}
fan_curve_frame.hide();
fan_control_enabled_switch.connect_state_set(move |_, state| {
if state {
show_fan_control_warning();
fan_curve_frame.container.hide();
} else {
fan_curve_frame.show();
fan_curve_frame.container.show();
}
Inhibit(false)
});
}*/
}
Self {
container,
@ -164,11 +154,11 @@ impl ThermalsPage {
self.fan_control_enabled_switch
.set_active(!stats.fan.control_enabled);
/*if stats.fan.control_enabled {
self.fan_curve_frame.show();
if stats.fan.control_enabled {
self.fan_curve_frame.container.show();
} else {
self.fan_curve_frame.hide();
}*/
self.fan_curve_frame.container.hide();
}
}
// TODO
@ -202,3 +192,11 @@ impl ThermalsPage {
// self.fan_curve_frame.hide();
}
}
fn show_fan_control_warning() {
let diag = MessageDialog::new(None::<&Window>, DialogFlags::empty(), MessageType::Warning, ButtonsType::Ok,
"Warning! Due to a driver bug, a reboot may be required for fan control to properly switch back to automatic.");
diag.run_async(|diag, _| {
diag.hide();
})
}