X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fmain.c;h=be6ff8b762473c50829f16b64096db9dd416c298;hb=88b72a1562c00da25a9e8a3622a82e6452cb42ad;hp=773b0337059e327809ec7a7038e2c2c14b06d6bb;hpb=55d69c616a9f4f3bae23045f1174047003e2e1d4;p=aweather

diff --git a/src/main.c b/src/main.c
index 773b033..be6ff8b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,32 +19,85 @@
 #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;
+
+static void log_func(const gchar *log_domain, GLogLevelFlags log_level,
+              const gchar *message, gpointer udata)
+{
+	if (log_level & log_levels)
+		g_log_default_handler(log_domain, log_level, message, udata);
+}
+
+static void on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
+{
+	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[])
 {
-	gtk_init(&argc, &argv);
+	/* Defaults */
+	gint     debug   = 6;
+	gchar   *site    = "KIND";
+	gboolean offline = FALSE;
+
+	/* Arguments */
+	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},
+		{"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}
+	};
+
+	/* Init */
+	GError *error = NULL;
+	g_thread_init(NULL);
+	if (!gtk_init_with_args(&argc, &argv, "aweather", entries, NULL, &error)) {
+		g_print("%s\n", error->message);
+		g_error_free(error);
+		return -1;
+	}
 	gtk_gl_init(&argc, &argv);
 
+	/* 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);
+	AWeatherGui *gui    = aweather_gui_new();
 
-	/* Load plugins */
-	//example_init(gui);
-        //ridge_init(gui);
-	//radar_init(gui);
+	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);
 
-	aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_example_new(gui)));
+	debug   = (opt_debug   ?: prefs_debug   ?: debug);
+	site    = (opt_site    ?: prefs_site    ?: site);
+	offline = (opt_offline ?: prefs_offline ?: offline);
 
-	gtk_widget_show_all(aweather_gui_get_widget(gui, "window"));
-	gtk_main();
+	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));
+	gis_viewer_set_site(gui->viewer, site);
+	gtk_main();
 	return 0;
 }