X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_pref.c;h=596bb414ac265c40c6ac284cded6b85c80fddf19;hb=66aa25bbb5834e9278226680087f4e8b325f23e7;hp=cae40f2dfb74052eab3e27ab26828a495ef0f1e0;hpb=14fc47ac64775ddfbc62ad606c7a94054dc4a898;p=psensor.git

diff --git a/src/ui_pref.c b/src/ui_pref.c
index cae40f2..596bb41 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -19,12 +19,31 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <ui.h>
+#include <amd.h>
 #include <cfg.h>
 #include <graph.h>
-#include <ui_pref.h>
-#include <ui_color.h>
+#include <hdd.h>
+#include <lmsensor.h>
+#include <nvidia.h>
+#include <pgtop2.h>
+#include <pudisks2.h>
 #include <pxdg.h>
+#include <ui.h>
+#include <ui_color.h>
+#include <ui_pref.h>
+#include <ui_unity.h>
+
+void ui_pref_decoration_toggled_cbk(GtkToggleButton *btn, gpointer data)
+{
+	config_set_window_decoration_enabled
+		(!config_is_window_decoration_enabled());
+}
+
+void ui_pref_keep_below_toggled_cbk(GtkToggleButton *btn, gpointer data)
+{
+	config_set_window_keep_below_enabled
+		(!config_is_window_keep_below_enabled());
+}
 
 GdkRGBA color_to_GdkRGBA(struct color *color)
 {
@@ -52,7 +71,7 @@ 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,
+	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,
@@ -121,16 +140,6 @@ 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());
@@ -144,13 +153,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_APPINDICATOR && !HAVE_APPINDICATOR_029
-	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"));
@@ -188,38 +199,50 @@ 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 !HAVE_LIBATIADL
-	gtk_widget_set_sensitive(GTK_WIDGET(w_atiadlsdk), 0);
-	gtk_widget_set_has_tooltip(GTK_WIDGET(w_atiadlsdk), TRUE);
-#else
-	gtk_widget_set_has_tooltip(GTK_WIDGET(w_atiadlsdk), FALSE);
-#endif
+	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 !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
@@ -231,26 +254,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) {
@@ -285,12 +314,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);
-
 		cfg->menu_bar_disabled
 			= !gtk_toggle_button_get_active(w_enable_menu);
 
@@ -298,12 +321,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);
-
 		cfg->sensor_update_interval
 			= gtk_spin_button_get_value_as_int(w_s_update_interval);