static void on_gis_site_changed(GisView *view, char *site, gpointer _self);
static void site_setup(AWeatherGui *self);
static void time_setup(AWeatherGui *self);
+static void prefs_setup(AWeatherGui *self);
/****************
* GObject code *
/* GIS things */
GtkWidget *drawing = aweather_gui_get_widget(self, "drawing");
- g_message("drawing = %p", 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));
- /* Misc, helpers */
- site_setup(self);
- time_setup(self);
-
/* Plugins */
GtkTreeIter iter;
self->gtk_plugins = GTK_LIST_STORE(aweather_gui_get_object(self, "plugins"));
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",
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));
- g_message("model=%p", model);
gboolean state;
gchar *name;
GtkTreeIter iter;
gis_prefs_set_boolean_v(self->prefs, name, "enabled", state);
g_free(name);
}
-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);
-
- /* 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_time_changed(GtkTreeView *view, GtkTreePath *path,
GtkTreeViewColumn *column, 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 */
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)
{
/*****************
* 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)
{
GtkTreeIter iter;
times = g_list_reverse(times);
for (GList *cur = times; cur; cur = cur->next) {
- g_message("trying time %s", (gchar*)cur->data);
if (g_regex_match(regex, cur->data, 0, &info)) {
gchar *time = g_match_info_fetch(info, 1);
- g_message("adding time %s", (gchar*)cur->data);
gtk_list_store_insert(lstore, &iter, 0);
gtk_list_store_set(lstore, &iter, 0, time, -1);
last_time = time;
}
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);
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, "general/nexrad_url");
- cache_file(base, path, AWEATHER_REFRESH, NULL, update_times_online_cb, self);
+ 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("GisPluginRadar: on_site_changed - Loading wsr88d list for %s", site);
+ 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)
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);
}
projects / aweather / blobdiff