Merge branch 'master' of metageek.codebasehq.com:metageek/inssider/do…

…nate-inssider

Conflicts:
	MetaScanner.v11.suo

.gitignore

@@ -18,3 +18,4 @@ tools
 /PackagerReadme.txt
 /TestProject/bin
 /TestProject/obj
+MetaScanner.v11.suo

MetaScanner/Localization/LocalizerResources.resx

@@ -121,7 +121,7 @@
     <value>Altitude {0}</value>
   </data>
   <data name="AmplitudedBm" xml:space="preserve">
-    <value>Amplitude [dB]</value>
+    <value>Amplitude [dBm]</value>
   </data>
   <data name="ApplicationUpToDate" xml:space="preserve">
     <value>The application is up to date</value>

MetaScanner/Misc/XmlHelper.cs

@@ -22,6 +22,7 @@
 
 
 ////////////////////////////////////////////////////////////////
+using System.Globalization;
 using System.Text;
 using System.Xml;
 
@@ -59,8 +60,8 @@ public static string CleanString(string input)
                             break;
                         // all other weird characters change directly to unicode
                         default:
-                            byte[] tempByte = Encoding.Unicode.GetBytes(new char[] { input[j] });
-                            string unicodeValue = System.Convert.ToString(tempByte[0] + (tempByte[1] << 8));
+                            byte[] tempByte = Encoding.Unicode.GetBytes(new[] { input[j] });
+                            string unicodeValue = System.Convert.ToString(tempByte[0] + (tempByte[1] << 8), CultureInfo.InvariantCulture);
                             string output = "&amp;#" + unicodeValue + ";";
                             input = input.Substring(0, j) + output + input.Substring(j + 1);
                             j += output.Length - 1;
@@ -111,7 +112,7 @@ public static XmlElement CreatePlacemark(XmlDocument document, Waypoint wp, bool
             xeIconStyle.AppendChild(xeIcon);
 
             xeIconStyle.AppendChild(CreateElementWithText(document, "color", color));
-            xeIconStyle.AppendChild(CreateElementWithText(document, "scale", KmlWriter.IconScale(wp.Extensions.Rssi).ToString()));
+            xeIconStyle.AppendChild(CreateElementWithText(document, "scale", KmlWriter.IconScale(wp.Extensions.Rssi).ToString(CultureInfo.InvariantCulture)));
 
             //Add element
             xeStyle.AppendChild(xeIconStyle);
@@ -128,16 +129,18 @@ public static XmlElement CreatePlacemark(XmlDocument document, Waypoint wp, bool
             xeMain.AppendChild(xeStyle);
 
             //Add name element
-            xeMain.AppendChild(CreateElementWithText(document, "name", ssidLabel ? wp.Extensions.Ssid + ": " + wp.Extensions.Rssi : wp.Extensions.Rssi.ToString()));
+            xeMain.AppendChild(CreateElementWithText(document, "name", ssidLabel ? wp.Extensions.Ssid + ": " + wp.Extensions.Rssi : wp.Extensions.Rssi.ToString(CultureInfo.InvariantCulture)));
 
             //Add description element
             xeMain.AppendChild(CreateElementWithText(document, "description", wp.BuildKmlDescription()));
             //Location
             //KML requires Lon,Lat,Alt. It's backwards!
             XmlElement xePoint = document.CreateElement("Point");
             xePoint.AppendChild(CreateElementWithText(document, "coordinates",
-                                                      string.Format("{0},{1},{2}", wp.Longitude, wp.Latitude,
-                                                                    wp.Elevation)));
+                                            string.Format("{0},{1},{2}", 
+                                            wp.Longitude.ToString(CultureInfo.InvariantCulture.NumberFormat),
+                                            wp.Latitude.ToString(CultureInfo.InvariantCulture.NumberFormat),
+                                            wp.Elevation.ToString(CultureInfo.InvariantCulture.NumberFormat))));
             xeMain.AppendChild(xePoint);
 
             return xeMain;
@@ -197,7 +200,7 @@ public static XmlElement CreatePlacemark(XmlDocument document, Waypoint wp, bool
             }
             else if (showLabel)
             {
-                tempName = wp.Extensions.Rssi.ToString();
+                tempName = wp.Extensions.Rssi.ToString(CultureInfo.InvariantCulture);
             }
             else if(ssidLabel)
             {
@@ -212,8 +215,10 @@ public static XmlElement CreatePlacemark(XmlDocument document, Waypoint wp, bool
             //KML requires Lon,Lat,Alt. It's backwards!
             XmlElement xePoint = document.CreateElement("Point");
             xePoint.AppendChild(CreateElementWithText(document, "coordinates",
-                                                      string.Format("{0},{1},{2}", longitude, latitude,
-                                                                    elevation)));
+                                                    string.Format("{0},{1},{2}",
+                                                    longitude.ToString(CultureInfo.InvariantCulture.NumberFormat),
+                                                    latitude.ToString(CultureInfo.InvariantCulture.NumberFormat),
+                                                    elevation.ToString(CultureInfo.InvariantCulture.NumberFormat))));
             xeMain.AppendChild(xePoint);
 
             return xeMain;

MetaScanner/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.7.1317")]
-[assembly: AssemblyFileVersion("2.0.7.1317")]
+[assembly: AssemblyVersion("2.0.7.1318")]
+[assembly: AssemblyFileVersion("2.0.7.1318")]

MetaScanner/UI/Controls/ChannelView.cs

@@ -305,7 +305,7 @@ private void DrawGrid(Graphics graphics)
             var matrix = new Matrix();
             matrix.RotateAt(270, rotationPoint);
             graphics.Transform = matrix;
-            graphics.DrawString("Amplitude [dB]"/*Localizer.GetString("AmplitudedBm")*/, Font, brush, 8, y);
+            graphics.DrawString(Localizer.GetString("AmplitudedBm"), Font, brush, 8, y);
             matrix.RotateAt(90, rotationPoint);
             graphics.Transform = matrix;