X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_pref.c;h=3a181c3e2dea778ea2b458df7872531f0000b4e9;hb=30280f0093e8aea4bc8af8a46c2e529e8ec61ac9;hp=f6cb5a513cdf076591c3c8246adba0c6376e17c5;hpb=8b71ec661efef4e00a454dc4d7168b6bddab32e7;p=psensor.git diff --git a/src/ui_pref.c b/src/ui_pref.c index f6cb5a5..3a181c3 100644 --- a/src/ui_pref.c +++ b/src/ui_pref.c @@ -20,16 +20,45 @@ #include #include -#include #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)); +} GdkRGBA color_to_GdkRGBA(struct color *color) { @@ -57,11 +86,11 @@ void ui_pref_dialog_run(struct ui_psensor *ui) 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_smooth_curves, - *w_atiadlsdk, *w_lmsensors, *w_nvctrl, *w_gtop2, *w_hddtemp, - *w_libatasmart, *w_udisks2; + 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; @@ -116,6 +145,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")); @@ -126,36 +165,29 @@ void ui_pref_dialog_run(struct ui_psensor *ui) (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); - - 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); -#if !HAVE_UNITY - gtk_widget_set_sensitive(GTK_WIDGET(w_enable_launcher_counter), FALSE); - gtk_widget_set_has_tooltip(GTK_WIDGET(w_enable_launcher_counter), TRUE); -#else - gtk_widget_set_has_tooltip(GTK_WIDGET(w_enable_launcher_counter), - FALSE); -#endif + 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")); @@ -185,7 +217,7 @@ void ui_pref_dialog_run(struct ui_psensor *ui) = GTK_COMBO_BOX_TEXT(gtk_builder_get_object (builder, "temperature_unit")); gtk_combo_box_set_active(GTK_COMBO_BOX(w_temp_unit), - cfg->temperature_unit); + config_get_temperature_unit()); /* providers */ w_lmsensors @@ -248,12 +280,14 @@ void ui_pref_dialog_run(struct ui_psensor *ui) w_libatasmart = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "libatasmart")); -#if !HAVE_ATASMART - gtk_widget_set_sensitive(GTK_WIDGET(w_libatasmart), 0); - gtk_widget_set_has_tooltip(GTK_WIDGET(w_libatasmart), TRUE); -#else - gtk_widget_set_has_tooltip(GTK_WIDGET(w_libatasmart), FALSE); -#endif + + 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()); @@ -270,6 +304,8 @@ void ui_pref_dialog_run(struct ui_psensor *ui) gtk_toggle_button_set_active(w_udisks2, config_is_udisks2_enabled()); + gtk_builder_connect_signals(builder, NULL); + result = gtk_dialog_run(diag); if (result == GTK_RESPONSE_ACCEPT) { @@ -304,25 +340,10 @@ void ui_pref_dialog_run(struct ui_psensor *ui) 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); @@ -345,9 +366,6 @@ void ui_pref_dialog_run(struct ui_psensor *ui) cfg->slog_interval = gtk_spin_button_get_value_as_int(w_slog_interval); - 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);