X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=4337c53ff4d8e7fb2b2e76380d39e993b3a59069;hb=f3b05dae619a7909bd7422b3a82422c9442aa114;hp=8c45eaf956ff2d4b213352423fcf609f3a90ef96;hpb=523510dee952554bd893ad963a72b08f92a20d50;p=psensor.git

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 8c45eaf..4337c53 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 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
@@ -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,35 +90,30 @@ static void sensor_pref_free(struct sensor_pref *p)
 	free(p);
 }
 
-static struct sensor_pref *
-get_selected_sensor_pref(GtkBuilder *builder)
+static struct sensor_pref *get_selected_sensor_pref(GtkTreeView *tree)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	struct sensor_pref *pref;
 	GtkTreeSelection *selection;
-	GtkTreeView *tree;
-
-	tree = GTK_TREE_VIEW(gtk_builder_get_object(builder, "sensors_list"));
 
 	selection = gtk_tree_view_get_selection(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;
 }
 
 static void on_name_changed(GtkEntry *entry, gpointer data)
 {
-	struct cb_data *cbdata = data;
 	struct sensor_pref *p;
 	const char *str;
 
 	str = gtk_entry_get_text(entry);
 
-	p = get_selected_sensor_pref(cbdata->builder);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p && strcmp(p->name, str)) {
 		free(p->name);
@@ -126,37 +121,31 @@ 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 cb_data *cbdata = data;
 	struct sensor_pref *p;
 
-	p = get_selected_sensor_pref(cbdata->builder);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p)
 		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 cb_data *cbdata = data;
 	struct sensor_pref *p;
 
-	p = get_selected_sensor_pref(cbdata->builder);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p)
 		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 cb_data *cbdata = data;
 	struct sensor_pref *p;
 
-	p = get_selected_sensor_pref(cbdata->builder);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p)
 		p->appindicator_enabled = gtk_toggle_button_get_active(btn);
@@ -164,11 +153,10 @@ on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
 
 static void on_color_set(GtkColorButton *widget, gpointer data)
 {
-	struct cb_data *cbdata = data;
 	struct sensor_pref *p;
 	GdkColor color;
 
-	p = get_selected_sensor_pref(cbdata->builder);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p) {
 		gtk_color_button_get_color(widget, &color);
@@ -178,12 +166,9 @@ static void on_color_set(GtkColorButton *widget, gpointer data)
 
 static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data)
 {
-	struct cb_data *cbdata;
 	struct sensor_pref *p;
 
-	cbdata = data;
-
-	p = get_selected_sensor_pref(cbdata->builder);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p)
 		p->alarm_high_threshold = gtk_spin_button_get_value(btn);
@@ -191,48 +176,45 @@ static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data)
 
 static void on_alarm_low_threshold_changed(GtkSpinButton *btn, gpointer data)
 {
-	struct cb_data *cbdata;
 	struct sensor_pref *p;
 
-	cbdata = data;
-
-	p = get_selected_sensor_pref(cbdata->builder);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p)
 		p->alarm_low_threshold = gtk_spin_button_get_value(btn);
 }
 
-static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata)
+static void connect_signals(GtkBuilder *builder, GtkTreeView *tree)
 {
 	g_signal_connect(gtk_builder_get_object(builder, "sensor_name"),
-			 "changed", G_CALLBACK(on_name_changed), cbdata);
+			 "changed", G_CALLBACK(on_name_changed), tree);
 
 	g_signal_connect(gtk_builder_get_object(builder, "sensor_draw"),
-			 "toggled", G_CALLBACK(on_drawed_toggled), cbdata);
+			 "toggled", G_CALLBACK(on_drawed_toggled), tree);
 
 	g_signal_connect(gtk_builder_get_object(builder, "sensor_color"),
-			 "color-set", G_CALLBACK(on_color_set), cbdata);
+			 "color-set", G_CALLBACK(on_color_set), tree);
 
 	g_signal_connect(gtk_builder_get_object(builder, "sensor_alarm"),
-			 "toggled", G_CALLBACK(on_alarm_toggled), cbdata);
+			 "toggled", G_CALLBACK(on_alarm_toggled), tree);
 
 	g_signal_connect(gtk_builder_get_object(builder,
 						"sensor_alarm_high_threshold"),
 			 "value-changed",
 			 G_CALLBACK(on_alarm_high_threshold_changed),
-			 cbdata);
+			 tree);
 
 	g_signal_connect(gtk_builder_get_object(builder,
 						"sensor_alarm_low_threshold"),
 			 "value-changed",
 			 G_CALLBACK(on_alarm_low_threshold_changed),
-			 cbdata);
+			 tree);
 
 	g_signal_connect(gtk_builder_get_object(builder,
 						"indicator_checkbox"),
 			 "toggled",
 			 G_CALLBACK(on_appindicator_toggled),
-			 cbdata);
+			 tree);
 }
 
 static void
@@ -321,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)
@@ -329,28 +310,28 @@ static void on_changed(GtkTreeSelection *selection, gpointer data)
 	struct cb_data *cbdata = data;
 	struct ui_psensor *ui = cbdata->ui;
 	struct sensor_pref *p;
+	GtkTreeView *tree;
 
-	p = get_selected_sensor_pref(cbdata->builder);
+	tree = GTK_TREE_VIEW(gtk_builder_get_object(cbdata->builder,
+						    "sensors_list"));
+	p = get_selected_sensor_pref(tree);
 	update_pref(p, ui->config, cbdata->builder);
 }
 
 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);
 
@@ -359,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;
 
@@ -371,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
@@ -402,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++;
 	}
 }
 
@@ -423,12 +407,12 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 {
 	GtkDialog *diag;
 	gint result;
+	guint ok;
 	GtkBuilder *builder;
-	GError *error = NULL;
+	GError *error;
 	GtkTreeView *w_sensors_list;
-	guint ok;
 	GtkListStore *store;
-	struct psensor **s_cur, *s;
+	struct psensor **s_cur, *s, **ordered_sensors;
 	GtkTreeSelection *selection;
 	struct cb_data cbdata;
 	GtkTreeIter iter;
@@ -441,6 +425,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 	builder = gtk_builder_new();
 	cbdata.builder = builder;
 
+	error = NULL;
 	ok = gtk_builder_add_from_file
 		(builder,
 		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "sensor-edit.glade",
@@ -452,23 +437,23 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 		return ;
 	}
 
-	connect_signals(builder, &cbdata);
-
 	w_sensors_list
 		= GTK_TREE_VIEW(gtk_builder_get_object(builder,
 						       "sensors_list"));
+	connect_signals(builder, w_sensors_list);
 
 	store = GTK_LIST_STORE(gtk_builder_get_object(builder,
 						      "sensors_liststore"));
 
-	for (s_cur = ui->sensors; *s_cur; s_cur++) {
+	ordered_sensors = ui_get_sensors_ordered_by_position(ui);
+	for (s_cur = ordered_sensors; *s_cur; s_cur++) {
 		s = *s_cur;
 		gtk_list_store_append(store, &iter);
 
 		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)
@@ -477,7 +462,9 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 
 	selection = gtk_tree_view_get_selection(w_sensors_list);
 	g_signal_connect(selection, "changed", G_CALLBACK(on_changed), &cbdata);
-	select_sensor(sensor, ui->sensors, w_sensors_list);
+	select_sensor(sensor, ordered_sensors, w_sensors_list);
+
+	free(ordered_sensors);
 
 	diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1"));
 	result = gtk_dialog_run(diag);
@@ -494,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);
 	}