preferences: add log level

Can now set the log level in the application
This commit is contained in:
Stéphane Cerveau 2022-02-16 17:07:57 +01:00
parent 28abb4555a
commit 7762332700
2 changed files with 66 additions and 10 deletions

View file

@ -17,12 +17,28 @@ use std::fs::File;
#[derive(Debug, Eq, Ord, PartialEq, PartialOrd)] #[derive(Debug, Eq, Ord, PartialEq, PartialOrd)]
pub enum LogLevel { pub enum LogLevel {
Off,
Error, Error,
Warning, Warning,
Info, Info,
Debug, Debug,
Trace, Trace,
} }
impl LogLevel {
pub fn from_u32(value: u32) -> LogLevel {
match value {
0 => LogLevel::Off,
1 => LogLevel::Error,
2 => LogLevel::Warning,
3 => LogLevel::Info,
4 => LogLevel::Debug,
5 => LogLevel::Trace,
_ => panic!("Unknown value: {}", value),
}
}
}
impl fmt::Display for LogLevel { impl fmt::Display for LogLevel {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{:?}", self) write!(f, "{:?}", self)
@ -95,6 +111,7 @@ impl io::Write for WriteAdapter {
fn translate_to_simple_logger(log_level: LogLevel) -> LevelFilter { fn translate_to_simple_logger(log_level: LogLevel) -> LevelFilter {
match log_level { match log_level {
LogLevel::Off => LevelFilter::Off,
LogLevel::Error => LevelFilter::Error, LogLevel::Error => LevelFilter::Error,
LogLevel::Warning => LevelFilter::Warn, LogLevel::Warning => LevelFilter::Warn,
LogLevel::Info => LevelFilter::Info, LogLevel::Info => LevelFilter::Info,
@ -128,6 +145,10 @@ pub fn init_logger(sender: Sender<String>, log_file: &str) {
.unwrap(); .unwrap();
} }
pub fn set_log_level(level: LogLevel) {
log::set_max_level(translate_to_simple_logger(level));
}
pub fn print_log(log_level: LogLevel, msg: String) { pub fn print_log(log_level: LogLevel, msg: String) {
match log_level { match log_level {
LogLevel::Error => { LogLevel::Error => {
@ -145,5 +166,6 @@ pub fn print_log(log_level: LogLevel, msg: String) {
LogLevel::Trace => { LogLevel::Trace => {
trace!("{}", msg); trace!("{}", msg);
} }
_ => {}
}; };
} }

View file

@ -8,25 +8,31 @@
use crate::app::GPSApp; use crate::app::GPSApp;
use crate::logger;
use crate::settings; use crate::settings;
use crate::ui as GPSUI; use crate::ui as GPSUI;
use gtk::glib; use gtk::glib;
use gtk::prelude::*; use gtk::prelude::*;
fn add_settings_widget(grid: &gtk::Grid, label_name: &str, widget: &gtk::Widget, row: i32) {
let label = gtk::Label::builder()
.label(label_name)
.hexpand(true)
.halign(gtk::Align::Start)
.margin_start(4)
.build();
grid.attach(&label, 0, row, 1, 1);
grid.attach(widget, 1, row, 1, 1);
}
pub fn display_settings(app: &GPSApp) { pub fn display_settings(app: &GPSApp) {
let grid = gtk::Grid::new(); let grid = gtk::Grid::new();
grid.set_column_spacing(4); grid.set_column_spacing(4);
grid.set_row_spacing(4); grid.set_row_spacing(4);
grid.set_margin_bottom(12); grid.set_margin_bottom(12);
let label = gtk::Label::builder()
.label("Use gtk4paintablesink element for video rendering:")
.hexpand(true)
.halign(gtk::Align::Start)
.margin_start(4)
.build();
let widget = gtk::CheckButton::new();
let settings = settings::Settings::load_settings(); let settings = settings::Settings::load_settings();
let widget = gtk::CheckButton::new();
widget.set_active( widget.set_active(
settings settings
.preferences .preferences
@ -41,8 +47,36 @@ pub fn display_settings(app: &GPSApp) {
settings::Settings::save_settings(&settings); settings::Settings::save_settings(&settings);
})); }));
grid.attach(&label, 0, 0, 1, 1); let widget = widget
grid.attach(&widget, 1, 0, 1, 1); .dynamic_cast::<gtk::Widget>()
.expect("Should be a widget");
add_settings_widget(
&grid,
"Use gtk4paintablesink element for video rendering:",
&widget,
0,
);
let widget = gtk::SpinButton::with_range(0.0, 5.0, 1.0);
widget.set_value(
settings
.preferences
.get("log_level")
.unwrap_or(&"0.0".to_string())
.parse::<f64>()
.expect("Should a f64 value"),
);
widget.connect_value_changed(glib::clone!(@weak widget => move |c| {
let mut settings = settings::Settings::load_settings();
settings.preferences.insert("log_level".to_string(), c.value().to_string());
logger::set_log_level(logger::LogLevel::from_u32(c.value() as u32));
settings::Settings::save_settings(&settings);
}));
let widget = widget
.dynamic_cast::<gtk::Widget>()
.expect("Should be a widget");
add_settings_widget(&grid, "Log level", &widget, 1);
let dialog = GPSUI::dialog::create_dialog("Preferences", app, &grid, move |_app, dialog| { let dialog = GPSUI::dialog::create_dialog("Preferences", app, &grid, move |_app, dialog| {
dialog.close(); dialog.close();