Fix compiling plugins

[grits] / src / main.c

diff --git a/src/main.c b/src/main.c
index d1b13b38ec9eb4ba0e3f116e13d457874bb8fd37..09a3bfd43817578d4f4d5e2424870ddb5ecd403b 100644 (file)
--- 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,27 +32,35 @@ 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  = "IND";
-       gboolean opt_auto  = FALSE;
+       gint     opt_debug   = 0;
+       gchar   *opt_site    = NULL;
+       gboolean opt_auto    = FALSE;
+       gboolean opt_offline = FALSE;
        GOptionEntry entries[] = {
-               //long    short flg type                 location    description                 arg desc
-               {"debug", 'd',  0,  G_OPTION_ARG_INT,    &opt_debug, "Change default log level", "[1-7]"},
-               {"site",  's',  0,  G_OPTION_ARG_STRING, &opt_site,  "Set initial site",         NULL},
-               {"auto",  'a',  0,  G_OPTION_ARG_NONE,   &opt_auto,  "Auto update radar (todo)", NULL},
+               //long      short flg type                 location      description                 arg desc
+               {"debug",   'd',  0,  G_OPTION_ARG_INT,    &opt_debug,   "Change default log level", "[1-7]"},
+               {"site",    's',  0,  G_OPTION_ARG_STRING, &opt_site,    "Set initial site",         NULL},
+               {"offline", 'o',  0,  G_OPTION_ARG_NONE,   &opt_offline, "Run in offline mode",      NULL},
+               {"auto",    'a',  0,  G_OPTION_ARG_NONE,   &opt_auto,    "Auto update radar (todo)", NULL},
                {NULL}
        };
 
@@ -67,24 +74,30 @@ int main(int argc, char *argv[])
        }
        gtk_gl_init(&argc, &argv);
 
-       /* Finish arguments */
-       log_levels = 1 << opt_debug;
-
-       /* 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);
-       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;
 }