/*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 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
#include <cfg.h>
#include <temperature.h>
+#include <ui_appindicator.h>
+#include <ui_color.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
};
-struct sensor_pref {
- struct psensor *sensor;
- char *name;
- 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 {
- struct ui_psensor *ui;
- GtkBuilder *builder;
-};
+static GtkTreeView *w_sensors_list;
+static GtkDialog *w_dialog;
+static GtkLabel *w_sensor_id;
+static GtkLabel *w_sensor_type;
+static GtkLabel *w_sensor_chipname;
+static GtkLabel *w_sensor_min;
+static GtkLabel *w_sensor_max;
+static GtkLabel *w_sensor_low_threshold_unit;
+static GtkLabel *w_sensor_high_threshold_unit;
+static GtkEntry *w_sensor_name;
+static GtkToggleButton *w_sensor_draw;
+static GtkToggleButton *w_sensor_display;
+static GtkToggleButton *w_sensor_alarm;
+static GtkToggleButton *w_appindicator_enabled;
+static GtkToggleButton *w_appindicator_label_enabled;
+static GtkColorButton *w_sensor_color;
+static GtkSpinButton *w_sensor_high_threshold;
+static GtkSpinButton *w_sensor_low_threshold;
+static GtkListStore *store;
+
+/* 'true' when the notifications of field changes are due to the change
+ * of the selected sensor.
+ */
+static bool ignore_changes;
-static struct sensor_pref *
-sensor_pref_new(struct psensor *s, struct config *cfg)
+static struct psensor *get_selected_sensor(void)
{
- struct sensor_pref *p;
-
- p = malloc(sizeof(struct sensor_pref));
-
- 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->display_enabled = config_is_sensor_enabled(s->id);
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ struct psensor *s;
+ GtkTreeSelection *selection;
- if (cfg->temperature_unit == CELSIUS) {
- p->alarm_high_threshold = s->alarm_high_threshold;
- p->alarm_low_threshold = s->alarm_low_threshold;
- } else {
- p->alarm_high_threshold
- = celsius_to_fahrenheit(s->alarm_high_threshold);
- p->alarm_low_threshold
- = celsius_to_fahrenheit(s->alarm_low_threshold);
- }
+ selection = gtk_tree_view_get_selection(w_sensors_list);
- p->appindicator_enabled = s->appindicator_enabled;
- p->appindicator_label_enabled
- = config_is_appindicator_label_enabled(s->id);
+ s = NULL;
+ if (gtk_tree_selection_get_selected(selection, &model, &iter))
+ gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &s, -1);
- return p;
+ return s;
}
-static void sensor_pref_free(struct sensor_pref *p)
+static void apply_config(struct ui_psensor *ui)
{
- if (!p)
- return;
-
- free(p->name);
- free(p->color);
+ config_sync();
- free(p);
+ ui_sensorlist_update(ui, 1);
+ ui_appindicator_update_menu(ui);
}
-static struct sensor_pref *get_selected_sensor_pref(GtkTreeView *tree)
+void ui_sensorpref_name_changed_cb(GtkEntry *entry, gpointer data)
{
- GtkTreeModel *model;
- GtkTreeIter iter;
- struct sensor_pref *pref;
- GtkTreeSelection *selection;
+ struct psensor *s;
- selection = gtk_tree_view_get_selection(tree);
+ const gchar *str;
- pref = NULL;
- if (gtk_tree_selection_get_selected(selection, &model, &iter))
- gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &pref, -1);
+ if (ignore_changes)
+ return;
- return pref;
-}
+ s = get_selected_sensor();
-void ui_sensorpref_name_changed_cb(GtkEntry *entry, gpointer data)
-{
- struct sensor_pref *p;
- const char *str;
+ if (!s)
+ return;
str = gtk_entry_get_text(entry);
- p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+ if (strcmp(str, s->name)) {
+ free(s->name);
+ s->name = strdup(str);
+ config_set_sensor_name(s->id, str);
- if (p && strcmp(p->name, str)) {
- free(p->name);
- p->name = strdup(str);
+ apply_config((struct ui_psensor *)data);
}
}
void ui_sensorpref_draw_toggled_cb(GtkToggleButton *btn, gpointer data)
{
- struct sensor_pref *p;
+ gboolean active;
+ struct psensor *s;
+
+ if (ignore_changes)
+ return;
+
+ s = get_selected_sensor();
+
+ if (!s)
+ return;
- p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+ active = gtk_toggle_button_get_active(btn);
+ config_set_sensor_graph_enabled(s->id, active);
- if (p)
- p->graph_enabled = gtk_toggle_button_get_active(btn);
+ apply_config((struct ui_psensor *)data);
}
void ui_sensorpref_display_toggled_cb(GtkToggleButton *btn, gpointer data)
{
- struct sensor_pref *p;
+ gboolean active;
+ struct psensor *s;
+
+ if (ignore_changes)
+ return;
+
+ s = get_selected_sensor();
+
+ if (!s)
+ return;
- p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+ active = gtk_toggle_button_get_active(btn);
+ config_set_sensor_enabled(s->id, active);
- if (p)
- p->display_enabled = gtk_toggle_button_get_active(btn);
+ apply_config((struct ui_psensor *)data);
}
void ui_sensorpref_alarm_toggled_cb(GtkToggleButton *btn, gpointer data)
{
- struct sensor_pref *p;
+ gboolean active;
+ struct psensor *s;
+
+ if (ignore_changes)
+ return;
+
+ s = get_selected_sensor();
- p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+ if (!s)
+ return;
+
+ active = gtk_toggle_button_get_active(btn);
+ config_set_sensor_alarm_enabled(s->id, active);
- if (p)
- p->alarm_enabled = gtk_toggle_button_get_active(btn);
+ apply_config((struct ui_psensor *)data);
}
void
ui_sensorpref_appindicator_menu_toggled_cb(GtkToggleButton *btn, gpointer data)
{
- struct sensor_pref *p;
+ gboolean active;
+ struct psensor *s;
+
+ if (ignore_changes)
+ return;
- p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+ s = get_selected_sensor();
- if (p)
- p->appindicator_enabled = gtk_toggle_button_get_active(btn);
+ if (!s)
+ return;
+
+ active = gtk_toggle_button_get_active(btn);
+ config_set_appindicator_enabled(s->id, active);
+
+ apply_config((struct ui_psensor *)data);
}
void
ui_sensorpref_appindicator_label_toggled_cb(GtkToggleButton *btn, gpointer data)
{
- struct sensor_pref *p;
+ gboolean active;
+ struct psensor *s;
+
+ if (ignore_changes)
+ return;
+
+ s = get_selected_sensor();
- p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+ if (!s)
+ return;
- if (p)
- p->appindicator_label_enabled
- = gtk_toggle_button_get_active(btn);
+ active = gtk_toggle_button_get_active(btn);
+ config_set_appindicator_label_enabled(s->id, active);
+
+ apply_config((struct ui_psensor *)data);
}
void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data)
{
- struct sensor_pref *p;
+ struct psensor *s;
GdkRGBA color;
- p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+ if (ignore_changes)
+ return;
- if (p) {
- gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &color);
- color_set(p->color, color.red, color.green, color.blue);
- }
+ s = get_selected_sensor();
+ if (!s)
+ return;
+
+ gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &color);
+ config_set_sensor_color(s->id, &color);
+
+ apply_config((struct ui_psensor *)data);
}
void
ui_sensorpref_alarm_high_threshold_changed_cb(GtkSpinButton *btn, gpointer data)
{
- struct sensor_pref *p;
+ struct psensor *s;
+ gdouble v;
+
+ if (ignore_changes)
+ return;
+
+ s = get_selected_sensor();
+ if (!s)
+ return;
- p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+ v = gtk_spin_button_get_value(btn);
+ if (config_get_temperature_unit() == FAHRENHEIT)
+ v = fahrenheit_to_celsius(v);
- if (p)
- p->alarm_high_threshold = gtk_spin_button_get_value(btn);
+ config_set_sensor_alarm_high_threshold(s->id, v);
+ s->alarm_high_threshold = v;
+
+ apply_config((struct ui_psensor *)data);
}
void
ui_sensorpref_alarm_low_threshold_changed_cb(GtkSpinButton *btn, gpointer data)
{
- struct sensor_pref *p;
+ struct psensor *s;
+ gdouble v;
+
+ if (ignore_changes)
+ return;
+
+ s = get_selected_sensor();
+ if (!s)
+ return;
+
+ v = gtk_spin_button_get_value(btn);
+ if (config_get_temperature_unit() == FAHRENHEIT)
+ v = fahrenheit_to_celsius(v);
- p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+ config_set_sensor_alarm_low_threshold(s->id, v);
+ s->alarm_low_threshold = v;
- if (p)
- p->alarm_low_threshold = gtk_spin_button_get_value(btn);
+ apply_config((struct ui_psensor *)data);
}
-static void
-update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
+static void update_pref(struct psensor *s)
{
- GtkLabel *w_id, *w_type, *w_high_threshold_unit, *w_low_threshold_unit,
- *w_chipname;
- GtkEntry *w_name;
- GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled,
- *w_appindicator_label_enabled, *w_display;
- GtkColorButton *w_color;
- GtkSpinButton *w_high_threshold, *w_low_threshold;
- GdkRGBA color;
- struct psensor *s;
- int use_celsius;
-
- s = p->sensor;
+ int use_celsius, threshold;
+ GdkRGBA *color;
+ const char *chip;
+ char *smin, *smax;
- w_id = GTK_LABEL(gtk_builder_get_object(builder, "sensor_id"));
- gtk_label_set_text(w_id, s->id);
+ if (!s)
+ return;
- w_type = GTK_LABEL(gtk_builder_get_object(builder, "sensor_type"));
- gtk_label_set_text(w_type, psensor_type_to_str(s->type));
+ ignore_changes = true;
- w_name = GTK_ENTRY(gtk_builder_get_object(builder, "sensor_name"));
- gtk_entry_set_text(w_name, p->name);
+ gtk_label_set_text(w_sensor_id, s->id);
+ gtk_label_set_text(w_sensor_type, psensor_type_to_str(s->type));
+ gtk_entry_set_text(w_sensor_name, s->name);
- w_chipname = GTK_LABEL(gtk_builder_get_object(builder, "chip_name"));
if (s->chip)
- gtk_label_set_text(w_chipname, s->chip);
+ chip = 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->graph_enabled);
-
- 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_chooser_set_rgba(GTK_COLOR_CHOOSER(w_color), &color);
-
- w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
- "sensor_alarm"));
- 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_celsius = cfg->temperature_unit == CELSIUS ? 1 : 0;
- gtk_label_set_text(w_high_threshold_unit,
- psensor_type_to_unit_str(s->type,
- use_celsius));
- gtk_label_set_text(w_low_threshold_unit,
- psensor_type_to_unit_str(s->type,
- use_celsius));
+ chip = _("Unknown");
+ gtk_label_set_text(w_sensor_chipname, chip);
- w_appindicator_enabled = GTK_TOGGLE_BUTTON
- (gtk_builder_get_object(builder, "indicator_checkbox"));
- w_appindicator_label_enabled = GTK_TOGGLE_BUTTON
- (gtk_builder_get_object(builder, "indicator_label_checkbox"));
+ use_celsius = config_get_temperature_unit() == CELSIUS ? 1 : 0;
- 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 (s->min == UNKNOWN_DBL_VALUE)
+ smin = strdup(_("Unknown"));
+ else
+ smin = psensor_value_to_str(s->type, s->min, use_celsius);
+
+ gtk_label_set_text(w_sensor_min, smin);
+ free(smin);
+
+ if (s->max == UNKNOWN_DBL_VALUE)
+ smax = strdup(_("Unknown"));
+ else
+ smax = psensor_value_to_str(s->type, s->max, use_celsius);
+ gtk_label_set_text(w_sensor_max, smax);
+ free(smax);
+
+ gtk_toggle_button_set_active(w_sensor_draw,
+ config_is_sensor_graph_enabled(s->id));
+
+ gtk_toggle_button_set_active(w_sensor_display,
+ config_is_sensor_enabled(s->id));
+
+ color = config_get_sensor_color(s->id);
+ gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(w_sensor_color), color);
+ gdk_rgba_free(color);
+
+ gtk_label_set_text(w_sensor_high_threshold_unit,
+ psensor_type_to_unit_str(s->type, use_celsius));
+ gtk_label_set_text(w_sensor_low_threshold_unit,
+ psensor_type_to_unit_str(s->type, use_celsius));
+
+ 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_sensor_alarm,
+ config_get_sensor_alarm_enabled(s->id));
+
+ threshold = s->alarm_high_threshold;
+ if (!use_celsius)
+ threshold = celsius_to_fahrenheit(threshold);
+ gtk_spin_button_set_value(w_sensor_high_threshold, threshold);
+
+ threshold = s->alarm_low_threshold;
+ if (!use_celsius)
+ threshold = celsius_to_fahrenheit(threshold);
+ gtk_spin_button_set_value(w_sensor_low_threshold, threshold);
gtk_toggle_button_set_active(w_appindicator_enabled,
- p->appindicator_enabled);
+ config_is_appindicator_enabled(s->id));
+
+ gtk_toggle_button_set_active
+ (w_appindicator_label_enabled,
+ config_is_appindicator_label_enabled(s->id));
- gtk_toggle_button_set_active(w_appindicator_label_enabled,
- p->appindicator_label_enabled);
+ ignore_changes = false;
}
-static void on_changed(GtkTreeSelection *selection, gpointer data)
+void
+ui_sensorpref_tree_selection_changed_cb(GtkTreeSelection *sel, gpointer data)
{
- struct cb_data *cbdata = data;
- struct ui_psensor *ui = cbdata->ui;
- struct sensor_pref *p;
- GtkTreeView *tree;
-
- tree = GTK_TREE_VIEW(gtk_builder_get_object(cbdata->builder,
- "sensors_list"));
- p = get_selected_sensor_pref(tree);
- update_pref(p, ui->config, cbdata->builder);
+ update_pref(get_selected_sensor());
}
-static void
-select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
+static void select_sensor(struct psensor *s, struct psensor **sensors)
{
struct psensor **s_cur;
int i;
GtkTreePath *p;
+ GtkTreeSelection *sel;
- p = NULL;
for (s_cur = sensors, i = 0; *s_cur; s_cur++, i++)
if (s == *s_cur) {
p = gtk_tree_path_new_from_indices(i, -1);
- break;
- }
+ sel = gtk_tree_view_get_selection(w_sensors_list);
+ gtk_tree_selection_select_path(sel, p);
- if (p) {
- GtkTreeSelection *s = gtk_tree_view_get_selection(tree);
+ gtk_tree_path_free(p);
- gtk_tree_selection_select_path(s, p);
- gtk_tree_path_free(p);
- }
+ update_pref(s);
+ break;
+ }
}
-static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
+static void quit(void)
{
- struct psensor *s;
-
- s = p->sensor;
-
- if (strcmp(p->name, s->name)) {
- free(s->name);
- s->name = strdup(p->name);
- 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);
- }
-
- if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) {
- s->alarm_high_threshold
- = fahrenheit_to_celsius(p->alarm_high_threshold);
- s->alarm_low_threshold
- = fahrenheit_to_celsius(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, s->alarm_enabled);
- }
-
- 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);
- }
-
- 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);
+ gtk_widget_destroy(GTK_WIDGET(w_dialog));
+ w_dialog = NULL;
}
-static void apply_prefs(GtkTreeModel *model, struct config *cfg)
+static gboolean
+on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
{
- gboolean valid;
- struct sensor_pref *spref;
- GtkTreeIter iter;
- int i;
+ quit();
+ return TRUE;
+}
- valid = gtk_tree_model_get_iter_first(model, &iter);
- i = 0;
- while (valid) {
- gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &spref, -1);
- apply_pref(spref, i, cfg);
- valid = gtk_tree_model_iter_next(model, &iter);
- i++;
- }
- config_sync();
+void ui_sensorpref_close_clicked_cb(GtkButton *btn, gpointer data)
+{
+ quit();
}
-void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
+static GtkBuilder *load_ui(struct ui_psensor *ui)
{
- GtkDialog *diag;
- gint result;
- guint ok;
GtkBuilder *builder;
GError *error;
- GtkTreeView *w_sensors_list;
- GtkListStore *store;
- struct psensor **s_cur, *s, **ordered_sensors;
- GtkTreeSelection *selection;
- struct cb_data cbdata;
- GtkTreeIter iter;
- struct sensor_pref *spref;
- gboolean valid;
- GtkTreeModel *model;
+ guint ok;
- cbdata.ui = ui;
+ error = NULL;
builder = gtk_builder_new();
- cbdata.builder = builder;
-
- error = NULL;
ok = gtk_builder_add_from_file
(builder,
PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "sensor-edit.glade",
if (!ok) {
log_printf(LOG_ERR, error->message);
g_error_free(error);
- return;
+ return NULL;
}
- w_sensors_list
- = GTK_TREE_VIEW(gtk_builder_get_object(builder,
- "sensors_list"));
- gtk_builder_connect_signals(builder, w_sensors_list);
+ w_sensors_list = GTK_TREE_VIEW
+ (gtk_builder_get_object(builder, "sensors_list"));
+ w_dialog = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1"));
+ w_sensor_id = GTK_LABEL(gtk_builder_get_object(builder, "sensor_id"));
+ w_sensor_type = GTK_LABEL
+ (gtk_builder_get_object(builder, "sensor_type"));
+ w_sensor_name = GTK_ENTRY
+ (gtk_builder_get_object(builder, "sensor_name"));
+ w_sensor_chipname = GTK_LABEL
+ (gtk_builder_get_object(builder, "chip_name"));
+ w_sensor_min = GTK_LABEL
+ (gtk_builder_get_object(builder, "sensor_min"));
+ w_sensor_max = GTK_LABEL
+ (gtk_builder_get_object(builder, "sensor_max"));
+ w_sensor_draw = GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object(builder, "sensor_draw"));
+ w_sensor_display = GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object(builder, "sensor_enable_checkbox"));
+ w_sensor_color = GTK_COLOR_BUTTON
+ (gtk_builder_get_object(builder, "sensor_color"));
+ w_sensor_alarm = GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object(builder, "sensor_alarm"));
+ w_sensor_high_threshold
+ = GTK_SPIN_BUTTON(gtk_builder_get_object
+ (builder, "sensor_alarm_high_threshold"));
+ w_sensor_low_threshold
+ = GTK_SPIN_BUTTON(gtk_builder_get_object
+ (builder, "sensor_alarm_low_threshold"));
+ w_sensor_high_threshold_unit
+ = GTK_LABEL(gtk_builder_get_object
+ (builder, "sensor_alarm_high_threshold_unit"));
+ w_sensor_low_threshold_unit
+ = GTK_LABEL(gtk_builder_get_object
+ (builder, "sensor_alarm_low_threshold_unit"));
+ w_appindicator_enabled = GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object(builder, "indicator_checkbox"));
+ w_appindicator_label_enabled = GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object(builder, "indicator_label_checkbox"));
store = GTK_LIST_STORE(gtk_builder_get_object(builder,
"sensors_liststore"));
- ordered_sensors = ui_get_sensors_ordered_by_position(ui);
+ gtk_window_set_transient_for(GTK_WINDOW(w_dialog),
+ GTK_WINDOW(ui->main_window));
+ gtk_builder_connect_signals(builder, ui);
+
+ g_signal_connect(w_dialog,
+ "delete_event",
+ G_CALLBACK(on_delete_event_cb),
+ w_dialog);
+
+ return builder;
+}
+
+static void populate(struct psensor *sensor, struct psensor **sensors)
+{
+ GtkTreeIter iter;
+ struct psensor **s_cur, **ordered_sensors, *s;
+
+ gtk_list_store_clear(store);
+
+ ordered_sensors = ui_get_sensors_ordered_by_position(sensors);
for (s_cur = ordered_sensors; *s_cur; s_cur++) {
s = *s_cur;
gtk_list_store_append(store, &iter);
- spref = sensor_pref_new(s, ui->config);
gtk_list_store_set(store, &iter,
COL_NAME, s->name,
- COL_SENSOR_PREF, spref,
+ COL_SENSOR_PREF, s,
-1);
-
- if (s == sensor)
- update_pref(spref, ui->config, builder);
}
- selection = gtk_tree_view_get_selection(w_sensors_list);
- g_signal_connect(selection, "changed", G_CALLBACK(on_changed), &cbdata);
- select_sensor(sensor, ordered_sensors, w_sensors_list);
+ select_sensor(sensor, ordered_sensors);
free(ordered_sensors);
+}
- diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1"));
- result = gtk_dialog_run(diag);
+void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
+{
+ GtkBuilder *builder;
- model = gtk_tree_view_get_model(w_sensors_list);
+ if (w_dialog == NULL) {
+ builder = load_ui(ui);
- if (result == GTK_RESPONSE_ACCEPT) {
- apply_prefs(model, ui->config);
- ui_sensorlist_update(ui, 1);
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
- ui_appindicator_update_menu(ui);
-#endif
- }
+ if (!builder)
+ return;
- valid = gtk_tree_model_get_iter_first(model, &iter);
- while (valid) {
- gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &spref, -1);
- sensor_pref_free(spref);
- valid = gtk_tree_model_iter_next(model, &iter);
+ g_object_unref(G_OBJECT(builder));
}
- g_object_unref(G_OBJECT(builder));
+ populate(sensor, ui->sensors);
- gtk_widget_destroy(GTK_WIDGET(diag));
+ gtk_window_present(GTK_WINDOW(w_dialog));
}
projects / psensor-pkg-debian.git / blobdiff