]> Pileus Git - grits/blobdiff - src/aweather-gui.c
Lots of work on libGIS
[grits] / src / aweather-gui.c
index be6ed5b94ea753fe8d0e0ab62a126dd15b91a731..0c3204d6e15bc40ae763e274ed39d01635e437ac 100644 (file)
 #include "aweather-gui.h"
 #include "aweather-location.h"
 
-/* Needed prototpes */
-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);
-
-/****************
- * GObject code *
- ****************/
-G_DEFINE_TYPE(AWeatherGui, aweather_gui, GTK_TYPE_WINDOW);
-static void aweather_gui_init(AWeatherGui *self)
-{
-       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();
-
-       /* 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));
-
-       /* GIS things */
-       GtkWidget *drawing = aweather_gui_get_widget(self, "drawing");
-       self->opengl = gis_opengl_new(self->world, self->view, GTK_DRAWING_AREA(drawing));
-       self->opengl->plugins = self->plugins;
-       //gtk_widget_show_all(GTK_WIDGET(self));
-
-       /* 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);
-       }
-
-       /* 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",
-                       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"));
-
-       /* 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);
-}
-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_debug("AWeatherGui: finalize");
-       G_OBJECT_CLASS(aweather_gui_parent_class)->finalize(_self);
-       gtk_main_quit();
-
-}
-static void aweather_gui_class_init(AWeatherGuiClass *klass)
-{
-       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;
-}
 
 /*************
  * Callbacks *
@@ -189,7 +69,6 @@ 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");
@@ -208,15 +87,6 @@ void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui
        gis_prefs_set_boolean_v(self->prefs, name, "enabled", state);
        g_free(name);
 }
-void on_prefs(GtkAction *action, AWeatherGui *self)
-{
-       gtk_window_present(GTK_WINDOW(aweather_gui_get_widget(self, "prefs_window")));
-}
-
-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,
                GtkTreeViewColumn *column, AWeatherGui *self)
@@ -241,59 +111,61 @@ void on_site_changed(GtkComboBox *combo, AWeatherGui *self)
        g_free(site);
 }
 
-/* TODO: replace the code in these with `gtk_tree_model_find' utility */
+static gboolean gtk_tree_model_find_string(GtkTreeModel *model,
+               GtkTreeIter *rval, GtkTreeIter *parent, gint field, const gchar *key)
+{
+       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;
+}
+
 static void update_time_widget(GisView *view, const char *time, AWeatherGui *self)
 {
        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));
-       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), 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);
-                       g_free(text);
-                       return;
-               }
-               g_free(text);
+       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);
        }
 }
+
 static void update_site_widget(GisView *view, char *site, AWeatherGui *self)
 {
        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));
-       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 (text == NULL)
-                               continue;
-                       if (g_str_equal(text, site)) {
-                               g_signal_handlers_block_by_func(combo,
-                                               G_CALLBACK(on_site_changed), self);
-                               gtk_combo_box_set_active_iter(combo, &iter2);
-                               g_signal_handlers_unblock_by_func(combo,
-                                               G_CALLBACK(on_site_changed), self);
-                               g_free(text);
-                               return;
-                       }
-                       g_free(text);
-               }
+       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);
        }
 }
+
 /* Prefs callbacks */
 void on_offline(GtkToggleAction *action, AWeatherGui *self)
 {
@@ -302,18 +174,26 @@ void on_offline(GtkToggleAction *action, AWeatherGui *self)
        gis_prefs_set_boolean(self->prefs, "gis/offline", value);
        gis_world_set_offline(self->world, value);
 }
-void on_initial_site_changed(GtkEntry *entry, AWeatherGui *self)
+
+void on_initial_site_changed(GtkComboBox *combo, AWeatherGui *self)
 {
-       const gchar *text = gtk_entry_get_text(entry);
-       g_debug("AWeatherGui: on_initial_site_changed - site=%s", text);
-       gis_prefs_set_string(self->prefs, "aweather/initial_site", text);
+       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);
 }
+
 void on_nexrad_url_changed(GtkEntry *entry, AWeatherGui *self)
 {
        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);
 }
+
 int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
 {
        gint value = gtk_spin_button_get_value_as_int(spinner);
@@ -321,7 +201,7 @@ int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
        gis_prefs_set_integer(self->prefs, "aweather/log_level", value);
        return TRUE;
 }
-// plugins
+
 
 /*****************
  * Setup helpers *
@@ -329,15 +209,20 @@ int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
 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");
+       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");
-       if (is) gtk_entry_set_text(GTK_ENTRY(isw), is), g_free(is);
+       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"));
@@ -483,6 +368,7 @@ static void on_gis_refresh(GisWorld *world, gpointer _self)
        update_times(self, self->view, site);
 }
 
+
 /***********
  * Methods *
  ***********/
@@ -536,6 +422,7 @@ void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *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)
 {
@@ -552,4 +439,117 @@ void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *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_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);
+       }
+
+       /* Misc, helpers */
+       site_setup(self);
+       time_setup(self);
+       prefs_setup(self);
+
+       /* 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"));
+
+       /* 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);
+}
+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_debug("AWeatherGui: finalize");
+       G_OBJECT_CLASS(aweather_gui_parent_class)->finalize(_self);
+       gtk_main_quit();
+
+}
+static void aweather_gui_class_init(AWeatherGuiClass *klass)
+{
+       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;
 }