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

Gui code restructure

Browse Source
This commit is contained in:
Ilya Zlobintsev 2020-11-16 09:27:22 +02:00
parent d9dda8ed25
commit cd9774d292
1 changed files with 109 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

233
gui/src/main.rs
View File

@ -2,7 +2,7 @@ extern crate gdk;
extern crate gio; extern crate gio;
extern crate gtk; extern crate gtk;
use daemon::{Daemon, daemon_connection::DaemonConnection, gpu_controller::GpuInfo}; use daemon::{Daemon, daemon_connection::DaemonConnection};
use gio::prelude::*; use gio::prelude::*;
use gtk::{Adjustment, Button, ButtonsType, ComboBoxText, DialogFlags, Frame, Label, LevelBar, MessageType, Switch, prelude::*}; use gtk::{Adjustment, Button, ButtonsType, ComboBoxText, DialogFlags, Frame, Label, LevelBar, MessageType, Switch, prelude::*};
@ -42,15 +42,16 @@ fn build_ui(application: &gtk::Application) {
let power_cap_label: Label = builder.get_object("power_cap_label").unwrap(); let power_cap_label: Label = builder.get_object("power_cap_label").unwrap();
let apply_button: Button = builder.get_object("apply_button").unwrap();
let automatic_fan_control_switch: Switch = let automatic_fan_control_switch: Switch =
builder.get_object("automatic_fan_control_switch").unwrap(); builder.get_object("automatic_fan_control_switch").unwrap();
let apply_button: Button = builder.get_object("apply_button").unwrap();
let fan_curve_frame: Frame = builder.get_object("fan_curve_frame").unwrap(); let fan_curve_frame: Frame = builder.get_object("fan_curve_frame").unwrap();
let gpu_power_adjustment: Adjustment = builder.get_object("gpu_power_adjustment").unwrap(); let gpu_power_adjustment: Adjustment = builder.get_object("gpu_power_adjustment").unwrap();
let mut unpriviliged: bool = false; let mut unpriviliged: bool = false;
let d = match DaemonConnection::new() { let d = match DaemonConnection::new() {
@ -92,13 +93,8 @@ fn build_ui(application: &gtk::Application) {
let current_gpu_id = Arc::new(RwLock::new(0u32)); let current_gpu_id = Arc::new(RwLock::new(0u32));
let cur_id = current_gpu_id.clone();
let build = builder.clone(); let build = builder.clone();
let fan_curv_frm = fan_curve_frame.clone();
let auto_fan_ctrl_swtch = automatic_fan_control_switch.clone();
let b = apply_button.clone(); let b = apply_button.clone();
gpu_power_adjustment.connect_value_changed(move |adjustment| { gpu_power_adjustment.connect_value_changed(move |adjustment| {
println!("changed adjustment value to {}/{}", adjustment.get_value(), adjustment.get_upper()); println!("changed adjustment value to {}/{}", adjustment.get_value(), adjustment.get_upper());
@ -106,36 +102,16 @@ fn build_ui(application: &gtk::Application) {
power_cap_label.set_text(&format!("{}/{}", adjustment.get_value().floor(), adjustment.get_upper())); power_cap_label.set_text(&format!("{}/{}", adjustment.get_value().floor(), adjustment.get_upper()));
}); });
let cur_id = current_gpu_id.clone();
let b = apply_button.clone(); let b = apply_button.clone();
gpu_select_comboboxtext.connect_changed(move |combobox| { gpu_select_comboboxtext.connect_changed(move |combobox| {
let mut current_gpu_id = cur_id.write().unwrap(); let mut current_gpu_id = cur_id.write().unwrap();
*current_gpu_id = combobox.get_active_id().unwrap().parse::<u32>().expect("invalid id"); *current_gpu_id = combobox.get_active_id().unwrap().parse::<u32>().expect("invalid id");
println!("Set current gpu id to {}", current_gpu_id); println!("Set current gpu id to {}", current_gpu_id);
let gpu_info = d.get_gpu_info(*current_gpu_id).unwrap(); set_info(&build, d, current_gpu_id.clone());
set_info(&build, &gpu_info);
let fan_control = d.get_fan_control(*current_gpu_id);
match fan_control {
Ok(ref fan_control) => {
if fan_control.enabled {
println!("Automatic fan control disabled!");
auto_fan_ctrl_swtch.set_active(false);
fan_curv_frm.set_visible(true);
} else {
println!("Automatic fan control enabled");
auto_fan_ctrl_swtch.set_active(true);
fan_curv_frm.set_visible(false);
}
},
Err(_) => {
auto_fan_ctrl_swtch.set_sensitive(false);
auto_fan_ctrl_swtch.set_tooltip_text(Some("Unavailable"));
fan_curv_frm.set_visible(false);
}
}
b.set_sensitive(false); b.set_sensitive(false);
@ -144,8 +120,6 @@ fn build_ui(application: &gtk::Application) {
//gpu_select_comboboxtext.set_active_id(Some(&current_gpu_id.to_string())); //gpu_select_comboboxtext.set_active_id(Some(&current_gpu_id.to_string()));
gpu_select_comboboxtext.set_active(Some(0)); gpu_select_comboboxtext.set_active(Some(0));
if unpriviliged { if unpriviliged {
automatic_fan_control_switch.set_sensitive(false); automatic_fan_control_switch.set_sensitive(false);
fan_curve_frame.set_visible(false); fan_curve_frame.set_visible(false);
@ -189,32 +163,6 @@ fn build_ui(application: &gtk::Application) {
glib::Continue(true) glib::Continue(true)
}); });
let fan_control = d.get_fan_control(*current_gpu_id.read().unwrap());
match fan_control {
Ok(ref fan_control) => {
if fan_control.enabled {
println!("Automatic fan control disabled!");
automatic_fan_control_switch.set_active(false);
fan_curve_frame.set_visible(true);
} else {
println!("Automatic fan control enabled");
fan_curve_frame.set_visible(false);
}
},
Err(_) => {
automatic_fan_control_switch.set_sensitive(false);
automatic_fan_control_switch.set_tooltip_text(Some("Unavailable"));
fan_curve_frame.set_visible(false);
}
}
let (power_cap, power_cap_max) = d.get_power_cap(*current_gpu_id.read().unwrap()).unwrap();
gpu_power_adjustment.set_upper(power_cap_max as f64);
gpu_power_adjustment.set_value(power_cap as f64);
let b = apply_button.clone(); let b = apply_button.clone();
let switch = automatic_fan_control_switch.clone(); let switch = automatic_fan_control_switch.clone();
@ -231,6 +179,101 @@ fn build_ui(application: &gtk::Application) {
b.set_sensitive(true); b.set_sensitive(true);
}); });
main_window.set_application(Some(application));
main_window.show();
}
fn set_info(builder: &Builder, d: DaemonConnection, gpu_id: u32) {
let gpu_model_text_buffer: TextBuffer = builder
.get_object("gpu_model_text_buffer")
.expect("Couldn't get textbuffer");
let vbios_version_text_buffer: TextBuffer = builder .get_object("vbios_version_text_buffer") .expect("Couldn't get textbuffer");
let driver_text_buffer: TextBuffer = builder
.get_object("driver_text_buffer")
.expect("Couldn't get textbuffer");
let manufacturer_text_buffer: TextBuffer = builder
.get_object("manufacturer_text_buffer")
.expect("Couldn't get textbuffer");
let vram_size_text_buffer: TextBuffer = builder
.get_object("vram_size_text_buffer")
.expect("Couldn't get textbuffer");
let link_speed_text_buffer: TextBuffer = builder
.get_object("link_speed_text_buffer")
.expect("Couldn't get textbuffer");
let vulkan_device_name_text_buffer: TextBuffer = builder
.get_object("vulkan_device_name_text_buffer")
.expect("Couldn't get textbuffer");
let vulkan_version_text_buffer: TextBuffer = builder
.get_object("vulkan_version_text_buffer")
.expect("Couldn't get textbuffer");
let vulkan_features_text_buffer: TextBuffer = builder
.get_object("vulkan_features_text_buffer")
.expect("Couldn't get textbuffer");
let automatic_fan_control_switch: Switch =
builder.get_object("automatic_fan_control_switch").unwrap();
let fan_curve_frame: Frame = builder.get_object("fan_curve_frame").unwrap();
let gpu_power_adjustment: Adjustment = builder.get_object("gpu_power_adjustment").unwrap();
let apply_button: Button = builder.get_object("apply_button").unwrap();
let gpu_info = d.get_gpu_info(gpu_id).unwrap();
gpu_model_text_buffer.set_text(&gpu_info.card_model);
manufacturer_text_buffer.set_text(&gpu_info.card_vendor);
vbios_version_text_buffer.set_text(&gpu_info.vbios_version);
driver_text_buffer.set_text(&gpu_info.driver);
vram_size_text_buffer.set_text(&format!("{} MiB", &gpu_info.vram_size));
link_speed_text_buffer.set_text(&format!(
"{} x{}",
&gpu_info.link_speed, &gpu_info.link_width
));
let vulkan_features = gpu_info.vulkan_info.features.replace(',', "\n").replace("Features", "").replace("{", "").replace("}", "").replace(" ", "").replace(":", ": ");
vulkan_device_name_text_buffer.set_text(&gpu_info.vulkan_info.device_name);
vulkan_version_text_buffer.set_text(&gpu_info.vulkan_info.api_version);
vulkan_features_text_buffer.set_text(&vulkan_features);
let (power_cap, power_cap_max) = d.get_power_cap(gpu_id).unwrap();
gpu_power_adjustment.set_upper(power_cap_max as f64);
gpu_power_adjustment.set_value(power_cap as f64);
let fan_control = d.get_fan_control(gpu_id);
match fan_control {
Ok(ref fan_control) => {
if fan_control.enabled {
println!("Automatic fan control disabled!");
automatic_fan_control_switch.set_active(false);
fan_curve_frame.set_visible(true);
} else {
println!("Automatic fan control enabled");
automatic_fan_control_switch.set_active(true);
fan_curve_frame.set_visible(false);
}
},
Err(_) => {
automatic_fan_control_switch.set_sensitive(false);
automatic_fan_control_switch.set_tooltip_text(Some("Unavailable"));
fan_curve_frame.set_visible(false);
}
}
match fan_control { match fan_control {
Ok(fan_control) => { Ok(fan_control) => {
@ -259,16 +302,16 @@ fn build_ui(application: &gtk::Application) {
} }
apply_button.connect_clicked(move |b| { apply_button.connect_clicked(move |b| {
let current_gpu_id = *current_gpu_id.read().unwrap(); //let current_gpu_id = *current_gpu_id.read().unwrap();
let curve = curve.read().unwrap().clone(); let curve = curve.read().unwrap().clone();
println!("setting curve to {:?}", curve); println!("setting curve to {:?}", curve);
d.set_fan_curve(current_gpu_id, curve).unwrap(); d.set_fan_curve(gpu_id, curve).unwrap();
b.set_sensitive(false); b.set_sensitive(false);
match automatic_fan_control_switch.get_active() { match automatic_fan_control_switch.get_active() {
true => { true => {
d.stop_fan_control(current_gpu_id).unwrap(); d.stop_fan_control(gpu_id).unwrap();
let diag = MessageDialog::new( let diag = MessageDialog::new(
None::<&Window>, None::<&Window>,
@ -281,76 +324,16 @@ fn build_ui(application: &gtk::Application) {
diag.hide(); diag.hide();
} }
false => { false => {
d.start_fan_control(current_gpu_id).unwrap(); d.start_fan_control(gpu_id).unwrap();
} }
} }
let power_cap = gpu_power_adjustment.get_value().floor() as i32; let power_cap = gpu_power_adjustment.get_value().floor() as i32;
d.set_power_cap(current_gpu_id, power_cap).unwrap(); d.set_power_cap(gpu_id, power_cap).unwrap();
}); });
}, },
Err(_) => (), Err(_) => (),
} }
main_window.set_application(Some(application));
main_window.show();
}
fn set_info(builder: &Builder, gpu_info: &GpuInfo) {
let gpu_model_text_buffer: TextBuffer = builder
.get_object("gpu_model_text_buffer")
.expect("Couldn't get textbuffer");
let vbios_version_text_buffer: TextBuffer = builder
.get_object("vbios_version_text_buffer")
.expect("Couldn't get textbuffer");
let driver_text_buffer: TextBuffer = builder
.get_object("driver_text_buffer")
.expect("Couldn't get textbuffer");
let manufacturer_text_buffer: TextBuffer = builder
.get_object("manufacturer_text_buffer")
.expect("Couldn't get textbuffer");
let vram_size_text_buffer: TextBuffer = builder
.get_object("vram_size_text_buffer")
.expect("Couldn't get textbuffer");
let link_speed_text_buffer: TextBuffer = builder
.get_object("link_speed_text_buffer")
.expect("Couldn't get textbuffer");
let vulkan_device_name_text_buffer: TextBuffer = builder
.get_object("vulkan_device_name_text_buffer")
.expect("Couldn't get textbuffer");
let vulkan_version_text_buffer: TextBuffer = builder
.get_object("vulkan_version_text_buffer")
.expect("Couldn't get textbuffer");
let vulkan_features_text_buffer: TextBuffer = builder
.get_object("vulkan_features_text_buffer")
.expect("Couldn't get textbuffer");
gpu_model_text_buffer.set_text(&gpu_info.card_model);
manufacturer_text_buffer.set_text(&gpu_info.card_vendor);
vbios_version_text_buffer.set_text(&gpu_info.vbios_version);
driver_text_buffer.set_text(&gpu_info.driver);
vram_size_text_buffer.set_text(&format!("{} MiB", &gpu_info.vram_size));
link_speed_text_buffer.set_text(&format!(
"{} x{}",
&gpu_info.link_speed, &gpu_info.link_width
));
let vulkan_features = gpu_info.vulkan_info.features.replace(',', "\n").replace("Features", "").replace("{", "").replace("}", "").replace(" ", "").replace(":", ": ");
vulkan_device_name_text_buffer.set_text(&gpu_info.vulkan_info.device_name);
vulkan_version_text_buffer.set_text(&gpu_info.vulkan_info.api_version);
vulkan_features_text_buffer.set_text(&vulkan_features);
} }
fn main() { fn main() {