X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=ecf265549a55afc7ad96e1f6a697ebf097ea6bbc;hb=1410f23801330c83c83caf21353860ff2bc18399;hp=2335cc14a1b5d8e0435bf0a4475759c3d0381197;hpb=0d5ce393b282c110929a5e8b65a4076358ce5d59;p=psensor.git

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 2335cc1..ecf2655 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -32,7 +32,7 @@
 
 enum {
 	COL_NAME = 0,
-	COL_SENSOR
+	COL_SENSOR_PREF
 };
 
 struct sensor_pref {
@@ -51,8 +51,8 @@ struct cb_data {
 	GtkBuilder *builder;
 };
 
-static struct sensor_pref *sensor_pref_new(struct psensor *s,
-					   struct config *cfg)
+static struct sensor_pref *
+sensor_pref_new(struct psensor *s, struct config *cfg)
 {
 	struct sensor_pref *p;
 
@@ -60,7 +60,7 @@ static struct sensor_pref *sensor_pref_new(struct psensor *s,
 
 	p->sensor = s;
 	p->name = strdup(s->name);
-	p->enabled = s->enabled;
+	p->enabled = s->graph_enabled;
 	p->alarm_enabled = s->alarm_enabled;
 	p->color = color_dup(s->color);
 
@@ -90,8 +90,7 @@ static void sensor_pref_free(struct sensor_pref *p)
 	free(p);
 }
 
-static struct sensor_pref *
-get_selected_sensor_pref(GtkTreeView *tree)
+static struct sensor_pref *get_selected_sensor_pref(GtkTreeView *tree)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -102,7 +101,7 @@ get_selected_sensor_pref(GtkTreeView *tree)
 
 	pref = NULL;
 	if (gtk_tree_selection_get_selected(selection, &model, &iter))
-		gtk_tree_model_get(model, &iter, COL_SENSOR, &pref, -1);
+		gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &pref, -1);
 
 	return pref;
 }
@@ -122,8 +121,7 @@ static void on_name_changed(GtkEntry *entry, gpointer data)
 	}
 }
 
-static void
-on_drawed_toggled(GtkToggleButton *btn, gpointer data)
+static void on_drawed_toggled(GtkToggleButton *btn, gpointer data)
 {
 	struct sensor_pref *p;
 
@@ -133,8 +131,7 @@ on_drawed_toggled(GtkToggleButton *btn, gpointer data)
 		p->enabled = gtk_toggle_button_get_active(btn);
 }
 
-static void
-on_alarm_toggled(GtkToggleButton *btn, gpointer data)
+static void on_alarm_toggled(GtkToggleButton *btn, gpointer data)
 {
 	struct sensor_pref *p;
 
@@ -144,8 +141,7 @@ on_alarm_toggled(GtkToggleButton *btn, gpointer data)
 		p->alarm_enabled = gtk_toggle_button_get_active(btn);
 }
 
-static void
-on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
+static void on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
 {
 	struct sensor_pref *p;
 
@@ -307,7 +303,6 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 
 	gtk_toggle_button_set_active(w_appindicator_enabled,
 				     p->appindicator_enabled);
-
 }
 
 static void on_changed(GtkTreeSelection *selection, gpointer data)
@@ -316,7 +311,7 @@ static void on_changed(GtkTreeSelection *selection, gpointer data)
 	struct ui_psensor *ui = cbdata->ui;
 	struct sensor_pref *p;
 	GtkTreeView *tree;
-	
+
 	tree = GTK_TREE_VIEW(gtk_builder_get_object(cbdata->builder,
 						    "sensors_list"));
 	p = get_selected_sensor_pref(tree);
@@ -326,20 +321,17 @@ static void on_changed(GtkTreeSelection *selection, gpointer data)
 static void
 select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
 {
-	struct psensor **s_cur = sensors;
-	int i = 0;
-	GtkTreePath *p = NULL;
+	struct psensor **s_cur;
+	int i;
+	GtkTreePath *p;
 
-	while (*s_cur) {
+	p = NULL;
+	for (s_cur = sensors, i = 0; *s_cur; s_cur++, i++)
 		if (s == *s_cur) {
 			p = gtk_tree_path_new_from_indices(i, -1);
 			break;
 		}
 
-		i++;
-		s_cur++;
-	}
-
 	if (p) {
 		GtkTreeSelection *s = gtk_tree_view_get_selection(tree);
 
@@ -348,7 +340,7 @@ select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
 	}
 }
 
-static void apply_pref(struct sensor_pref *p, struct config *cfg)
+static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
 {
 	struct psensor *s;
 
@@ -360,13 +352,12 @@ static void apply_pref(struct sensor_pref *p, struct config *cfg)
 		config_set_sensor_name(s->id, s->name);
 	}
 
-	if (s->enabled != p->enabled) {
-		s->enabled = p->enabled;
-		config_set_sensor_enabled(s->id, s->enabled);
+	if (s->graph_enabled != p->enabled) {
+		s->graph_enabled = p->enabled;
+		config_set_sensor_enabled(s->id, s->graph_enabled);
 	}
 
-	if (is_temp_type(s->type)
-	    && cfg->temperature_unit == FAHRENHEIT) {
+	if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) {
 		s->alarm_high_threshold
 			= fahrenheit_to_celcius(p->alarm_high_threshold);
 		s->alarm_low_threshold
@@ -391,20 +382,24 @@ static void apply_pref(struct sensor_pref *p, struct config *cfg)
 		s->appindicator_enabled = p->appindicator_enabled;
 		config_set_appindicator_enabled(s->id, s->appindicator_enabled);
 	}
+
+	config_set_sensor_position(s->id, pos);
 }
 
-static void
-apply_prefs(GtkTreeModel *model, struct config *cfg)
+static void apply_prefs(GtkTreeModel *model, struct config *cfg)
 {
 	gboolean valid;
 	struct sensor_pref *spref;
 	GtkTreeIter iter;
+	int i;
 
 	valid = gtk_tree_model_get_iter_first(model, &iter);
+	i = 0;
 	while (valid) {
-		gtk_tree_model_get(model, &iter, COL_SENSOR, &spref, -1);
-		apply_pref(spref, cfg);
+		gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &spref, -1);
+		apply_pref(spref, i, cfg);
 		valid = gtk_tree_model_iter_next(model, &iter);
+		i++;
 	}
 }
 
@@ -458,7 +453,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 		spref = sensor_pref_new(s, ui->config);
 		gtk_list_store_set(store, &iter,
 				   COL_NAME, s->name,
-				   COL_SENSOR, spref,
+				   COL_SENSOR_PREF, spref,
 				   -1);
 
 		if (s == sensor)
@@ -486,7 +481,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 
 	valid = gtk_tree_model_get_iter_first(model, &iter);
 	while (valid) {
-		gtk_tree_model_get(model, &iter, COL_SENSOR, &spref, -1);
+		gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &spref, -1);
 		sensor_pref_free(spref);
 		valid = gtk_tree_model_iter_next(model, &iter);
 	}