#include <gtk/gtk.h>
-#include "cfg.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
+#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>
enum {
COL_NAME = 0,
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;
};
struct cb_data {
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) {
p->alarm_high_threshold = s->alarm_high_threshold;
= 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);
static void sensor_pref_free(struct sensor_pref *p)
{
if (!p)
- return ;
+ return;
free(p->name);
- free(p->color);
+ gdk_rgba_free(p->color);
free(p);
}
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)
{
struct sensor_pref *p;
void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data)
{
struct sensor_pref *p;
- GdkColor color;
p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
- if (p) {
- gtk_color_button_get_color(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_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;
struct psensor *s;
int use_celsius;
"sensor_draw"));
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);
+
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), p->color);
w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
"sensor_alarm"));
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,
- 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_high_threshold), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), TRUE);
+
+ 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_toggle_button_set_active(w_alarm, 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_high_threshold), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), FALSE);
+ 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);
+ 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_high_threshold), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), TRUE);
+
gtk_toggle_button_set_active(w_appindicator_enabled,
p->appindicator_enabled);
struct psensor **s_cur;
int i;
GtkTreePath *p;
+ GtkTreeSelection *sel;
p = NULL;
for (s_cur = sensors, i = 0; *s_cur; s_cur++, i++)
}
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);
}
}
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
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);
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)
if (!ok) {
log_printf(LOG_ERR, error->message);
g_error_free(error);
- return ;
+ return;
}
w_sensors_list
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
}
projects / psensor.git / blobdiff