/*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * 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
#include "ui_sensorpref.h"
#include "cfg.h"
#include "ui_color.h"
-#include "compat.h"
enum {
COL_NAME = 0,
COL_COLOR_STR,
COL_ENABLED,
COL_EMPTY,
- COLS_COUNT
+ COL_SENSOR,
};
struct cb_data {
return idx;
}
-void ui_sensorlist_update(struct ui_psensor *ui)
+void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
{
- char *str;
+ char *scolor, *value, *min, *max;
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;
+ GtkTreeModel *model;
+ gboolean valid;
int use_celcius;
+ GdkColor color;
+ GtkListStore *store;
+
+ model = gtk_tree_view_get_model(ui->sensors_tree);
+ store = GTK_LIST_STORE(model);
use_celcius = ui->config->temperature_unit == CELCIUS;
- while (valid && *sensor) {
- s = *sensor;
+ valid = gtk_tree_model_get_iter_first(model, &iter);
+ 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 -
- 1].value,
- use_celcius);
+ value = psensor_value_to_str(s->type,
+ psensor_get_current_value(s),
+ use_celcius);
+ min = psensor_value_to_str(s->type, s->min, use_celcius);
+ max = psensor_value_to_str(s->type, s->max, use_celcius);
- gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_TEMP, str,
+ gtk_list_store_set(store, &iter,
+ COL_TEMP, value,
+ COL_TEMP_MIN, min,
+ COL_TEMP_MAX, max,
-1);
- free(str);
-
- 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_str(s->type, s->max, use_celcius);
- gtk_list_store_set(GTK_LIST_STORE(model), &iter,
- COL_TEMP_MAX, str, -1);
- free(str);
+ free(value);
+ free(min);
+ free(max);
+
+ 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(store, &iter,
+ COL_NAME, s->name,
+ COL_COLOR_STR, scolor,
+ COL_ENABLED, s->enabled,
+ -1);
+ free(scolor);
+ }
valid = gtk_tree_model_iter_next(model, &iter);
- sensor++;
}
}
* <null> if none.
*/
static struct psensor *
-get_sensor_at_pos(GtkTreeView *view, int x, int y, struct psensor **sensors)
+get_sensor_at_pos(GtkTreeView *view, int x, int y, struct ui_psensor *ui)
{
GtkTreePath *path;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ struct psensor *s;
gtk_tree_view_get_path_at_pos(view, x, y, &path, NULL, NULL, NULL);
+ model = gtk_tree_view_get_model(ui->sensors_tree);
if (path) {
- gint *i = gtk_tree_path_get_indices(path);
- if (i)
- return *(sensors + *i);
+ if (gtk_tree_model_get_iter(model, &iter, path)) {
+ gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
+ return s;
+ }
}
return NULL;
}
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;
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;
+ GtkTreeView *view;
+
+ if (event->button != 3)
+ return FALSE;
+
+ view = ui->sensors_tree;
struct psensor *sensor = get_sensor_at_pos(view,
event->x,
event->y,
- ui->sensors);
+ ui);
if (sensor) {
int coli = col_index_to_col(get_col_index_at_pos(view,
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);
-
}
}
- return FALSE;
+ return TRUE;
}
static void
on_toggled(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
{
- struct ui_sensorlist *list = (struct ui_sensorlist *)data;
+ struct ui_psensor *ui = (struct ui_psensor *)data;
GtkTreeModel *model
- = gtk_tree_view_get_model(list->treeview);
+ = gtk_tree_view_get_model(ui->sensors_tree);
GtkTreeIter iter;
GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
gboolean fixed;
i = gtk_tree_path_get_indices(path);
if (i) {
int n = *i;
- struct psensor **sensor = list->sensors;
+ struct psensor **sensor = ui->sensors;
while (n--)
sensor++;
(*sensor)->enabled = fixed;
gtk_tree_path_free(path);
}
-static void create_widget(struct ui_psensor *ui)
+static int cmp_sensors(const void *p1, const void *p2)
{
- GtkListStore *store;
- GtkCellRenderer *renderer;
- struct psensor **s_cur = ui->sensors;
- struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
+ const struct psensor *s1, *s2;
+ int pos1, pos2;
- 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);
+ s1 = *(void **)p1;
+ s2 = *(void **)p2;
- ui_sl->treeview = GTK_TREE_VIEW
- (gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
+ pos1 = config_get_sensor_position(s1->id);
+ pos2 = config_get_sensor_position(s2->id);
- gtk_tree_selection_set_mode
- (gtk_tree_view_get_selection(ui_sl->treeview),
- GTK_SELECTION_NONE);
+ return pos1 - pos2;
+}
+
+static void create_widget(struct ui_psensor *ui)
+{
+ GtkListStore *store;
+ GtkCellRenderer *renderer;
+ struct psensor **s_cur;
+ GtkTreeIter iter;
+ struct psensor **ordered_sensors;
renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
+ 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_sl->treeview,
+ 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_sl->treeview,
+ 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_sl->treeview,
+ 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_sl->treeview,
+ gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
-1,
_("Color"),
renderer,
"background", COL_COLOR_STR,
NULL);
- g_signal_connect(ui_sl->treeview,
+ g_signal_connect(ui->sensors_tree,
"button-press-event", (GCallback) on_clicked, ui);
renderer = gtk_cell_renderer_toggle_new();
- gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
+ gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
-1,
- _("Enabled"),
+ _("Graph"),
renderer,
"active", COL_ENABLED,
NULL);
g_signal_connect(G_OBJECT(renderer),
- "toggled", (GCallback) on_toggled, ui_sl);
+ "toggled", (GCallback) on_toggled, ui);
renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
+ gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
-1,
"",
renderer,
"text", COL_EMPTY, NULL);
- while (*s_cur) {
- GtkTreeIter iter;
- GdkColor color;
- gchar *scolor;
- struct psensor *s = *s_cur;
-
- color.red = s->color->red;
- color.green = s->color->green;
- color.blue = s->color->blue;
-
- scolor = gdk_color_to_string(&color);
+ ordered_sensors = psensor_list_copy(ui->sensors);
+ qsort(ordered_sensors,
+ psensor_list_size(ordered_sensors),
+ sizeof(struct psensor *),
+ cmp_sensors);
+ store = ui->sensors_store;
+ for (s_cur = ordered_sensors; *s_cur; s_cur++) {
gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- COL_NAME, s->name,
- COL_TEMP, _("N/A"),
- COL_TEMP_MIN, _("N/A"),
- COL_TEMP_MAX, _("N/A"),
- COL_COLOR_STR, scolor,
- COL_ENABLED, s->enabled, -1);
-
- free(scolor);
-
- s_cur++;
+ gtk_list_store_set(store, &iter, COL_SENSOR, *s_cur, -1);
}
- 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));
+ ui_sensorlist_update(ui, 1);
}
void ui_sensorlist_create(struct ui_psensor *ui)
{
- ui->ui_sensorlist = malloc(sizeof(struct ui_sensorlist));
- ui->ui_sensorlist->sensors = ui->sensors;
-
+ log_debug("ui_sensorlist_create()");
create_widget(ui);
}
projects / psensor.git / blobdiff