X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_pref.c;h=0df9f1c0e2b6a55eadfc33012f212a848b8129c8;hb=86b65fb45db977c76c592f14272837e64ed60208;hp=6f7f3b649e107d51dd0e40fc2b67d4b92fc89ceb;hpb=2c551d611a80ed9971d4a8921a7bb7d14731ee59;p=psensor.git diff --git a/src/ui_pref.c b/src/ui_pref.c index 6f7f3b6..0df9f1c 100644 --- a/src/ui_pref.c +++ b/src/ui_pref.c @@ -20,14 +20,50 @@ #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)); +} + +void ui_pref_sensorlist_position_changed_cbk(GtkComboBox *combo, gpointer data) +{ + config_set_sensorlist_position(gtk_combo_box_get_active(combo)); +} GdkRGBA color_to_GdkRGBA(struct color *color) { @@ -55,11 +91,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; @@ -114,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")); @@ -122,17 +168,8 @@ 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); - - 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); + gtk_combo_box_set_active(w_sensorlist_pos, + config_get_sensorlist_position()); w_autostart = GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "autostart")); @@ -140,20 +177,23 @@ void ui_pref_dialog_run(struct ui_psensor *ui) 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 !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")); @@ -183,7 +223,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 @@ -191,6 +231,13 @@ void ui_pref_dialog_run(struct ui_psensor *ui) "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")); @@ -239,26 +286,32 @@ 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()); w_udisks2 = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "udisks2")); -#if !HAVE_LIBUDISKS2 - gtk_widget_set_sensitive(GTK_WIDGET(w_udisks2), 0); - gtk_widget_set_has_tooltip(GTK_WIDGET(w_udisks2), TRUE); -#else - gtk_widget_set_has_tooltip(GTK_WIDGET(w_udisks2), FALSE); -#endif + + 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_builder_connect_signals(builder, NULL); + result = gtk_dialog_run(diag); if (result == GTK_RESPONSE_ACCEPT) { @@ -290,28 +343,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); @@ -334,9 +365,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);