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

diff --git a/src/main.c b/src/main.c
index 67df7a6..09a3bfd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,10 +19,9 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 
+#include <gis/gis.h>
+
 #include "aweather-gui.h"
-#include "plugin-radar.h"
-#include "plugin-ridge.h"
-#include "plugin-example.h"
 
 static gint log_levels = 0;
 
@@ -33,21 +32,27 @@ static void log_func(const gchar *log_domain, GLogLevelFlags log_level,
 		g_log_default_handler(log_domain, log_level, message, udata);
 }
 
-static gboolean on_map(AWeatherGui *gui, GdkEvent *event, gchar *site)
+static void on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
 {
-	AWeatherView *view = aweather_gui_get_view(gui);
-	aweather_view_set_site(view, site);
-	return FALSE;
+	g_message("main: log_level_changed");
+	gint value = gtk_spin_button_get_value_as_int(spinner);
+	log_levels = (1 << (value+1))-1;
 }
 
+
 /********
  * Main *
  ********/
 int main(int argc, char *argv[])
 {
+	/* Defaults */
+	gint     debug   = 6;
+	gchar   *site    = "KIND";
+	gboolean offline = FALSE;
+
 	/* Arguments */
-	gint     opt_debug   = 6;
-	gchar   *opt_site    = "KIND";
+	gint     opt_debug   = 0;
+	gchar   *opt_site    = NULL;
 	gboolean opt_auto    = FALSE;
 	gboolean opt_offline = FALSE;
 	GOptionEntry entries[] = {
@@ -69,25 +74,30 @@ int main(int argc, char *argv[])
 	}
 	gtk_gl_init(&argc, &argv);
 
-	/* Finish arguments */
-	log_levels = (1 << (opt_debug+1))-1;
-
-	/* Logging */
+	/* Do some logging here for aweather_gui_new */
+	if (opt_debug) log_levels = (1 << (opt_debug+1))-1;
+	else           log_levels = (1 << (6+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);
+	AWeatherGui *gui    = aweather_gui_new();
 
-	/* 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)));
+	gint     prefs_debug   = gis_prefs_get_integer(gui->prefs, "aweather/log_level");
+	gchar   *prefs_site    = gis_prefs_get_string(gui->prefs,  "aweather/initial_site");
+	gboolean prefs_offline = gis_prefs_get_boolean(gui->prefs, "gis/offline");
+
+	debug   = (opt_debug   ?: prefs_debug   ?: debug);
+	site    = (opt_site    ?: prefs_site    ?: site);
+	offline = (opt_offline ?: prefs_offline ?: offline);
+
+	gis_world_set_offline(gui->world, offline);
+	log_levels = (1 << (debug+1))-1;
+
+	GObject *action = aweather_gui_get_object(gui, "prefs_general_log");
+	g_signal_connect(action, "changed", G_CALLBACK(on_log_level_changed), NULL);
 
 	gtk_widget_show_all(GTK_WIDGET(gui));
+	gis_view_set_site(gui->view, site);
 	gtk_main();
-
 	return 0;
 }