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

diff --git a/src/ui_pref.c b/src/ui_pref.c
index cae40f2..4594a97 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -19,12 +19,19 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <ui.h>
+#include <hdd.h>
+#include <amd.h>
 #include <cfg.h>
 #include <graph.h>
-#include <ui_pref.h>
-#include <ui_color.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>
 
 GdkRGBA color_to_GdkRGBA(struct color *color)
 {
@@ -144,13 +151,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 +197,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,24 +252,28 @@ 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());
 
 	result = gtk_dialog_run(diag);