/*
- * Copyright (C) 2010-2013 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 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
enum {
COL_NAME = 0,
- COL_SENSOR
+ COL_SENSOR_PREF
};
struct sensor_pref {
int alarm_high_threshold;
int alarm_low_threshold;
unsigned int appindicator_enabled;
+ unsigned int appindicator_label_enabled;
};
struct cb_data {
GtkBuilder *builder;
};
-static struct sensor_pref *sensor_pref_new(struct psensor *s,
- struct config *cfg)
+static struct sensor_pref *
+sensor_pref_new(struct psensor *s, struct config *cfg)
{
struct sensor_pref *p;
p->sensor = s;
p->name = strdup(s->name);
- p->enabled = s->enabled;
+ p->enabled = s->graph_enabled;
p->alarm_enabled = s->alarm_enabled;
p->color = color_dup(s->color);
}
p->appindicator_enabled = s->appindicator_enabled;
+ p->appindicator_label_enabled
+ = config_is_appindicator_label_enabled(s->id);
return p;
}
free(p);
}
-static struct sensor_pref *
-get_selected_sensor_pref(GtkBuilder *builder)
+static struct sensor_pref *get_selected_sensor_pref(GtkTreeView *tree)
{
GtkTreeModel *model;
GtkTreeIter iter;
struct sensor_pref *pref;
GtkTreeSelection *selection;
- GtkTreeView *tree;
-
- tree = GTK_TREE_VIEW(gtk_builder_get_object(builder, "sensors_list"));
selection = gtk_tree_view_get_selection(tree);
pref = NULL;
if (gtk_tree_selection_get_selected(selection, &model, &iter))
- gtk_tree_model_get(model, &iter, COL_SENSOR, &pref, -1);
+ gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &pref, -1);
return pref;
}
-static void on_name_changed(GtkEntry *entry, gpointer data)
+void ui_sensorpref_name_changed_cb(GtkEntry *entry, gpointer data)
{
- struct cb_data *cbdata = data;
struct sensor_pref *p;
const char *str;
str = gtk_entry_get_text(entry);
- p = get_selected_sensor_pref(cbdata->builder);
+ p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
if (p && strcmp(p->name, str)) {
free(p->name);
}
}
-static void
-on_drawed_toggled(GtkToggleButton *btn, gpointer data)
+void ui_sensorpref_draw_toggled_cb(GtkToggleButton *btn, gpointer data)
{
- struct cb_data *cbdata = data;
struct sensor_pref *p;
- p = get_selected_sensor_pref(cbdata->builder);
+ p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
if (p)
p->enabled = gtk_toggle_button_get_active(btn);
}
-static void
-on_alarm_toggled(GtkToggleButton *btn, gpointer data)
+void ui_sensorpref_alarm_toggled_cb(GtkToggleButton *btn, gpointer data)
{
- struct cb_data *cbdata = data;
struct sensor_pref *p;
- p = get_selected_sensor_pref(cbdata->builder);
+ p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
if (p)
p->alarm_enabled = gtk_toggle_button_get_active(btn);
}
-static void
-on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
+void
+ui_sensorpref_appindicator_menu_toggled_cb(GtkToggleButton *btn, gpointer data)
{
- struct cb_data *cbdata = data;
struct sensor_pref *p;
- p = get_selected_sensor_pref(cbdata->builder);
+ p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
if (p)
p->appindicator_enabled = gtk_toggle_button_get_active(btn);
}
-static void on_color_set(GtkColorButton *widget, gpointer data)
+void
+ui_sensorpref_appindicator_label_toggled_cb(GtkToggleButton *btn, gpointer data)
+{
+ struct sensor_pref *p;
+
+ p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+
+ if (p)
+ p->appindicator_label_enabled
+ = gtk_toggle_button_get_active(btn);
+}
+
+void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data)
{
- struct cb_data *cbdata = data;
struct sensor_pref *p;
GdkColor color;
- p = get_selected_sensor_pref(cbdata->builder);
+ p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
if (p) {
gtk_color_button_get_color(widget, &color);
}
}
-static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data)
+void
+ui_sensorpref_alarm_high_threshold_changed_cb(GtkSpinButton *btn, gpointer data)
{
- struct cb_data *cbdata;
struct sensor_pref *p;
- cbdata = data;
-
- p = get_selected_sensor_pref(cbdata->builder);
+ p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
if (p)
p->alarm_high_threshold = gtk_spin_button_get_value(btn);
}
-static void on_alarm_low_threshold_changed(GtkSpinButton *btn, gpointer data)
+void
+ui_sensorpref_alarm_low_threshold_changed_cb(GtkSpinButton *btn, gpointer data)
{
- struct cb_data *cbdata;
struct sensor_pref *p;
- cbdata = data;
-
- p = get_selected_sensor_pref(cbdata->builder);
+ p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
if (p)
p->alarm_low_threshold = gtk_spin_button_get_value(btn);
}
-static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata)
-{
- g_signal_connect(gtk_builder_get_object(builder, "sensor_name"),
- "changed", G_CALLBACK(on_name_changed), cbdata);
-
- g_signal_connect(gtk_builder_get_object(builder, "sensor_draw"),
- "toggled", G_CALLBACK(on_drawed_toggled), cbdata);
-
- g_signal_connect(gtk_builder_get_object(builder, "sensor_color"),
- "color-set", G_CALLBACK(on_color_set), cbdata);
-
- g_signal_connect(gtk_builder_get_object(builder, "sensor_alarm"),
- "toggled", G_CALLBACK(on_alarm_toggled), cbdata);
-
- g_signal_connect(gtk_builder_get_object(builder,
- "sensor_alarm_high_threshold"),
- "value-changed",
- G_CALLBACK(on_alarm_high_threshold_changed),
- cbdata);
-
- g_signal_connect(gtk_builder_get_object(builder,
- "sensor_alarm_low_threshold"),
- "value-changed",
- G_CALLBACK(on_alarm_low_threshold_changed),
- cbdata);
-
- g_signal_connect(gtk_builder_get_object(builder,
- "indicator_checkbox"),
- "toggled",
- G_CALLBACK(on_appindicator_toggled),
- cbdata);
-}
-
static void
update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
{
GtkLabel *w_id, *w_type, *w_high_threshold_unit, *w_low_threshold_unit,
*w_chipname;
GtkEntry *w_name;
- GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled;
+ GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled,
+ *w_appindicator_label_enabled;
GtkColorButton *w_color;
GtkSpinButton *w_high_threshold, *w_low_threshold;
GdkColor *color;
w_appindicator_enabled = GTK_TOGGLE_BUTTON
(gtk_builder_get_object(builder, "indicator_checkbox"));
+ w_appindicator_label_enabled = GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object(builder, "indicator_label_checkbox"));
+
if (is_temp_type(s->type) || is_fan_type(s->type)) {
gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
gtk_toggle_button_set_active(w_appindicator_enabled,
p->appindicator_enabled);
+ gtk_toggle_button_set_active(w_appindicator_label_enabled,
+ p->appindicator_label_enabled);
}
static void on_changed(GtkTreeSelection *selection, gpointer data)
struct cb_data *cbdata = data;
struct ui_psensor *ui = cbdata->ui;
struct sensor_pref *p;
+ GtkTreeView *tree;
- p = get_selected_sensor_pref(cbdata->builder);
+ tree = GTK_TREE_VIEW(gtk_builder_get_object(cbdata->builder,
+ "sensors_list"));
+ p = get_selected_sensor_pref(tree);
update_pref(p, ui->config, cbdata->builder);
}
static void
select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
{
- struct psensor **s_cur = sensors;
- int i = 0;
- GtkTreePath *p = NULL;
+ struct psensor **s_cur;
+ int i;
+ GtkTreePath *p;
- while (*s_cur) {
+ p = NULL;
+ for (s_cur = sensors, i = 0; *s_cur; s_cur++, i++)
if (s == *s_cur) {
p = gtk_tree_path_new_from_indices(i, -1);
break;
}
- i++;
- s_cur++;
- }
-
if (p) {
GtkTreeSelection *s = gtk_tree_view_get_selection(tree);
}
}
-static void apply_pref(struct sensor_pref *p, struct config *cfg)
+static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
{
struct psensor *s;
config_set_sensor_name(s->id, s->name);
}
- if (s->enabled != p->enabled) {
- s->enabled = p->enabled;
- config_set_sensor_enabled(s->id, s->enabled);
+ if (s->graph_enabled != p->enabled) {
+ s->graph_enabled = p->enabled;
+ config_set_sensor_enabled(s->id, s->graph_enabled);
}
- if (is_temp_type(s->type)
- && cfg->temperature_unit == FAHRENHEIT) {
+ if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) {
s->alarm_high_threshold
= fahrenheit_to_celcius(p->alarm_high_threshold);
s->alarm_low_threshold
s->appindicator_enabled = p->appindicator_enabled;
config_set_appindicator_enabled(s->id, s->appindicator_enabled);
}
+
+ config_set_appindicator_label_enabled(s->id,
+ p->appindicator_label_enabled);
+
+ config_set_sensor_position(s->id, pos);
}
-static void
-apply_prefs(GtkTreeModel *model, struct config *cfg)
+static void apply_prefs(GtkTreeModel *model, struct config *cfg)
{
gboolean valid;
struct sensor_pref *spref;
GtkTreeIter iter;
+ int i;
valid = gtk_tree_model_get_iter_first(model, &iter);
+ i = 0;
while (valid) {
- gtk_tree_model_get(model, &iter, COL_SENSOR, &spref, -1);
- apply_pref(spref, cfg);
+ gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &spref, -1);
+ apply_pref(spref, i, cfg);
valid = gtk_tree_model_iter_next(model, &iter);
+ i++;
}
}
return ;
}
- connect_signals(builder, &cbdata);
-
w_sensors_list
= GTK_TREE_VIEW(gtk_builder_get_object(builder,
"sensors_list"));
+ gtk_builder_connect_signals(builder, w_sensors_list);
store = GTK_LIST_STORE(gtk_builder_get_object(builder,
"sensors_liststore"));
spref = sensor_pref_new(s, ui->config);
gtk_list_store_set(store, &iter,
COL_NAME, s->name,
- COL_SENSOR, spref,
+ COL_SENSOR_PREF, spref,
-1);
if (s == sensor)
valid = gtk_tree_model_get_iter_first(model, &iter);
while (valid) {
- gtk_tree_model_get(model, &iter, COL_SENSOR, &spref, -1);
+ gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &spref, -1);
sensor_pref_free(spref);
valid = gtk_tree_model_iter_next(model, &iter);
}
projects / psensor.git / blobdiff