#include <ui_sensorpref.h>
#include <ui_color.h>
-
enum {
COL_NAME = 0,
COL_SENSOR_PREF
struct psensor *sensor;
char *name;
int graph_enabled;
- struct color *color;
+ GdkRGBA *color;
int alarm_enabled;
int alarm_high_threshold;
int alarm_low_threshold;
p->name = strdup(s->name);
p->graph_enabled = config_is_sensor_graph_enabled(s->id);
p->alarm_enabled = config_get_sensor_alarm_enabled(s->id);
- p->color = color_dup(s->color);
+ p->color = config_get_sensor_color(s->id);
p->display_enabled = config_is_sensor_enabled(s->id);
if (cfg->temperature_unit == CELSIUS) {
return;
free(p->name);
- free(p->color);
+ gdk_rgba_free(p->color);
free(p);
}
void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data)
{
struct sensor_pref *p;
- GdkRGBA color;
p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
- if (p) {
- gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &color);
- color_set(p->color, color.red, color.green, color.blue);
- }
+ if (p)
+ gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), p->color);
}
void
*w_appindicator_label_enabled, *w_display;
GtkColorButton *w_color;
GtkSpinButton *w_high_threshold, *w_low_threshold;
- GdkRGBA color;
struct psensor *s;
int use_celsius;
"sensor_enable_checkbox"));
gtk_toggle_button_set_active(w_display, p->display_enabled);
- color = color_to_GdkRGBA(p->color);
w_color = GTK_COLOR_BUTTON(gtk_builder_get_object(builder,
"sensor_color"));
- gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(w_color), &color);
+ gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(w_color), p->color);
w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
"sensor_alarm"));
config_set_sensor_alarm_enabled(s->id, p->alarm_enabled);
- color_set(s->color,
- p->color->red,
- p->color->green,
- p->color->blue);
- config_set_sensor_color(s->id, s->color);
+ config_set_sensor_color(s->id, p->color);
config_set_appindicator_enabled(s->id, p->appindicator_enabled);