X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=main.c;h=82c24c884341febbcdc1b6a8ab03bcc594f1f379;hb=8bd00384b1f1e9ac7d4a888d53aab0bfce6bd5f8;hp=d15a3046104fe0f37fb91e78e5fbdb523e95dfbb;hpb=544712e99a80a7434714ce1abe25088921a853cb;p=speedometer

diff --git a/main.c b/main.c
index d15a304..82c24c8 100644
--- a/main.c
+++ b/main.c
@@ -20,12 +20,11 @@
 #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) {
 
@@ -33,76 +32,31 @@ int main(int argc, char** argv) {
 
 	gtk_init(&argc, &argv);
 
-
-	GtkWidget *hbox;
-	GtkWidget *vbox;
-
 	appdata->program = HILDON_PROGRAM(hildon_program_get_instance());
 	appdata->window = HILDON_WINDOW(hildon_window_new());
 	hildon_program_add_window(appdata->program, appdata->window);
 
-	set_app_bg_black(appdata);
-
-	populate_image_array(appdata);
-
-	load_default_images(appdata);
+	// loads images from the disk to the image array
+	load_images(appdata);
 
-	vbox = gtk_vbox_new(FALSE, 0);
-	hbox = gtk_hbox_new(TRUE, 0);
+	// set display to 000
+	reset_speed(appdata);
 
-	gtk_box_pack_start_defaults(vbox, gtk_event_box_new());
-	gtk_box_pack_start_defaults(vbox, hbox);
-
-	gtk_box_pack_start(hbox, appdata->speed_array[0], FALSE, FALSE, 0);
-	gtk_box_pack_start(hbox, appdata->speed_array[1], FALSE, FALSE, 0);
-	gtk_box_pack_start(hbox, appdata->speed_array[2], FALSE, FALSE, 0);
-
-	gtk_box_pack_start_defaults(vbox, gtk_button_new_with_label("Bottom"));
-
-	gtk_container_add(GTK_CONTAINER(appdata->window), GTK_WIDGET(vbox));
+	// create ui structure
+	create_ui(appdata);
 
 	// set the window fullscreen
 	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);
-
-	LocationGPSDControl *control;
-
-	control = location_gpsd_control_get_default();
-	location_gpsd_control_start(control);
-#endif // __arm__
-
-	g_signal_connect(G_OBJECT(appdata->window),
-			"delete_event",
-			G_CALLBACK(gtk_main_quit),
-			NULL);
-
-    g_signal_connect(G_OBJECT(appdata->window),
-    		"key_press_event",
-    		G_CALLBACK(key_press_cb),
-    		appdata->window);
+	//g_idle_add(randomize, appdata);
 
-    g_signal_connect(G_OBJECT(appdata->window),
-    		"button_press_event",
-    		G_CALLBACK(button_press),
-    		appdata->window);
+	start_gps(appdata);
 
-    gtk_main();
+	gtk_main();
 
 	return EXIT_SUCCESS;
 }