X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fui_pref.c;h=8d2c8ab5942c854663d34404b15a7c519aac2098;hp=b9bc3c4b4cb18d7e48fed711767ee531e53f9d78;hb=3361fda8735c65887a859c9faf287cb105ae6bc8;hpb=f055e7507526592d3a74c652f5f053701614c9c0 diff --git a/src/ui_pref.c b/src/ui_pref.c index b9bc3c4..8d2c8ab 100644 --- a/src/ui_pref.c +++ b/src/ui_pref.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 @@ -19,19 +19,60 @@ #include #include -#include "ui.h" -#include "cfg.h" -#include "ui_pref.h" -#include "ui_color.h" -#include "compat.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void ui_pref_decoration_toggled_cbk(GtkToggleButton *btn, gpointer data) +{ + config_set_window_decoration_enabled + (!gtk_toggle_button_get_active(btn)); +} + +void ui_pref_keep_below_toggled_cbk(GtkToggleButton *btn, gpointer data) +{ + config_set_window_keep_below_enabled + (gtk_toggle_button_get_active(btn)); +} + +void ui_pref_temperature_unit_changed_cbk(GtkComboBox *combo, gpointer data) +{ + config_set_temperature_unit(gtk_combo_box_get_active(combo)); +} + +void ui_pref_menu_toggled_cbk(GtkToggleButton *btn, gpointer data) +{ + config_set_menu_bar_enabled(gtk_toggle_button_get_active(btn)); +} + +void ui_pref_count_visible_toggled_cbk(GtkToggleButton *btn, gpointer data) +{ + config_set_count_visible(gtk_toggle_button_get_active(btn)); +} + +void ui_pref_sensorlist_position_changed_cbk(GtkComboBox *combo, gpointer data) +{ + config_set_sensorlist_position(gtk_combo_box_get_active(combo)); +} -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 +85,20 @@ 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; - GtkHScale *w_bg_opacity; + 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_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; + GtkToggleButton *w_enable_menu, *w_enable_launcher_counter, + *w_hide_on_startup, *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, + *w_decoration, *w_keep_below; + GtkComboBoxText *w_temp_unit; + GtkEntry *w_notif_script; + char *notif_script; cfg = ui->config; @@ -66,23 +112,31 @@ 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")); - 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); + w_notif_script = GTK_ENTRY(gtk_builder_get_object(builder, + "notif_script")); + notif_script = config_get_notif_script(); + if (notif_script) { + gtk_entry_set_text(GTK_ENTRY(w_notif_script), notif_script); + free(notif_script); + } - color_bg = color_to_gdkcolor(cfg->graph_bgcolor); - w_color_bg = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, + 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_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_HSCALE(gtk_builder_get_object(builder, - "bg_opacity")); + w_bg_opacity = GTK_SCALE(gtk_builder_get_object(builder, + "bg_opacity")); gtk_range_set_value(GTK_RANGE(w_bg_opacity), cfg->graph_bg_alpha); w_update_interval = GTK_SPIN_BUTTON(gtk_builder_get_object @@ -96,6 +150,16 @@ void ui_pref_dialog_run(struct ui_psensor *ui) gtk_spin_button_set_value(w_s_update_interval, cfg->sensor_update_interval); + w_decoration = GTK_TOGGLE_BUTTON(gtk_builder_get_object + (builder, "hide_window_decoration")); + gtk_toggle_button_set_active(w_decoration, + !config_is_window_decoration_enabled()); + + w_keep_below = GTK_TOGGLE_BUTTON(gtk_builder_get_object + (builder, "keep_window_below")); + gtk_toggle_button_set_active(w_keep_below, + config_is_window_keep_below_enabled()); + w_monitoring_duration = GTK_SPIN_BUTTON(gtk_builder_get_object (builder, "monitoring_duration")); @@ -104,26 +168,45 @@ void ui_pref_dialog_run(struct ui_psensor *ui) w_sensorlist_pos = GTK_COMBO_BOX (gtk_builder_get_object(builder, "sensors_list_position")); - gtk_combo_box_set_active(w_sensorlist_pos, cfg->sensorlist_position); - - w_hide_window_decoration = GTK_TOGGLE_BUTTON - (gtk_builder_get_object(builder, "hide_window_decoration")); - gtk_toggle_button_set_active(w_hide_window_decoration, - !cfg->window_decoration_enabled); + gtk_combo_box_set_active(w_sensorlist_pos, + config_get_sensorlist_position()); - w_keep_window_below = GTK_TOGGLE_BUTTON - (gtk_builder_get_object(builder, "keep_window_below")); - gtk_toggle_button_set_active(w_keep_window_below, - cfg->window_keep_below_enabled); + w_autostart = GTK_TOGGLE_BUTTON + (gtk_builder_get_object(builder, "autostart")); + gtk_toggle_button_set_active(w_autostart, pxdg_is_autostarted()); w_enable_menu = GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "enable_menu")); - gtk_toggle_button_set_active(w_enable_menu, !cfg->menu_bar_disabled); + gtk_toggle_button_set_active(w_enable_menu, + config_is_menu_bar_enabled()); w_enable_launcher_counter = GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "enable_launcher_counter")); gtk_toggle_button_set_active(w_enable_launcher_counter, - !cfg->unity_launcher_count_disabled); + config_is_count_visible()); + + if (ui_unity_is_supported()) { + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_enable_launcher_counter), FALSE); + } else { + gtk_widget_set_sensitive + (GTK_WIDGET(w_enable_launcher_counter), FALSE); + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_enable_launcher_counter), TRUE); + } + + 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); + + w_slog_interval = GTK_SPIN_BUTTON + (gtk_builder_get_object(builder, "slog_interval")); + gtk_spin_button_set_value(w_slog_interval, cfg->slog_interval); w_hide_on_startup = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, @@ -136,21 +219,123 @@ void ui_pref_dialog_run(struct ui_psensor *ui) gtk_toggle_button_set_active(w_win_restore, cfg->window_restore_enabled); + w_temp_unit + = GTK_COMBO_BOX_TEXT(gtk_builder_get_object + (builder, "temperature_unit")); + gtk_combo_box_set_active(GTK_COMBO_BOX(w_temp_unit), + config_get_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()); + + if (lmsensor_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_lmsensors), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_lmsensors), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_lmsensors), TRUE); + } + + w_nvctrl + = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, + "nvctrl")); + + if (nvidia_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_nvctrl), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_nvctrl), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_nvctrl), TRUE); + } + + gtk_toggle_button_set_active(w_nvctrl, config_is_nvctrl_enabled()); + + w_atiadlsdk + = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, + "atiadlsdk")); + if (amd_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_atiadlsdk), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_atiadlsdk), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_atiadlsdk), TRUE); + } + + gtk_toggle_button_set_active(w_atiadlsdk, + config_is_atiadlsdk_enabled()); + + w_gtop2 + = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, + "gtop2")); + + if (gtop2_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_gtop2), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_gtop2), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_gtop2), TRUE); + } + + 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 (atasmart_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_libatasmart), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_libatasmart), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_libatasmart), TRUE); + } + + gtk_toggle_button_set_active(w_libatasmart, + config_is_libatasmart_enabled()); + + w_udisks2 + = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, + "udisks2")); + + if (udisks2_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_udisks2), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_udisks2), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_udisks2), TRUE); + } + + gtk_toggle_button_set_active(w_udisks2, config_is_udisks2_enabled()); + + gtk_window_set_transient_for(GTK_WINDOW(diag), + GTK_WINDOW(ui->main_window)); + gtk_builder_connect_signals(builder, NULL); + result = gtk_dialog_run(diag); if (result == GTK_RESPONSE_ACCEPT) { double value; - GdkColor color; + GdkRGBA color; - g_mutex_lock(ui->sensors_mutex); + pthread_mutex_lock(&ui->sensors_mutex); - gtk_color_button_get_color(w_color_fg, &color); + config_set_notif_script + (gtk_entry_get_text(GTK_ENTRY(w_notif_script))); + + 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; @@ -160,28 +345,6 @@ void ui_pref_dialog_run(struct ui_psensor *ui) else cfg->alpha_channel_enabled = 1; - cfg->sensorlist_position - = gtk_combo_box_get_active(w_sensorlist_pos); - - cfg->window_decoration_enabled = - !gtk_toggle_button_get_active(w_hide_window_decoration); - - cfg->window_keep_below_enabled - = gtk_toggle_button_get_active(w_keep_window_below); - - cfg->menu_bar_disabled - = !gtk_toggle_button_get_active(w_enable_menu); - - cfg->unity_launcher_count_disabled - = !gtk_toggle_button_get_active - (w_enable_launcher_counter); - - gtk_window_set_decorated(GTK_WINDOW(ui->main_window), - cfg->window_decoration_enabled); - - gtk_window_set_keep_below(GTK_WINDOW(ui->main_window), - cfg->window_keep_below_enabled); - cfg->sensor_update_interval = gtk_spin_button_get_value_as_int(w_s_update_interval); @@ -192,19 +355,49 @@ 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); cfg->window_restore_enabled = gtk_toggle_button_get_active(w_win_restore); + cfg->slog_enabled + = gtk_toggle_button_get_active(w_slog_enabled); + + cfg->slog_interval + = gtk_spin_button_get_value_as_int(w_slog_interval); + + cfg->sensor_values_max_length = compute_values_max_length(cfg); + config_save(cfg); - g_mutex_unlock(ui->sensors_mutex); + 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); ui_window_update(ui); }