X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_pref.c;h=8d2c8ab5942c854663d34404b15a7c519aac2098;hb=fd0242c4e19038c1eca927498c6c6d163b46c736;hp=65949662c906e35c379d75249f64bba335470b48;hpb=51450a36b7143fe230197dfa89b5fd072af7421c;p=psensor.git

diff --git a/src/ui_pref.c b/src/ui_pref.c
index 6594966..8d2c8ab 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -36,13 +36,13 @@
 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)
@@ -50,6 +50,21 @@ 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)
 {
 	GdkRGBA c;
@@ -79,7 +94,8 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	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_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;
@@ -134,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"));
@@ -142,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"));
@@ -150,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
@@ -282,6 +310,8 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 
 	gtk_toggle_button_set_active(w_udisks2, config_is_udisks2_enabled());
 
+	gtk_window_set_transient_for(GTK_WINDOW(diag),
+				     GTK_WINDOW(ui->main_window));
 	gtk_builder_connect_signals(builder, NULL);
 
 	result = gtk_dialog_run(diag);
@@ -315,16 +345,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);