made menu enabled setting dynamic

[psensor.git] / src / ui_pref.c

diff --git a/src/ui_pref.c b/src/ui_pref.c
index 817b7c9..40c4dcc 100644 (file)
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -42,7 +42,7 @@ void ui_pref_decoration_toggled_cbk(GtkToggleButton *btn, gpointer data)
 void ui_pref_keep_below_toggled_cbk(GtkToggleButton *btn, gpointer data)
 {
        config_set_window_keep_below_enabled
-               (!gtk_toggle_button_get_active(btn));
+               (gtk_toggle_button_get_active(btn));
 }
 
 void ui_pref_temperature_unit_changed_cbk(GtkComboBox *combo, gpointer data)
@@ -50,6 +50,11 @@ 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));
+}
+
 GdkRGBA color_to_GdkRGBA(struct color *color)
 {
        GdkRGBA c;
@@ -79,7 +84,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 +140,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"));
@@ -150,7 +166,8 @@ 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"));
@@ -318,9 +335,6 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
                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);