X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=58382de9c534e51e0c460fe9f8727f6ea5d87f4e;hb=e1f8d2cbf6c09da9cbcb0bdf04d495b3d3666178;hp=a3b97b29812bb5288c94816632bb1606552fa210;hpb=6bc514333f857af0e986168e2f703d824b4924f8;p=psensor.git diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c index a3b97b2..58382de 100644 --- a/src/ui_sensorpref.c +++ b/src/ui_sensorpref.c @@ -1,22 +1,21 @@ /* - Copyright (C) 2010-2011 jeanfi@gmail.com - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - + * Copyright (C) 2010-2012 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ #include #include @@ -33,7 +32,8 @@ struct sensor_pref { int enabled; struct color *color; int alarm_enabled; - double alarm_limit; + int alarm_high_thresold; + int alarm_low_thresold; }; struct cb_data { @@ -42,18 +42,29 @@ struct cb_data { struct sensor_pref **prefs; }; -static struct sensor_pref *sensor_pref_new(struct psensor *s) +static struct sensor_pref *sensor_pref_new(struct psensor *s, + struct config *cfg) { - struct sensor_pref *p = malloc(sizeof(struct sensor_pref)); + struct sensor_pref *p; - p->sensor = s; + p = malloc(sizeof(struct sensor_pref)); + p->sensor = s; p->name = strdup(s->name); p->enabled = s->enabled; p->alarm_enabled = s->alarm_enabled; - p->alarm_limit = s->alarm_limit; p->color = color_dup(s->color); + if (cfg->temperature_unit == CELCIUS) { + p->alarm_high_thresold = s->alarm_high_thresold; + p->alarm_low_thresold = s->alarm_low_thresold; + } else { + p->alarm_high_thresold + = celcius_to_fahrenheit(s->alarm_high_thresold); + p->alarm_low_thresold + = celcius_to_fahrenheit(s->alarm_low_thresold); + } + return p; } @@ -68,7 +79,8 @@ static void sensor_pref_free(struct sensor_pref *p) free(p); } -static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors) +static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors, + struct config *cfg) { int n, i; struct sensor_pref **pref_list; @@ -77,7 +89,8 @@ static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors) pref_list = malloc(sizeof(struct sensor_pref *) * (n+1)); for (i = 0; i < n; i++) - pref_list[i] = sensor_pref_new(sensors[i]); + pref_list[i] = sensor_pref_new(sensors[i], + cfg); pref_list[n] = NULL; @@ -115,7 +128,7 @@ sensor_pref_get(struct sensor_pref **ps, struct psensor *s) } static struct sensor_pref * -get_seleted_sensor_pref(GtkBuilder *builder, struct sensor_pref **ps) +get_selected_sensor_pref(GtkBuilder *builder, struct sensor_pref **ps) { GtkTreeModel *model; GtkTreeIter iter; @@ -148,7 +161,7 @@ static void on_name_changed(GtkEntry *entry, gpointer data) str = gtk_entry_get_text(entry); - p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs); + p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); if (p && strcmp(p->name, str)) { free(p->name); @@ -162,7 +175,7 @@ on_drawed_toggled(GtkToggleButton *btn, gpointer data) struct cb_data *cbdata = data; struct sensor_pref *p; - p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs); + p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); if (p) p->enabled = gtk_toggle_button_get_active(btn); @@ -174,7 +187,7 @@ on_alarm_toggled(GtkToggleButton *btn, gpointer data) struct cb_data *cbdata = data; struct sensor_pref *p; - p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs); + p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); if (p) p->alarm_enabled = gtk_toggle_button_get_active(btn); @@ -186,7 +199,7 @@ static void on_color_set(GtkColorButton *widget, gpointer data) struct sensor_pref *p; GdkColor color; - p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs); + p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); if (p) { gtk_color_button_get_color(widget, &color); @@ -194,15 +207,30 @@ static void on_color_set(GtkColorButton *widget, gpointer data) } } -static void on_temp_limit_changed(GtkSpinButton *btn, gpointer data) +static void on_alarm_high_thresold_changed(GtkSpinButton *btn, gpointer data) { - struct cb_data *cbdata = data; + struct cb_data *cbdata; struct sensor_pref *p; - p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs); + cbdata = data; + + p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); if (p) - p->alarm_limit = gtk_spin_button_get_value(btn); + p->alarm_high_thresold = gtk_spin_button_get_value(btn); +} + +static void on_alarm_low_thresold_changed(GtkSpinButton *btn, gpointer data) +{ + struct cb_data *cbdata; + struct sensor_pref *p; + + cbdata = data; + + p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); + + if (p) + p->alarm_low_thresold = gtk_spin_button_get_value(btn); } static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata) @@ -219,21 +247,33 @@ static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata) g_signal_connect(gtk_builder_get_object(builder, "sensor_alarm"), "toggled", G_CALLBACK(on_alarm_toggled), cbdata); - g_signal_connect(gtk_builder_get_object(builder, "sensor_temp_limit"), - "value-changed", G_CALLBACK(on_temp_limit_changed), + g_signal_connect(gtk_builder_get_object(builder, + "sensor_alarm_high_thresold"), + "value-changed", + G_CALLBACK(on_alarm_high_thresold_changed), + cbdata); + + g_signal_connect(gtk_builder_get_object(builder, + "sensor_alarm_low_thresold"), + "value-changed", + G_CALLBACK(on_alarm_low_thresold_changed), cbdata); } static void -update_pref(struct psensor *s, struct sensor_pref **prefs, GtkBuilder *builder) +update_pref(struct psensor *s, + struct sensor_pref **prefs, + struct config *cfg, + GtkBuilder *builder) { - GtkLabel *w_id, *w_type; + GtkLabel *w_id, *w_type, *w_high_thresold_unit, *w_low_thresold_unit; GtkEntry *w_name; GtkToggleButton *w_draw, *w_alarm; GtkColorButton *w_color; - GtkSpinButton *w_temp_limit; + GtkSpinButton *w_high_thresold, *w_low_thresold; GdkColor *color; struct sensor_pref *p = sensor_pref_get(prefs, s); + int use_celcius; w_id = GTK_LABEL(gtk_builder_get_object(builder, "sensor_id")); gtk_label_set_text(w_id, s->id); @@ -255,20 +295,44 @@ update_pref(struct psensor *s, struct sensor_pref **prefs, GtkBuilder *builder) w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "sensor_alarm")); - w_temp_limit - = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, - "sensor_temp_limit")); + w_high_thresold = GTK_SPIN_BUTTON(gtk_builder_get_object + (builder, + "sensor_alarm_high_thresold")); + w_low_thresold = GTK_SPIN_BUTTON(gtk_builder_get_object + (builder, + "sensor_alarm_low_thresold")); + + w_high_thresold_unit = GTK_LABEL(gtk_builder_get_object + (builder, + "sensor_alarm_high_thresold_unit")); + w_low_thresold_unit = GTK_LABEL(gtk_builder_get_object + (builder, + "sensor_alarm_low_thresold_unit")); + + use_celcius = cfg->temperature_unit == CELCIUS ? 1 : 0; + gtk_label_set_text(w_high_thresold_unit, + psensor_type_to_unit_str(s->type, + use_celcius)); + gtk_label_set_text(w_low_thresold_unit, + psensor_type_to_unit_str(s->type, + use_celcius)); if (is_temp_type(s->type)) { gtk_toggle_button_set_active(w_alarm, p->alarm_enabled); - gtk_spin_button_set_value(w_temp_limit, p->alarm_limit); + gtk_spin_button_set_value(w_high_thresold, + p->alarm_high_thresold); + gtk_spin_button_set_value(w_low_thresold, + p->alarm_low_thresold); gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(w_high_thresold), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(w_low_thresold), TRUE); } else { gtk_toggle_button_set_active(w_alarm, 0); - gtk_spin_button_set_value(w_temp_limit, 0); + gtk_spin_button_set_value(w_high_thresold, 0); + gtk_spin_button_set_value(w_low_thresold, 0); gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(w_high_thresold), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(w_low_thresold), FALSE); } } @@ -284,7 +348,10 @@ static void on_changed(GtkTreeSelection *selection, gpointer data) gint *indices = gtk_tree_path_get_indices(p); struct psensor *s = *(ui->sensors + *indices); - update_pref(s, cbdata->prefs, cbdata->builder); + update_pref(s, + cbdata->prefs, + ui->config, + cbdata->builder); gtk_tree_path_free(p); } @@ -316,7 +383,9 @@ select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree) } static void -apply_prefs(struct sensor_pref **prefs, struct psensor **sensors) +apply_prefs(struct sensor_pref **prefs, + struct psensor **sensors, + struct config *cfg) { int n = psensor_list_size(sensors); int i; @@ -336,12 +405,21 @@ apply_prefs(struct sensor_pref **prefs, struct psensor **sensors) config_set_sensor_enabled(s->id, s->enabled); } - if (s->alarm_limit != p->alarm_limit) { - s->alarm_limit = p->alarm_limit; - config_set_sensor_alarm_limit(s->id, - s->alarm_limit); + if (is_temp_type(s->type) && cfg->temperature_unit == CELCIUS) { + s->alarm_high_thresold = p->alarm_high_thresold; + s->alarm_low_thresold = p->alarm_low_thresold; + } else { + s->alarm_high_thresold = fahrenheit_to_celcius + (p->alarm_high_thresold); + s->alarm_low_thresold = fahrenheit_to_celcius + (p->alarm_low_thresold); } + config_set_sensor_alarm_high_thresold(s->id, + s->alarm_high_thresold); + config_set_sensor_alarm_low_thresold(s->id, + s->alarm_low_thresold); + if (s->alarm_enabled != p->alarm_enabled) { s->alarm_enabled = p->alarm_enabled; config_set_sensor_alarm_enabled(s->id, @@ -369,7 +447,8 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) struct cb_data cbdata; cbdata.ui = ui; - cbdata.prefs = sensor_pref_list_new(ui->sensors); + cbdata.prefs = sensor_pref_list_new(ui->sensors, + ui->config); builder = gtk_builder_new(); cbdata.builder = builder; @@ -385,7 +464,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) return ; } - update_pref(sensor, cbdata.prefs, builder); + update_pref(sensor, cbdata.prefs, ui->config, builder); connect_signals(builder, &cbdata); w_sensors_list @@ -420,7 +499,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) result = gtk_dialog_run(diag); if (result == GTK_RESPONSE_ACCEPT) { - apply_prefs(cbdata.prefs, ui->sensors); + apply_prefs(cbdata.prefs, ui->sensors, ui->config); ui_sensorlist_update_sensors_preferences(ui); }