#include "ui_pref.h"
#include "ui_sensorlist.h"
-static void on_destroy(GtkWidget *widget, gpointer data)
+static gboolean
+on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
{
+
+#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+ gtk_widget_hide(((struct ui_psensor *)data)->main_window);
+#else
ui_psensor_quit();
+#endif
+
+ return TRUE;
}
-static void cb_menu_quit(gpointer data,
- guint cb_action,
- GtkWidget *item)
+static void
+cb_menu_quit(gpointer data, guint cb_action, GtkWidget *item)
{
ui_psensor_quit();
}
-static void cb_menu_preferences(gpointer data,
- guint cb_action,
- GtkWidget *item)
+static void
+cb_menu_preferences(gpointer data, guint cb_action, GtkWidget *item)
{
ui_pref_dialog_run((struct ui_psensor *)data);
}
else
fprintf(stderr, _("ERROR: Failed to load psensor icon.\n"));
- g_signal_connect(window, "destroy", G_CALLBACK(on_destroy), ui);
+ g_signal_connect(window,
+ "delete_event", G_CALLBACK(on_delete_event_cb), ui);
gtk_window_set_decorated(GTK_WINDOW(window),
ui->config->window_decoration_enabled);
gtk_container_add(GTK_CONTAINER(window), ui->main_box);
ui->main_window = window;
+ ui->menu_bar = menubar;
+
+ gtk_widget_show_all(ui->main_window);
}
-void ui_sensor_box_create(struct ui_psensor *ui)
+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;
GtkWidget *w_sensorlist;
}
gtk_widget_show_all(ui->sensor_box);
+
+ if (cfg->menu_bar_disabled)
+ menu_bar_show(0, ui);
+ else
+ menu_bar_show(1, ui);
}