/*
- Copyright (C) 2010-2011 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 published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA
-*/
-
-
+ * Copyright (C) 2010-2013 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
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
#include <stdlib.h>
#include <string.h>
COL_COLOR_STR,
COL_ENABLED,
COL_EMPTY,
+ COL_SENSOR,
COLS_COUNT
};
void ui_sensorlist_update(struct ui_psensor *ui)
{
+ char *str;
+ 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;
- while (valid && *sensor) {
- struct psensor *s = *sensor;
+ use_celcius = ui->config->temperature_unit == CELCIUS;
- char *str;
+ while (valid) {
+ gtk_tree_model_get(model, &iter,
+ COL_SENSOR, &s,
+ -1);
- str = psensor_value_to_string(s->type,
- s->measures[s->values_max_length -
- 1].value.d_num);
+ str = psensor_value_to_str(s->type,
+ s->measures[s->values_max_length -
+ 1].value,
+ use_celcius);
gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_TEMP, str,
-1);
free(str);
- str = psensor_value_to_string(s->type, s->min);
+ 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_string(s->type, s->max);
+ 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);
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,
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);
}
}
- return FALSE;
+ return TRUE;
}
static void
struct psensor **s_cur = ui->sensors;
struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
- store = gtk_list_store_new(COLS_COUNT,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_BOOLEAN, G_TYPE_STRING);
-
- ui_sl->treeview = GTK_TREE_VIEW
- (gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
+ store = ui->sensors_store;
- gtk_tree_selection_set_mode
- (gtk_tree_view_get_selection(ui_sl->treeview),
- GTK_SELECTION_NONE);
+ 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_sl->treeview,
-1,
- _("Current"),
+ _("Value"),
renderer,
"text", COL_TEMP, NULL);
renderer = gtk_cell_renderer_toggle_new();
gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-1,
- _("Enabled"),
+ _("Graph"),
renderer,
"active", COL_ENABLED,
NULL);
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);
s_cur++;
}
-
- ui_sl->widget = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ui_sl->widget),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_container_add(GTK_CONTAINER(ui_sl->widget),
- GTK_WIDGET(ui_sl->treeview));
}
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;
projects / psensor.git / blobdiff