0.3 release with experimental layoyt.

[speedometer] / main.c

diff --git a/main.c b/main.c
index a3c6de0..82c24c8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -20,76 +20,42 @@
 #include <hildon/hildon-window.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
-#include <location/location-gps-device.h>
-#include <location/location-gpsd-control.h>
 
 #include "callbacks.h"
+#include "appdata.h"
+#include "ui.h"
+#include "util.h"
 
 int main(int argc, char** argv) {
 
-
-       HildonProgram *program;
-       HildonWindow *window;
+       AppData *appdata = g_new0(AppData, 1);
 
        gtk_init(&argc, &argv);
 
-       GtkWidget *i1, *i2, *i3;
-       GtkWidget *box;
-
-       program = HILDON_PROGRAM(hildon_program_get_instance());
-       g_set_application_name("Speedometer");
-
-       window = HILDON_WINDOW(hildon_window_new());
-       hildon_program_add_window(program, window);
+       appdata->program = HILDON_PROGRAM(hildon_program_get_instance());
+       appdata->window = HILDON_WINDOW(hildon_window_new());
+       hildon_program_add_window(appdata->program, appdata->window);
 
-       i1 = gtk_image_new_from_file("data/1.png");
-       i2 = gtk_image_new_from_file("data/3.png");
-       i3 = gtk_image_new_from_file("data/4.png");
+       // loads images from the disk to the image array
+       load_images(appdata);
 
-       box = gtk_hbox_new(TRUE, 0);
-       gtk_box_pack_end(box, i1, FALSE, FALSE, 0);
-       gtk_box_pack_end(box, i2, FALSE, FALSE, 0);
-       gtk_box_pack_end(box, i3, FALSE, FALSE, 0);
+       // set display to 000
+       reset_speed(appdata);
 
-       gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(box));
-
-       // set the background color to black
-       GdkColor black;
-       black.red = 0x0000;
-       black.blue = 0x0000;
-       black.green = 0x0000;
-       gtk_widget_modify_bg(window, GTK_STATE_NORMAL, &black);
+       // create ui structure
+       create_ui(appdata);
 
        // set the window fullscreen
-       gtk_window_fullscreen(GTK_WINDOW(window));
-
-       gtk_widget_show_all(GTK_WIDGET(window));
-
+       gtk_window_fullscreen(GTK_WINDOW(appdata->window));
 
+       gtk_widget_show_all(GTK_WIDGET(appdata->window));
 
        g_thread_init(NULL);
 
+       //g_idle_add(randomize, appdata);
 
-#ifdef __arm__
-       // gps device
-       LocationGPSDevice *device;
-       device = g_object_new(LOCATION_TYPE_GPS_DEVICE, NULL);
-
-       // connect some signal handlers
-       g_signal_connect (device, "changed", G_CALLBACK (location_changed), NULL);
-
-    g_signal_connect(G_OBJECT(window),  "key_press_event", G_CALLBACK(key_press_cb), window);
-
-       LocationGPSDControl *control;
-
-       control = location_gpsd_control_get_default();
-       location_gpsd_control_start(control);
-#endif // __arm__
-
-       /* Connect signal to X in the upper corner */
-       g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(gtk_main_quit), NULL);
+       start_gps(appdata);
 
-       /* Start the main event loop. */
        gtk_main();
 
        return EXIT_SUCCESS;