X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=6db13932a551caaddfa2101a74575502477fc85e;hb=f705ad00b5d94f8ddc59575737b79feed191b404;hp=67df7a6a3a3703c981b6d043c71ad87e3df9309e;hpb=1cf8b4ecd92f49dfbbe0472e02d4e5bc8841fe2f;p=grits

diff --git a/src/main.c b/src/main.c
index 67df7a6..6db1393 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,9 +20,9 @@
 #include <gtk/gtkgl.h>
 
 #include "aweather-gui.h"
-#include "plugin-radar.h"
-#include "plugin-ridge.h"
-#include "plugin-example.h"
+#include "aweather-plugin.h"
+#include "gis-view.h"
+#include "gis-world.h"
 
 static gint log_levels = 0;
 
@@ -33,10 +33,18 @@ static void log_func(const gchar *log_domain, GLogLevelFlags log_level,
 		g_log_default_handler(log_domain, log_level, message, udata);
 }
 
+static void on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
+{
+	gint value = gtk_spin_button_get_value_as_int(spinner);
+	log_levels = (1 << (value+1))-1;
+}
+
+static gulong on_map_id = 0;
 static gboolean on_map(AWeatherGui *gui, GdkEvent *event, gchar *site)
 {
-	AWeatherView *view = aweather_gui_get_view(gui);
-	aweather_view_set_site(view, site);
+	GisView *view = aweather_gui_get_view(gui);
+	gis_view_set_site(view, site);
+	g_signal_handler_disconnect(gui, on_map_id);
 	return FALSE;
 }
 
@@ -69,22 +77,23 @@ int main(int argc, char *argv[])
 	}
 	gtk_gl_init(&argc, &argv);
 
-	/* Finish arguments */
-	log_levels = (1 << (opt_debug+1))-1;
-
 	/* Logging */
+	log_levels = (1 << (opt_debug+1))-1;
 	g_log_set_handler(NULL, G_LOG_LEVEL_MASK, log_func, NULL);
 
 	/* Set up AWeather */
-	AWeatherGui  *gui  = aweather_gui_new();
-	AWeatherView *view = aweather_gui_get_view(gui);
-	aweather_view_set_offline(view, opt_offline);
-	g_signal_connect(gui, "map-event", G_CALLBACK(on_map), opt_site);
+	/* TODO: Figure out a better way to do plugins
+	 *    AWeatherPlugin interface for tabs?
+	 *    GisPlugin      interface for expose? */
+	AWeatherGui *gui    = aweather_gui_new();
+	GisWorld    *world  = aweather_gui_get_world(gui);
+	GisOpenGL   *opengl = aweather_gui_get_opengl(gui);
+
+	gis_world_set_offline(world, opt_offline);
+	on_map_id = g_signal_connect(gui, "map-event", G_CALLBACK(on_map), opt_site);
 
-	/* Load plugins */
-	aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_example_new(gui)));
-	aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_ridge_new(gui)));
-	aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_radar_new(gui)));
+	GObject *action = aweather_gui_get_object(gui, "log_level");
+	g_signal_connect(action, "changed", G_CALLBACK(on_log_level_changed), NULL);
 
 	gtk_widget_show_all(GTK_WIDGET(gui));
 	gtk_main();