X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=5816c3f93e8198338a5cc3fa53a4b4adb82da188;hb=0f1747433389f5885c0892c2ffb4f3bec0279d14;hp=3fef8cc543e1aa024fb37e34d8d586fa24ee1fa8;hpb=67578c86259e0c57fac82727a6bd8f4e7b54e3a8;p=psensor.git

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 3fef8cc..5816c3f 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -91,15 +91,12 @@ static void sensor_pref_free(struct sensor_pref *p)
 }
 
 static struct sensor_pref *
-get_selected_sensor_pref(GtkBuilder *builder)
+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);
 
@@ -112,13 +109,12 @@ get_selected_sensor_pref(GtkBuilder *builder)
 
 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);
@@ -129,10 +125,9 @@ static void on_name_changed(GtkEntry *entry, 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);
@@ -141,10 +136,9 @@ on_drawed_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);
@@ -153,10 +147,9 @@ on_alarm_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 +157,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 +170,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 +180,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
@@ -329,8 +315,11 @@ static void on_changed(GtkTreeSelection *selection, gpointer data)
 	struct cb_data *cbdata = data;
 	struct ui_psensor *ui = cbdata->ui;
 	struct sensor_pref *p;
-
-	p = get_selected_sensor_pref(cbdata->builder);
+	GtkTreeView *tree;
+	
+	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);
 }
 
@@ -359,7 +348,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;
 
@@ -376,8 +365,7 @@ static void apply_pref(struct sensor_pref *p, struct config *cfg)
 		config_set_sensor_enabled(s->id, s->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,6 +390,8 @@ 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
@@ -410,12 +400,15 @@ 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);
+		apply_pref(spref, i, cfg);		
 		valid = gtk_tree_model_iter_next(model, &iter);
+		i++;
 	}
 }
 
@@ -453,11 +446,10 @@ 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"));