COL_COLOR_STR,
COL_ENABLED,
COL_EMPTY,
- COL_SENSOR
+ COL_SENSOR,
};
struct cb_data {
gtk_tree_path_free(path);
}
+static int cmp_sensors(const void *p1, const void *p2)
+{
+ const struct psensor *s1, *s2;
+ int pos1, pos2;
+
+ s1 = *(void **)p1;
+ s2 = *(void **)p2;
+
+ pos1 = config_get_sensor_position(s1->id);
+ pos2 = config_get_sensor_position(s2->id);
+
+ return pos1 - pos2;
+}
+
static void create_widget(struct ui_psensor *ui)
{
GtkListStore *store;
GtkCellRenderer *renderer;
- struct psensor **s_cur = ui->sensors;
-
- store = ui->sensors_store;
+ struct psensor **s_cur;
+ GtkTreeIter iter;
+ struct psensor **ordered_sensors;
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
renderer,
"text", COL_EMPTY, NULL);
- while (*s_cur) {
- GtkTreeIter iter;
- GdkColor color;
- gchar *scolor;
- struct psensor *s = *s_cur;
-
- color.red = s->color->red;
- color.green = s->color->green;
- color.blue = s->color->blue;
-
- scolor = gdk_color_to_string(&color);
+ ordered_sensors = psensor_list_copy(ui->sensors);
+ qsort(ordered_sensors,
+ psensor_list_size(ordered_sensors)-1,
+ sizeof(struct psensor *),
+ cmp_sensors);
+ store = ui->sensors_store;
+ for (s_cur = ordered_sensors; *s_cur; s_cur++) {
gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- COL_NAME, s->name,
- COL_TEMP, _("N/A"),
- COL_TEMP_MIN, _("N/A"),
- COL_TEMP_MAX, _("N/A"),
- COL_COLOR_STR, scolor,
- COL_ENABLED, s->enabled,
- COL_SENSOR, s, -1);
-
- free(scolor);
-
- s_cur++;
+ gtk_list_store_set(store, &iter, COL_SENSOR, *s_cur, -1);
}
+
+ ui_sensorlist_update(ui, 1);
}
void ui_sensorlist_create(struct ui_psensor *ui)