X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=8fa44004561e3c4e2dc62b2f3ad153c1bf451466;hb=67defd334424afc5b6eeb9a4b342ddec6e92d6d8;hp=286b25f9a9f58de8245c38774d1d6e92733a0025;hpb=94cd6e094ffb603809880f854a71dcef093257e5;p=psensor.git diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c index 286b25f..8fa4400 100644 --- a/src/ui_sensorpref.c +++ b/src/ui_sensorpref.c @@ -1,5 +1,5 @@ /* - * 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 @@ -26,13 +26,24 @@ #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_high_threshold; + int alarm_low_threshold; + unsigned int appindicator_enabled; }; struct cb_data { @@ -44,20 +55,27 @@ struct cb_data { static struct sensor_pref *sensor_pref_new(struct psensor *s, struct config *cfg) { - struct sensor_pref *p = malloc(sizeof(struct sensor_pref)); + struct sensor_pref *p; - p->sensor = s; + p = malloc(sizeof(struct sensor_pref)); + p->sensor = s; p->name = strdup(s->name); p->enabled = s->enabled; p->alarm_enabled = s->alarm_enabled; p->color = color_dup(s->color); - if (cfg->temperature_unit == CELCIUS) - p->alarm_high_thresold = s->alarm_high_thresold; - else - p->alarm_high_thresold - = celcius_to_fahrenheit(s->alarm_high_thresold); + if (cfg->temperature_unit == CELCIUS) { + p->alarm_high_threshold = s->alarm_high_threshold; + p->alarm_low_threshold = s->alarm_low_threshold; + } else { + 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; } @@ -93,14 +111,11 @@ static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors, static void sensor_pref_list_free(struct sensor_pref **list) { - struct sensor_pref **cur = list; + struct sensor_pref **cur; - while (*cur) { + for (cur = list; *cur; cur++) sensor_pref_free(*cur); - cur++; - } - free(list); } @@ -187,6 +202,18 @@ on_alarm_toggled(GtkToggleButton *btn, gpointer data) 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; @@ -201,15 +228,30 @@ static void on_color_set(GtkColorButton *widget, gpointer data) } } -static void on_temp_limit_changed(GtkSpinButton *btn, gpointer data) +static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data) { - struct cb_data *cbdata = data; + struct cb_data *cbdata; + struct sensor_pref *p; + + cbdata = data; + + p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); + + if (p) + p->alarm_high_threshold = gtk_spin_button_get_value(btn); +} + +static void on_alarm_low_threshold_changed(GtkSpinButton *btn, gpointer data) +{ + struct cb_data *cbdata; struct sensor_pref *p; + cbdata = data; + p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); if (p) - p->alarm_high_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) @@ -226,8 +268,22 @@ static void connect_signals(GtkBuilder *builder, struct cb_data *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_temp_limit"), - "value-changed", G_CALLBACK(on_temp_limit_changed), + 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); } @@ -237,11 +293,12 @@ update_pref(struct psensor *s, struct config *cfg, GtkBuilder *builder) { - GtkLabel *w_id, *w_type, *w_temp_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_temp_limit; + GtkSpinButton *w_high_threshold, *w_low_threshold; GdkColor *color; struct sensor_pref *p = sensor_pref_get(prefs, s); int use_celcius; @@ -255,6 +312,12 @@ update_pref(struct psensor *s, 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); @@ -266,30 +329,52 @@ update_pref(struct psensor *s, w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "sensor_alarm")); - w_temp_limit - = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, - "sensor_temp_limit")); - - w_temp_unit - = GTK_LABEL(gtk_builder_get_object(builder, - "sensor_temp_unit")); + w_high_threshold = GTK_SPIN_BUTTON(gtk_builder_get_object + (builder, + "sensor_alarm_high_threshold")); + w_low_threshold = GTK_SPIN_BUTTON(gtk_builder_get_object + (builder, + "sensor_alarm_low_threshold")); + + w_high_threshold_unit = GTK_LABEL(gtk_builder_get_object + (builder, + "sensor_alarm_high_threshold_unit")); + w_low_threshold_unit = GTK_LABEL(gtk_builder_get_object + (builder, + "sensor_alarm_low_threshold_unit")); use_celcius = cfg->temperature_unit == CELCIUS ? 1 : 0; - gtk_label_set_text(w_temp_unit, + gtk_label_set_text(w_high_threshold_unit, psensor_type_to_unit_str(s->type, use_celcius)); + gtk_label_set_text(w_low_threshold_unit, + psensor_type_to_unit_str(s->type, + use_celcius)); + + w_appindicator_enabled = GTK_TOGGLE_BUTTON + (gtk_builder_get_object(builder, "indicator_checkbox")); - if (is_temp_type(s->type)) { + 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_temp_limit, p->alarm_high_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_temp_limit), 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_temp_limit, 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_temp_limit), 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) @@ -361,14 +446,21 @@ apply_prefs(struct sensor_pref **prefs, config_set_sensor_enabled(s->id, s->enabled); } - if (cfg->temperature_unit == CELCIUS) - s->alarm_high_thresold = p->alarm_high_thresold; - else - s->alarm_high_thresold = fahrenheit_to_celcius - (p->alarm_high_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_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_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; @@ -379,6 +471,12 @@ apply_prefs(struct sensor_pref **prefs, 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); + } } } @@ -390,15 +488,14 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) 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; @@ -421,24 +518,16 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) = 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); @@ -450,7 +539,10 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) 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));