X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_pref.c;h=a883be63b1bc4d66b29e49554152ac979d60c059;hb=f73aa2047e162f171d9bfc39ddd11406bec3ace8;hp=27201adcecef3454cc12a561e1d767a53a8bf03c;hpb=ae573ea0c5328662e711d7717edc835d1a313d58;p=psensor.git

diff --git a/src/ui_pref.c b/src/ui_pref.c
index 27201ad..a883be6 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -19,10 +19,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <hdd.h>
 #include <amd.h>
 #include <cfg.h>
 #include <graph.h>
+#include <hdd.h>
 #include <lmsensor.h>
 #include <nvidia.h>
 #include <pgtop2.h>
@@ -36,7 +36,18 @@
 void ui_pref_decoration_toggled_cbk(GtkToggleButton *btn, gpointer data)
 {
 	config_set_window_decoration_enabled
-		(!config_is_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));
 }
 
 GdkRGBA color_to_GdkRGBA(struct color *color)
@@ -65,11 +76,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;
@@ -124,6 +135,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"));
@@ -134,16 +155,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,
-				     !config_is_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());
@@ -195,7 +206,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
@@ -318,9 +329,6 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 		cfg->sensorlist_position
 			= gtk_combo_box_get_active(w_sensorlist_pos);
 
-		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);
 
@@ -328,9 +336,6 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 			= !gtk_toggle_button_get_active
 			(w_enable_launcher_counter);
 
-		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);
 
@@ -353,9 +358,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);