correctly update sensor row when name/color/graph is modified

[psensor.git] / src / ui_sensorlist.c

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index 1893a89..522004c 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -36,6 +36,7 @@ enum {
        COL_COLOR_STR,
        COL_ENABLED,
        COL_EMPTY,
+       COL_SENSOR,
        COLS_COUNT
 };
 
@@ -54,22 +55,22 @@ static int col_index_to_col(int idx)
        return idx;
 }
 
-void ui_sensorlist_update(struct ui_psensor *ui)
+void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
 {
-       char *str;
+       char *str, *scolor;
        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;
+       GdkColor color;
 
        use_celcius = ui->config->temperature_unit == CELCIUS;
 
-       while (valid && *sensor) {
-               s = *sensor;
+       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 -
@@ -90,8 +91,26 @@ void ui_sensorlist_update(struct ui_psensor *ui)
                                   COL_TEMP_MAX, str, -1);
                free(str);
 
+               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);
+                       
+                       free(scolor);
+               }
+
                valid = gtk_tree_model_iter_next(model, &iter);
-               sensor++;
        }
 }
 
@@ -144,40 +163,6 @@ static int get_col_index_at_pos(GtkTreeView *view, int x)
        return -1;
 }
 
-void ui_sensorlist_update_sensors_preferences(struct ui_psensor *ui)
-{
-       GtkTreeIter iter;
-       GtkTreeModel *model
-           = gtk_tree_view_get_model(ui->ui_sensorlist->treeview);
-       gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
-       struct psensor **sensor = ui->ui_sensorlist->sensors;
-
-       while (valid && *sensor) {
-               GdkColor color;
-               gchar *scolor;
-
-               color.red = (*sensor)->color->red;
-               color.green = (*sensor)->color->green;
-               color.blue = (*sensor)->color->blue;
-
-               scolor = gdk_color_to_string(&color);
-
-               gtk_list_store_set(GTK_LIST_STORE(model),
-                                  &iter, COL_NAME, (*sensor)->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, (*sensor)->enabled, -1);
-
-               free(scolor);
-
-               valid = gtk_tree_model_iter_next(model, &iter);
-               sensor++;
-       }
-}
-
 static void on_preferences_activated(GtkWidget *menu_item, gpointer data)
 {
        struct cb_data *cb_data = data;
@@ -219,9 +204,13 @@ static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
 
 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;
 
+       if (event->button != 3)
+               return FALSE;
+
        struct psensor *sensor = get_sensor_at_pos(view,
                                                   event->x,
                                                   event->y,
@@ -234,13 +223,12 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
                if (coli == COL_COLOR) {
                        if (ui_change_color(_("Select foreground color"),
                                            sensor->color)) {
-                               ui_sensorlist_update_sensors_preferences(ui);
+                               ui_sensorlist_update(ui, 1);
                                config_set_sensor_color(sensor->id,
                                                        sensor->color);
                        }
                } else if (coli >= 0 && coli != COL_ENABLED) {
-                       GtkWidget *menu = create_sensor_popup(ui,
-                                                             sensor);
+                       menu = create_sensor_popup(ui, sensor);
 
                        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
                                       event->button, event->time);
@@ -248,7 +236,7 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
                }
 
        }
-       return FALSE;
+       return TRUE;
 }
 
 static void
@@ -294,10 +282,6 @@ static void create_widget(struct ui_psensor *ui)
 
        ui_sl->treeview = ui->sensors_tree;
 
-       gtk_tree_selection_set_mode
-               (gtk_tree_view_get_selection(ui_sl->treeview),
-                GTK_SELECTION_NONE);
-
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
                                                    -1,
@@ -371,7 +355,8 @@ static void create_widget(struct ui_psensor *ui)
                                   COL_TEMP_MIN, _("N/A"),
                                   COL_TEMP_MAX, _("N/A"),
                                   COL_COLOR_STR, scolor,
-                                  COL_ENABLED, s->enabled, -1);
+                                  COL_ENABLED, s->enabled,
+                                  COL_SENSOR, s, -1);
 
                free(scolor);