Changed name of application

[gps-tracker] / gps-tracker.c

diff --git a/gps-tracker.c b/gps-tracker.c
index 3551528..90f08b7 100644 (file)
--- a/gps-tracker.c
+++ b/gps-tracker.c
@@ -194,7 +194,7 @@ static void on_gps_device_changed (LocationGPSDevice *device, gpointer data)
         //g_print ("alt = %f\n", device->fix->altitude);
         CHANGE_LABEL(app_data->alt_val_label, "% 5.0f", device->fix->altitude);
         if(fp)
-          g_fprintf(fp, "<ele>%s</ele>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->altitude));
+          g_fprintf(fp, "<ele>%s</ele>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%.1f", device->fix->altitude));
 
       }
 
@@ -202,14 +202,14 @@ static void on_gps_device_changed (LocationGPSDevice *device, gpointer data)
         //g_print ("speed = %f\n", device->fix->speed);
         CHANGE_LABEL(app_data->speed_val_label, "% 5.1fkm/h", device->fix->speed);
         if(fp)
-          g_fprintf(fp, "<speed>%s</speed>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->speed));
+          g_fprintf(fp, "<speed>%s</speed>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%.1f", device->fix->speed));
       }
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_TRACK_SET) {
         //g_print ("track = %f\n", device->fix->track);
         CHANGE_LABEL(app_data->track_val_label, "%4.0f°", device->fix->track);
         if(fp)
-          g_fprintf(fp, "<course>%s</course>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->track));
+          g_fprintf(fp, "<course>%s</course>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%.1f", device->fix->track));
       }
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_CLIMB_SET) {
@@ -291,25 +291,13 @@ int main (int argc, char **argv)
   data->working_dir = g_strdup_printf("%s" G_DIR_SEPARATOR_S "MyDocs", g_get_home_dir());
   data->intermediate_gpx_data_filename = g_strdup_printf("%s" G_DIR_SEPARATOR_S ".gps-tracker.gpx", data->working_dir);
        data->program = hildon_program_get_instance ();
-       g_set_application_name("GPS tracker");
+       g_set_application_name("GPS Træcker");
 
        data->window = HILDON_WINDOW(hildon_stackable_window_new());
        hildon_program_add_window (data->program, HILDON_WINDOW (data->window));
 
   data->wp_marker_str = g_string_sized_new(64);
   data->main_vbox = (gpointer)gtk_vbox_new(FALSE, 0);
-  data->btn_hbox = (gpointer)gtk_hbox_new(TRUE, 0);
-
-  data->start_stop_button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_THUMB_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH));
-  gtk_button_set_label (data->start_stop_button, "Start");
-  gtk_widget_set_sensitive(GTK_WIDGET(data->start_stop_button), FALSE);
-  data->save_button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_THUMB_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH));
-  gtk_button_set_label (data->save_button, "Save");
-  gtk_widget_set_sensitive(GTK_WIDGET(data->save_button), FALSE);
-  gtk_box_pack_start(GTK_BOX(data->btn_hbox), GTK_WIDGET(data->start_stop_button), FALSE, FALSE, 8);
-  gtk_box_pack_start(GTK_BOX(data->btn_hbox), GTK_WIDGET(data->save_button), FALSE, FALSE, 8);
-  gtk_box_pack_start(GTK_BOX(data->main_vbox), GTK_WIDGET(data->btn_hbox), FALSE, FALSE, 0);
-
   data->loc_hbox = (gpointer)gtk_hbox_new(FALSE, 0);
   data->loc_gps_data_table = (gpointer)gtk_table_new(4, 2, FALSE);
   {
@@ -348,7 +336,7 @@ int main (int argc, char **argv)
     gtk_box_pack_start(GTK_BOX(data->loc_hbox), alignment_gps, TRUE, FALSE, 0);
   }
 
-  //gtk_box_pack_start(GTK_BOX(data->loc_hbox), gtk_vseparator_new(), TRUE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(data->loc_hbox), gtk_vseparator_new(), TRUE, FALSE, 0);
 
   data->loc_track_data_table = (gpointer)gtk_table_new(4, 2, TRUE);
   {
@@ -385,13 +373,25 @@ int main (int argc, char **argv)
   //data->wp_label = gtk_label_new("Marker:");
   data->wp_name_entry = hildon_entry_new (HILDON_SIZE_HALFSCREEN_WIDTH);
   //hildon_entry_set_placeholder (HILDON_ENTRY (data->wp_name_entry), "First name");
-  data->wp_set_btn = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH));
+  data->wp_set_btn = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_HALFSCREEN_WIDTH));
   gtk_button_set_label (data->wp_set_btn, "Set marker");
   gtk_widget_set_sensitive(GTK_WIDGET(data->wp_set_btn), FALSE);
   //gtk_box_pack_start(GTK_BOX(data->wp_hbox), GTK_WIDGET(data->wp_label), TRUE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(data->wp_hbox), GTK_WIDGET(data->wp_name_entry), TRUE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(data->wp_hbox), GTK_WIDGET(data->wp_set_btn), TRUE, FALSE, 0);
-  gtk_box_pack_end(GTK_BOX(data->main_vbox), GTK_WIDGET(data->wp_hbox), FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(data->main_vbox), GTK_WIDGET(data->wp_hbox), FALSE, FALSE, 0);
+
+  data->btn_hbox = (gpointer)gtk_hbox_new(TRUE, 0);
+
+  data->start_stop_button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_THUMB_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH));
+  gtk_button_set_label (data->start_stop_button, "Start");
+  gtk_widget_set_sensitive(GTK_WIDGET(data->start_stop_button), FALSE);
+  data->save_button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_THUMB_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH));
+  gtk_button_set_label (data->save_button, "Save");
+  gtk_widget_set_sensitive(GTK_WIDGET(data->save_button), FALSE);
+  gtk_box_pack_start(GTK_BOX(data->btn_hbox), GTK_WIDGET(data->start_stop_button), FALSE, FALSE, 8);
+  gtk_box_pack_start(GTK_BOX(data->btn_hbox), GTK_WIDGET(data->save_button), FALSE, FALSE, 8);
+  gtk_box_pack_start(GTK_BOX(data->main_vbox), GTK_WIDGET(data->btn_hbox), FALSE, FALSE, 4);
 
        /* Add vbox to main window */
        gtk_container_add (GTK_CONTAINER (data->window), GTK_WIDGET(data->main_vbox));