Alpha release.

[speedometer] / main.c

diff --git a/main.c b/main.c
index f7c2597..82c24c8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -14,78 +14,50 @@
 
        You should have received a copy of the GNU General Public License
        along with this program.  If not, see <http://www.gnu.org/licenses/>.
-****/
-
-
+ ****/
 
+#include <hildon/hildon-program.h>
+#include <hildon/hildon-window.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
-#include <location/location-gps-device.h>
-#include <location/location-gpsd-control.h>
-
-static void location_changed (LocationGPSDevice *device, gpointer userdata) {
-        g_print ("Latitude: %.2f\nLongitude: %.2f\nAltitude: %.2f\n",
-                 device->fix->latitude, device->fix->longitude, device->fix->altitude);
-}
-
-
-
-
-
 
+#include "callbacks.h"
+#include "appdata.h"
+#include "ui.h"
+#include "util.h"
 
 int main(int argc, char** argv) {
 
-  /* We'll have two references to two GTK+ widgets. */
-  GtkWindow* window;
-  GtkLabel* label;
-
-  /* Initialize the GTK+ library. */
-  gtk_init(&argc, &argv);
-
-
-
-
-
-  /* Create a window with window border width of 12 pixels and a
-     title text. */
-  window = g_object_new(GTK_TYPE_WINDOW,
-    "border-width", 12,
-    "title", "Hello GTK+",
-    NULL);
-
-  /* Create the label widget. */
-  label = g_object_new(GTK_TYPE_LABEL,
-    "label", "Hello World!",
-    NULL);
-
-  /* Pack the label into the window layout. */
-  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(label));
-
-  /* Show all widgets that are contained by the window. */
-  gtk_widget_show_all(GTK_WIDGET(window));
+       AppData *appdata = g_new0(AppData, 1);
 
+       gtk_init(&argc, &argv);
 
+       appdata->program = HILDON_PROGRAM(hildon_program_get_instance());
+       appdata->window = HILDON_WINDOW(hildon_window_new());
+       hildon_program_add_window(appdata->program, appdata->window);
 
-  g_thread_init(NULL);
+       // loads images from the disk to the image array
+       load_images(appdata);
 
-  // gps device
-  LocationGPSDevice *device;
-  device = g_object_new (LOCATION_TYPE_GPS_DEVICE, NULL);
+       // set display to 000
+       reset_speed(appdata);
 
-  g_signal_connect (device, "changed", G_CALLBACK (location_changed), NULL);
+       // create ui structure
+       create_ui(appdata);
 
+       // set the window fullscreen
+       gtk_window_fullscreen(GTK_WINDOW(appdata->window));
 
-  LocationGPSDControl *control;
+       gtk_widget_show_all(GTK_WIDGET(appdata->window));
 
-  control = location_gpsd_control_get_default ();
-  location_gpsd_control_start(control);
+       g_thread_init(NULL);
 
+       //g_idle_add(randomize, appdata);
 
+       start_gps(appdata);
 
-  /* Start the main event loop. */
-  gtk_main();
+       gtk_main();
 
-  return EXIT_SUCCESS;
+       return EXIT_SUCCESS;
 }