Initialize NEXRAD site setup data

[aweather] / src / aweather-gui.c

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index df5e84695aa9a9d265d3a7fa2e2fd9e133843301..c34c6e4dd396f1e460f36cc92a348e831b13b656 100644 (file)
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -180,7 +180,9 @@ G_MODULE_EXPORT void on_fullscreen(GtkToggleAction *action, AWeatherGui *self)
        GtkWidget *toolbar = aweather_gui_get_widget(self, "main_toolbar");
        GtkWidget *sidebar = aweather_gui_get_widget(self, "main_sidebar");
        GtkWidget *tabs    = aweather_gui_get_widget(self, "main_tabs");
+       static gboolean menushow = TRUE; // Toolbar can be always disabled
        if (gtk_toggle_action_get_active(action)) {
+               menushow = gtk_widget_get_visible(menu);
                gtk_window_fullscreen(GTK_WINDOW(self));
                gtk_widget_hide(menu);
                _gtk_widget_autohide(toolbar, GTK_WIDGET(self->viewer), GTK_POS_TOP);
@@ -188,7 +190,7 @@ G_MODULE_EXPORT void on_fullscreen(GtkToggleAction *action, AWeatherGui *self)
                _gtk_widget_autohide(tabs,    GTK_WIDGET(self->viewer), GTK_POS_BOTTOM);
        } else {
                gtk_window_unfullscreen(GTK_WINDOW(self));
-               gtk_widget_show(menu);
+               gtk_widget_set_visible(menu, menushow);
                _gtk_widget_autoshow(toolbar);
                _gtk_widget_autoshow(sidebar);
                _gtk_widget_autoshow(tabs);
@@ -389,7 +391,7 @@ static void site_setup(AWeatherGui *self)
 static void menu_setup(AWeatherGui *self)
 {
        GtkWidget *menu = aweather_gui_get_widget(self, "main_menu_radar");
-       GtkWidget *states, *state, *sites, *site;
+       GtkWidget *states=NULL, *state=NULL, *sites=NULL, *site=NULL;
 
        states = gtk_menu_new();
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), states);