/*
- * 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
{
GtkTreeIter iter;
GtkListStore *store;
- GdkRGBA color;
+ GdkRGBA *color;
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);
gtk_list_store_append(store, &iter);
- color.red = s->color->red;
- color.green = s->color->green;
- color.blue = s->color->blue;
- color.alpha = 1.0;
+ color = config_get_sensor_color(s->id);
- scolor = gdk_rgba_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,
- COL_GRAPH_ENABLED, s->graph_enabled,
+ COL_GRAPH_ENABLED,
+ config_is_sensor_graph_enabled(s->id),
COL_SENSOR, s,
COL_DISPLAY_ENABLED, enabled,
-1);
free(scolor);
+ gdk_rgba_free(color);
}
free(ordered_sensors);
}
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) {
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,
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++;
}
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 *
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);
GtkTreeView *view;
struct psensor *s;
int coli;
-
- if (event->button != 3)
- return FALSE;
+ GdkRGBA *color;
ui = (struct ui_psensor *)data;
view = ui->sensors_tree;
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))) {
+ config_set_sensor_color(s->id, color);
ui_sensorlist_update(ui, 1);
- config_set_sensor_color(s->id, s->color);
config_sync();
}
+ 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);
+ 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;
GtkTreePath *path;
struct psensor *s, *s2;
gboolean valid;
+ bool b;
ui = (struct ui_psensor *)data;
fmodel = gtk_tree_view_get_model(ui->sensors_tree);
gtk_tree_model_get(fmodel, &iter, COL_SENSOR, &s, -1);
- s->graph_enabled ^= 1;
- config_set_sensor_graph_enabled(s->id, s->graph_enabled);
+ b = config_is_sensor_graph_enabled(s->id) ^ 1;
+ config_set_sensor_graph_enabled(s->id, b);
+
+ config_sync();
gtk_tree_path_free(path);
gtk_list_store_set(ui->sensors_store,
&iter,
COL_GRAPH_ENABLED,
- s->graph_enabled,
+ b,
-1);
valid = gtk_tree_model_iter_next(model, &iter);
}
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);
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();
}
projects / psensor.git / blobdiff