Imported Upstream version 1.2.0

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

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index f7200c1..9d4b748 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 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
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as


@@ -19,12 +19,12 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include "ui.h"
-#include "ui_pref.h"
-#include "ui_sensorlist.h"
-#include "ui_sensorpref.h"
-#include "cfg.h"
-#include "ui_color.h"
+#include <cfg.h>
+#include <ui.h>
+#include <ui_color.h>
+#include <ui_pref.h>
+#include <ui_sensorlist.h>
+#include <ui_sensorpref.h>

 
 enum {
        COL_NAME = 0,
 
 enum {
        COL_NAME = 0,


@@ -33,9 +33,10 @@ enum {
        COL_TEMP_MAX,
        COL_COLOR,
        COL_COLOR_STR,
        COL_TEMP_MAX,
        COL_COLOR,
        COL_COLOR_STR,

-       COL_ENABLED,
+       COL_GRAPH_ENABLED,

        COL_EMPTY,
        COL_SENSOR,
        COL_EMPTY,
        COL_SENSOR,

+       COL_DISPLAY_ENABLED

 };
 
 struct cb_data {
 };
 
 struct cb_data {


@@ -46,7 +47,7 @@ struct cb_data {
 static int col_index_to_col(int idx)
 {
        if (idx == 5)
 static int col_index_to_col(int idx)
 {
        if (idx == 5)

-               return COL_ENABLED;
+               return COL_GRAPH_ENABLED;

        else if (idx > 5)
                return -1;
 
        else if (idx > 5)
                return -1;
 


@@ -57,11 +58,12 @@ static void populate(struct ui_psensor *ui)
 {
        GtkTreeIter iter;
        GtkListStore *store;
 {
        GtkTreeIter iter;
        GtkListStore *store;

-       GdkColor color;
+       GdkRGBA *color;

        char *scolor;
        struct psensor **ordered_sensors, **s_cur, *s;
        char *scolor;
        struct psensor **ordered_sensors, **s_cur, *s;

+       unsigned int enabled;

 
 

-       ordered_sensors = ui_get_sensors_ordered_by_position(ui);
+       ordered_sensors = ui_get_sensors_ordered_by_position(ui->sensors);

        store = ui->sensors_store;
 
        gtk_list_store_clear(store);
        store = ui->sensors_store;
 
        gtk_list_store_clear(store);


@@ -71,19 +73,21 @@ static void populate(struct ui_psensor *ui)
 
                gtk_list_store_append(store, &iter);
 
 
                gtk_list_store_append(store, &iter);
 

-               color.red = s->color->red;
-               color.green = s->color->green;
-               color.blue = s->color->blue;
+               color = config_get_sensor_color(s->id);

 
 

-               scolor = gdk_color_to_string(&color);
+               scolor = gdk_rgba_to_string(color);

 
 

+               enabled = config_is_sensor_enabled(s->id);

                gtk_list_store_set(store, &iter,
                                   COL_NAME, s->name,
                                   COL_COLOR_STR, scolor,
                gtk_list_store_set(store, &iter,
                                   COL_NAME, s->name,
                                   COL_COLOR_STR, scolor,

-                                  COL_ENABLED, s->graph_enabled,
+                                  COL_GRAPH_ENABLED,
+                                  config_is_sensor_graph_enabled(s->id),

                                   COL_SENSOR, s,
                                   COL_SENSOR, s,

+                                  COL_DISPLAY_ENABLED, enabled,

                                   -1);
                free(scolor);
                                   -1);
                free(scolor);

+               gdk_rgba_free(color);

        }
        free(ordered_sensors);
 }
        }
        free(ordered_sensors);
 }


@@ -102,9 +106,14 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
                populate(ui);
 
        model = gtk_tree_view_get_model(ui->sensors_tree);
                populate(ui);
 
        model = gtk_tree_view_get_model(ui->sensors_tree);

+       model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(model));
+

        store = ui->sensors_store;
 
        store = ui->sensors_store;
 

-       use_celsius = ui->config->temperature_unit == CELSIUS;
+       if (config_get_temperature_unit() == CELSIUS)
+               use_celsius = 1;
+       else
+               use_celsius = 0;

 
        valid = gtk_tree_model_get_iter_first(model, &iter);
        while (valid) {
 
        valid = gtk_tree_model_get_iter_first(model, &iter);
        while (valid) {


@@ -113,8 +122,12 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
                value = psensor_value_to_str(s->type,
                                             psensor_get_current_value(s),
                                             use_celsius);
                value = psensor_value_to_str(s->type,
                                             psensor_get_current_value(s),
                                             use_celsius);

-               min = psensor_value_to_str(s->type, s->min, use_celsius);
-               max = psensor_value_to_str(s->type, s->max, use_celsius);
+               min = psensor_value_to_str(s->type,
+                                          s->sess_lowest,
+                                          use_celsius);
+               max = psensor_value_to_str(s->type,
+                                          s->sess_highest,
+                                          use_celsius);

 
                gtk_list_store_set(store, &iter,
                                   COL_TEMP, value,
 
                gtk_list_store_set(store, &iter,
                                   COL_TEMP, value,


@@ -176,8 +189,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;
                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++;
        }
 
                coli++;
        }


@@ -187,9 +200,46 @@ static int get_col_index_at_pos(GtkTreeView *view, int x)
 
 static void preferences_activated_cbk(GtkWidget *menu_item, gpointer data)
 {
 
 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);
        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 *
 }
 
 static GtkWidget *


@@ -206,13 +256,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);
 
        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;
        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);
        g_signal_connect(item,
                         "activate",
                         G_CALLBACK(preferences_activated_cbk), data);


@@ -229,9 +288,7 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data)
        GtkTreeView *view;
        struct psensor *s;
        int coli;
        GtkTreeView *view;
        struct psensor *s;
        int coli;

-
-       if (event->button != 3)
-               return FALSE;
+       GdkRGBA *color;

 
        ui = (struct ui_psensor *)data;
        view = ui->sensors_tree;
 
        ui = (struct ui_psensor *)data;
        view = ui->sensors_tree;


@@ -242,108 +299,88 @@ 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) {
                coli = col_index_to_col(get_col_index_at_pos(view, event->x));
 
                if (coli == COL_COLOR) {

-                       if (ui_change_color(_("Select foreground color"),
-                                           s->color,
+                       color = config_get_sensor_color(s->id);
+                       if (ui_change_color(_("Select sensor color"),
+                                           color,

                                            GTK_WINDOW(ui->main_window))) {
                                            GTK_WINDOW(ui->main_window))) {

+                               config_set_sensor_color(s->id, color);

                                ui_sensorlist_update(ui, 1);
                                ui_sensorlist_update(ui, 1);

-                               config_set_sensor_color(s->id, s->color);
+                               config_sync();

                        }
                        }

-               } else if (coli >= 0 && coli != COL_ENABLED) {
+                       gdk_rgba_free(color);
+                       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);
                        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;
 {
        struct ui_psensor *ui;

-       GtkTreeModel *model;
+       GtkTreeModel *model, *fmodel;

        GtkTreeIter iter;
        GtkTreePath *path;
        GtkTreeIter iter;
        GtkTreePath *path;

-       struct psensor *s;
+       struct psensor *s, *s2;
+       gboolean valid;
+       bool b;

 
        ui = (struct ui_psensor *)data;
 
        ui = (struct ui_psensor *)data;

-       model = gtk_tree_view_get_model(ui->sensors_tree);
+       fmodel = gtk_tree_view_get_model(ui->sensors_tree);
+

        path = gtk_tree_path_new_from_string(path_str);
 
        path = gtk_tree_path_new_from_string(path_str);
 

-       gtk_tree_model_get_iter(model, &iter, path);
+       gtk_tree_model_get_iter(fmodel, &iter, path);

 
 

-       gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
+       gtk_tree_model_get(fmodel, &iter, COL_SENSOR, &s, -1);

 
 

-       s->graph_enabled ^= 1;
-       config_set_sensor_enabled(s->id, s->graph_enabled);
+       b = config_is_sensor_graph_enabled(s->id) ^ 1;
+       config_set_sensor_graph_enabled(s->id, b);

 
 

-       gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-                          COL_ENABLED, s->graph_enabled, -1);
+       config_sync();

 
        gtk_tree_path_free(path);
 
        gtk_tree_path_free(path);

+
+       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(ui->sensors_store,
+                                          &iter,
+                                          COL_GRAPH_ENABLED,
+                                          b,
+                                          -1);
+               valid = gtk_tree_model_iter_next(model, &iter);
+       }

 }
 
 void ui_sensorlist_create(struct ui_psensor *ui)
 {
 }
 
 void ui_sensorlist_create(struct ui_psensor *ui)
 {

-       GtkCellRenderer *renderer;
-
-       log_debug("ui_sensorlist_create()");
-
-       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);
+       GtkTreeModel *fmodel, *model;
+
+       log_fct_enter();
+
+       model = gtk_tree_view_get_model(ui->sensors_tree);
+       fmodel = gtk_tree_model_filter_new(model, NULL);
+       gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(fmodel),
+                                                COL_DISPLAY_ENABLED);
+
+       gtk_tree_view_set_model(ui->sensors_tree, fmodel);

 
        g_signal_connect(ui->sensors_tree,
                         "button-press-event", (GCallback)clicked_cbk, ui);
 
 
        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_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);
        ui_sensorlist_update(ui, 1);

+
+       log_fct_exit();

 }
 }