Rework font code, add new fonts, also proportional, rework watch usage - "SET" button...

[oswald.git] / ui / oswald-ui.c

diff --git a/ui/oswald-ui.c b/ui/oswald-ui.c
index 563a7b7e51792cebc7252e2e0463a10d0a375286..285d844d4434a5d7d9c3e0444c98f986fe0e6b60 100644 (file)
--- a/ui/oswald-ui.c
+++ b/ui/oswald-ui.c
@@ -12,7 +12,7 @@
 
 #include <gtk/gtk.h>
 
-#include "Fonts.h" // the MetaWatch fonts
+//#include "Fonts.h" // the MetaWatch fonts
 #include "oswald.h"
 #include "oswald_main.h"
 
@@ -205,7 +205,7 @@ void ambientlight_value_changed (GtkRange *range, gpointer  user_data)
        double val;
 
        val = gtk_range_get_value(range);
-       oswald_handle_ambientlight_event((u8t) val);
+       oswald_handle_ambientlight_event((uint8_t) val);
 }
 
 void accelX_value_changed (GtkRange *range, gpointer  user_data)
@@ -214,7 +214,7 @@ void accelX_value_changed (GtkRange *range, gpointer  user_data)
        double val;
 
        val = gtk_range_get_value(range);
-       ui->accel_x = (u8t)val;
+       ui->accel_x = (uint8_t)val;
        oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z);
 }
 
@@ -224,7 +224,7 @@ void accelY_value_changed (GtkRange *range, gpointer  user_data)
        double val;
 
        val = gtk_range_get_value(range);
-       ui->accel_y = (u8t)val;
+       ui->accel_y = (uint8_t)val;
        oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z);
 }
 
@@ -234,7 +234,7 @@ void accelZ_value_changed (GtkRange *range, gpointer  user_data)
        double val;
 
        val = gtk_range_get_value(range);
-       ui->accel_z = (u8t)val;
+       ui->accel_z = (uint8_t)val;
        oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z);
 }