X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Faweather-gui.h;h=476cab18ac7201c9d370266dd85b78ad641e0ddf;hp=27383b258ccc293bc12f125ac055e13a5262d25d;hb=f705ad00b5d94f8ddc59575737b79feed191b404;hpb=1cf8b4ecd92f49dfbbe0472e02d4e5bc8841fe2f

diff --git a/src/aweather-gui.h b/src/aweather-gui.h
index 27383b2..476cab1 100644
--- a/src/aweather-gui.h
+++ b/src/aweather-gui.h
@@ -20,7 +20,9 @@
 
 #include <gtk/gtk.h>
 #include <glib-object.h>
-#include "aweather-view.h"
+#include "gis-opengl.h"
+#include "gis-world.h"
+#include "gis-view.h"
 #include "aweather-plugin.h"
 
 /* Type macros */
@@ -38,9 +40,13 @@ struct _AWeatherGui {
 	GtkWindow parent_instance;
 
 	/* instance members */
-	AWeatherView   *view;
-	GtkBuilder     *builder;
-	GList          *plugins;
+	GtkBuilder *builder;
+	GisWorld   *world;
+	GisView    *view;
+	GisOpenGL  *opengl;
+	GList      *plugins;
+	GKeyFile   *prefs;
+	GtkListStore *gtk_plugins;
 };
 
 struct _AWeatherGuiClass {
@@ -52,14 +58,16 @@ struct _AWeatherGuiClass {
 GType aweather_gui_get_type(void);
 
 /* Methods */
-AWeatherGui    *aweather_gui_new();
-AWeatherView   *aweather_gui_get_view(AWeatherGui *gui);
-GtkWidget      *aweather_gui_get_widget(AWeatherGui *gui, const gchar *name);
-GObject        *aweather_gui_get_object(AWeatherGui *gui, const gchar *name);
-void            aweather_gui_register_plugin(AWeatherGui *gui, AWeatherPlugin *plugin);
-void            aweather_gui_gl_redraw(AWeatherGui *gui);
-void            aweather_gui_gl_begin(AWeatherGui *gui);
-void            aweather_gui_gl_end(AWeatherGui *gui);
-void            aweather_gui_gl_flush(AWeatherGui *gui);
+AWeatherGui *aweather_gui_new();
+
+GisWorld    *aweather_gui_get_world(AWeatherGui *gui);
+GisOpenGL   *aweather_gui_get_opengl(AWeatherGui *gui);
+GisView     *aweather_gui_get_view(AWeatherGui *gui);
+
+GtkWidget   *aweather_gui_get_widget(AWeatherGui *gui, const gchar *name);
+GObject     *aweather_gui_get_object(AWeatherGui *gui, const gchar *name);
+
+gboolean     aweather_gui_load_plugin(AWeatherGui *gui, const gchar *name);
+gboolean     aweather_gui_unload_plugin(AWeatherGui *gui, const gchar *name);
 
 #endif