X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fui_pref.c;fp=src%2Fui_pref.c;h=54947779e3377a71a853299a054d574da6dc70ea;hp=4dd4bf8309f855a602c1046190cd03e6a178b492;hb=4e6ce51e7afeb7924573c40796910cd003850949;hpb=29dd6f0e20b1f109b1fbdd8a30f02b0f0dc1f103 diff --git a/src/ui_pref.c b/src/ui_pref.c index 4dd4bf8..5494777 100644 --- a/src/ui_pref.c +++ b/src/ui_pref.c @@ -19,19 +19,21 @@ #include #include -#include "ui.h" -#include "cfg.h" -#include "ui_pref.h" -#include "ui_color.h" +#include +#include +#include +#include +#include #include -GdkColor *color_to_gdkcolor(struct color *color) +GdkRGBA color_to_GdkRGBA(struct color *color) { - GdkColor *c = malloc(sizeof(GdkColor)); + GdkRGBA c; - c->red = color->red; - c->green = color->green; - c->blue = color->blue; + c.red = color->red; + c.green = color->green; + c.blue = color->blue; + c.alpha = 1.0; return c; } @@ -44,15 +46,17 @@ void ui_pref_dialog_run(struct ui_psensor *ui) GtkBuilder *builder; guint ok; GError *error = NULL; - GdkColor *color_fg, *color_bg; - GtkColorButton *w_color_fg, *w_color_bg; + GdkRGBA color_fg, color_bg; + GtkColorChooser *w_color_fg, *w_color_bg; GtkScale *w_bg_opacity; GtkSpinButton *w_update_interval, *w_monitoring_duration, *w_s_update_interval, *w_slog_interval; GtkComboBox *w_sensorlist_pos; GtkToggleButton *w_hide_window_decoration, *w_keep_window_below, *w_enable_menu, *w_enable_launcher_counter, *w_hide_on_startup, - *w_win_restore, *w_slog_enabled, *w_autostart; + *w_win_restore, *w_slog_enabled, *w_autostart, *w_smooth_curves, + *w_atiadlsdk, *w_lmsensors, *w_nvctrl, *w_gtop2, *w_hddtemp, + *w_libatasmart, *w_udisks2; GtkComboBoxText *w_temp_unit; GtkEntry *w_notif_script; char *notif_script; @@ -69,7 +73,7 @@ void ui_pref_dialog_run(struct ui_psensor *ui) if (!ok) { log_printf(LOG_ERR, error->message); g_error_free(error); - return ; + return; } diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1")); @@ -82,15 +86,15 @@ void ui_pref_dialog_run(struct ui_psensor *ui) free(notif_script); } - color_fg = color_to_gdkcolor(cfg->graph_fgcolor); - w_color_fg = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, - "color_fg")); - gtk_color_button_set_color(w_color_fg, color_fg); + color_fg = color_to_GdkRGBA(cfg->graph_fgcolor); + w_color_fg = GTK_COLOR_CHOOSER(gtk_builder_get_object(builder, + "color_fg")); + gtk_color_chooser_set_rgba(w_color_fg, &color_fg); - color_bg = color_to_gdkcolor(cfg->graph_bgcolor); - w_color_bg = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, + color_bg = color_to_GdkRGBA(cfg->graph_bgcolor); + w_color_bg = GTK_COLOR_CHOOSER(gtk_builder_get_object(builder, "color_bg")); - gtk_color_button_set_color(w_color_bg, color_bg); + gtk_color_chooser_set_rgba(w_color_bg, &color_bg); w_bg_opacity = GTK_SCALE(gtk_builder_get_object(builder, "bg_opacity")); @@ -140,6 +144,11 @@ void ui_pref_dialog_run(struct ui_psensor *ui) gtk_toggle_button_set_active(w_enable_launcher_counter, !cfg->unity_launcher_count_disabled); + w_smooth_curves = GTK_TOGGLE_BUTTON + (gtk_builder_get_object(builder, "graph_smooth_curves")); + gtk_toggle_button_set_active(w_smooth_curves, + config_is_smooth_curves_enabled()); + w_slog_enabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "enable_slog")); gtk_toggle_button_set_active(w_slog_enabled, cfg->slog_enabled); @@ -165,24 +174,82 @@ void ui_pref_dialog_run(struct ui_psensor *ui) gtk_combo_box_set_active(GTK_COMBO_BOX(w_temp_unit), cfg->temperature_unit); + /* providers */ + w_lmsensors + = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, + "lmsensors")); + gtk_toggle_button_set_active(w_lmsensors, config_is_lmsensor_enabled()); + + w_nvctrl + = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, + "nvctrl")); +#if !HAVE_NVIDIA + gtk_widget_set_sensitive(GTK_WIDGET(w_nvctrl), 0); +#endif + gtk_toggle_button_set_active(w_nvctrl, config_is_nvctrl_enabled()); + + w_atiadlsdk + = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, + "atiadlsdk")); +#if !HAVE_LIBATIADL + gtk_widget_set_sensitive(GTK_WIDGET(w_atiadlsdk), 0); +#endif + gtk_toggle_button_set_active(w_atiadlsdk, + config_is_atiadlsdk_enabled()); + + w_gtop2 + = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, + "gtop2")); +#if !HAVE_GTOP + gtk_widget_set_sensitive(GTK_WIDGET(w_gtop2), 0); +#endif + gtk_toggle_button_set_active(w_gtop2, config_is_gtop2_enabled()); + + w_hddtemp + = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, + "hddtemp")); + gtk_toggle_button_set_active(w_hddtemp, config_is_hddtemp_enabled()); + + + w_libatasmart + = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, + "libatasmart")); +#if !HAVE_ATASMART + gtk_widget_set_sensitive(GTK_WIDGET(w_libatasmart), 0); +#endif + gtk_toggle_button_set_active(w_libatasmart, + config_is_libatasmart_enabled()); + + w_udisks2 + = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, + "udisks2")); +#if !HAVE_LIBUDISKS2 + gtk_widget_set_sensitive(GTK_WIDGET(w_udisks2), 0); +#endif + gtk_toggle_button_set_active(w_udisks2, config_is_udisks2_enabled()); + result = gtk_dialog_run(diag); if (result == GTK_RESPONSE_ACCEPT) { double value; - GdkColor color; + GdkRGBA color; pthread_mutex_lock(&ui->sensors_mutex); config_set_notif_script (gtk_entry_get_text(GTK_ENTRY(w_notif_script))); - gtk_color_button_get_color(w_color_fg, &color); + gtk_color_chooser_get_rgba(w_color_fg, &color); color_set(cfg->graph_fgcolor, - color.red, color.green, color.blue); + color.red, + color.green, + color.blue); - gtk_color_button_get_color(w_color_bg, &color); + gtk_color_chooser_get_rgba(w_color_bg, &color); color_set(cfg->graph_bgcolor, - color.red, color.green, color.blue); + color.red, + color.green, + color.blue); value = gtk_range_get_value(GTK_RANGE(w_bg_opacity)); cfg->graph_bg_alpha = value; @@ -224,10 +291,6 @@ void ui_pref_dialog_run(struct ui_psensor *ui) = gtk_spin_button_get_value_as_int (w_monitoring_duration); - cfg->sensor_values_max_length - = (cfg->graph_monitoring_duration * 60) / - cfg->sensor_update_interval; - cfg->hide_on_startup = gtk_toggle_button_get_active(w_hide_on_startup); @@ -243,8 +306,34 @@ void ui_pref_dialog_run(struct ui_psensor *ui) cfg->temperature_unit = gtk_combo_box_get_active(GTK_COMBO_BOX(w_temp_unit)); + cfg->sensor_values_max_length = compute_values_max_length(cfg); + config_save(cfg); + config_set_smooth_curves_enabled + (gtk_toggle_button_get_active(w_smooth_curves)); + + config_set_lmsensor_enable + (gtk_toggle_button_get_active(w_lmsensors)); + + config_set_nvctrl_enable + (gtk_toggle_button_get_active(w_nvctrl)); + + config_set_atiadlsdk_enable + (gtk_toggle_button_get_active(w_atiadlsdk)); + + config_set_gtop2_enable + (gtk_toggle_button_get_active(w_gtop2)); + + config_set_hddtemp_enable + (gtk_toggle_button_get_active(w_hddtemp)); + + config_set_libatasmart_enable + (gtk_toggle_button_get_active(w_libatasmart)); + + config_set_udisks2_enable + (gtk_toggle_button_get_active(w_udisks2)); + pxdg_set_autostart(gtk_toggle_button_get_active(w_autostart)); pthread_mutex_unlock(&ui->sensors_mutex);