Converting a lot of stuff to GObject and adding gtk-doc support

[grits] / src / main.c

diff --git a/src/aweather.c b/src/main.c
similarity index 54%
rename from src/aweather.c
rename to src/main.c
index f6f4341c42fe2a59d507a04502a125b8da6cab54..c5982232569fed94cba70f436e8e50e644e92cea 100644 (file)
--- a/src/aweather.c
+++ b/src/main.c
@@ -1,28 +1,14 @@
 #include <config.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
-#include <gdk/gdkkeysyms.h>
 
+#include "aweather-gui.h"
 #include "location.h"
 #include "opengl.h"
 #include "plugin-radar.h"
 #include "plugin-ridge.h"
 #include "plugin-example.h"
 
-/************************
- * GtkBuilder callbacks *
- ************************/
-gboolean on_window_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
-{
-       if (event->keyval == GDK_q)
-               gtk_main_quit();
-       return TRUE;
-}
-
-void on_site_changed() {
-       g_message("site changed");
-}
-
 /*****************
  * Setup helpers *
  *****************/
@@ -33,7 +19,7 @@ static void combo_sensitive(GtkCellLayout *cell_layout, GtkCellRenderer *cell,
        g_object_set(cell, "sensitive", sensitive, NULL);
 }
 
-static void site_setup(GtkBuilder *builder)
+static void site_setup(AWeatherGui *gui)
 {
        GtkTreeIter state, city;
        GtkTreeStore *store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
@@ -49,6 +35,7 @@ static void site_setup(GtkBuilder *builder)
                }
        }
 
+       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);
@@ -61,11 +48,12 @@ static void site_setup(GtkBuilder *builder)
        //gtk_box_pack_start(GTK_BOX(selectors), loc_sel,  FALSE, FALSE, 0);
 }
 
-static void time_setup(GtkBuilder *builder)
+static void time_setup(AWeatherGui *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(
+       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);
 
@@ -82,36 +70,20 @@ int main(int argc, char *argv[])
        gtk_init(&argc, &argv);
        gtk_gl_init(&argc, &argv);
 
-       GError *error = NULL;
-       GtkBuilder *builder = gtk_builder_new();
-       if (!gtk_builder_add_from_file(builder, DATADIR "/aweather/aweather.xml", &error))
-               g_error("Failed to create gtk builder: %s", error->message);
-       gtk_builder_connect_signals(builder, NULL);
-
-       GtkWidget  *window  = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
-       GtkWidget  *drawing = GTK_WIDGET(gtk_builder_get_object(builder, "drawing"));
-       GtkWidget  *tabs    = GTK_WIDGET(gtk_builder_get_object(builder, "tabs"));
-
-       /* Set up darwing area */
-       GdkGLConfig *glconfig = gdk_gl_config_new_by_mode(
-                       GDK_GL_MODE_RGBA   | GDK_GL_MODE_DEPTH |
-                       GDK_GL_MODE_DOUBLE | GDK_GL_MODE_ALPHA);
-       if (!glconfig)
-               g_error("Failed to create glconfig");
-       if (!gtk_widget_set_gl_capability(drawing, glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE))
-               g_error("GL lacks required capabilities");
+       /* Set up AWeather */
+       AWeatherGui *gui = aweather_gui_new();
 
        /* Load components */
-       site_setup(builder);
-       time_setup(builder);
-       opengl_init(GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tabs));
+       site_setup(gui);
+       time_setup(gui);
+       opengl_init(gui);
 
        /* Load plugins */
-       radar_init  (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tabs));
-       ridge_init  (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tabs));
-       example_init(GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tabs));
+       radar_init  (gui);
+        ridge_init  (gui);
+       example_init(gui);
 
-       gtk_widget_show_all(window);
+       gtk_widget_show_all(GTK_WIDGET(aweather_gui_get_window(gui)));
        gtk_main();
 
        return 0;