X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=b87d53dcb97926d669c9735348779487d8b10645;hp=cf399d3d4eb2d6b3efe51ba98c73e97fb321e8e7;hb=02611eef7107eba73945e0ad47edb129c6261cc2;hpb=f055e7507526592d3a74c652f5f053701614c9c0 diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c index cf399d3..b87d53d 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-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 @@ -20,359 +20,400 @@ #include -#include "cfg.h" -#include "ui_pref.h" -#include "ui_sensorlist.h" -#include "ui_sensorpref.h" -#include "ui_color.h" - -struct sensor_pref { - struct psensor *sensor; - char *name; - int enabled; - struct color *color; - int alarm_enabled; - double alarm_limit; +#include +#include +#include +#include +#include +#include +#include + +enum { + COL_NAME = 0, + COL_SENSOR_PREF }; -struct cb_data { - struct ui_psensor *ui; - GtkBuilder *builder; - struct sensor_pref **prefs; -}; +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) +static struct psensor *get_selected_sensor(void) { - struct sensor_pref *p = malloc(sizeof(struct sensor_pref)); + GtkTreeModel *model; + GtkTreeIter iter; + struct psensor *s; + GtkTreeSelection *selection; - p->sensor = s; + selection = gtk_tree_view_get_selection(w_sensors_list); - 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); + 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 **sensor_pref_list_new(struct psensor **sensors) +void ui_sensorpref_name_changed_cb(GtkEntry *entry, gpointer data) { - int n, i; - struct sensor_pref **pref_list; + struct psensor *s; - n = psensor_list_size(sensors); - pref_list = malloc(sizeof(struct sensor_pref *) * (n+1)); + const gchar *str; - for (i = 0; i < n; i++) - pref_list[i] = sensor_pref_new(sensors[i]); + if (ignore_changes) + return; - pref_list[n] = NULL; + s = get_selected_sensor(); - return pref_list; -} + if (!s) + return; -static void sensor_pref_list_free(struct sensor_pref **list) -{ - struct sensor_pref **cur = list; + str = gtk_entry_get_text(entry); - while (*cur) { - sensor_pref_free(*cur); + if (strcmp(str, s->name)) { + free(s->name); + s->name = strdup(str); + config_set_sensor_name(s->id, str); - cur++; + apply_config((struct ui_psensor *)data); } - - free(list); } -static struct sensor_pref * -sensor_pref_get(struct sensor_pref **ps, struct psensor *s) +void ui_sensorpref_draw_toggled_cb(GtkToggleButton *btn, gpointer data) { - struct sensor_pref **p_cur = ps; + gboolean active; + struct psensor *s; - while (*p_cur) { - struct sensor_pref *p = *p_cur; + if (ignore_changes) + return; - if (p->sensor == s) - return p; + s = get_selected_sensor(); - p_cur++; - } + if (!s) + return; + + active = gtk_toggle_button_get_active(btn); + config_set_sensor_graph_enabled(s->id, active); - return NULL; + apply_config((struct ui_psensor *)data); } -static struct sensor_pref * -get_seleted_sensor_pref(GtkBuilder *builder, struct sensor_pref **ps) +void ui_sensorpref_display_toggled_cb(GtkToggleButton *btn, gpointer data) { - GtkTreeModel *model; - GtkTreeIter iter; - struct sensor_pref *pref = NULL; - GtkTreeSelection *selection; - GtkTreeView *tree; + gboolean active; + struct psensor *s; - tree = GTK_TREE_VIEW(gtk_builder_get_object(builder, - "sensors_list")); + if (ignore_changes) + return; - selection = gtk_tree_view_get_selection(tree); + s = get_selected_sensor(); - if (gtk_tree_selection_get_selected(selection, &model, &iter)) { - GtkTreePath *p = gtk_tree_model_get_path(model, &iter); - gint *indices = gtk_tree_path_get_indices(p); + if (!s) + return; - pref = ps[*indices]; + active = gtk_toggle_button_get_active(btn); + config_set_sensor_enabled(s->id, active); - gtk_tree_path_free(p); - } - - return pref; + apply_config((struct ui_psensor *)data); } -static void on_name_changed(GtkEntry *entry, gpointer data) +void ui_sensorpref_alarm_toggled_cb(GtkToggleButton *btn, gpointer data) { - struct cb_data *cbdata = data; - struct sensor_pref *p; - const char *str; + gboolean active; + struct psensor *s; - str = gtk_entry_get_text(entry); + if (ignore_changes) + return; - p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs); + s = get_selected_sensor(); - if (p && strcmp(p->name, str)) { - free(p->name); - p->name = strdup(str); - } + if (!s) + return; + + active = gtk_toggle_button_get_active(btn); + config_set_sensor_alarm_enabled(s->id, active); + + apply_config((struct ui_psensor *)data); } -static void -on_drawed_toggled(GtkToggleButton *btn, gpointer data) +void +ui_sensorpref_appindicator_menu_toggled_cb(GtkToggleButton *btn, gpointer data) { - struct cb_data *cbdata = data; - struct sensor_pref *p; + gboolean active; + struct psensor *s; - p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs); + if (ignore_changes) + return; - if (p) - p->enabled = gtk_toggle_button_get_active(btn); -} + s = get_selected_sensor(); -static void -on_alarm_toggled(GtkToggleButton *btn, gpointer data) -{ - struct cb_data *cbdata = data; - struct sensor_pref *p; + if (!s) + return; - p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs); + active = gtk_toggle_button_get_active(btn); + config_set_appindicator_enabled(s->id, active); - if (p) - p->alarm_enabled = gtk_toggle_button_get_active(btn); + apply_config((struct ui_psensor *)data); } -static void on_color_set(GtkColorButton *widget, gpointer data) +void +ui_sensorpref_appindicator_label_toggled_cb(GtkToggleButton *btn, gpointer data) { - struct cb_data *cbdata = data; - struct sensor_pref *p; - GdkColor color; + gboolean active; + struct psensor *s; - p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs); + if (ignore_changes) + return; - if (p) { - gtk_color_button_get_color(widget, &color); - color_set(p->color, color.red, color.green, color.blue); - } -} + s = get_selected_sensor(); -static void on_temp_limit_changed(GtkSpinButton *btn, gpointer data) -{ - struct cb_data *cbdata = data; - struct sensor_pref *p; + if (!s) + return; - p = get_seleted_sensor_pref(cbdata->builder, cbdata->prefs); + active = gtk_toggle_button_get_active(btn); + config_set_appindicator_label_enabled(s->id, active); - if (p) - p->alarm_limit = gtk_spin_button_get_value(btn); + apply_config((struct ui_psensor *)data); } -static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata) +void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data) { - g_signal_connect(gtk_builder_get_object(builder, "sensor_name"), - "changed", G_CALLBACK(on_name_changed), cbdata); + struct psensor *s; + GdkRGBA color; - g_signal_connect(gtk_builder_get_object(builder, "sensor_draw"), - "toggled", G_CALLBACK(on_drawed_toggled), cbdata); + if (ignore_changes) + return; - g_signal_connect(gtk_builder_get_object(builder, "sensor_color"), - "color-set", G_CALLBACK(on_color_set), cbdata); + s = get_selected_sensor(); + if (!s) + return; - g_signal_connect(gtk_builder_get_object(builder, "sensor_alarm"), - "toggled", G_CALLBACK(on_alarm_toggled), cbdata); + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &color); + config_set_sensor_color(s->id, &color); - g_signal_connect(gtk_builder_get_object(builder, "sensor_temp_limit"), - "value-changed", G_CALLBACK(on_temp_limit_changed), - cbdata); + apply_config((struct ui_psensor *)data); } -static void -update_pref(struct psensor *s, struct sensor_pref **prefs, GtkBuilder *builder) +void +ui_sensorpref_alarm_high_threshold_changed_cb(GtkSpinButton *btn, gpointer data) { - GtkLabel *w_id, *w_type; - GtkEntry *w_name; - GtkToggleButton *w_draw, *w_alarm; - GtkColorButton *w_color; - GtkSpinButton *w_temp_limit; - GdkColor *color; - struct sensor_pref *p = sensor_pref_get(prefs, s); - - w_id = GTK_LABEL(gtk_builder_get_object(builder, "sensor_id")); - gtk_label_set_text(w_id, s->id); - - w_type = GTK_LABEL(gtk_builder_get_object(builder, "sensor_type")); - gtk_label_set_text(w_type, psensor_type_to_str(s->type)); - - w_name = GTK_ENTRY(gtk_builder_get_object(builder, "sensor_name")); - gtk_entry_set_text(w_name, p->name); - - w_draw = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, - "sensor_draw")); - gtk_toggle_button_set_active(w_draw, p->enabled); - - color = color_to_gdkcolor(p->color); - w_color = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, - "sensor_color")); - gtk_color_button_set_color(w_color, color); - - 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)) { - gtk_toggle_button_set_active(w_alarm, p->alarm_enabled); - gtk_spin_button_set_value(w_temp_limit, p->alarm_limit); - gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), TRUE); - } else { - gtk_toggle_button_set_active(w_alarm, 0); - gtk_spin_button_set_value(w_temp_limit, 0); - gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), FALSE); - } + 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); + + config_set_sensor_alarm_high_threshold(s->id, v); + s->alarm_high_threshold = v; + + apply_config((struct ui_psensor *)data); } -static void on_changed(GtkTreeSelection *selection, gpointer data) +void +ui_sensorpref_alarm_low_threshold_changed_cb(GtkSpinButton *btn, gpointer data) { - GtkTreeModel *model; - GtkTreeIter iter; - struct cb_data *cbdata = data; - struct ui_psensor *ui = cbdata->ui; + struct psensor *s; + gdouble v; - if (gtk_tree_selection_get_selected(selection, &model, &iter)) { - GtkTreePath *p = gtk_tree_model_get_path(model, &iter); - gint *indices = gtk_tree_path_get_indices(p); - struct psensor *s = *(ui->sensors + *indices); + if (ignore_changes) + return; - update_pref(s, cbdata->prefs, cbdata->builder); + s = get_selected_sensor(); + if (!s) + return; - gtk_tree_path_free(p); - } + v = gtk_spin_button_get_value(btn); + if (config_get_temperature_unit() == FAHRENHEIT) + v = fahrenheit_to_celsius(v); + + config_set_sensor_alarm_low_threshold(s->id, v); + s->alarm_low_threshold = v; + + apply_config((struct ui_psensor *)data); } -static void -select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree) +static void update_pref(struct psensor *s) { - struct psensor **s_cur = sensors; - int i = 0; - GtkTreePath *p = NULL; + int use_celsius, threshold; + GdkRGBA *color; + const char *chip; + char *smin, *smax; + + if (!s) + return; + + ignore_changes = true; + + 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); + + if (s->chip) + chip = s->chip; + else + chip = _("Unknown"); + gtk_label_set_text(w_sensor_chipname, chip); + + use_celsius = config_get_temperature_unit() == CELSIUS ? 1 : 0; + + 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); + } - while (*s_cur) { - if (s == *s_cur) { - p = gtk_tree_path_new_from_indices(i, -1); - break; - } + gtk_toggle_button_set_active(w_sensor_alarm, + config_get_sensor_alarm_enabled(s->id)); - i++; - s_cur++; - } + threshold = s->alarm_high_threshold; + if (!use_celsius) + threshold = celsius_to_fahrenheit(threshold); + gtk_spin_button_set_value(w_sensor_high_threshold, threshold); - if (p) { - GtkTreeSelection *s = gtk_tree_view_get_selection(tree); + threshold = s->alarm_low_threshold; + if (!use_celsius) + threshold = celsius_to_fahrenheit(threshold); + gtk_spin_button_set_value(w_sensor_low_threshold, threshold); - gtk_tree_selection_select_path(s, p); - gtk_tree_path_free(p); - } + gtk_toggle_button_set_active(w_appindicator_enabled, + config_is_appindicator_enabled(s->id)); + + gtk_toggle_button_set_active + (w_appindicator_label_enabled, + config_is_appindicator_label_enabled(s->id)); + + ignore_changes = false; } -static void -apply_prefs(struct sensor_pref **prefs, struct psensor **sensors) +void +ui_sensorpref_tree_selection_changed_cb(GtkTreeSelection *sel, gpointer data) { - int n = psensor_list_size(sensors); + update_pref(get_selected_sensor()); +} + +static void select_sensor(struct psensor *s, struct psensor **sensors) +{ + struct psensor **s_cur; int i; + GtkTreePath *p; + GtkTreeSelection *sel; - for (i = 0; i < n; i++) { - struct psensor *s = sensors[i]; - struct sensor_pref *p = prefs[i]; + for (s_cur = sensors, i = 0; *s_cur; s_cur++, i++) + if (s == *s_cur) { + p = gtk_tree_path_new_from_indices(i, -1); + sel = gtk_tree_view_get_selection(w_sensors_list); + gtk_tree_selection_select_path(sel, p); - if (strcmp(p->name, s->name)) { - free(s->name); - s->name = strdup(p->name); - config_set_sensor_name(s->id, s->name); - } + gtk_tree_path_free(p); - if (s->enabled != p->enabled) { - s->enabled = p->enabled; - config_set_sensor_enabled(s->id, s->enabled); + update_pref(s); + break; } +} - if (s->alarm_limit != p->alarm_limit) { - s->alarm_limit = p->alarm_limit; - config_set_sensor_alarm_limit(s->id, - s->alarm_limit); - } +static void quit(void) +{ + gtk_widget_destroy(GTK_WIDGET(w_dialog)); + w_dialog = NULL; +} - if (s->alarm_enabled != p->alarm_enabled) { - s->alarm_enabled = p->alarm_enabled; - config_set_sensor_alarm_enabled(s->id, - s->alarm_enabled); - } +static gboolean +on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) +{ + quit(); + return TRUE; +} - color_set(s->color, - p->color->red, p->color->green, p->color->blue); - config_set_sensor_color(s->id, s->color); - } +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; GtkBuilder *builder; - GError *error = NULL; - GtkTreeView *w_sensors_list; + GError *error; 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); + error = NULL; builder = gtk_builder_new(); - cbdata.builder = builder; - ok = gtk_builder_add_from_file (builder, PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "sensor-edit.glade", @@ -381,51 +422,100 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) if (!ok) { log_printf(LOG_ERR, error->message); g_error_free(error); - return ; + return NULL; } - update_pref(sensor, cbdata.prefs, 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); + 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")); + + 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; +} - store = GTK_LIST_STORE(gtk_tree_view_get_model(w_sensors_list)); +static void populate(struct psensor *sensor, struct psensor **sensors) +{ + GtkTreeIter iter; + struct psensor **s_cur, **ordered_sensors, *s; - s_cur = ui->sensors; - while (*s_cur) { - GtkTreeIter iter; - struct psensor *s = *s_cur; + 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); - gtk_list_store_set(store, &iter, 0, s->name, -1); - s_cur++; + gtk_list_store_set(store, &iter, + COL_NAME, s->name, + COL_SENSOR_PREF, s, + -1); } - selection = gtk_tree_view_get_selection(w_sensors_list); - g_signal_connect(selection, "changed", G_CALLBACK(on_changed), &cbdata); - select_sensor(sensor, ui->sensors, w_sensors_list); + select_sensor(sensor, ordered_sensors); - diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1")); - result = gtk_dialog_run(diag); + free(ordered_sensors); +} - if (result == GTK_RESPONSE_ACCEPT) { - apply_prefs(cbdata.prefs, ui->sensors); - ui_sensorlist_update_sensors_preferences(ui); - } +void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) +{ + GtkBuilder *builder; + + if (w_dialog == NULL) { + builder = load_ui(ui); - g_object_unref(G_OBJECT(builder)); + if (!builder) + return; + + g_object_unref(G_OBJECT(builder)); + } - gtk_widget_destroy(GTK_WIDGET(diag)); + populate(sensor, ui->sensors); - sensor_pref_list_free(cbdata.prefs); + gtk_window_present(GTK_WINDOW(w_dialog)); }