X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=blobdiff_plain;f=src%2Fui_pref.c;fp=src%2Fui_pref.c;h=54947779e3377a71a853299a054d574da6dc70ea;hp=e614da30f5bb516f7180897f8a22efca4a6fa4a7;hb=5c1e07fec97e34a94331b6b47e25c98f2b2e4cce;hpb=4c50d430bea4b8462b0ae7ab70baf3f538f87718

diff --git a/src/ui_pref.c b/src/ui_pref.c
index e614da3..5494777 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -21,6 +21,7 @@
 
 #include <ui.h>
 #include <cfg.h>
+#include <graph.h>
 #include <ui_pref.h>
 #include <ui_color.h>
 #include <pxdg.h>
@@ -53,7 +54,9 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	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_win_restore, *w_slog_enabled, *w_autostart, *w_smooth_curves,
+		*w_atiadlsdk, *w_lmsensors, *w_nvctrl, *w_gtop2, *w_hddtemp,
+		*w_libatasmart, *w_udisks2;
 	GtkComboBoxText *w_temp_unit;
 	GtkEntry *w_notif_script;
 	char *notif_script;
@@ -70,7 +73,7 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	if (!ok) {
 		log_printf(LOG_ERR, error->message);
 		g_error_free(error);
-		return ;
+		return;
 	}
 
 	diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1"));
@@ -141,6 +144,11 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	gtk_toggle_button_set_active(w_enable_launcher_counter,
 				     !cfg->unity_launcher_count_disabled);
 
+	w_smooth_curves = GTK_TOGGLE_BUTTON
+		(gtk_builder_get_object(builder, "graph_smooth_curves"));
+	gtk_toggle_button_set_active(w_smooth_curves,
+				     config_is_smooth_curves_enabled());
+
 	w_slog_enabled = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "enable_slog"));
 	gtk_toggle_button_set_active(w_slog_enabled, cfg->slog_enabled);
@@ -166,6 +174,60 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	gtk_combo_box_set_active(GTK_COMBO_BOX(w_temp_unit),
 				 cfg->temperature_unit);
 
+	/* providers */
+	w_lmsensors
+		= GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
+							   "lmsensors"));
+	gtk_toggle_button_set_active(w_lmsensors, config_is_lmsensor_enabled());
+
+	w_nvctrl
+		= GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
+							   "nvctrl"));
+#if !HAVE_NVIDIA
+	gtk_widget_set_sensitive(GTK_WIDGET(w_nvctrl), 0);
+#endif
+	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);
+#endif
+	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);
+#endif
+	gtk_toggle_button_set_active(w_gtop2, config_is_gtop2_enabled());
+
+	w_hddtemp
+		= GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
+							   "hddtemp"));
+	gtk_toggle_button_set_active(w_hddtemp, config_is_hddtemp_enabled());
+
+
+	w_libatasmart
+		= GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
+							   "libatasmart"));
+#if !HAVE_ATASMART
+	gtk_widget_set_sensitive(GTK_WIDGET(w_libatasmart), 0);
+#endif
+	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);
+#endif
+	gtk_toggle_button_set_active(w_udisks2, config_is_udisks2_enabled());
+
 	result = gtk_dialog_run(diag);
 
 	if (result == GTK_RESPONSE_ACCEPT) {
@@ -229,10 +291,6 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 		    = gtk_spin_button_get_value_as_int
 			(w_monitoring_duration);
 
-		cfg->sensor_values_max_length
-		    = (cfg->graph_monitoring_duration * 60) /
-		    cfg->sensor_update_interval;
-
 		cfg->hide_on_startup
 			= gtk_toggle_button_get_active(w_hide_on_startup);
 
@@ -248,8 +306,34 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 		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);
 
+		config_set_smooth_curves_enabled
+			(gtk_toggle_button_get_active(w_smooth_curves));
+
+		config_set_lmsensor_enable
+			(gtk_toggle_button_get_active(w_lmsensors));
+
+		config_set_nvctrl_enable
+			(gtk_toggle_button_get_active(w_nvctrl));
+
+		config_set_atiadlsdk_enable
+			(gtk_toggle_button_get_active(w_atiadlsdk));
+
+		config_set_gtop2_enable
+			(gtk_toggle_button_get_active(w_gtop2));
+
+		config_set_hddtemp_enable
+			(gtk_toggle_button_get_active(w_hddtemp));
+
+		config_set_libatasmart_enable
+			(gtk_toggle_button_get_active(w_libatasmart));
+
+		config_set_udisks2_enable
+			(gtk_toggle_button_get_active(w_udisks2));
+
 		pxdg_set_autostart(gtk_toggle_button_get_active(w_autostart));
 
 		pthread_mutex_unlock(&ui->sensors_mutex);