X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_pref.c;h=1db60a5d755e5bf1a2844e976f27f2a261b00ac4;hb=28ba8deef53e8f46fa79919b9fea4fe2dc1163e4;hp=9be3c8c89fee82f2d5125e7218e63c42141fee12;hpb=b50653aecc1a70ba5196bc37c31d154fdbdecf34;p=psensor.git diff --git a/src/ui_pref.c b/src/ui_pref.c index 9be3c8c..1db60a5 100644 --- a/src/ui_pref.c +++ b/src/ui_pref.c @@ -20,12 +20,24 @@ #include #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 + (!config_is_window_decoration_enabled()); +} GdkRGBA color_to_GdkRGBA(struct color *color) { @@ -125,7 +137,7 @@ void ui_pref_dialog_run(struct ui_psensor *ui) 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); + !config_is_window_decoration_enabled()); w_keep_window_below = GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "keep_window_below")); @@ -145,13 +157,15 @@ void ui_pref_dialog_run(struct ui_psensor *ui) 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")); @@ -189,21 +203,30 @@ 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")); -#if !HAVE_NVIDIA - gtk_widget_set_sensitive(GTK_WIDGET(w_nvctrl), 0); - gtk_widget_set_has_tooltip(GTK_WIDGET(w_nvctrl), TRUE); -#else - gtk_widget_set_has_tooltip(GTK_WIDGET(w_nvctrl), FALSE); -#endif + + 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()) { + if (amd_is_supported()) { gtk_widget_set_has_tooltip(GTK_WIDGET(w_atiadlsdk), FALSE); } else { gtk_widget_set_sensitive(GTK_WIDGET(w_atiadlsdk), 0); @@ -216,12 +239,14 @@ void ui_pref_dialog_run(struct ui_psensor *ui) w_gtop2 = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "gtop2")); -#if !HAVE_GTOP - gtk_widget_set_sensitive(GTK_WIDGET(w_gtop2), 0); - gtk_widget_set_has_tooltip(GTK_WIDGET(w_gtop2), TRUE); -#else - gtk_widget_set_has_tooltip(GTK_WIDGET(w_gtop2), FALSE); -#endif + + 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 @@ -233,26 +258,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) { @@ -287,9 +318,6 @@ 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); @@ -300,9 +328,6 @@ void ui_pref_dialog_run(struct ui_psensor *ui) = !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);