X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=126f33c22516ffba1a9f97d433ad632f8f740181;hp=463dedaa213f44a216085875d0098508311ff4d6;hb=4c50d430bea4b8462b0ae7ab70baf3f538f87718;hpb=0470c31b8a4293914a6fd9b089503775706da084

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 463deda..126f33c 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -20,11 +20,13 @@
 
 #include <gtk/gtk.h>
 
-#include "cfg.h"
-#include "ui_pref.h"
-#include "ui_sensorlist.h"
-#include "ui_sensorpref.h"
-#include "ui_color.h"
+#include <cfg.h>
+#include <temperature.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"
@@ -38,13 +40,14 @@ enum {
 struct sensor_pref {
 	struct psensor *sensor;
 	char *name;
-	int enabled;
+	int graph_enabled;
 	struct color *color;
 	int alarm_enabled;
 	int alarm_high_threshold;
 	int alarm_low_threshold;
 	unsigned int appindicator_enabled;
 	unsigned int appindicator_label_enabled;
+	unsigned int display_enabled;
 };
 
 struct cb_data {
@@ -61,9 +64,10 @@ sensor_pref_new(struct psensor *s, struct config *cfg)
 
 	p->sensor = s;
 	p->name = strdup(s->name);
-	p->enabled = s->graph_enabled;
+	p->graph_enabled = s->graph_enabled;
 	p->alarm_enabled = s->alarm_enabled;
 	p->color = color_dup(s->color);
+	p->display_enabled = config_is_sensor_enabled(s->id);
 
 	if (cfg->temperature_unit == CELSIUS) {
 		p->alarm_high_threshold = s->alarm_high_threshold;
@@ -131,7 +135,17 @@ void ui_sensorpref_draw_toggled_cb(GtkToggleButton *btn, gpointer data)
 	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p)
-		p->enabled = gtk_toggle_button_get_active(btn);
+		p->graph_enabled = gtk_toggle_button_get_active(btn);
+}
+
+void ui_sensorpref_display_toggled_cb(GtkToggleButton *btn, gpointer data)
+{
+	struct sensor_pref *p;
+
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+
+	if (p)
+		p->display_enabled = gtk_toggle_button_get_active(btn);
 }
 
 void ui_sensorpref_alarm_toggled_cb(GtkToggleButton *btn, gpointer data)
@@ -170,12 +184,12 @@ ui_sensorpref_appindicator_label_toggled_cb(GtkToggleButton *btn, gpointer data)
 void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data)
 {
 	struct sensor_pref *p;
-	GdkColor color;
+	GdkRGBA color;
 
 	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p) {
-		gtk_color_button_get_color(widget, &color);
+		gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &color);
 		color_set(p->color, color.red, color.green, color.blue);
 	}
 }
@@ -209,10 +223,10 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 		*w_chipname;
 	GtkEntry *w_name;
 	GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled,
-		*w_appindicator_label_enabled;
+		*w_appindicator_label_enabled, *w_display;
 	GtkColorButton *w_color;
 	GtkSpinButton *w_high_threshold, *w_low_threshold;
-	GdkColor *color;
+	GdkRGBA color;
 	struct psensor *s;
 	int use_celsius;
 
@@ -235,12 +249,17 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 
 	w_draw = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
 							  "sensor_draw"));
-	gtk_toggle_button_set_active(w_draw, p->enabled);
+	gtk_toggle_button_set_active(w_draw, p->graph_enabled);
 
-	color = color_to_gdkcolor(p->color);
+	w_display = GTK_TOGGLE_BUTTON(gtk_builder_get_object
+				      (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_button_set_color(w_color, color);
+	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(w_color), &color);
 
 	w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
 							   "sensor_alarm"));
@@ -271,7 +290,6 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 	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_spin_button_set_value(w_high_threshold,
@@ -344,9 +362,9 @@ 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->enabled) {
-		s->graph_enabled = p->enabled;
-		config_set_sensor_enabled(s->id, s->graph_enabled);
+	if (s->graph_enabled != p->graph_enabled) {
+		s->graph_enabled = p->graph_enabled;
+		config_set_sensor_graph_enabled(s->id, s->graph_enabled);
 	}
 
 	if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) {
@@ -367,7 +385,10 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
 		config_set_sensor_alarm_enabled(s->id, s->alarm_enabled);
 	}
 
-	color_set(s->color, p->color->red, p->color->green, p->color->blue);
+	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) {
@@ -379,6 +400,8 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
 					      p->appindicator_label_enabled);
 
 	config_set_sensor_position(s->id, pos);
+
+	config_set_sensor_enabled(s->id, p->display_enabled);
 }
 
 static void apply_prefs(GtkTreeModel *model, struct config *cfg)
@@ -396,6 +419,7 @@ static void apply_prefs(GtkTreeModel *model, struct config *cfg)
 		valid = gtk_tree_model_iter_next(model, &iter);
 		i++;
 	}
+	config_sync();
 }
 
 void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)