Use monospace font to avoid jumping of the info data

diff --git a/debian/changelog b/debian/changelog
index 4b07bbb..9c97cc3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 gps-tracker (1.0-6) unstable; urgency=low
 
   * GPS/Track information display is rearranged
+  * Use monospace font to avoid jumping of the info data
 
- -- Dr. Johann Pfefferl <pfefferl@gmx.net>  Wed, 26 May 2010 14:40:46 +0200
+ -- Dr. Johann Pfefferl <pfefferl@gmx.net>  Wed, 26 May 2010 16:27:55 +0200
 
 gps-tracker (1.0-5) unstable; urgency=low
 

diff --git a/gps-tracker.c b/gps-tracker.c
index f80ed4f..3551528 100644 (file)
--- a/gps-tracker.c
+++ b/gps-tracker.c
@@ -130,20 +130,35 @@ static void cb_file_save (GtkWidget * w, AppData * data)
     g_free(filename);
 }
 
-static void
-on_gps_device_changed (LocationGPSDevice *device, gpointer data)
+#define SPAN_PREFIX "<span font_family='monospace'>"
+#define SPAN_POST   "</span>"
+#define LABEL_FMT(s) SPAN_PREFIX s SPAN_POST
+#define CHANGE_LABEL(w,fmt,val) change_label_text(w, SPAN_PREFIX fmt SPAN_POST, val)
+#define CHANGE_LABEL2(w,fmt,val1, val2) change_label_text(w, SPAN_PREFIX fmt SPAN_POST, val1, val2)
+
+static void change_label_text(GtkWidget *l, gchar *format, ...)
+{
+  va_list args;
+  gchar buf[512];
+  va_start(args, format);
+  g_vsnprintf(buf, sizeof(buf), format, args);
+  va_end(args);
+  gtk_label_set_markup(GTK_LABEL(l), buf);
+}
+
+static void on_gps_device_changed (LocationGPSDevice *device, gpointer data)
 {
   AppData *app_data = data;
   FILE *fp = app_data->outf_p;
-  gchar sbuf1[30*G_ASCII_DTOSTR_BUF_SIZE], sbuf2[2*G_ASCII_DTOSTR_BUF_SIZE];
+  gchar sbuf1[G_ASCII_DTOSTR_BUF_SIZE], sbuf2[G_ASCII_DTOSTR_BUF_SIZE];
        if (!device)
                return;
 
   if (device->fix && device->status) {
     if (device->fix->fields & LOCATION_GPS_DEVICE_LATLONG_SET) {
       //g_print ("lat = %f, long = %f\n", device->fix->latitude, device->fix->longitude);
-      gtk_label_set_text(GTK_LABEL(app_data->lat_val_label), g_ascii_formatd(sbuf1, sizeof(sbuf1), "% 9.6f", device->fix->latitude));
-      gtk_label_set_text(GTK_LABEL(app_data->lon_val_label), g_ascii_formatd(sbuf1, sizeof(sbuf1), "% 9.6f", device->fix->longitude));
+      CHANGE_LABEL(app_data->lat_val_label, "% 9.6f", device->fix->latitude);
+      CHANGE_LABEL(app_data->lon_val_label, "% 9.6f", device->fix->longitude);
       if(fp) {
         g_fprintf(fp, "\n<trkpt lat=\"%s\" lon=\"%s\">\n",
           g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->latitude),
@@ -177,7 +192,7 @@ on_gps_device_changed (LocationGPSDevice *device, gpointer data)
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_ALTITUDE_SET) {
         //g_print ("alt = %f\n", device->fix->altitude);
-        gtk_label_set_text(GTK_LABEL(app_data->alt_val_label), g_ascii_formatd(sbuf1, sizeof(sbuf1), "% 5.0f", 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));
 
@@ -185,24 +200,21 @@ on_gps_device_changed (LocationGPSDevice *device, gpointer data)
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_SPEED_SET) {
         //g_print ("speed = %f\n", device->fix->speed);
-        g_snprintf(sbuf1, sizeof(sbuf1), "% 5.1fkm/h", device->fix->speed);
-        gtk_label_set_text(GTK_LABEL(app_data->speed_val_label), sbuf1);
+        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));
       }
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_TRACK_SET) {
         //g_print ("track = %f\n", device->fix->track);
-        g_snprintf(sbuf1, sizeof(sbuf1), "%4.0f°", device->fix->track);
-        gtk_label_set_text(GTK_LABEL(app_data->track_val_label), sbuf1);
+        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));
       }
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_CLIMB_SET) {
         //g_print ("climb = %f\n", device->fix->climb);
-        g_snprintf(sbuf1, sizeof(sbuf1), "%+4.0f°", device->fix->climb);
-        gtk_label_set_text(GTK_LABEL(app_data->climb_val_label), sbuf1);
+        CHANGE_LABEL(app_data->climb_val_label, "%+4.0f°", device->fix->climb);
       }
 
       //g_print ("Accuracy values:\n");
@@ -225,8 +237,7 @@ on_gps_device_changed (LocationGPSDevice *device, gpointer data)
        
        //g_print ("Satellites in view: %d\n", device->satellites_in_view);
        //g_print ("Satellites in use: %d\n", device->satellites_in_use);
-  g_snprintf(sbuf1, sizeof(sbuf1), "%3d/%2d", device->satellites_in_use, device->satellites_in_view);
-  gtk_label_set_text(GTK_LABEL(app_data->sat_val_label), sbuf1);
+  CHANGE_LABEL2(app_data->sat_val_label, "%3d/%2d", device->satellites_in_use, device->satellites_in_view);
        //g_print ("GPS status: %d\n", device->status);
 
   hildon_gtk_window_set_progress_indicator(GTK_WINDOW(app_data->window), device->status == LOCATION_GPS_DEVICE_STATUS_NO_FIX);