projects / psensor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
removed compat.h because gtk2 is no more supported since a while
[psensor.git] / src / ui_sensorlist.c
diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index ba38437..6697753 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -25,7 +25,6 @@
 #include "ui_sensorpref.h"
 #include "cfg.h"
 #include "ui_color.h"
-#include "compat.h"
 
 enum {
        COL_NAME = 0,
@@ -36,8 +35,7 @@ enum {
        COL_COLOR_STR,
        COL_ENABLED,
        COL_EMPTY,
-       COL_SENSOR,
-       COLS_COUNT
+       COL_SENSOR
 };
 
 struct cb_data {
@@ -57,56 +55,51 @@ static int col_index_to_col(int idx)
 
 void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
 {
-       char *str, *scolor;
+       char *scolor, *value, *min, *max;
        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);
+       GtkTreeModel *model;
+       gboolean valid;
        int use_celcius;
        GdkColor color;
+       GtkListStore *store;
+
+       model = gtk_tree_view_get_model(ui->sensors_tree);
+       store = GTK_LIST_STORE(model);
 
        use_celcius = ui->config->temperature_unit == CELCIUS;
 
+       valid = gtk_tree_model_get_iter_first(model, &iter);
        while (valid) {
                gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
 
-               str = psensor_value_to_str(s->type,
-                                          s->measures[s->values_max_length -
-                                                      1].value,
-                                          use_celcius);
+               value = psensor_value_to_str(s->type,
+                                            psensor_get_current_value(s),
+                                            use_celcius);
+               min = psensor_value_to_str(s->type, s->min, use_celcius);
+               max = psensor_value_to_str(s->type, s->max, use_celcius);
 
-               gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_TEMP, str,
+               gtk_list_store_set(store, &iter,
+                                  COL_TEMP, value,
+                                  COL_TEMP_MIN, min,
+                                  COL_TEMP_MAX, max,
                                   -1);
-               free(str);
-
-               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_str(s->type, s->max, use_celcius);
-               gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-                                  COL_TEMP_MAX, str, -1);
-               free(str);
+               free(value);
+               free(min);
+               free(max);
 
                if (complete) {
                        color.red = s->color->red;
                        color.green = s->color->green;
                        color.blue = s->color->blue;
-                       
+
                        scolor = gdk_color_to_string(&color);
-                       
-                       gtk_list_store_set(GTK_LIST_STORE(model),
-                                          &iter, COL_NAME, s->name, -1);
-                       
-                       gtk_list_store_set(GTK_LIST_STORE(model),
-                                          &iter, COL_COLOR_STR, scolor, -1);
-                       
-                       gtk_list_store_set(GTK_LIST_STORE(model),
-                                          &iter, COL_ENABLED, s->enabled, -1);
-                       
+
+                       gtk_list_store_set(store, &iter,
+                                          COL_NAME, s->name,
+                                          COL_COLOR_STR, scolor,
+                                          COL_ENABLED, s->enabled,
+                                          -1);
                        free(scolor);
                }
 
@@ -206,11 +199,13 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        GtkWidget *menu;
        struct ui_psensor *ui = (struct ui_psensor *)data;
-       GtkTreeView *view = ui->ui_sensorlist->treeview;
+       GtkTreeView *view;
 
        if (event->button != 3)
                return FALSE;
 
+       view = ui->sensors_tree;
+
        struct psensor *sensor = get_sensor_at_pos(view,
                                                   event->x,
                                                   event->y,
@@ -241,9 +236,9 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
 static void
 on_toggled(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
 {
-       struct ui_sensorlist *list = (struct ui_sensorlist *)data;
+       struct ui_psensor *ui = (struct ui_psensor *)data;
        GtkTreeModel *model
-           = gtk_tree_view_get_model(list->treeview);
+           = gtk_tree_view_get_model(ui->sensors_tree);
        GtkTreeIter iter;
        GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
        gboolean fixed;
@@ -257,7 +252,7 @@ on_toggled(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
        i = gtk_tree_path_get_indices(path);
        if (i) {
                int n = *i;
-               struct psensor **sensor = list->sensors;
+               struct psensor **sensor = ui->sensors;
                while (n--)
                        sensor++;
                (*sensor)->enabled = fixed;
@@ -275,39 +270,36 @@ static void create_widget(struct ui_psensor *ui)
        GtkListStore *store;
        GtkCellRenderer *renderer;
        struct psensor **s_cur = ui->sensors;
-       struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
 
        store = ui->sensors_store;
 
-       ui_sl->treeview = ui->sensors_tree;
-
        renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
                                                    -1,
                                                    _("Sensor"),
                                                    renderer,
                                                    "text", COL_NAME, NULL);
 
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
                                                    -1,
                                                    _("Value"),
                                                    renderer,
                                                    "text", COL_TEMP, NULL);
 
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
                                                    -1,
                                                    _("Min"),
                                                    renderer,
                                                    "text", COL_TEMP_MIN, NULL);
 
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
                                                    -1,
                                                    _("Max"),
                                                    renderer,
                                                    "text", COL_TEMP_MAX, NULL);
 
        renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
                                                    -1,
                                                    _("Color"),
                                                    renderer,
@@ -315,21 +307,21 @@ static void create_widget(struct ui_psensor *ui)
                                                    "background", COL_COLOR_STR,
                                                    NULL);
 
-       g_signal_connect(ui_sl->treeview,
+       g_signal_connect(ui->sensors_tree,
                         "button-press-event", (GCallback) on_clicked, ui);
 
        renderer = gtk_cell_renderer_toggle_new();
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
                                                    -1,
                                                    _("Graph"),
                                                    renderer,
                                                    "active", COL_ENABLED,
                                                    NULL);
        g_signal_connect(G_OBJECT(renderer),
-                        "toggled", (GCallback) on_toggled, ui_sl);
+                        "toggled", (GCallback) on_toggled, ui);
 
        renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
                                                    -1,
                                                    "",
                                                    renderer,
@@ -366,8 +358,5 @@ static void create_widget(struct ui_psensor *ui)
 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;
-
        create_widget(ui);
 }
psensor