/*
- * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-2011 Andy Spencer <andy753421@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <config.h>
#include <gtk/gtk.h>
-#include <gtk/gtkgl.h>
#include <gdk/gdkkeysyms.h>
#include "grits.h"
*************/
static gboolean grits_shutdown(GtkWidget *window)
{
+ static gboolean shutdown = FALSE;
+ if (shutdown) return TRUE;
+ shutdown = TRUE;
+
grits_plugins_free(plugins);
g_object_unref(prefs);
gtk_widget_destroy(window);
-
- while (gtk_events_pending())
- gtk_main_iteration();
-
gtk_main_quit();
return TRUE;
}
return grits_shutdown(widget);
}
static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event,
- gpointer window)
+ gpointer _)
{
if (event->keyval == GDK_q)
return grits_shutdown(widget);
{
GritsPlugin *plugin = grits_plugins_load(plugins, name, viewer, prefs);
GtkWidget *config = grits_plugin_get_config(plugin);
- gtk_notebook_append_page(notebook, config, gtk_label_new(name));
+ if (config)
+ gtk_notebook_append_page(notebook, config, gtk_label_new(name));
}
/***********
g_thread_init(NULL);
gdk_threads_init();
gtk_init(&argc, &argv);
- gtk_gl_init(&argc, &argv);
prefs = grits_prefs_new(NULL, NULL);
plugins = grits_plugins_new(g_getenv("GRITS_PLUGIN_PATH"), prefs);
GtkWidget *config = gtk_notebook_new();
g_signal_connect(window, "delete-event", G_CALLBACK(on_delete), NULL);
g_signal_connect(window, "key-press-event", G_CALLBACK(on_key_press), NULL);
+ gtk_widget_set_size_request(GTK_WIDGET(viewer), 300, 300);
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(config), GTK_POS_BOTTOM);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(viewer), TRUE, TRUE, 0);
/* Configurable stuff */
grits_viewer_set_offline(viewer, TRUE);
- load_plugin(plugins, "elev", viewer, prefs, GTK_NOTEBOOK(config));
+ (void)load_plugin;
load_plugin(plugins, "env", viewer, prefs, GTK_NOTEBOOK(config));
- //load_plugin(plugins, "map", viewer, prefs, GTK_NOTEBOOK(config));
- load_plugin(plugins, "sat", viewer, prefs, GTK_NOTEBOOK(config));
- load_plugin(plugins, "test", viewer, prefs, GTK_NOTEBOOK(config));
+ //load_plugin(plugins, "elev", viewer, prefs, GTK_NOTEBOOK(config));
+ //load_plugin(plugins, "sat", viewer, prefs, GTK_NOTEBOOK(config));
+ load_plugin(plugins, "map", viewer, prefs, GTK_NOTEBOOK(config));
+ //load_plugin(plugins, "alert", viewer, prefs, GTK_NOTEBOOK(config));
//load_plugin(plugins, "radar", viewer, prefs, GTK_NOTEBOOK(config));
+ //load_plugin(plugins, "test", viewer, prefs, GTK_NOTEBOOK(config));
gtk_widget_show_all(config);
gtk_main();
gdk_threads_leave();
gdk_display_close(gdk_display_get_default());
+
+ prefs = NULL;
+ plugins = NULL;
+ viewer = NULL;
+ window = vbox = config = NULL;
return 0;
}