X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=90326330166716277345de7390785b0c2ab26562;hb=ad6ea372fc3673d6b9dcc08f9edac8558e6eb5c9;hp=cf399d3d4eb2d6b3efe51ba98c73e97fb321e8e7;hpb=2b51051578ef29b031d0927388c4d62baa3c525e;p=psensor.git

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index cf399d3..9032633 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,23 @@
 #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
+};
+
 struct sensor_pref {
 	struct psensor *sensor;
 	char *name;
 	int enabled;
 	struct color *color;
 	int alarm_enabled;
-	double alarm_limit;
+	int alarm_high_threshold;
+	int alarm_low_threshold;
+	unsigned int appindicator_enabled;
 };
 
 struct cb_data {
@@ -41,18 +51,31 @@ struct cb_data {
 	struct sensor_pref **prefs;
 };
 
-static struct sensor_pref *sensor_pref_new(struct psensor *s)
+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->alarm_limit = s->alarm_limit;
 	p->color = color_dup(s->color);
 
+	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;
 }
 
@@ -67,7 +90,8 @@ static void sensor_pref_free(struct sensor_pref *p)
 	free(p);
 }
 
-static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors)
+static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors,
+						 struct config *cfg)
 {
 	int n, i;
 	struct sensor_pref **pref_list;
@@ -76,7 +100,8 @@ static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors)
 	pref_list = malloc(sizeof(struct sensor_pref *) * (n+1));
 
 	for (i = 0; i < n; i++)
-		pref_list[i] = sensor_pref_new(sensors[i]);
+		pref_list[i] = sensor_pref_new(sensors[i],
+					       cfg);
 
 	pref_list[n] = NULL;
 
@@ -114,7 +139,7 @@ sensor_pref_get(struct sensor_pref **ps, struct psensor *s)
 }
 
 static struct sensor_pref *
-get_seleted_sensor_pref(GtkBuilder *builder, struct sensor_pref **ps)
+get_selected_sensor_pref(GtkBuilder *builder, struct sensor_pref **ps)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -147,7 +172,7 @@ static void on_name_changed(GtkEntry *entry, gpointer data)
 
 	str = gtk_entry_get_text(entry);
 
-	p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs);
+	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
 
 	if (p && strcmp(p->name, str)) {
 		free(p->name);
@@ -161,7 +186,7 @@ on_drawed_toggled(GtkToggleButton *btn, gpointer data)
 	struct cb_data *cbdata = data;
 	struct sensor_pref *p;
 
-	p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs);
+	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
 
 	if (p)
 		p->enabled = gtk_toggle_button_get_active(btn);
@@ -173,19 +198,31 @@ on_alarm_toggled(GtkToggleButton *btn, gpointer data)
 	struct cb_data *cbdata = data;
 	struct sensor_pref *p;
 
-	p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs);
+	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
 
 	if (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;
 	struct sensor_pref *p;
 	GdkColor color;
 
-	p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs);
+	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
 
 	if (p) {
 		gtk_color_button_get_color(widget, &color);
@@ -193,15 +230,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;
 
-	p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs);
+	cbdata = data;
+
+	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
 
 	if (p)
-		p->alarm_limit = gtk_spin_button_get_value(btn);
+		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_low_threshold = gtk_spin_button_get_value(btn);
 }
 
 static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata)
@@ -218,21 +270,40 @@ 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);
 }
 
 static void
-update_pref(struct psensor *s, struct sensor_pref **prefs, GtkBuilder *builder)
+update_pref(struct psensor *s,
+	    struct sensor_pref **prefs,
+	    struct config *cfg,
+	    GtkBuilder *builder)
 {
-	GtkLabel *w_id, *w_type;
+	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;
 
 	w_id = GTK_LABEL(gtk_builder_get_object(builder, "sensor_id"));
 	gtk_label_set_text(w_id, s->id);
@@ -243,6 +314,12 @@ update_pref(struct psensor *s, struct sensor_pref **prefs, GtkBuilder *builder)
 	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);
@@ -254,21 +331,52 @@ update_pref(struct psensor *s, struct sensor_pref **prefs, GtkBuilder *builder)
 
 	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"));
-
-	if (is_temp_type(s->type)) {
+	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_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) || 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_limit);
+		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)
@@ -283,7 +391,10 @@ static void on_changed(GtkTreeSelection *selection, gpointer data)
 		gint *indices = gtk_tree_path_get_indices(p);
 		struct psensor *s = *(ui->sensors + *indices);
 
-		update_pref(s, cbdata->prefs, cbdata->builder);
+		update_pref(s,
+			    cbdata->prefs,
+			    ui->config,
+			    cbdata->builder);
 
 		gtk_tree_path_free(p);
 	}
@@ -315,7 +426,9 @@ select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
 }
 
 static void
-apply_prefs(struct sensor_pref **prefs, struct psensor **sensors)
+apply_prefs(struct sensor_pref **prefs,
+	    struct psensor **sensors,
+	    struct config *cfg)
 {
 	int n = psensor_list_size(sensors);
 	int i;
@@ -335,12 +448,22 @@ apply_prefs(struct sensor_pref **prefs, struct psensor **sensors)
 			config_set_sensor_enabled(s->id, s->enabled);
 		}
 
-		if (s->alarm_limit != p->alarm_limit) {
-			s->alarm_limit = p->alarm_limit;
-			config_set_sensor_alarm_limit(s->id,
-						      s->alarm_limit);
+		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_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,
@@ -350,6 +473,12 @@ apply_prefs(struct sensor_pref **prefs, struct psensor **sensors)
 		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);
+		}
 	}
 }
 
@@ -361,14 +490,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;
 	GtkTreeSelection *selection;
 	struct cb_data cbdata;
 
 	cbdata.ui = ui;
-	cbdata.prefs = sensor_pref_list_new(ui->sensors);
+	cbdata.prefs = sensor_pref_list_new(ui->sensors,
+					    ui->config);
 
 	builder = gtk_builder_new();
 	cbdata.builder = builder;
@@ -384,21 +513,15 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 		return ;
 	}
 
-	update_pref(sensor, cbdata.prefs, builder);
+	update_pref(sensor, cbdata.prefs, ui->config, builder);
 	connect_signals(builder, &cbdata);
 
 	w_sensors_list
 		= 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));
+	store = GTK_LIST_STORE(gtk_builder_get_object(builder,
+						      "sensors_liststore"));
 
 	s_cur = ui->sensors;
 	while (*s_cur) {
@@ -406,7 +529,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 		struct psensor *s = *s_cur;
 
 		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 0, s->name, -1);
+		gtk_list_store_set(store, &iter, COL_NAME, s->name, -1);
 
 		s_cur++;
 	}
@@ -419,8 +542,11 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 	result = gtk_dialog_run(diag);
 
 	if (result == GTK_RESPONSE_ACCEPT) {
-		apply_prefs(cbdata.prefs, ui->sensors);
-		ui_sensorlist_update_sensors_preferences(ui);
+		apply_prefs(cbdata.prefs, ui->sensors, ui->config);
+		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));