improving dialog box handling

diff --git a/data/main.ui b/data/main.ui
index a5bed8176b181209ea72975dbbf8e7be21ee2a13..cd889cdd21ecd0d6d9999e796a06084aaa365f77 100644 (file)
--- a/data/main.ui
+++ b/data/main.ui
@@ -400,6 +400,8 @@
     <property name="border_width">5</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <property name="border_width">5</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>

+    <signal name="response" handler="gtk_widget_hide" object="prefs_window"/>
+    <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>

     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>


@@ -876,7 +878,8 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
 </property>
     <property name="authors">Andy Spencer &lt;andy753421@gmail.com&gt;</property>
     <property name="wrap_license">True</property>
 </property>
     <property name="authors">Andy Spencer &lt;andy753421@gmail.com&gt;</property>
     <property name="wrap_license">True</property>

-    <signal name="response" handler="gtk_widget_destroy" object="about_window"/>
+    <signal name="response" handler="gtk_widget_hide"/>
+    <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>

     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>

diff --git a/src/Makefile.am b/src/Makefile.am
index 9b912f511b44c049b9408c4d182ee07d5536a333..9f317e6cf113f04eced9b1deefc37b18a2d058f4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,15 +16,16 @@ CLEANFILES = gmon.out valgrind.out
 MAINTAINERCLEANFILES = Makefile.in
 
 test: all
 MAINTAINERCLEANFILES = Makefile.in
 
 test: all

-       ./aweather -o -d 7 -s KVNX
+       LD_LIBRARY_PATH=gis/.libs .libs/aweather -o -d 7 -s KVNX

 
 gdb: all
 
 gdb: all

-       gdb .libs/aweather
+       LD_LIBRARY_PATH=gis/.libs gdb .libs/aweather

 
 ddd: all
 
 ddd: all

-       ddd .libs/aweather
+       LD_LIBRARY_PATH=gis/.libs ddd .libs/aweather

 
 memcheck:
 
 memcheck:

+       LD_LIBRARY_PATH=gis/.libs/               \

        G_SLICE=always-malloc                   \
        G_DEBUG=gc-friendly,resident-modules    \
        valgrind --leak-check=full              \
        G_SLICE=always-malloc                   \
        G_DEBUG=gc-friendly,resident-modules    \
        valgrind --leak-check=full              \

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 480d026be5f1c6be4223389b54a88de39dda149a..be6ed5b94ea753fe8d0e0ab62a126dd15b91a731 100644 (file)
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -29,6 +29,7 @@
 gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *self);
 static void on_gis_refresh(GisWorld *world, gpointer _self);
 static void on_gis_site_changed(GisView *view, char *site, gpointer _self);
 gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *self);
 static void on_gis_refresh(GisWorld *world, gpointer _self);
 static void on_gis_site_changed(GisView *view, char *site, gpointer _self);

+static void prefs_setup(AWeatherGui *self);

 static void site_setup(AWeatherGui *self);
 static void time_setup(AWeatherGui *self);
 
 static void site_setup(AWeatherGui *self);
 static void time_setup(AWeatherGui *self);
 


@@ -59,10 +60,6 @@ static void aweather_gui_init(AWeatherGui *self)
        self->opengl->plugins = self->plugins;
        //gtk_widget_show_all(GTK_WIDGET(self));
 
        self->opengl->plugins = self->plugins;
        //gtk_widget_show_all(GTK_WIDGET(self));
 

-       /* Misc, helpers */
-       site_setup(self);
-       time_setup(self);
-

        /* Plugins */
        GtkTreeIter iter;
        self->gtk_plugins = GTK_LIST_STORE(aweather_gui_get_object(self, "plugins"));
        /* Plugins */
        GtkTreeIter iter;
        self->gtk_plugins = GTK_LIST_STORE(aweather_gui_get_object(self, "plugins"));


@@ -75,6 +72,11 @@ static void aweather_gui_init(AWeatherGui *self)
                        aweather_gui_attach_plugin(self, name);
        }
 
                        aweather_gui_attach_plugin(self, name);
        }
 

+       /* Misc, helpers */
+       prefs_setup(self);
+       site_setup(self);
+       time_setup(self);
+

        /* Connect signals */
        gtk_builder_connect_signals(self->builder, self);
        g_signal_connect(self, "key-press-event",
        /* Connect signals */
        gtk_builder_connect_signals(self->builder, self);
        g_signal_connect(self, "key-press-event",


@@ -187,29 +189,11 @@ void on_refresh(GtkAction *action, AWeatherGui *self)
        gis_world_refresh(self->world);
 }
 
        gis_world_refresh(self->world);
 }
 

-void load_window(gchar *name, AWeatherGui *self)
-{
-       // TODO: use gtk_widget_hide_on_delete()
-       char *objects[2] = {name, NULL};
-       gtk_builder_add_objects_from_file(self->builder,
-                       DATADIR "/aweather/main.ui", objects, NULL);
-       gtk_builder_connect_signals(self->builder, self);
-       GtkWidget *main_win = aweather_gui_get_widget(self, "main_window");
-       GtkWidget *this_win = aweather_gui_get_widget(self, name);
-       gtk_window_set_transient_for(GTK_WINDOW(this_win), GTK_WINDOW(main_win));
-       gtk_widget_show_all(this_win);
-}
-
-void on_about(GtkAction *action, AWeatherGui *self)
-{
-       load_window("about_window", self);
-}

 
 void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui *self)
 {
        GtkWidget    *tview = aweather_gui_get_widget(self, "plugins_view");
        GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(tview));
 
 void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui *self)
 {
        GtkWidget    *tview = aweather_gui_get_widget(self, "plugins_view");
        GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(tview));

-       g_message("model=%p", model);

        gboolean state;
        gchar *name;
        GtkTreeIter iter;
        gboolean state;
        gchar *name;
        GtkTreeIter iter;


@@ -226,31 +210,12 @@ void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui
 }
 void on_prefs(GtkAction *action, AWeatherGui *self)
 {
 }
 void on_prefs(GtkAction *action, AWeatherGui *self)
 {

-       /* get prefs */
-       gchar *is = gis_prefs_get_string (self->prefs, "aweather/initial_site");
-       gchar *nu = gis_prefs_get_string (self->prefs, "aweather/nexrad_url");
-       gint   ll = gis_prefs_get_integer(self->prefs, "aweather/log_level");
-       load_window("prefs_window", self);
-       /* set prefs */
-       GtkWidget *isw = aweather_gui_get_widget(self, "initial_site");
-       GtkWidget *nuw = aweather_gui_get_widget(self, "nexrad_url");
-       GtkWidget *llw = aweather_gui_get_widget(self, "log_level");
-       if (is) gtk_entry_set_text(GTK_ENTRY(isw), is), g_free(is);
-       if (nu) gtk_entry_set_text(GTK_ENTRY(nuw), nu), g_free(nu);
-       if (ll) gtk_spin_button_set_value(GTK_SPIN_BUTTON(llw), ll);
+       gtk_window_present(GTK_WINDOW(aweather_gui_get_widget(self, "prefs_window")));
+}

 
 

-       /* Plugins */
-       GtkTreeView       *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "plugins_view"));
-       GtkCellRenderer   *rend1 = gtk_cell_renderer_text_new();
-       GtkCellRenderer   *rend2 = gtk_cell_renderer_toggle_new();
-       GtkTreeViewColumn *col1  = gtk_tree_view_column_new_with_attributes(
-                       "Plugin",  rend1, "text",   0, NULL);
-       GtkTreeViewColumn *col2  = gtk_tree_view_column_new_with_attributes(
-                       "Enabled", rend2, "active", 1, NULL);
-       gtk_tree_view_append_column(tview, col1);
-       gtk_tree_view_append_column(tview, col2);
-       g_signal_connect(rend2, "toggled", G_CALLBACK(on_plugin_toggled), self);
-       gtk_tree_view_set_model(GTK_TREE_VIEW(tview), GTK_TREE_MODEL(self->gtk_plugins));
+void on_about(GtkAction *action, AWeatherGui *self)
+{
+       gtk_window_present(GTK_WINDOW(aweather_gui_get_widget(self, "about_window")));

 }
 
 void on_time_changed(GtkTreeView *view, GtkTreePath *path,
 }
 
 void on_time_changed(GtkTreeView *view, GtkTreePath *path,


@@ -361,6 +326,33 @@ int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
 /*****************
  * Setup helpers *
  *****************/
 /*****************
  * Setup helpers *
  *****************/

+static void prefs_setup(AWeatherGui *self)
+{
+       /* Set values */
+       gchar *is = gis_prefs_get_string (self->prefs, "aweather/initial_site");
+       gchar *nu = gis_prefs_get_string (self->prefs, "aweather/nexrad_url");
+       gint   ll = gis_prefs_get_integer(self->prefs, "aweather/log_level");
+       GtkWidget *isw = aweather_gui_get_widget(self, "initial_site");
+       GtkWidget *nuw = aweather_gui_get_widget(self, "nexrad_url");
+       GtkWidget *llw = aweather_gui_get_widget(self, "log_level");
+       if (is) gtk_entry_set_text(GTK_ENTRY(isw), is), g_free(is);
+       if (nu) gtk_entry_set_text(GTK_ENTRY(nuw), nu), g_free(nu);
+       if (ll) gtk_spin_button_set_value(GTK_SPIN_BUTTON(llw), ll);
+
+       /* Load Plugins */
+       GtkTreeView       *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "plugins_view"));
+       GtkCellRenderer   *rend1 = gtk_cell_renderer_text_new();
+       GtkCellRenderer   *rend2 = gtk_cell_renderer_toggle_new();
+       GtkTreeViewColumn *col1  = gtk_tree_view_column_new_with_attributes(
+                       "Plugin",  rend1, "text",   0, NULL);
+       GtkTreeViewColumn *col2  = gtk_tree_view_column_new_with_attributes(
+                       "Enabled", rend2, "active", 1, NULL);
+       gtk_tree_view_append_column(tview, col1);
+       gtk_tree_view_append_column(tview, col2);
+       g_signal_connect(rend2, "toggled", G_CALLBACK(on_plugin_toggled), self);
+       gtk_tree_view_set_model(GTK_TREE_VIEW(tview), GTK_TREE_MODEL(self->gtk_plugins));
+}
+

 static void combo_sensitive(GtkCellLayout *cell_layout, GtkCellRenderer *cell,
                GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
 {
 static void combo_sensitive(GtkCellLayout *cell_layout, GtkCellRenderer *cell,
                GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
 {


@@ -550,8 +542,11 @@ void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name)
        GtkWidget *config = aweather_gui_get_widget(self, "tabs");
        guint n_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(config));
        for (int i = 0; i < n_pages; i++) {
        GtkWidget *config = aweather_gui_get_widget(self, "tabs");
        guint n_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(config));
        for (int i = 0; i < n_pages; i++) {

+               g_debug("testing tab %d", i);

                GtkWidget *body = gtk_notebook_get_nth_page(GTK_NOTEBOOK(config), i);
                GtkWidget *body = gtk_notebook_get_nth_page(GTK_NOTEBOOK(config), i);

+               if (!body) continue;

                GtkWidget *tab = gtk_notebook_get_tab_label(GTK_NOTEBOOK(config), body);
                GtkWidget *tab = gtk_notebook_get_tab_label(GTK_NOTEBOOK(config), body);

+               if (!tab) continue;

                const gchar *tab_name = gtk_label_get_text(GTK_LABEL(tab));
                if (tab_name && g_str_equal(name, tab_name))
                        gtk_notebook_remove_page(GTK_NOTEBOOK(config), i);
                const gchar *tab_name = gtk_label_get_text(GTK_LABEL(tab));
                if (tab_name && g_str_equal(name, tab_name))
                        gtk_notebook_remove_page(GTK_NOTEBOOK(config), i);