X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fui_sensorlist.c;h=9d4b748717e7537b04c321569bc7111ea4c07e68;hp=5f1cb4f88fef294071f81d265b42af727354e12f;hb=bd7036af56a4b61b2b473dccbeac5e26f78b57da;hpb=48da1ac5531838d157762882ee455cec4da05728

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index 5f1cb4f..9d4b748 100644
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 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
@@ -58,12 +58,12 @@ static void populate(struct ui_psensor *ui)
 {
 	GtkTreeIter iter;
 	GtkListStore *store;
-	GdkRGBA color;
+	GdkRGBA *color;
 	char *scolor;
 	struct psensor **ordered_sensors, **s_cur, *s;
 	unsigned int enabled;
 
-	ordered_sensors = ui_get_sensors_ordered_by_position(ui);
+	ordered_sensors = ui_get_sensors_ordered_by_position(ui->sensors);
 	store = ui->sensors_store;
 
 	gtk_list_store_clear(store);
@@ -73,23 +73,21 @@ static void populate(struct ui_psensor *ui)
 
 		gtk_list_store_append(store, &iter);
 
-		color.red = s->color->red;
-		color.green = s->color->green;
-		color.blue = s->color->blue;
-		color.alpha = 1.0;
+		color = config_get_sensor_color(s->id);
 
-		scolor = gdk_rgba_to_string(&color);
+		scolor = gdk_rgba_to_string(color);
 
 		enabled = config_is_sensor_enabled(s->id);
-
 		gtk_list_store_set(store, &iter,
 				   COL_NAME, s->name,
 				   COL_COLOR_STR, scolor,
-				   COL_GRAPH_ENABLED, s->graph_enabled,
+				   COL_GRAPH_ENABLED,
+				   config_is_sensor_graph_enabled(s->id),
 				   COL_SENSOR, s,
 				   COL_DISPLAY_ENABLED, enabled,
 				   -1);
 		free(scolor);
+		gdk_rgba_free(color);
 	}
 	free(ordered_sensors);
 }
@@ -112,7 +110,10 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
 
 	store = ui->sensors_store;
 
-	use_celsius = ui->config->temperature_unit == CELSIUS;
+	if (config_get_temperature_unit() == CELSIUS)
+		use_celsius = 1;
+	else
+		use_celsius = 0;
 
 	valid = gtk_tree_model_get_iter_first(model, &iter);
 	while (valid) {
@@ -121,8 +122,12 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
 		value = psensor_value_to_str(s->type,
 					     psensor_get_current_value(s),
 					     use_celsius);
-		min = psensor_value_to_str(s->type, s->min, use_celsius);
-		max = psensor_value_to_str(s->type, s->max, use_celsius);
+		min = psensor_value_to_str(s->type,
+					   s->sess_lowest,
+					   use_celsius);
+		max = psensor_value_to_str(s->type,
+					   s->sess_highest,
+					   use_celsius);
 
 		gtk_list_store_set(store, &iter,
 				   COL_TEMP, value,
@@ -283,6 +288,7 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data)
 	GtkTreeView *view;
 	struct psensor *s;
 	int coli;
+	GdkRGBA *color;
 
 	ui = (struct ui_psensor *)data;
 	view = ui->sensors_tree;
@@ -293,13 +299,15 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data)
 		coli = col_index_to_col(get_col_index_at_pos(view, event->x));
 
 		if (coli == COL_COLOR) {
+			color = config_get_sensor_color(s->id);
 			if (ui_change_color(_("Select sensor color"),
-					    s->color,
+					    color,
 					    GTK_WINDOW(ui->main_window))) {
+				config_set_sensor_color(s->id, color);
 				ui_sensorlist_update(ui, 1);
-				config_set_sensor_color(s->id, s->color);
 				config_sync();
 			}
+			gdk_rgba_free(color);
 			return TRUE;
 		} else if (coli >= 0 && coli != COL_GRAPH_ENABLED) {
 			menu = create_sensor_popup(ui, s);
@@ -323,6 +331,7 @@ void ui_sensorlist_cb_graph_toggled(GtkCellRendererToggle *cell,
 	GtkTreePath *path;
 	struct psensor *s, *s2;
 	gboolean valid;
+	bool b;
 
 	ui = (struct ui_psensor *)data;
 	fmodel = gtk_tree_view_get_model(ui->sensors_tree);
@@ -333,8 +342,9 @@ void ui_sensorlist_cb_graph_toggled(GtkCellRendererToggle *cell,
 
 	gtk_tree_model_get(fmodel, &iter, COL_SENSOR, &s, -1);
 
-	s->graph_enabled ^= 1;
-	config_set_sensor_graph_enabled(s->id, s->graph_enabled);
+	b = config_is_sensor_graph_enabled(s->id) ^ 1;
+	config_set_sensor_graph_enabled(s->id, b);
+
 	config_sync();
 
 	gtk_tree_path_free(path);
@@ -348,7 +358,7 @@ void ui_sensorlist_cb_graph_toggled(GtkCellRendererToggle *cell,
 			gtk_list_store_set(ui->sensors_store,
 					   &iter,
 					   COL_GRAPH_ENABLED,
-					   s->graph_enabled,
+					   b,
 					   -1);
 		valid = gtk_tree_model_iter_next(model, &iter);
 	}