X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/2c3f09a62245787314f35d655819440ae7f31245..de2fc9aa9e8db8e0258c8328161c6b5eda176a0a:/src/vikgpslayer.c

diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c
index 41c91818..83e56148 100644
--- a/src/vikgpslayer.c
+++ b/src/vikgpslayer.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "viking.h"
-#include "vikgpslayer_pixmap.h"
+#include "icons/icons.h"
 #include "babel.h"
 
 #include <string.h>
@@ -67,7 +67,11 @@ typedef enum {GARMIN_P = 0, MAGELLAN_P, NUM_PROTOCOLS} vik_gps_proto;
 static gchar * params_protocols[] = {"Garmin", "Magellan", NULL};
 static gchar * protocols_args[]   = {"garmin", "magellan"};
 /*#define NUM_PROTOCOLS (sizeof(params_protocols)/sizeof(params_protocols[0]) - 1) */
+#ifdef WINDOWS
+static gchar * params_ports[] = {"com1", "usb:", NULL};
+#else
 static gchar * params_ports[] = {"/dev/ttyS0", "/dev/ttyS1", "/dev/ttyUSB0", "/dev/ttyUSB1", "usb:", NULL};
+#endif
 #define NUM_PORTS (sizeof(params_ports)/sizeof(params_ports[0]) - 1)
 typedef enum {GPS_DOWN=0, GPS_UP} gps_dir;
 
@@ -122,7 +126,7 @@ enum {
 
 VikLayerInterface vik_gps_layer_interface = {
   "GPS",
-  &gpslayer_pixbuf,
+  &vikgpslayer_pixbuf,
 
   NULL,
   0,
@@ -704,30 +708,30 @@ static void set_current_count(gint cnt, GpsSession *sess)
       if (sess->direction == GPS_DOWN)
       {
         if (sess->progress_label == sess->wp_label)
-          tmp_str = ngettext("Downloaded %d out of %d waypoint.", "Downloaded %d out of %d waypoints.", sess->total_count);
+          tmp_str = ngettext("Downloaded %d out of %d waypoint...", "Downloaded %d out of %d waypoints...", sess->total_count);
         else
-          tmp_str = ngettext("Downloaded %d out of %d trackpoint.", "Downloaded %d out of %d trackpoints.", sess->total_count);
+          tmp_str = ngettext("Downloaded %d out of %d trackpoint...", "Downloaded %d out of %d trackpoints...", sess->total_count);
       }
       else {
         if (sess->progress_label == sess->wp_label)
-          tmp_str = ngettext("Uploaded %d out of %d waypoint.", "Uploaded %d out of %d waypoints.", sess->total_count);
+          tmp_str = ngettext("Uploaded %d out of %d waypoint...", "Uploaded %d out of %d waypoints...", sess->total_count);
         else
-          tmp_str = ngettext("Uploaded %d out of %d trackpoint.", "Uploaded %d out of %d trackpoints.", sess->total_count);
+          tmp_str = ngettext("Uploaded %d out of %d trackpoint...", "Uploaded %d out of %d trackpoints...", sess->total_count);
       }
       g_snprintf(s, 128, tmp_str, cnt, sess->total_count);
     } else {
       if (sess->direction == GPS_DOWN)
       {
         if (sess->progress_label == sess->wp_label)
-          tmp_str = ngettext("Downloaded %d waypoint.", "Downloaded %d waypoints.", cnt);
+          tmp_str = ngettext("Downloaded %d waypoint", "Downloaded %d waypoints", cnt);
         else
-          tmp_str = ngettext("Downloaded %d trackpoint.", "Downloaded %d trackpoints.", cnt);
+          tmp_str = ngettext("Downloaded %d trackpoint", "Downloaded %d trackpoints", cnt);
       }
       else {
         if (sess->progress_label == sess->wp_label)
-          tmp_str = ngettext("Uploaded %d waypoint.", "Uploaded %d waypoints.", cnt);
+          tmp_str = ngettext("Uploaded %d waypoint", "Uploaded %d waypoints", cnt);
         else
-          tmp_str = ngettext("Uploaded %d trackpoint.", "Uploaded %d trackpoints.", cnt);
+          tmp_str = ngettext("Uploaded %d trackpoint", "Uploaded %d trackpoints", cnt);
       }
       g_snprintf(s, 128, tmp_str, cnt);
     }