avoid configuration (color) field in psensor struct

[psensor.git] / src / ui_sensorpref.c

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 76a90ea..91f24e3 100644 (file)
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -22,16 +22,12 @@
 
 #include <cfg.h>
 #include <temperature.h>
+#include <ui_appindicator.h>
 #include <ui_pref.h>
 #include <ui_sensorlist.h>
 #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_PREF
@@ -41,11 +37,11 @@ struct 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;
-       unsigned int appindicator_enabled;
+       bool appindicator_enabled;
        unsigned int appindicator_label_enabled;
        unsigned int display_enabled;
 };
@@ -64,9 +60,9 @@ sensor_pref_new(struct psensor *s, struct config *cfg)
 
        p->sensor = s;
        p->name = strdup(s->name);
-       p->graph_enabled = s->graph_enabled;
-       p->alarm_enabled = s->alarm_enabled;
-       p->color = color_dup(s->color);
+       p->graph_enabled = config_is_sensor_graph_enabled(s->id);
+       p->alarm_enabled = config_get_sensor_alarm_enabled(s->id);
+       p->color = config_get_sensor_color(s->id);
        p->display_enabled = config_is_sensor_enabled(s->id);
 
        if (cfg->temperature_unit == CELSIUS) {
@@ -79,7 +75,7 @@ sensor_pref_new(struct psensor *s, struct config *cfg)
                        = celsius_to_fahrenheit(s->alarm_low_threshold);
        }
 
-       p->appindicator_enabled = s->appindicator_enabled;
+       p->appindicator_enabled = config_is_appindicator_enabled(s->id);
        p->appindicator_label_enabled
                = config_is_appindicator_label_enabled(s->id);
 
@@ -92,7 +88,7 @@ static void sensor_pref_free(struct sensor_pref *p)
                return;
 
        free(p->name);
-       free(p->color);
+       gdk_rgba_free(p->color);
 
        free(p);
 }
@@ -184,14 +180,11 @@ ui_sensorpref_appindicator_label_toggled_cb(GtkToggleButton *btn, gpointer data)
 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
@@ -226,7 +219,6 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
                *w_appindicator_label_enabled, *w_display;
        GtkColorButton *w_color;
        GtkSpinButton *w_high_threshold, *w_low_threshold;
-       GdkRGBA color;
        struct psensor *s;
        int use_celsius;
 
@@ -256,10 +248,9 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
                                       "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"));
@@ -291,18 +282,21 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
                (gtk_builder_get_object(builder, "indicator_label_checkbox"));
 
 
-#if !HAVE_APPINDICATOR && !HAVE_APPINDICATOR_029
-       gtk_widget_set_sensitive(GTK_WIDGET(w_appindicator_label_enabled),
-                                FALSE);
-       gtk_widget_set_sensitive(GTK_WIDGET(w_appindicator_enabled), FALSE);
-       gtk_widget_set_has_tooltip(GTK_WIDGET(w_appindicator_label_enabled),
-                                  TRUE);
-       gtk_widget_set_has_tooltip(GTK_WIDGET(w_appindicator_enabled), TRUE);
-#else
-       gtk_widget_set_has_tooltip(GTK_WIDGET(w_appindicator_label_enabled),
-                                  FALSE);
-       gtk_widget_set_has_tooltip(GTK_WIDGET(w_appindicator_enabled), FALSE);
-#endif
+       if (is_appindicator_supported()) {
+               gtk_widget_set_has_tooltip
+                       (GTK_WIDGET(w_appindicator_label_enabled), FALSE);
+               gtk_widget_set_has_tooltip
+                       (GTK_WIDGET(w_appindicator_enabled), FALSE);
+       } else {
+               gtk_widget_set_sensitive
+                       (GTK_WIDGET(w_appindicator_label_enabled), FALSE);
+               gtk_widget_set_has_tooltip
+                       (GTK_WIDGET(w_appindicator_label_enabled), TRUE);
+               gtk_widget_set_sensitive
+                       (GTK_WIDGET(w_appindicator_enabled), FALSE);
+               gtk_widget_set_has_tooltip
+                       (GTK_WIDGET(w_appindicator_enabled), TRUE);
+       }
 
        gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
        gtk_spin_button_set_value(w_high_threshold, p->alarm_high_threshold);
@@ -337,6 +331,7 @@ select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
        struct psensor **s_cur;
        int i;
        GtkTreePath *p;
+       GtkTreeSelection *sel;
 
        p = NULL;
        for (s_cur = sensors, i = 0; *s_cur; s_cur++, i++)
@@ -346,9 +341,9 @@ select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
                }
 
        if (p) {
-               GtkTreeSelection *s = gtk_tree_view_get_selection(tree);
+               sel = gtk_tree_view_get_selection(tree);
 
-               gtk_tree_selection_select_path(s, p);
+               gtk_tree_selection_select_path(sel, p);
                gtk_tree_path_free(p);
        }
 }
@@ -365,10 +360,7 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
                config_set_sensor_name(s->id, s->name);
        }
 
-       if (s->graph_enabled != p->graph_enabled) {
-               s->graph_enabled = p->graph_enabled;
-               config_set_sensor_graph_enabled(s->id, s->graph_enabled);
-       }
+       config_set_sensor_graph_enabled(s->id, p->graph_enabled);
 
        if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) {
                s->alarm_high_threshold
@@ -383,21 +375,11 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
        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;
-               config_set_sensor_alarm_enabled(s->id, s->alarm_enabled);
-       }
+       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);
 
-       if (s->appindicator_enabled != p->appindicator_enabled) {
-               s->appindicator_enabled = p->appindicator_enabled;
-               config_set_appindicator_enabled(s->id, s->appindicator_enabled);
-       }
+       config_set_appindicator_enabled(s->id, p->appindicator_enabled);
 
        config_set_appindicator_label_enabled(s->id,
                                              p->appindicator_label_enabled);
@@ -496,7 +478,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
        if (result == GTK_RESPONSE_ACCEPT) {
                apply_prefs(model, ui->config);
                ui_sensorlist_update(ui, 1);
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
                ui_appindicator_update_menu(ui);
 #endif
        }