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);
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);
{
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);
+}
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();
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();
}
void ui_window_create(struct ui_psensor *ui)
{
- GtkWidget *window;
+ GtkWidget *window, *menu_bar;
GdkPixbuf *icon;
GtkIconTheme *icon_theme;
struct config *cfg;
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,
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;
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)
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;
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"));
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);