]> Pileus Git - grits/blobdiff - src/aweather-gui.c
Lots of work on libGIS
[grits] / src / aweather-gui.c
index 7adecf0c054cd6510b70c478dd491d6eeddeecb2..0c3204d6e15bc40ae763e274ed39d01635e437ac 100644 (file)
 
 #include <config.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkgl.h>
 #include <gdk/gdkkeysyms.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
 #include <math.h>
 
+#include <gis/gis.h>
+
 #include "aweather-gui.h"
-#include "aweather-view.h"
-#include "aweather-plugin.h"
-#include "location.h"
+#include "aweather-location.h"
 
-/****************
- * GObject code *
- ****************/
-G_DEFINE_TYPE(AWeatherGui, aweather_gui, G_TYPE_OBJECT);
-static void aweather_gui_init(AWeatherGui *gui)
-{
-       gui->plugins = NULL;
-       //g_message("aweather_gui_init");
-}
-static GObject *aweather_gui_constructor(GType gtype, guint n_properties,
-               GObjectConstructParam *properties)
-{
-       //g_message("aweather_gui_constructor");
-       GObjectClass *parent_class = G_OBJECT_CLASS(aweather_gui_parent_class);
-       return  parent_class->constructor(gtype, n_properties, properties);
-}
-static void aweather_gui_dispose (GObject *gobject)
-{
-       //g_message("aweather_gui_dispose");
-       AWeatherGui *gui = AWEATHER_GUI(gobject);
-       g_object_unref(gui->view   );
-       g_object_unref(gui->builder);
-       g_object_unref(gui->window );
-       g_object_unref(gui->tabs   );
-       g_object_unref(gui->drawing);
-       G_OBJECT_CLASS(aweather_gui_parent_class)->dispose(gobject);
-}
-static void aweather_gui_finalize(GObject *gobject)
-{
-       //g_message("aweather_gui_finalize");
-       G_OBJECT_CLASS(aweather_gui_parent_class)->finalize(gobject);
-}
-static void aweather_gui_class_init(AWeatherGuiClass *klass)
-{
-       //g_message("aweather_gui_class_init");
-       GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
-       gobject_class->constructor  = aweather_gui_constructor;
-       gobject_class->dispose      = aweather_gui_dispose;
-       gobject_class->finalize     = aweather_gui_finalize;
-}
 
 /*************
  * Callbacks *
  *************/
-gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *gui)
+gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *self)
 {
-       g_message("key_press: key=%x, state=%x", event->keyval, event->state);
-       AWeatherView *view = aweather_gui_get_view(gui);
-       double x,y,z;
-       aweather_view_get_location(view, &x, &y, &z);
+       g_debug("AWeatherGui: on_gui_key_press - key=%x, state=%x",
+                       event->keyval, event->state);
        if (event->keyval == GDK_q)
-               gtk_main_quit();
+               gtk_widget_destroy(GTK_WIDGET(self));
        else if (event->keyval == GDK_r && event->state & GDK_CONTROL_MASK)
-               aweather_view_refresh(view);
-       else if (event->keyval == GDK_Right) aweather_view_pan(view,  z/10, 0, 0);
-       else if (event->keyval == GDK_Left)  aweather_view_pan(view, -z/10, 0, 0);
-       else if (event->keyval == GDK_Up)    aweather_view_pan(view, 0,  z/10, 0);
-       else if (event->keyval == GDK_Down)  aweather_view_pan(view, 0, -z/10, 0);
-       else if (event->keyval == GDK_minus) aweather_view_zoom(view, 10./9);
-       else if (event->keyval == GDK_plus)  aweather_view_zoom(view, 9./10);
+               gis_world_refresh(self->world);
        else if (event->keyval == GDK_Tab || event->keyval == GDK_ISO_Left_Tab) {
-               GtkNotebook *tabs = GTK_NOTEBOOK(aweather_gui_get_widget(gui, "tabs"));
+               GtkNotebook *tabs = GTK_NOTEBOOK(aweather_gui_get_widget(self, "tabs"));
                gint num_tabs = gtk_notebook_get_n_pages(tabs);
                gint cur_tab  = gtk_notebook_get_current_page(tabs);
                if (event->state & GDK_SHIFT_MASK)
@@ -97,215 +46,198 @@ gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *gui)
                else 
                        gtk_notebook_set_current_page(tabs, (cur_tab+1)%num_tabs);
        };
-       return TRUE;
+       return FALSE;
 }
 
-void on_refresh(GtkToolButton *button, AWeatherGui *gui)
+void on_quit(GtkMenuItem *menu, AWeatherGui *self)
 {
-       AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_refresh(view);
+       gtk_widget_destroy(GTK_WIDGET(self));
 }
 
-void on_zoomin(GtkToolButton *button, AWeatherGui *gui)
+void on_zoomin(GtkAction *action, AWeatherGui *self)
 {
-       AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_zoom(view, 3./4);
+       gis_view_zoom(self->view, 3./4);
 }
 
-void on_zoomout(GtkToolButton *button, AWeatherGui *gui)
+void on_zoomout(GtkAction *action, AWeatherGui *self)
 {
-       AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_zoom(view, 4./3);
+       gis_view_zoom(self->view, 4./3);
+}
+
+void on_refresh(GtkAction *action, AWeatherGui *self)
+{
+       gis_world_refresh(self->world);
+}
+
+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));
+       gboolean state;
+       gchar *name;
+       GtkTreeIter iter;
+       gtk_tree_model_get_iter_from_string(model, &iter, path_str);
+       gtk_tree_model_get(model, &iter, 0, &name, 1, &state, -1);
+       state = !state;
+       gtk_list_store_set(GTK_LIST_STORE(model), &iter, 1, state, -1);
+       if (state)
+               aweather_gui_attach_plugin(self, name);
+       else
+               aweather_gui_deattach_plugin(self, name);
+       gis_prefs_set_boolean_v(self->prefs, name, "enabled", state);
+       g_free(name);
 }
 
 void on_time_changed(GtkTreeView *view, GtkTreePath *path,
-               GtkTreeViewColumn *column, AWeatherGui *gui)
+               GtkTreeViewColumn *column, AWeatherGui *self)
 {
        gchar *time;
        GtkTreeIter iter;
        GtkTreeModel *model = gtk_tree_view_get_model(view);
        gtk_tree_model_get_iter(model, &iter, path);
        gtk_tree_model_get(model, &iter, 0, &time, -1);
-       AWeatherView *aview = aweather_gui_get_view(gui);
-       aweather_view_set_time(aview, time);
+       gis_view_set_time(self->view, time);
        g_free(time);
 }
 
-void on_site_changed(GtkComboBox *combo, AWeatherGui *gui)
+void on_site_changed(GtkComboBox *combo, AWeatherGui *self)
 {
        gchar *site;
        GtkTreeIter iter;
        GtkTreeModel *model = gtk_combo_box_get_model(combo);
        gtk_combo_box_get_active_iter(combo, &iter);
        gtk_tree_model_get(model, &iter, 1, &site, -1);
-       AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_set_site(view, site);
+       gis_view_set_site(self->view, site);
        g_free(site);
 }
 
-gboolean on_map(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
+static gboolean gtk_tree_model_find_string(GtkTreeModel *model,
+               GtkTreeIter *rval, GtkTreeIter *parent, gint field, const gchar *key)
 {
-       g_message("on_map");
-       AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_set_site(view, "IND");
-
-       /* Misc */
-       glEnable(GL_BLEND);
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-
-       /* Tessellation, "finding intersecting triangles" */
-       /* http://research.microsoft.com/pubs/70307/tr-2006-81.pdf */
-       /* http://www.opengl.org/wiki/Alpha_Blending */
-       glAlphaFunc(GL_GREATER,0.1);
-       glEnable(GL_ALPHA_TEST);
-
-       /* Depth test */
-       glClearDepth(1.0);
-       glDepthFunc(GL_LEQUAL);
-       glEnable(GL_DEPTH_TEST);
-
-       aweather_gui_gl_end(gui);
+       g_debug("AWeatherGui: gtk_tree_model_find - field=%d key=%s", field, key);
+       char *text;
+       GtkTreeIter cur;
+       gint num_children = gtk_tree_model_iter_n_children(model, parent);
+       for (int i = 0; i < num_children; i++) {
+               gtk_tree_model_iter_nth_child(model, &cur, parent, i);
+               gtk_tree_model_get(model, &cur, field, &text, -1);
+               if (text != NULL && g_str_equal(text, key)) {
+                       *rval = cur;
+                       g_free(text);
+                       return TRUE;
+               }
+               g_free(text);
+               if (gtk_tree_model_iter_has_child(model, &cur))
+                       if (gtk_tree_model_find_string(model, rval, &cur, field, key))
+                               return TRUE;
+       }
        return FALSE;
 }
 
-gboolean on_configure(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
+static void update_time_widget(GisView *view, const char *time, AWeatherGui *self)
 {
-       //g_message("on_confiure");
-       aweather_gui_gl_begin(gui);
-
-       double x, y, z;
-       AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_get_location(view, &x, &y, &z);
-
-       /* Window is at 500 m from camera */
-       double width  = da->allocation.width;
-       double height = da->allocation.height;
-
-       glViewport(0, 0, width, height);
-
-       /* Perspective */
-       glMatrixMode(GL_PROJECTION);
-       glLoadIdentity();
-       double rad  = atan((height/2)/500);
-       double deg  = (rad*180)/M_PI;
-
-       //gluPerspective(deg*2, width/height, -z-20, -z+20);
-       gluPerspective(deg*2, width/height, 1, 500*1000);
-
-       aweather_gui_gl_end(gui);
-       return FALSE;
+       g_debug("AWeatherGui: update_time_widget - time=%s", time);
+       GtkTreeView  *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "time"));
+       GtkTreeModel *model = GTK_TREE_MODEL(gtk_tree_view_get_model(tview));
+       GtkTreeIter iter;
+       if (gtk_tree_model_find_string(model, &iter, NULL, 0, time)) {
+               GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
+               g_signal_handlers_block_by_func(tview,
+                               G_CALLBACK(on_site_changed), self);
+               gtk_tree_view_set_cursor(tview, path, NULL, FALSE);
+               g_signal_handlers_unblock_by_func(tview,
+                               G_CALLBACK(on_site_changed), self);
+               gtk_tree_path_free(path);
+       }
 }
 
-gboolean on_expose_begin(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui)
+static void update_site_widget(GisView *view, char *site, AWeatherGui *self)
 {
-       g_message("aweather:expose_begin");
-       aweather_gui_gl_begin(gui);
-
-       double x, y, z;
-       AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_get_location(view, &x, &y, &z);
-
-       glMatrixMode(GL_MODELVIEW);
-       glLoadIdentity();
-       glTranslatef(x, y, z);
-
-       //glRotatef(-45, 1, 0, 0);
-
-       /* Expose plugins */
-       for (GList *cur = gui->plugins; cur; cur = cur->next) {
-               AWeatherPlugin *plugin = AWEATHER_PLUGIN(cur->data);
-               aweather_plugin_expose(plugin);
+       g_debug("AWeatherGui: update_site_widget - site=%s", site);
+       GtkComboBox  *combo = GTK_COMBO_BOX(aweather_gui_get_widget(self, "site"));
+       GtkTreeModel *model = GTK_TREE_MODEL(gtk_combo_box_get_model(combo));
+       GtkTreeIter iter;
+       if (gtk_tree_model_find_string(model, &iter, NULL, 1, site)) {
+               g_signal_handlers_block_by_func(combo,
+                               G_CALLBACK(on_site_changed), self);
+               gtk_combo_box_set_active_iter(combo, &iter);
+               g_signal_handlers_unblock_by_func(combo,
+                               G_CALLBACK(on_site_changed), self);
        }
-
-       return FALSE;
-}
-gboolean on_expose_end(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui)
-{
-       g_message("aweather:expose_end\n");
-       aweather_gui_gl_end(gui);
-       aweather_gui_gl_flush(gui);
-       return FALSE;
 }
 
-void on_about(GtkMenuItem *item, AWeatherGui *gui)
+/* Prefs callbacks */
+void on_offline(GtkToggleAction *action, AWeatherGui *self)
 {
-       GError *error = NULL;
-       GtkBuilder *builder = gtk_builder_new();
-       if (!gtk_builder_add_from_file(builder, DATADIR "/aweather/about.xml", &error))
-               g_error("Failed to create gtk builder: %s", error->message);
-       gtk_builder_connect_signals(builder, NULL);
-       GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
-       gtk_window_set_transient_for(GTK_WINDOW(window),
-                       GTK_WINDOW(aweather_gui_get_widget(gui, "window")));
-       gtk_widget_show_all(window);
-       g_object_unref(builder);
+       gboolean value = gtk_toggle_action_get_active(action);
+       g_debug("AWeatherGui: on_offline - offline=%d", value);
+       gis_prefs_set_boolean(self->prefs, "gis/offline", value);
+       gis_world_set_offline(self->world, value);
 }
 
-void on_location_changed(AWeatherView *view,
-               gdouble x, gdouble y, gdouble z, AWeatherGui *gui)
+void on_initial_site_changed(GtkComboBox *combo, AWeatherGui *self)
 {
-       /* Reset clipping area and redraw */
-       GtkWidget *da = aweather_gui_get_widget(gui, "drawing");
-       on_configure(da, NULL, gui);
-       aweather_gui_gl_redraw(gui);
+       gchar *site;
+       GtkTreeIter iter;
+       GtkTreeModel *model = gtk_combo_box_get_model(combo);
+       gtk_combo_box_get_active_iter(combo, &iter);
+       gtk_tree_model_get(model, &iter, 1, &site, -1);
+       g_debug("AWeatherGui: on_initial_site_changed - site=%s", site);
+       gis_prefs_set_string(self->prefs, "aweather/initial_site", site);
+       g_free(site);
 }
 
-/* TODO: replace the code in these with `gtk_tree_model_find' utility */
-static void update_time_widget(AWeatherView *view, char *time, AWeatherGui *gui)
+void on_nexrad_url_changed(GtkEntry *entry, AWeatherGui *self)
 {
-       g_message("updating time widget");
-       GtkTreeView  *tview = GTK_TREE_VIEW(aweather_gui_get_widget(gui, "time"));
-       GtkTreeModel *model = GTK_TREE_MODEL(gtk_tree_view_get_model(tview));
-       for (int i = 0; i < gtk_tree_model_iter_n_children(model, NULL); i++) {
-               char *text;
-               GtkTreeIter iter;
-               gtk_tree_model_iter_nth_child(model, &iter, NULL, i);
-               gtk_tree_model_get(model, &iter, 0, &text, -1);
-               if (g_str_equal(text, time)) {
-                       GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
-                       g_signal_handlers_block_by_func(tview,
-                                       G_CALLBACK(on_site_changed), gui);
-                       gtk_tree_view_set_cursor(tview, path, NULL, FALSE);
-                       g_signal_handlers_unblock_by_func(tview,
-                                       G_CALLBACK(on_site_changed), gui);
-                       gtk_tree_path_free(path);
-                       g_free(text);
-                       return;
-               }
-               g_free(text);
-       }
+       const gchar *text = gtk_entry_get_text(entry);
+       g_debug("AWeatherGui: on_nexrad_url_changed - url=%s", text);
+       gis_prefs_set_string(self->prefs, "aweather/nexrad_url", text);
 }
-static void update_site_widget(AWeatherView *view, char *site, AWeatherGui *gui)
+
+int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
 {
-       g_message("updating site widget to %s", site);
-       GtkComboBox  *combo = GTK_COMBO_BOX(aweather_gui_get_widget(gui, "site"));
-       GtkTreeModel *model = GTK_TREE_MODEL(gtk_combo_box_get_model(combo));
-       for (int i = 0; i < gtk_tree_model_iter_n_children(model, NULL); i++) {
-               GtkTreeIter iter1;
-               gtk_tree_model_iter_nth_child(model, &iter1, NULL, i);
-               for (int i = 0; i < gtk_tree_model_iter_n_children(model, &iter1); i++) {
-                       GtkTreeIter iter2;
-                       gtk_tree_model_iter_nth_child(model, &iter2, &iter1, i);
-                       char *text;
-                       gtk_tree_model_get(model, &iter2, 1, &text, -1);
-                       if (g_str_equal(text, site)) {
-                               g_signal_handlers_block_by_func(combo,
-                                               G_CALLBACK(on_site_changed), gui);
-                               gtk_combo_box_set_active_iter(combo, &iter2);
-                               g_signal_handlers_unblock_by_func(combo,
-                                               G_CALLBACK(on_site_changed), gui);
-                               g_free(text);
-                               return;
-                       }
-                       g_free(text);
-               }
-       }
+       gint value = gtk_spin_button_get_value_as_int(spinner);
+       g_debug("AWeatherGui: on_log_level_changed - %p, level=%d", self, value);
+       gis_prefs_set_integer(self->prefs, "aweather/log_level", value);
+       return TRUE;
 }
 
+
 /*****************
  * Setup helpers *
  *****************/
+static void prefs_setup(AWeatherGui *self)
+{
+       /* Set values */
+       gchar *nu = gis_prefs_get_string (self->prefs, "aweather/nexrad_url");
+       gint   ll = gis_prefs_get_integer(self->prefs, "aweather/log_level");
+       gchar *is = gis_prefs_get_string (self->prefs, "aweather/initial_site");
+       GtkWidget *nuw = aweather_gui_get_widget(self, "nexrad_url");
+       GtkWidget *llw = aweather_gui_get_widget(self, "log_level");
+       GtkWidget *isw = aweather_gui_get_widget(self, "initial_site");
+       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);
+       if (is) {
+               GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(isw));
+               GtkTreeIter iter;
+               if (gtk_tree_model_find_string(model, &iter, NULL, 1, is))
+                       gtk_combo_box_set_active_iter(GTK_COMBO_BOX(isw), &iter);
+       }
+
+       /* 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)
 {
@@ -313,10 +245,10 @@ static void combo_sensitive(GtkCellLayout *cell_layout, GtkCellRenderer *cell,
        g_object_set(cell, "sensitive", sensitive, NULL);
 }
 
-static void site_setup(AWeatherGui *gui)
+static void site_setup(AWeatherGui *self)
 {
        GtkTreeIter state, city;
-       GtkTreeStore *store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+       GtkTreeStore *store = GTK_TREE_STORE(aweather_gui_get_object(self, "sites"));
        for (int i = 0; cities[i].label; i++) {
                if (cities[i].type == LOCATION_STATE) {
                        gtk_tree_store_append(store, &state, NULL);
@@ -329,55 +261,112 @@ static void site_setup(AWeatherGui *gui)
                }
        }
 
-       GtkWidget       *combo    = aweather_gui_get_widget(gui, "site");
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
-       gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, FALSE);
-       gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer, "text", 0, NULL);
-       gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store));
-       gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), renderer,
-                       combo_sensitive, NULL, NULL);
-       g_object_unref(renderer);
-       g_object_unref(store);
+       GtkWidget *combo    = aweather_gui_get_widget(self, "site");
+       GObject   *renderer = aweather_gui_get_object(self, "site_rend");
+       gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo),
+                       GTK_CELL_RENDERER(renderer), combo_sensitive, NULL, NULL);
 
-       AWeatherView *aview = aweather_gui_get_view(gui);
-       g_signal_connect(aview, "site-changed", G_CALLBACK(update_site_widget), gui);
+       g_signal_connect(self->view, "site-changed",
+                       G_CALLBACK(update_site_widget), self);
 }
 
-static void time_setup(AWeatherGui *gui)
+static void time_setup(AWeatherGui *self)
 {
-       GtkTreeView  *tview  = GTK_TREE_VIEW(aweather_gui_get_widget(gui, "time"));
-       GtkTreeModel *store  = GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_STRING));
-       gtk_tree_view_set_model(tview, store);
-
-       GtkCellRenderer   *rend = gtk_cell_renderer_text_new();
-       GtkTreeViewColumn *col  = gtk_tree_view_column_new_with_attributes(
+       GtkTreeView       *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "time"));
+       GtkCellRenderer   *rend  = gtk_cell_renderer_text_new();
+       GtkTreeViewColumn *col   = gtk_tree_view_column_new_with_attributes(
                                        "Time", rend, "text", 0, NULL);
+
        gtk_tree_view_append_column(tview, col);
+       g_object_set(rend, "size-points", 8.0, NULL);
 
-       AWeatherView *aview = aweather_gui_get_view(gui);
-       g_signal_connect(aview, "time-changed", G_CALLBACK(update_time_widget), gui);
+       g_signal_connect(self->view, "time-changed",
+                       G_CALLBACK(update_time_widget), self);
 }
 
-static void opengl_setup(AWeatherGui *gui)
+
+/*************************
+ * Deprecated site stuff *
+ *************************/
+/* TODO: These update times functions are getting ugly... */
+static void update_times_gtk(AWeatherGui *self, GList *times)
 {
-       GtkDrawingArea *drawing = GTK_DRAWING_AREA(aweather_gui_get_widget(gui, "drawing"));
+       gchar *last_time = NULL;
+       GRegex *regex = g_regex_new("^[A-Z]{4}_([0-9]{8}_[0-9]{4})$", 0, 0, NULL); // KLSX_20090622_2113
+       GMatchInfo *info;
+
+       GtkTreeView  *tview  = GTK_TREE_VIEW(aweather_gui_get_widget(self, "time"));
+       GtkListStore *lstore = GTK_LIST_STORE(gtk_tree_view_get_model(tview));
+       gtk_list_store_clear(lstore);
+       GtkTreeIter iter;
+       times = g_list_reverse(times);
+       for (GList *cur = times; cur; cur = cur->next) {
+               if (g_regex_match(regex, cur->data, 0, &info)) {
+                       gchar *time = g_match_info_fetch(info, 1);
+                       gtk_list_store_insert(lstore, &iter, 0);
+                       gtk_list_store_set(lstore, &iter, 0, time, -1);
+                       last_time = time;
+               }
+       }
 
-       GdkGLConfig *glconfig = gdk_gl_config_new_by_mode(
-                       GDK_GL_MODE_RGBA   | GDK_GL_MODE_DEPTH |
-                       GDK_GL_MODE_DOUBLE | GDK_GL_MODE_ALPHA);
-       if (!glconfig)
-               g_error("Failed to create glconfig");
-       if (!gtk_widget_set_gl_capability(GTK_WIDGET(drawing),
-                               glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE))
-               g_error("GL lacks required capabilities");
+       gis_view_set_time(self->view, last_time);
 
-       /* Set up OpenGL Stuff, glade doesn't like doing these */
-       g_signal_connect      (drawing, "map-event",       G_CALLBACK(on_map),          gui);
-       g_signal_connect      (drawing, "configure-event", G_CALLBACK(on_configure),    gui);
-       g_signal_connect      (drawing, "expose-event",    G_CALLBACK(on_expose_begin), gui);
-       g_signal_connect_after(drawing, "expose-event",    G_CALLBACK(on_expose_end),   gui);
+       g_regex_unref(regex);
+       g_list_foreach(times, (GFunc)g_free, NULL);
+       g_list_free(times);
+}
+static void update_times_online_cb(char *path, gboolean updated, gpointer _self)
+{
+       GList *times = NULL;
+       gchar *data;
+       gsize length;
+       g_file_get_contents(path, &data, &length, NULL);
+       gchar **lines = g_strsplit(data, "\n", -1);
+       for (int i = 0; lines[i] && lines[i][0]; i++) {
+               char **parts = g_strsplit(lines[i], " ", 2);
+               times = g_list_prepend(times, g_strdup(parts[1]));
+               g_strfreev(parts);
+       }
+       g_strfreev(lines);
+       g_free(data);
+
+       update_times_gtk(_self, times);
+}
+static void update_times(AWeatherGui *self, GisView *view, char *site)
+{
+       g_debug("AWeatherGui: update_times - site=%s", site);
+       if (gis_world_get_offline(self->world)) {
+               GList *times = NULL;
+               gchar *path = g_build_filename(g_get_user_cache_dir(), PACKAGE, "nexrd2", "raw", site, NULL);
+               GDir *dir = g_dir_open(path, 0, NULL);
+               if (dir) {
+                       const gchar *name;
+                       while ((name = g_dir_read_name(dir))) {
+                               times = g_list_prepend(times, g_strdup(name));
+                       }
+                       g_dir_close(dir);
+               }
+               g_free(path);
+               update_times_gtk(self, times);
+       } else {
+               gchar *path = g_strdup_printf("nexrd2/raw/%s/dir.list", site);
+               char *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url");
+               cache_file(base, path, GIS_REFRESH, NULL, update_times_online_cb, self);
+               /* update_times_gtk from update_times_online_cb */
+       }
+}
+static void on_gis_site_changed(GisView *view, char *site, gpointer _self)
+{
+       AWeatherGui *self = AWEATHER_GUI(_self);
+       g_debug("AWeatherGui: on_site_changed - Loading wsr88d list for %s", site);
+       update_times(self, view, site);
+}
+static void on_gis_refresh(GisWorld *world, gpointer _self)
+{
+       AWeatherGui *self = AWEATHER_GUI(_self);
+       char *site = gis_view_get_site(self->view);
+       update_times(self, self->view, site);
 }
-
 
 
 /***********
@@ -385,84 +374,182 @@ static void opengl_setup(AWeatherGui *gui)
  ***********/
 AWeatherGui *aweather_gui_new()
 {
-       //g_message("aweather_gui_new");
-       GError *error = NULL;
-
-       AWeatherGui *gui = g_object_new(AWEATHER_TYPE_GUI, NULL);
-
-       gui->builder = gtk_builder_new();
-       if (!gtk_builder_add_from_file(gui->builder, DATADIR "/aweather/main.xml", &error))
-               g_error("Failed to create gtk builder: %s", error->message);
-       gui->view    = aweather_view_new();
-       gui->window  = GTK_WINDOW      (gtk_builder_get_object(gui->builder, "main"));
-       gui->tabs    = GTK_NOTEBOOK    (gtk_builder_get_object(gui->builder, "tabs")); 
-       gui->drawing = GTK_DRAWING_AREA(gtk_builder_get_object(gui->builder, "drawing"));
-       gtk_builder_connect_signals(gui->builder, gui);
-
-
-       /* Load components */
-       aweather_view_set_location(gui->view, 0, 0, -300*1000);
-       g_signal_connect(gui->view, "location-changed", G_CALLBACK(on_location_changed), gui);
-       site_setup(gui);
-       time_setup(gui);
-       opengl_setup(gui);
-       return gui;
+       g_debug("AWeatherGui: new");
+       return g_object_new(AWEATHER_TYPE_GUI, NULL);
 }
-AWeatherView *aweather_gui_get_view(AWeatherGui *gui)
+GisWorld *aweather_gui_get_world(AWeatherGui *self)
 {
-       g_assert(AWEATHER_IS_GUI(gui));
-       return gui->view;
+       g_assert(AWEATHER_IS_GUI(self));
+       return self->world;
 }
-GtkBuilder *aweather_gui_get_builder(AWeatherGui *gui)
+GisView *aweather_gui_get_view(AWeatherGui *self)
 {
-       g_assert(AWEATHER_IS_GUI(gui));
-       return gui->builder;
+       g_assert(AWEATHER_IS_GUI(self));
+       return self->view;
 }
-GtkWidget *aweather_gui_get_widget(AWeatherGui *gui, const gchar *name)
+GisOpenGL *aweather_gui_get_opengl(AWeatherGui *self)
 {
-       g_assert(AWEATHER_IS_GUI(gui));
-       GObject *widget = gtk_builder_get_object(gui->builder, name);
-       if (!GTK_IS_WIDGET(widget))
-               g_error("Failed to get widget `%s'", name);
-       return GTK_WIDGET(widget);
+       g_assert(AWEATHER_IS_GUI(self));
+       return self->opengl;
 }
-void aweather_gui_register_plugin(AWeatherGui *gui, AWeatherPlugin *plugin)
+GtkBuilder *aweather_gui_get_builder(AWeatherGui *self)
 {
-       g_message("registering plugin");
-       gui->plugins = g_list_append(gui->plugins, plugin);
+       g_debug("AWeatherGui: get_builder");
+       g_assert(AWEATHER_IS_GUI(self));
+       return self->builder;
 }
-void aweather_gui_gl_redraw(AWeatherGui *gui)
+GtkWidget *aweather_gui_get_widget(AWeatherGui *self, const gchar *name)
 {
-       g_message("redraw");
-       GtkWidget *drawing = aweather_gui_get_widget(gui, "drawing");
-       gtk_widget_queue_draw(drawing);
+       g_debug("AWeatherGui: get_widget - name=%s", name);
+       g_assert(AWEATHER_IS_GUI(self));
+       GObject *widget = gtk_builder_get_object(self->builder, name);
+       if (!GTK_IS_WIDGET(widget))
+               g_error("Failed to get widget `%s'", name);
+       return GTK_WIDGET(widget);
 }
-void aweather_gui_gl_begin(AWeatherGui *gui)
+GObject *aweather_gui_get_object(AWeatherGui *self, const gchar *name)
+{
+       g_debug("AWeatherGui: get_widget - name=%s", name);
+       g_assert(AWEATHER_IS_GUI(self));
+       return gtk_builder_get_object(self->builder, name);
+}
+void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name)
+{
+       GisPlugin *plugin = gis_plugins_load(self->plugins, name,
+                       self->world, self->view, self->opengl, self->prefs);
+       GtkWidget *config = aweather_gui_get_widget(self, "tabs");
+       GtkWidget *tab    = gtk_label_new(name);
+       GtkWidget *body   = gis_plugin_get_config(plugin);
+       gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab);
+       gtk_widget_show_all(config);
+       gis_opengl_redraw(self->opengl);
+}
+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++) {
+               g_debug("testing tab %d", 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);
+               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);
+       }
+       gis_plugins_unload(self->plugins, name);
+       gis_opengl_redraw(self->opengl);
+}
+
+
+/****************
+ * GObject code *
+ ****************/
+G_DEFINE_TYPE(AWeatherGui, aweather_gui, GTK_TYPE_WINDOW);
+static void aweather_gui_init(AWeatherGui *self)
 {
-       g_assert(AWEATHER_IS_GUI(gui));
+       g_debug("AWeatherGui: init");
+
+       /* Simple things */
+       self->prefs   = gis_prefs_new("aweather");
+       self->plugins = gis_plugins_new();
+       self->world   = gis_world_new();
+       self->view    = gis_view_new();
+       self->opengl  = gis_opengl_new(self->world, self->view, self->plugins);
+
+       /* Setup window */
+       self->builder = gtk_builder_new();
+       GError *error = NULL;
+       if (!gtk_builder_add_from_file(self->builder, DATADIR "/aweather/main.ui", &error))
+               g_error("Failed to create gtk builder: %s", error->message);
+       gtk_widget_reparent(aweather_gui_get_widget(self, "body"), GTK_WIDGET(self));
+       GtkWidget *hpaned = aweather_gui_get_widget(self, "hpaned");
+       gtk_widget_destroy(gtk_paned_get_child1(GTK_PANED(hpaned)));
+       gtk_paned_pack1(GTK_PANED(hpaned), GTK_WIDGET(self->opengl), TRUE, FALSE);
+
+       /* Plugins */
+       GtkTreeIter iter;
+       self->gtk_plugins = GTK_LIST_STORE(aweather_gui_get_object(self, "plugins"));
+       for (GList *cur = gis_plugins_available(); cur; cur = cur->next) {
+               gchar *name = cur->data;
+               gboolean enabled = gis_prefs_get_boolean_v(self->prefs, cur->data, "enabled");
+               gtk_list_store_append(self->gtk_plugins, &iter);
+               gtk_list_store_set(self->gtk_plugins, &iter, 0, name, 1, enabled, -1);
+               if (enabled)
+                       aweather_gui_attach_plugin(self, name);
+       }
 
-       GtkDrawingArea *drawing    = GTK_DRAWING_AREA(aweather_gui_get_widget(gui, "drawing"));
-       GdkGLContext   *glcontext  = gtk_widget_get_gl_context(GTK_WIDGET(drawing));
-       GdkGLDrawable  *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(drawing));
+       /* Misc, helpers */
+       site_setup(self);
+       time_setup(self);
+       prefs_setup(self);
 
-       if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
-               g_assert_not_reached();
+       /* Connect signals */
+       gtk_builder_connect_signals(self->builder, self);
+       g_signal_connect(self, "key-press-event",
+                       G_CALLBACK(on_gui_key_press), self);
+       g_signal_connect_swapped(self->world, "offline",
+                       G_CALLBACK(gtk_toggle_action_set_active),
+                       aweather_gui_get_object(self, "offline"));
 
-       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+       /* deprecated site stuff */
+       g_signal_connect(self->view,  "site-changed", G_CALLBACK(on_gis_site_changed), self);
+       g_signal_connect(self->world, "refresh",      G_CALLBACK(on_gis_refresh),      self);
 }
-void aweather_gui_gl_end(AWeatherGui *gui)
+static GObject *aweather_gui_constructor(GType gtype, guint n_properties,
+               GObjectConstructParam *properties)
+{
+       g_debug("aweather_gui: constructor");
+       GObjectClass *parent_class = G_OBJECT_CLASS(aweather_gui_parent_class);
+       return parent_class->constructor(gtype, n_properties, properties);
+}
+static void aweather_gui_dispose(GObject *_self)
+{
+       g_debug("AWeatherGui: dispose");
+       AWeatherGui *self = AWEATHER_GUI(_self);
+       if (self->builder) {
+               /* Reparent to avoid double unrefs */
+               GtkWidget *body   = aweather_gui_get_widget(self, "body");
+               GtkWidget *window = aweather_gui_get_widget(self, "main_window");
+               gtk_widget_reparent(body, window);
+               g_object_unref(self->builder);
+               self->builder = NULL;
+       }
+       if (self->world) {
+               g_object_unref(self->world);
+               self->world = NULL;
+       }
+       if (self->view) {
+               g_object_unref(self->view);
+               self->view = NULL;
+       }
+       if (self->opengl) {
+               g_object_unref(self->opengl);
+               self->opengl = NULL;
+       }
+       if (self->plugins) {
+               gis_plugins_free(self->plugins);
+               self->plugins = NULL;
+       }
+       if (self->prefs) {
+               g_object_unref(self->prefs);
+               self->prefs = NULL;
+       }
+       G_OBJECT_CLASS(aweather_gui_parent_class)->dispose(_self);
+}
+static void aweather_gui_finalize(GObject *_self)
 {
-       g_assert(AWEATHER_IS_GUI(gui));
-       GdkGLDrawable *gldrawable = gdk_gl_drawable_get_current();
-       gdk_gl_drawable_gl_end(gldrawable);
+       g_debug("AWeatherGui: finalize");
+       G_OBJECT_CLASS(aweather_gui_parent_class)->finalize(_self);
+       gtk_main_quit();
+
 }
-void aweather_gui_gl_flush(AWeatherGui *gui)
+static void aweather_gui_class_init(AWeatherGuiClass *klass)
 {
-       g_assert(AWEATHER_IS_GUI(gui));
-       GdkGLDrawable *gldrawable = gdk_gl_drawable_get_current();
-       if (gdk_gl_drawable_is_double_buffered(gldrawable))
-               gdk_gl_drawable_swap_buffers(gldrawable);
-       else
-               glFlush();
-       gdk_gl_drawable_gl_end(gldrawable);
+       g_debug("AWeatherGui: class_init");
+       GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+       gobject_class->constructor  = aweather_gui_constructor;
+       gobject_class->dispose      = aweather_gui_dispose;
+       gobject_class->finalize     = aweather_gui_finalize;
 }