defined sensors box, sensors list and graph widgets in the glade file.

[psensor.git] / src / ui_sensorlist.c

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index d5a0240..1893a89 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2013 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
@@ -56,32 +56,36 @@ static int col_index_to_col(int idx)
 
 void ui_sensorlist_update(struct ui_psensor *ui)
 {
+       char *str;
+       struct psensor *s;
        GtkTreeIter iter;
        struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
        GtkTreeModel *model
            = gtk_tree_view_get_model(ui_sl->treeview);
        gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
        struct psensor **sensor = ui->sensors;
+       int use_celcius;
 
-       while (valid && *sensor) {
-               struct psensor *s = *sensor;
+       use_celcius = ui->config->temperature_unit == CELCIUS;
 
-               char *str;
+       while (valid && *sensor) {
+               s = *sensor;
 
-               str = psensor_value_to_string(s->type,
-                                             s->measures[s->values_max_length -
-                                                         1].value.d_num);
+               str = psensor_value_to_str(s->type,
+                                          s->measures[s->values_max_length -
+                                                      1].value,
+                                          use_celcius);
 
                gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_TEMP, str,
                                   -1);
                free(str);
 
-               str = psensor_value_to_string(s->type, s->min);
+               str = psensor_value_to_str(s->type, s->min, use_celcius);
                gtk_list_store_set(GTK_LIST_STORE(model), &iter,
                                   COL_TEMP_MIN, str, -1);
                free(str);
 
-               str = psensor_value_to_string(s->type, s->max);
+               str = psensor_value_to_str(s->type, s->max, use_celcius);
                gtk_list_store_set(GTK_LIST_STORE(model), &iter,
                                   COL_TEMP_MAX, str, -1);
                free(str);
@@ -286,17 +290,9 @@ static void create_widget(struct ui_psensor *ui)
        struct psensor **s_cur = ui->sensors;
        struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
 
-       store = gtk_list_store_new(COLS_COUNT,
-                                  G_TYPE_STRING,
-                                  G_TYPE_STRING,
-                                  G_TYPE_STRING,
-                                  G_TYPE_STRING,
-                                  G_TYPE_STRING,
-                                  G_TYPE_STRING,
-                                  G_TYPE_BOOLEAN, G_TYPE_STRING);
+       store = ui->sensors_store;
 
-       ui_sl->treeview = GTK_TREE_VIEW
-               (gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
+       ui_sl->treeview = ui->sensors_tree;
 
        gtk_tree_selection_set_mode
                (gtk_tree_view_get_selection(ui_sl->treeview),
@@ -342,7 +338,7 @@ static void create_widget(struct ui_psensor *ui)
        renderer = gtk_cell_renderer_toggle_new();
        gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
                                                    -1,
-                                                   _("Enabled"),
+                                                   _("Graph"),
                                                    renderer,
                                                    "active", COL_ENABLED,
                                                    NULL);
@@ -381,16 +377,11 @@ static void create_widget(struct ui_psensor *ui)
 
                s_cur++;
        }
-
-       ui_sl->widget = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ui_sl->widget),
-                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_container_add(GTK_CONTAINER(ui_sl->widget),
-                         GTK_WIDGET(ui_sl->treeview));
 }
 
 void ui_sensorlist_create(struct ui_psensor *ui)
 {
+       log_debug("ui_sensorlist_create()");
        ui->ui_sensorlist = malloc(sizeof(struct ui_sensorlist));
        ui->ui_sensorlist->sensors = ui->sensors;