projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed alarm_limit to alarm_high_thresold
[psensor.git]
/
src
/
ui_sensorpref.c
diff --git
a/src/ui_sensorpref.c
b/src/ui_sensorpref.c
index
331fef3
..
286b25f
100644
(file)
--- a/
src/ui_sensorpref.c
+++ b/
src/ui_sensorpref.c
@@
-32,7
+32,7
@@
struct sensor_pref {
int enabled;
struct color *color;
int alarm_enabled;
int enabled;
struct color *color;
int alarm_enabled;
-
double alarm_limit
;
+
int alarm_high_thresold
;
};
struct cb_data {
};
struct cb_data {
@@
-54,9
+54,10
@@
static struct sensor_pref *sensor_pref_new(struct psensor *s,
p->color = color_dup(s->color);
if (cfg->temperature_unit == CELCIUS)
p->color = color_dup(s->color);
if (cfg->temperature_unit == CELCIUS)
- p->alarm_
limit = s->alarm_limit
;
+ p->alarm_
high_thresold = s->alarm_high_thresold
;
else
else
- p->alarm_limit = celcius_to_fahrenheit(s->alarm_limit);
+ p->alarm_high_thresold
+ = celcius_to_fahrenheit(s->alarm_high_thresold);
return p;
}
return p;
}
@@
-208,7
+209,7
@@
static void on_temp_limit_changed(GtkSpinButton *btn, gpointer data)
p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
if (p)
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 connect_signals(GtkBuilder *builder, struct cb_data *cbdata)
}
static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata)
@@
-280,7
+281,7
@@
update_pref(struct psensor *s,
if (is_temp_type(s->type)) {
gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
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_temp_limit, p->alarm_
high_thresold
);
gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), TRUE);
} else {
gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), TRUE);
} else {
@@
-361,13
+362,13
@@
apply_prefs(struct sensor_pref **prefs,
}
if (cfg->temperature_unit == CELCIUS)
}
if (cfg->temperature_unit == CELCIUS)
- s->alarm_
limit = p->alarm_limit
;
+ s->alarm_
high_thresold = p->alarm_high_thresold
;
else
else
- s->alarm_
limit
= fahrenheit_to_celcius
- (p->alarm_
limit
);
+ s->alarm_
high_thresold
= fahrenheit_to_celcius
+ (p->alarm_
high_thresold
);
- config_set_sensor_alarm_
limit
(s->id,
-
s->alarm_limit
);
+ config_set_sensor_alarm_
high_thresold
(s->id,
+
s->alarm_high_thresold
);
if (s->alarm_enabled != p->alarm_enabled) {
s->alarm_enabled = p->alarm_enabled;
if (s->alarm_enabled != p->alarm_enabled) {
s->alarm_enabled = p->alarm_enabled;