/*
- * 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 "ui_color.h"
+#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#include "ui_appindicator.h"
+#endif
+
+enum {
+ COL_NAME = 0,
+ COL_SENSOR
+};
+
struct sensor_pref {
struct psensor *sensor;
char *name;
int enabled;
struct color *color;
int alarm_enabled;
- int alarm_high_thresold;
- int alarm_low_thresold;
+ int alarm_high_threshold;
+ int alarm_low_threshold;
+ unsigned int appindicator_enabled;
};
struct cb_data {
p->color = color_dup(s->color);
if (cfg->temperature_unit == CELCIUS) {
- p->alarm_high_thresold = s->alarm_high_thresold;
- p->alarm_low_thresold = s->alarm_low_thresold;
+ p->alarm_high_threshold = s->alarm_high_threshold;
+ p->alarm_low_threshold = s->alarm_low_threshold;
} else {
- p->alarm_high_thresold
- = celcius_to_fahrenheit(s->alarm_high_thresold);
- p->alarm_low_thresold
- = celcius_to_fahrenheit(s->alarm_low_thresold);
+ p->alarm_high_threshold
+ = celcius_to_fahrenheit(s->alarm_high_threshold);
+ p->alarm_low_threshold
+ = celcius_to_fahrenheit(s->alarm_low_threshold);
}
+ p->appindicator_enabled = s->appindicator_enabled;
+
return p;
}
p->alarm_enabled = gtk_toggle_button_get_active(btn);
}
+static void
+on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
+{
+ struct cb_data *cbdata = data;
+ struct sensor_pref *p;
+
+ p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
+
+ if (p)
+ p->appindicator_enabled = gtk_toggle_button_get_active(btn);
+}
+
static void on_color_set(GtkColorButton *widget, gpointer data)
{
struct cb_data *cbdata = data;
}
}
-static void on_alarm_high_thresold_changed(GtkSpinButton *btn, gpointer data)
+static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data)
{
struct cb_data *cbdata;
struct sensor_pref *p;
p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
if (p)
- p->alarm_high_thresold = gtk_spin_button_get_value(btn);
+ p->alarm_high_threshold = gtk_spin_button_get_value(btn);
}
-static void on_alarm_low_thresold_changed(GtkSpinButton *btn, gpointer data)
+static void on_alarm_low_threshold_changed(GtkSpinButton *btn, gpointer data)
{
struct cb_data *cbdata;
struct sensor_pref *p;
p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
if (p)
- p->alarm_low_thresold = gtk_spin_button_get_value(btn);
+ p->alarm_low_threshold = gtk_spin_button_get_value(btn);
}
static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata)
"toggled", G_CALLBACK(on_alarm_toggled), cbdata);
g_signal_connect(gtk_builder_get_object(builder,
- "sensor_alarm_high_thresold"),
+ "sensor_alarm_high_threshold"),
"value-changed",
- G_CALLBACK(on_alarm_high_thresold_changed),
+ G_CALLBACK(on_alarm_high_threshold_changed),
cbdata);
g_signal_connect(gtk_builder_get_object(builder,
- "sensor_alarm_low_thresold"),
+ "sensor_alarm_low_threshold"),
"value-changed",
- G_CALLBACK(on_alarm_low_thresold_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);
}
struct config *cfg,
GtkBuilder *builder)
{
- GtkLabel *w_id, *w_type, *w_high_thresold_unit, *w_low_thresold_unit;
+ GtkLabel *w_id, *w_type, *w_high_threshold_unit, *w_low_threshold_unit,
+ *w_chipname;
GtkEntry *w_name;
- GtkToggleButton *w_draw, *w_alarm;
+ GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled;
GtkColorButton *w_color;
- GtkSpinButton *w_high_thresold, *w_low_thresold;
+ GtkSpinButton *w_high_threshold, *w_low_threshold;
GdkColor *color;
struct sensor_pref *p = sensor_pref_get(prefs, s);
int use_celcius;
w_name = GTK_ENTRY(gtk_builder_get_object(builder, "sensor_name"));
gtk_entry_set_text(w_name, p->name);
+ w_chipname = GTK_LABEL(gtk_builder_get_object(builder, "chip_name"));
+ if (s->chip)
+ gtk_label_set_text(w_chipname, s->chip);
+ else
+ gtk_label_set_text(w_chipname, _("Unknown"));
+
w_draw = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
"sensor_draw"));
gtk_toggle_button_set_active(w_draw, p->enabled);
w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
"sensor_alarm"));
- w_high_thresold = GTK_SPIN_BUTTON(gtk_builder_get_object
+ w_high_threshold = GTK_SPIN_BUTTON(gtk_builder_get_object
(builder,
- "sensor_alarm_high_thresold"));
- w_low_thresold = GTK_SPIN_BUTTON(gtk_builder_get_object
+ "sensor_alarm_high_threshold"));
+ w_low_threshold = GTK_SPIN_BUTTON(gtk_builder_get_object
(builder,
- "sensor_alarm_low_thresold"));
+ "sensor_alarm_low_threshold"));
- w_high_thresold_unit = GTK_LABEL(gtk_builder_get_object
+ w_high_threshold_unit = GTK_LABEL(gtk_builder_get_object
(builder,
- "sensor_alarm_high_thresold_unit"));
- w_low_thresold_unit = GTK_LABEL(gtk_builder_get_object
+ "sensor_alarm_high_threshold_unit"));
+ w_low_threshold_unit = GTK_LABEL(gtk_builder_get_object
(builder,
- "sensor_alarm_low_thresold_unit"));
+ "sensor_alarm_low_threshold_unit"));
use_celcius = cfg->temperature_unit == CELCIUS ? 1 : 0;
- gtk_label_set_text(w_high_thresold_unit,
+ gtk_label_set_text(w_high_threshold_unit,
psensor_type_to_unit_str(s->type,
use_celcius));
- gtk_label_set_text(w_low_thresold_unit,
+ gtk_label_set_text(w_low_threshold_unit,
psensor_type_to_unit_str(s->type,
use_celcius));
- if (is_temp_type(s->type)) {
+ w_appindicator_enabled = GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object(builder, "indicator_checkbox"));
+
+ if (is_temp_type(s->type) || is_fan_type(s->type)) {
gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
- gtk_spin_button_set_value(w_high_thresold,
- p->alarm_high_thresold);
- gtk_spin_button_set_value(w_low_thresold,
- p->alarm_low_thresold);
+ gtk_spin_button_set_value(w_high_threshold,
+ p->alarm_high_threshold);
+ gtk_spin_button_set_value(w_low_threshold,
+ p->alarm_low_threshold);
gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(w_high_thresold), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(w_low_thresold), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(w_high_threshold), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), TRUE);
} else {
gtk_toggle_button_set_active(w_alarm, 0);
- gtk_spin_button_set_value(w_high_thresold, 0);
- gtk_spin_button_set_value(w_low_thresold, 0);
+ gtk_spin_button_set_value(w_high_threshold, 0);
+ gtk_spin_button_set_value(w_low_threshold, 0);
gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(w_high_thresold), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(w_low_thresold), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(w_high_threshold), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), FALSE);
}
+
+ gtk_toggle_button_set_active(w_appindicator_enabled,
+ p->appindicator_enabled);
+
}
static void on_changed(GtkTreeSelection *selection, gpointer data)
config_set_sensor_enabled(s->id, s->enabled);
}
- if (is_temp_type(s->type) && cfg->temperature_unit == CELCIUS) {
- s->alarm_high_thresold = p->alarm_high_thresold;
- s->alarm_low_thresold = p->alarm_low_thresold;
+ 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 = fahrenheit_to_celcius
+ (p->alarm_low_threshold);
} else {
- s->alarm_high_thresold = fahrenheit_to_celcius
- (p->alarm_high_thresold);
- s->alarm_low_thresold = fahrenheit_to_celcius
- (p->alarm_low_thresold);
+ s->alarm_high_threshold = p->alarm_high_threshold;
+ s->alarm_low_threshold = p->alarm_low_threshold;
}
- config_set_sensor_alarm_high_thresold(s->id,
- s->alarm_high_thresold);
- config_set_sensor_alarm_low_thresold(s->id,
- s->alarm_low_thresold);
+ config_set_sensor_alarm_high_threshold(s->id,
+ s->alarm_high_threshold);
+ config_set_sensor_alarm_low_threshold(s->id,
+ s->alarm_low_threshold);
if (s->alarm_enabled != p->alarm_enabled) {
s->alarm_enabled = p->alarm_enabled;
color_set(s->color,
p->color->red, p->color->green, p->color->blue);
config_set_sensor_color(s->id, s->color);
+
+ if (s->appindicator_enabled != p->appindicator_enabled) {
+ s->appindicator_enabled = p->appindicator_enabled;
+ config_set_appindicator_enabled
+ (s->id, s->appindicator_enabled);
+ }
}
}
GError *error = NULL;
GtkTreeView *w_sensors_list;
guint ok;
- GtkCellRenderer *renderer;
GtkListStore *store;
- struct psensor **s_cur;
+ struct psensor **s_cur, *s;
GtkTreeSelection *selection;
struct cb_data cbdata;
+ GtkTreeIter iter;
cbdata.ui = ui;
- cbdata.prefs = sensor_pref_list_new(ui->sensors,
- ui->config);
+ cbdata.prefs = sensor_pref_list_new(ui->sensors, ui->config);
builder = gtk_builder_new();
cbdata.builder = builder;
= GTK_TREE_VIEW(gtk_builder_get_object(builder,
"sensors_list"));
- renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_insert_column_with_attributes(w_sensors_list,
- -1,
- _("Sensor Name"),
- renderer,
- "text", 0, NULL);
-
- store = GTK_LIST_STORE(gtk_tree_view_get_model(w_sensors_list));
-
- s_cur = ui->sensors;
- while (*s_cur) {
- GtkTreeIter iter;
- struct psensor *s = *s_cur;
+ store = GTK_LIST_STORE(gtk_builder_get_object(builder,
+ "sensors_liststore"));
+ for (s_cur = ui->sensors; *s_cur; s_cur++) {
+ s = *s_cur;
gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 0, s->name, -1);
-
- s_cur++;
+ gtk_list_store_set(store, &iter,
+ COL_NAME, s->name,
+ COL_SENSOR, s,
+ -1);
}
selection = gtk_tree_view_get_selection(w_sensors_list);
if (result == GTK_RESPONSE_ACCEPT) {
apply_prefs(cbdata.prefs, ui->sensors, ui->config);
- ui_sensorlist_update_sensors_preferences(ui);
+ ui_sensorlist_update(ui, 1);
+#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+ ui_appindicator_update_menu(ui);
+#endif
}
g_object_unref(G_OBJECT(builder));
projects / psensor.git / blobdiff