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

diff --git a/src/ui_pref.c b/src/ui_pref.c
index 596bb41..cbb5986 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -36,13 +36,33 @@
 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
-		(!config_is_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));
+}
+
+void ui_pref_menu_toggled_cbk(GtkToggleButton *btn, gpointer data)
+{
+	config_set_menu_bar_enabled(gtk_toggle_button_get_active(btn));
+}
+
+void ui_pref_count_visible_toggled_cbk(GtkToggleButton *btn, gpointer data)
+{
+	config_set_count_visible(gtk_toggle_button_get_active(btn));
+}
+
+void ui_pref_sensorlist_position_changed_cbk(GtkComboBox *combo, gpointer data)
+{
+	config_set_sensorlist_position(gtk_combo_box_get_active(combo));
 }
 
 GdkRGBA color_to_GdkRGBA(struct color *color)
@@ -71,11 +91,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_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;
@@ -130,6 +150,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"));
@@ -138,7 +168,8 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 
 	w_sensorlist_pos = GTK_COMBO_BOX
 		(gtk_builder_get_object(builder, "sensors_list_position"));
-	gtk_combo_box_set_active(w_sensorlist_pos, cfg->sensorlist_position);
+	gtk_combo_box_set_active(w_sensorlist_pos,
+				 config_get_sensorlist_position());
 
 	w_autostart = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "autostart"));
@@ -146,12 +177,13 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 
 	w_enable_menu = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "enable_menu"));
-	gtk_toggle_button_set_active(w_enable_menu, !cfg->menu_bar_disabled);
+	gtk_toggle_button_set_active(w_enable_menu,
+				     config_is_menu_bar_enabled());
 
 	w_enable_launcher_counter = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "enable_launcher_counter"));
 	gtk_toggle_button_set_active(w_enable_launcher_counter,
-				     !cfg->unity_launcher_count_disabled);
+				     !config_is_count_visible());
 
 	if (ui_unity_is_supported()) {
 		gtk_widget_set_has_tooltip
@@ -191,7 +223,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
@@ -311,16 +343,6 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 		else
 			cfg->alpha_channel_enabled = 1;
 
-		cfg->sensorlist_position
-			= gtk_combo_box_get_active(w_sensorlist_pos);
-
-		cfg->menu_bar_disabled
-			= !gtk_toggle_button_get_active(w_enable_menu);
-
-		cfg->unity_launcher_count_disabled
-			= !gtk_toggle_button_get_active
-			(w_enable_launcher_counter);
-
 		cfg->sensor_update_interval
 			= gtk_spin_button_get_value_as_int(w_s_update_interval);
 
@@ -343,9 +365,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);