projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed useless var
[psensor.git]
/
src
/
ui_sensorlist.c
diff --git
a/src/ui_sensorlist.c
b/src/ui_sensorlist.c
index
1893a89
..
59d9d79
100644
(file)
--- a/
src/ui_sensorlist.c
+++ b/
src/ui_sensorlist.c
@@
-36,6
+36,7
@@
enum {
COL_COLOR_STR,
COL_ENABLED,
COL_EMPTY,
COL_COLOR_STR,
COL_ENABLED,
COL_EMPTY,
+ COL_SENSOR,
COLS_COUNT
};
COLS_COUNT
};
@@
-63,13
+64,12
@@
void ui_sensorlist_update(struct ui_psensor *ui)
GtkTreeModel *model
= gtk_tree_view_get_model(ui_sl->treeview);
gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
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;
use_celcius = ui->config->temperature_unit == CELCIUS;
int use_celcius;
use_celcius = ui->config->temperature_unit == CELCIUS;
- while (valid
&& *sensor
) {
-
s = *sensor
;
+ 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 -
str = psensor_value_to_str(s->type,
s->measures[s->values_max_length -
@@
-91,7
+91,6
@@
void ui_sensorlist_update(struct ui_psensor *ui)
free(str);
valid = gtk_tree_model_iter_next(model, &iter);
free(str);
valid = gtk_tree_model_iter_next(model, &iter);
- sensor++;
}
}
}
}
@@
-219,9
+218,13
@@
static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer 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;
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,
struct psensor *sensor = get_sensor_at_pos(view,
event->x,
event->y,
@@
-239,8
+242,7
@@
static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
sensor->color);
}
} else if (coli >= 0 && coli != COL_ENABLED) {
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);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
event->button, event->time);
@@
-248,7
+250,7
@@
static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
}
}
}
}
- return
FALS
E;
+ return
TRU
E;
}
static void
}
static void
@@
-294,10
+296,6
@@
static void create_widget(struct ui_psensor *ui)
ui_sl->treeview = ui->sensors_tree;
ui_sl->treeview = ui->sensors_tree;
- gtk_tree_selection_set_mode
- (gtk_tree_view_get_selection(ui_sl->treeview),
- GTK_SELECTION_NONE);
-
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-1,
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-1,
@@
-371,7
+369,8
@@
static void create_widget(struct ui_psensor *ui)
COL_TEMP_MIN, _("N/A"),
COL_TEMP_MAX, _("N/A"),
COL_COLOR_STR, scolor,
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);
free(scolor);