X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=6db13932a551caaddfa2101a74575502477fc85e;hb=f705ad00b5d94f8ddc59575737b79feed191b404;hp=c5982232569fed94cba70f436e8e50e644e92cea;hpb=d527bfdb9682b1824e1c2df318a92291aaa48860;p=grits diff --git a/src/main.c b/src/main.c index c598223..6db1393 100644 --- a/src/main.c +++ b/src/main.c @@ -1,64 +1,51 @@ +/* + * Copyright (C) 2009 Andy Spencer + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #include #include #include #include "aweather-gui.h" -#include "location.h" -#include "opengl.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; -/***************** - * Setup helpers * - *****************/ -static void combo_sensitive(GtkCellLayout *cell_layout, GtkCellRenderer *cell, - GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) +static void log_func(const gchar *log_domain, GLogLevelFlags log_level, + const gchar *message, gpointer udata) { - gboolean sensitive = !gtk_tree_model_iter_has_child(tree_model, iter); - g_object_set(cell, "sensitive", sensitive, NULL); + if (log_level & log_levels) + g_log_default_handler(log_domain, log_level, message, udata); } -static void site_setup(AWeatherGui *gui) +static void on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self) { - GtkTreeIter state, city; - GtkTreeStore *store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_STRING); - for (int i = 0; cities[i].label; i++) { - if (cities[i].type == LOCATION_STATE) { - gtk_tree_store_append(store, &state, NULL); - gtk_tree_store_set (store, &state, 0, cities[i].label, - 1, cities[i].code, -1); - } else { - gtk_tree_store_append(store, &city, &state); - gtk_tree_store_set (store, &city, 0, cities[i].label, - 1, cities[i].code, -1); - } - } - - GtkBuilder *builder = aweather_gui_get_builder(gui); - GtkWidget *combo = GTK_WIDGET(gtk_builder_get_object(builder, "site")); - GtkCellRenderer *renderer = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, FALSE); - gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer, "text", 0, NULL); - gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store)); - gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), renderer, - combo_sensitive, NULL, NULL); - - //g_signal_connect(G_OBJECT(loc_sel), "changed", G_CALLBACK(loc_changed), NULL); - //gtk_box_pack_start(GTK_BOX(selectors), loc_sel, FALSE, FALSE, 0); + gint value = gtk_spin_button_get_value_as_int(spinner); + log_levels = (1 << (value+1))-1; } -static void time_setup(AWeatherGui *gui) +static gulong on_map_id = 0; +static gboolean on_map(AWeatherGui *gui, GdkEvent *event, gchar *site) { - GtkBuilder *builder = aweather_gui_get_builder(gui); - GtkWidget *view = GTK_WIDGET(gtk_builder_get_object(builder, "time")); - GtkCellRenderer *rend = gtk_cell_renderer_text_new(); - GtkTreeViewColumn *col = gtk_tree_view_column_new_with_attributes( - "Time", rend, 0, "text", NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(view), col); - - GtkTreeStore *store = gtk_tree_store_new(1, G_TYPE_STRING); - gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store)); + GisView *view = aweather_gui_get_view(gui); + gis_view_set_site(view, site); + g_signal_handler_disconnect(gui, on_map_id); + return FALSE; } /******** @@ -66,24 +53,49 @@ static void time_setup(AWeatherGui *gui) ********/ int main(int argc, char *argv[]) { + /* Arguments */ + gint opt_debug = 6; + gchar *opt_site = "KIND"; + 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} + }; - gtk_init(&argc, &argv); + /* 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); + /* 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(); + /* 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); - /* Load components */ - site_setup(gui); - time_setup(gui); - opengl_init(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 */ - radar_init (gui); - ridge_init (gui); - example_init(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(aweather_gui_get_window(gui))); + gtk_widget_show_all(GTK_WIDGET(gui)); gtk_main(); return 0;