return idx;
}
-void ui_sensorlist_update(struct ui_psensor *ui)
+void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
{
- char *str;
+ char *scolor, *value, *min, *max;
struct psensor *s;
GtkTreeIter iter;
- struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
- GtkTreeModel *model
- = gtk_tree_view_get_model(ui_sl->treeview);
- gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
- struct psensor **sensor = ui->sensors;
+ GtkTreeModel *model;
+ gboolean valid;
int use_celcius;
+ GdkColor color;
+ GtkListStore *store;
+
+ model = gtk_tree_view_get_model(ui->sensors_tree);
+ store = GTK_LIST_STORE(model);
use_celcius = ui->config->temperature_unit == CELCIUS;
+ valid = gtk_tree_model_get_iter_first(model, &iter);
while (valid) {
- gtk_tree_model_get(model, &iter,
- COL_SENSOR, &s,
- -1);
+ gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
- str = psensor_value_to_str(s->type,
- s->measures[s->values_max_length -
- 1].value,
- use_celcius);
+ value = psensor_value_to_str(s->type,
+ psensor_get_current_value(s),
+ use_celcius);
+ min = psensor_value_to_str(s->type, s->min, use_celcius);
+ max = psensor_value_to_str(s->type, s->max, use_celcius);
- gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_TEMP, str,
+ gtk_list_store_set(store, &iter,
+ COL_TEMP, value,
+ COL_TEMP_MIN, min,
+ COL_TEMP_MAX, max,
-1);
- free(str);
-
- str = psensor_value_to_str(s->type, s->min, use_celcius);
- gtk_list_store_set(GTK_LIST_STORE(model), &iter,
- COL_TEMP_MIN, str, -1);
- free(str);
-
- str = psensor_value_to_str(s->type, s->max, use_celcius);
- gtk_list_store_set(GTK_LIST_STORE(model), &iter,
- COL_TEMP_MAX, str, -1);
- free(str);
+ free(value);
+ free(min);
+ free(max);
+
+ if (complete) {
+ color.red = s->color->red;
+ color.green = s->color->green;
+ color.blue = s->color->blue;
+
+ scolor = gdk_color_to_string(&color);
+
+ gtk_list_store_set(store, &iter,
+ COL_NAME, s->name,
+ COL_COLOR_STR, scolor,
+ COL_ENABLED, s->enabled,
+ -1);
+ free(scolor);
+ }
valid = gtk_tree_model_iter_next(model, &iter);
- sensor++;
}
}
return -1;
}
-void ui_sensorlist_update_sensors_preferences(struct ui_psensor *ui)
-{
- GtkTreeIter iter;
- GtkTreeModel *model
- = gtk_tree_view_get_model(ui->ui_sensorlist->treeview);
- gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
- struct psensor **sensor = ui->ui_sensorlist->sensors;
-
- while (valid && *sensor) {
- GdkColor color;
- gchar *scolor;
-
- color.red = (*sensor)->color->red;
- color.green = (*sensor)->color->green;
- color.blue = (*sensor)->color->blue;
-
- scolor = gdk_color_to_string(&color);
-
- gtk_list_store_set(GTK_LIST_STORE(model),
- &iter, COL_NAME, (*sensor)->name, -1);
-
- gtk_list_store_set(GTK_LIST_STORE(model),
- &iter, COL_COLOR_STR, scolor, -1);
-
- gtk_list_store_set(GTK_LIST_STORE(model),
- &iter, COL_ENABLED, (*sensor)->enabled, -1);
-
- free(scolor);
-
- valid = gtk_tree_model_iter_next(model, &iter);
- sensor++;
- }
-}
-
static void on_preferences_activated(GtkWidget *menu_item, gpointer data)
{
struct cb_data *cb_data = data;
struct ui_psensor *ui = (struct ui_psensor *)data;
GtkTreeView *view = ui->ui_sensorlist->treeview;
+ if (event->button != 3)
+ return FALSE;
+
struct psensor *sensor = get_sensor_at_pos(view,
event->x,
event->y,
if (coli == COL_COLOR) {
if (ui_change_color(_("Select foreground color"),
sensor->color)) {
- ui_sensorlist_update_sensors_preferences(ui);
+ ui_sensorlist_update(ui, 1);
config_set_sensor_color(sensor->id,
sensor->color);
}
- } else if (coli >= 0 && coli != COL_ENABLED
- && event->button == 3) {
+ } else if (coli >= 0 && coli != COL_ENABLED) {
menu = create_sensor_popup(ui, sensor);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
event->button, event->time);
-
}
}
- return FALSE;
+ return TRUE;
}
static void