Update for libgis

[aweather] / src / main.c

diff --git a/src/main.c b/src/main.c
index 843592c54317804727410cd667bf1abbb37d6b14..83517e11e575822de0cfd9e547c8f0f3fc68e7a4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 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
@@ -19,12 +19,9 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 
+#include <gis.h>
+
 #include "aweather-gui.h"
-#include "gis-view.h"
-#include "gis-world.h"
-#include "plugin-radar.h"
-#include "plugin-ridge.h"
-#include "plugin-example.h"
 
 static gint log_levels = 0;
 
@@ -35,23 +32,27 @@ static void log_func(const gchar *log_domain, GLogLevelFlags log_level,
                g_log_default_handler(log_domain, log_level, message, udata);
 }
 
-static gulong on_map_id = 0;
-static gboolean on_map(AWeatherGui *gui, GdkEvent *event, gchar *site)
+static void on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
 {
-       GisView *view = aweather_gui_get_view(gui);
-       gis_view_set_site(view, site);
-       g_signal_handler_disconnect(gui, on_map_id);
-       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[] = {
@@ -73,30 +74,29 @@ 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 */
-       /* 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)));
-       opengl->plugins = gui->plugins;
+       AWeatherGui *gui    = aweather_gui_new();
+
+       gint     prefs_debug   = gis_prefs_get_integer(gui->prefs, "aweather/log_level", NULL);
+       gchar   *prefs_site    = gis_prefs_get_string(gui->prefs,  "aweather/initial_site", NULL);
+       gboolean prefs_offline = gis_prefs_get_boolean(gui->prefs, "gis/offline", NULL);
+
+       debug   = (opt_debug   ?: prefs_debug   ?: debug);
+       site    = (opt_site    ?: prefs_site    ?: site);
+       offline = (opt_offline ?: prefs_offline ?: offline);
+
+       gis_viewer_set_offline(gui->viewer, 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));
        gtk_main();
-
        return 0;
 }