Merge tag 'upstream/1.1.2'

[psensor-pkg-ubuntu.git] / src / ui_sensorlist.c

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index d0138c7..5f1cb4f 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -184,8 +184,8 @@ static int get_col_index_at_pos(GtkTreeView *view, int x)
                if (x >= colx
                    && x < (colx + gtk_tree_view_column_get_width(checkcol)))
                        return coli;
-               else
-                       colx += gtk_tree_view_column_get_width(checkcol);
+
+               colx += gtk_tree_view_column_get_width(checkcol);
 
                coli++;
        }
@@ -195,9 +195,46 @@ static int get_col_index_at_pos(GtkTreeView *view, int x)
 
 static void preferences_activated_cbk(GtkWidget *menu_item, gpointer data)
 {
-       struct cb_data *cb_data = data;
+       struct cb_data *cb_data;
 
+       cb_data = data;
        ui_sensorpref_dialog_run(cb_data->sensor, cb_data->ui);
+       free(cb_data);
+}
+
+static void hide_activated_cbk(GtkWidget *menu_item, gpointer data)
+{
+       struct psensor *s, *s2;
+       GtkTreeModel *model, *fmodel;
+       GtkTreeIter iter;
+       struct cb_data *cb_data;
+       gboolean valid;
+
+       log_fct_enter();
+
+       cb_data = data;
+       s = cb_data->sensor;
+       config_set_sensor_enabled(s->id, false);
+       config_sync();
+
+       fmodel = gtk_tree_view_get_model(cb_data->ui->sensors_tree);
+       model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(fmodel));
+       valid = gtk_tree_model_get_iter_first(model, &iter);
+       while (valid) {
+               gtk_tree_model_get(model, &iter, COL_SENSOR, &s2, -1);
+
+               if (s == s2)
+                       gtk_list_store_set(cb_data->ui->sensors_store,
+                                          &iter,
+                                          COL_DISPLAY_ENABLED,
+                                          false,
+                                          -1);
+               valid = gtk_tree_model_iter_next(model, &iter);
+       }
+
+       free(cb_data);
+
+       log_fct_exit();
 }
 
 static GtkWidget *
@@ -214,13 +251,22 @@ create_sensor_popup(struct ui_psensor *ui, struct psensor *sensor)
        separator = gtk_separator_menu_item_new();
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), separator);
 
-       item = gtk_menu_item_new_with_label(_("Preferences"));
+       item = gtk_menu_item_new_with_label(_("Hide"));
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
        data = malloc(sizeof(struct cb_data));
        data->ui = ui;
        data->sensor = sensor;
+       g_signal_connect(item,
+                        "activate",
+                        G_CALLBACK(hide_activated_cbk), data);
+
+       item = gtk_menu_item_new_with_label(_("Preferences"));
+       gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
+       data = malloc(sizeof(struct cb_data));
+       data->ui = ui;
+       data->sensor = sensor;
        g_signal_connect(item,
                         "activate",
                         G_CALLBACK(preferences_activated_cbk), data);
@@ -238,9 +284,6 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data)
        struct psensor *s;
        int coli;
 
-       if (event->button != 3)
-               return FALSE;
-
        ui = (struct ui_psensor *)data;
        view = ui->sensors_tree;
 
@@ -250,26 +293,29 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data)
                coli = col_index_to_col(get_col_index_at_pos(view, event->x));
 
                if (coli == COL_COLOR) {
-                       if (ui_change_color(_("Select foreground color"),
+                       if (ui_change_color(_("Select sensor color"),
                                            s->color,
                                            GTK_WINDOW(ui->main_window))) {
                                ui_sensorlist_update(ui, 1);
                                config_set_sensor_color(s->id, s->color);
                                config_sync();
                        }
+                       return TRUE;
                } else if (coli >= 0 && coli != COL_GRAPH_ENABLED) {
                        menu = create_sensor_popup(ui, s);
 
                        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
                                       event->button, event->time);
+                       return TRUE;
                }
 
        }
-       return TRUE;
+       return FALSE;
 }
 
-static void
-toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
+void ui_sensorlist_cb_graph_toggled(GtkCellRendererToggle *cell,
+                                   gchar *path_str,
+                                   gpointer data)
 {
        struct ui_psensor *ui;
        GtkTreeModel *model, *fmodel;
@@ -289,6 +335,7 @@ toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
 
        s->graph_enabled ^= 1;
        config_set_sensor_graph_enabled(s->id, s->graph_enabled);
+       config_sync();
 
        gtk_tree_path_free(path);
 
@@ -309,10 +356,9 @@ toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
 
 void ui_sensorlist_create(struct ui_psensor *ui)
 {
-       GtkCellRenderer *renderer;
        GtkTreeModel *fmodel, *model;
 
-       log_debug("ui_sensorlist_create()");
+       log_fct_enter();
 
        model = gtk_tree_view_get_model(ui->sensors_tree);
        fmodel = gtk_tree_model_filter_new(model, NULL);
@@ -321,59 +367,10 @@ void ui_sensorlist_create(struct ui_psensor *ui)
 
        gtk_tree_view_set_model(ui->sensors_tree, fmodel);
 
-       renderer = gtk_cell_renderer_text_new();
-       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->sensors_tree,
-                                                   -1,
-                                                   _("Value"),
-                                                   renderer,
-                                                   "text", COL_TEMP, NULL);
-
-       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->sensors_tree,
-                                                   -1,
-                                                   _("Max"),
-                                                   renderer,
-                                                   "text", COL_TEMP_MAX, NULL);
-
-       renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
-                                                   -1,
-                                                   _("Color"),
-                                                   renderer,
-                                                   "text", COL_COLOR,
-                                                   "background", COL_COLOR_STR,
-                                                   NULL);
-
        g_signal_connect(ui->sensors_tree,
                         "button-press-event", (GCallback)clicked_cbk, ui);
 
-       renderer = gtk_cell_renderer_toggle_new();
-       gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
-                                                   -1,
-                                                   _("Graph"),
-                                                   renderer,
-                                                   "active", COL_GRAPH_ENABLED,
-                                                   NULL);
-       g_signal_connect(G_OBJECT(renderer),
-                        "toggled", (GCallback) toggled_cbk, ui);
-
-       renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
-                                                   -1,
-                                                   "",
-                                                   renderer,
-                                                   "text", COL_EMPTY, NULL);
-
        ui_sensorlist_update(ui, 1);
+
+       log_fct_exit();
 }