made menu enabled setting dynamic

diff --git a/src/cfg.c b/src/cfg.c
index 96baa27..fb24085 100644 (file)
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -436,8 +436,6 @@ struct config *config_load(void)
        if (c->graph_monitoring_duration < 1)
                c->graph_monitoring_duration = 10;
 
-       c->menu_bar_disabled = get_bool(KEY_INTERFACE_MENU_BAR_DISABLED);
-
        c->unity_launcher_count_disabled
                = get_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED);
 
@@ -479,8 +477,6 @@ void config_save(const struct config *c)
 
        set_int(KEY_SENSOR_UPDATE_INTERVAL, c->sensor_update_interval);
 
-       set_bool(KEY_INTERFACE_MENU_BAR_DISABLED, c->menu_bar_disabled);
-
        set_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED,
                 c->unity_launcher_count_disabled);
 
@@ -945,3 +941,13 @@ void config_set_temperature_unit(enum temperature_unit u)
 {
        set_int(KEY_INTERFACE_TEMPERATURE_UNIT, u);
 }
+
+bool config_is_menu_bar_enabled(void)
+{
+       return !get_bool(KEY_INTERFACE_MENU_BAR_DISABLED);
+}
+
+void config_set_menu_bar_enabled(bool enabled)
+{
+       set_bool(KEY_INTERFACE_MENU_BAR_DISABLED, !enabled);
+}

diff --git a/src/cfg.h b/src/cfg.h
index 6ef7eae..2ca0fbf 100644 (file)
--- a/src/cfg.h
+++ b/src/cfg.h
@@ -63,8 +63,6 @@ struct config {
        int sensor_values_max_length;
        int sensor_update_interval;
 
-       bool menu_bar_disabled;
-
        bool unity_launcher_count_disabled;
 
        int hide_on_startup;
@@ -153,6 +151,9 @@ void config_set_window_decoration_enabled(bool);
 bool config_is_window_keep_below_enabled(void);
 void config_set_window_keep_below_enabled(bool);
 
+bool config_is_menu_bar_enabled(void);
+void config_set_menu_bar_enabled(bool);
+
 /*
  * Returns the user directory containing psensor data (configuration
  * and log).

diff --git a/src/glade/psensor-pref.glade b/src/glade/psensor-pref.glade
index 0b8d540..fa164dd 100644 (file)
--- a/src/glade/psensor-pref.glade
+++ b/src/glade/psensor-pref.glade
@@ -173,6 +173,7 @@
                     <property name="margin_bottom">4</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="ui_pref_menu_toggled_cbk" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>

diff --git a/src/ui.c b/src/ui.c
index 640a865..3a83f9c 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -38,19 +38,33 @@ static void set_keep_below(GtkWindow *win)
        gtk_window_set_keep_below(win, config_is_window_keep_below_enabled());
 }
 
+static void set_menu_bar_enabled(GtkWidget *bar)
+{
+       if (config_is_menu_bar_enabled())
+               gtk_widget_show(bar);
+       else
+               gtk_widget_hide(bar);
+}
+
 static void
 decoration_changed_cbk(GSettings *settings, gchar *key, gpointer data)
 {
-       set_decoration((GtkWindow *)data);
+       set_decoration(GTK_WINDOW(data));
 }
 
 static void
 keep_below_changed_cbk(GSettings *settings, gchar *key, gpointer data)
 {
-       set_keep_below((GtkWindow *)data);
+       set_keep_below(GTK_WINDOW(data));
+}
+
+static void
+menu_bar_changed_cbk(GSettings *settings, gchar *key, gpointer data)
+{
+       set_menu_bar_enabled(GTK_WIDGET(data));
 }
 
-static void connect_cbks(GtkWindow *win)
+static void connect_cbks(GtkWindow *win, GtkWidget *menu_bar)
 {
        log_fct_enter();
 
@@ -64,6 +78,11 @@ static void connect_cbks(GtkWindow *win)
                               G_CALLBACK(keep_below_changed_cbk),
                               win);
 
+       g_signal_connect_after(config_get_GSettings(),
+                              "changed::interface-menu-bar-disabled",
+                              G_CALLBACK(menu_bar_changed_cbk),
+                              menu_bar);
+
        log_fct_exit();
 }
 
@@ -218,7 +237,7 @@ static void slog_enabled_cbk(void *data)
 
 void ui_window_create(struct ui_psensor *ui)
 {
-       GtkWidget *window;
+       GtkWidget *window, *menu_bar;
        GdkPixbuf *icon;
        GtkIconTheme *icon_theme;
        struct config *cfg;
@@ -267,14 +286,13 @@ void ui_window_create(struct ui_psensor *ui)
        set_decoration(GTK_WINDOW(window));
        set_keep_below(GTK_WINDOW(window));
 
-       ui->menu_bar = GTK_WIDGET(gtk_builder_get_object(builder, "menu_bar"));
+       menu_bar = GTK_WIDGET(gtk_builder_get_object(builder, "menu_bar"));
        ui->main_box = GTK_WIDGET(gtk_builder_get_object(builder, "main_box"));
        ui->popup_menu = GTK_WIDGET(gtk_builder_get_object(builder,
                                                           "popup_menu"));
        g_object_ref(G_OBJECT(ui->popup_menu));
        ui->main_window = window;
-       ui->w_graph = GTK_WIDGET(gtk_builder_get_object(builder,
-                                                       "graph"));
+       ui->w_graph = GTK_WIDGET(gtk_builder_get_object(builder, "graph"));
        ui_graph_create(ui);
 
        ui->sensor_box = GTK_PANED(gtk_builder_get_object(builder,
@@ -289,24 +307,17 @@ void ui_window_create(struct ui_psensor *ui)
 
        ui_sensorlist_create(ui);
 
-       connect_cbks(GTK_WINDOW(window));
+       connect_cbks(GTK_WINDOW(window), menu_bar);
 
        log_debug("ui_window_create(): show_all");
        gtk_widget_show_all(ui->main_box);
+       set_menu_bar_enabled(menu_bar);
 
        g_object_unref(G_OBJECT(builder));
 
        log_debug("ui_window_create() ends");
 }
 
-static void menu_bar_show(unsigned int show, struct ui_psensor *ui)
-{
-       if (show)
-               gtk_widget_show(ui->menu_bar);
-       else
-               gtk_widget_hide(ui->menu_bar);
-}
-
 void ui_window_update(struct ui_psensor *ui)
 {
        struct config *cfg;
@@ -359,11 +370,6 @@ void ui_window_update(struct ui_psensor *ui)
        g_object_unref(GTK_WIDGET(ui->w_graph));
 
        gtk_widget_show_all(GTK_WIDGET(ui->sensor_box));
-
-       if (cfg->menu_bar_disabled)
-               menu_bar_show(0, ui);
-       else
-               menu_bar_show(1, ui);
 }
 
 void ui_window_show(struct ui_psensor *ui)

diff --git a/src/ui.h b/src/ui.h
index 453cdb0..26229d3 100644 (file)
--- a/src/ui.h
+++ b/src/ui.h
@@ -45,8 +45,6 @@ struct ui_psensor {
 
        GtkWidget *main_window;
 
-       GtkWidget *menu_bar;
-
        GtkWidget *popup_menu;
 
        /*

diff --git a/src/ui_pref.c b/src/ui_pref.c
index a883be6..40c4dcc 100644 (file)
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -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;
@@ -161,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"));
@@ -329,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);