Merge lp:~dangarner/xibo/client-170-alpha2 into lp:xibo/1.7

[Dan Garner]

=== modified file 'client/dotNET/Forms/OptionForm.cs'
--- client/dotNET/Forms/OptionForm.cs	2014-08-29 19:31:56 +0000
+++ client/dotNET/Forms/OptionForm.cs	2014-10-21 16:06:26 +0000
@@ -149,7 +149,7 @@
                 ApplicationSettings.Default.Save();
 
                 // Call register
-                xmds1.RegisterDisplayAsync(ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, ApplicationSettings.Default.DisplayName, "windows", ApplicationSettings.Default.ClientVersion, ApplicationSettings.Default.ClientCodeVersion, _hardwareKey.MacAddress, ApplicationSettings.Default.Version);
+                xmds1.RegisterDisplayAsync(ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, ApplicationSettings.Default.DisplayName, "windows", ApplicationSettings.Default.ClientVersion, ApplicationSettings.Default.ClientCodeVersion, Environment.OSVersion.ToString(), _hardwareKey.MacAddress, ApplicationSettings.Default.Version);
             }
             catch (Exception ex)
             {

=== modified file 'client/dotNET/Log/ClientInfo.Designer.cs'
--- client/dotNET/Log/ClientInfo.Designer.cs	2013-05-01 19:24:35 +0000
+++ client/dotNET/Log/ClientInfo.Designer.cs	2014-10-21 16:06:26 +0000
@@ -28,9 +28,9 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ClientInfo));
             this.logDataGridView = new System.Windows.Forms.DataGridView();
             this.Thread = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -45,6 +45,7 @@
             this.requiredFilesTextBox = new System.Windows.Forms.TextBox();
             this.scheduleManagerStatus = new System.Windows.Forms.TextBox();
             this.saveLogToDisk = new System.Windows.Forms.Button();
+            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
             ((System.ComponentModel.ISupportInitialize)(this.logDataGridView)).BeginInit();
             this.SuspendLayout();
             // 
@@ -52,14 +53,14 @@
             // 
             this.logDataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
             this.logDataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.logDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.logDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.logDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.logDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Thread,
@@ -67,25 +68,25 @@
             this.Type,
             this.Method,
             this.Message});
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.logDataGridView.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.logDataGridView.DefaultCellStyle = dataGridViewCellStyle5;
             this.logDataGridView.Location = new System.Drawing.Point(12, 314);
             this.logDataGridView.Name = "logDataGridView";
             this.logDataGridView.ReadOnly = true;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.logDataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.logDataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle6;
             this.logDataGridView.Size = new System.Drawing.Size(786, 408);
             this.logDataGridView.TabIndex = 0;
             // 
@@ -190,6 +191,10 @@
             this.saveLogToDisk.UseVisualStyleBackColor = true;
             this.saveLogToDisk.Click += new System.EventHandler(this.saveLogToDisk_Click);
             // 
+            // saveFileDialog
+            // 
+            this.saveFileDialog.FileOk += new System.ComponentModel.CancelEventHandler(this.saveFileDialog_FileOk);
+            // 
             // ClientInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -227,5 +232,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Message;
         private System.Windows.Forms.TextBox scheduleManagerStatus;
         private System.Windows.Forms.Button saveLogToDisk;
+        private System.Windows.Forms.SaveFileDialog saveFileDialog;
     }
 }
\ No newline at end of file

=== modified file 'client/dotNET/Log/ClientInfo.cs'
--- client/dotNET/Log/ClientInfo.cs	2014-08-27 14:37:13 +0000
+++ client/dotNET/Log/ClientInfo.cs	2014-10-21 16:06:26 +0000
@@ -216,7 +216,13 @@
         /// <param name="e"></param>
         private void saveLogToDisk_Click(object sender, EventArgs e)
         {
-            using (StreamWriter wrt = new StreamWriter(Path.GetDirectoryName(Application.ExecutablePath) + "\\XiboLog.txt"))
+            saveFileDialog.InitialDirectory = ApplicationSettings.Default.LibraryPath;
+            saveFileDialog.ShowDialog();
+        }
+
+        private void saveFileDialog_FileOk(object sender, CancelEventArgs e)
+        {
+            using (StreamWriter wrt = new StreamWriter(saveFileDialog.FileName))
             {
                 foreach (DataGridViewRow row in logDataGridView.Rows)
                 {
@@ -232,7 +238,7 @@
                 }
             }
 
-            MessageBox.Show("Log saved as " + Path.GetDirectoryName(Application.ExecutablePath) + "\\XiboLog.txt", "Log Saved");
+            MessageBox.Show("Log saved as " + saveFileDialog.FileName, "Log Saved");
         }
     }
 }
\ No newline at end of file

=== modified file 'client/dotNET/Log/ClientInfo.resx'
--- client/dotNET/Log/ClientInfo.resx	2013-05-01 19:24:35 +0000
+++ client/dotNET/Log/ClientInfo.resx	2014-10-21 16:06:26 +0000
@@ -112,27 +112,30 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Thread.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Date.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Type.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Method.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Message.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <metadata name="Thread.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Date.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Type.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Method.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Message.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAkAICAQAAEABADoAgAAlgAAABAQEAABAAQAKAEAAH4DAAAwMAAAAQAIAKgOAACmBAAAICAAAAEA

=== modified file 'client/dotNET/Log/StatLog.cs'
--- client/dotNET/Log/StatLog.cs	2014-08-29 19:31:56 +0000
+++ client/dotNET/Log/StatLog.cs	2014-10-21 16:06:26 +0000
@@ -1,6 +1,6 @@
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2009 Daniel Garner
+ * Copyright (C) 2009-2014 Spring Signage Ltd
  *
  * This file is part of Xibo.
  *
@@ -24,13 +24,14 @@
 using System.IO;
 using System.Windows.Forms;
 using System.Xml;
+using System.Diagnostics;
+using System.Threading;
 
 namespace XiboClient
 {
     class StatLog
     {
         private Collection<Stat> _stats;
-        private xmds.xmds _xmds;
         private String _lastSubmit;
         private HardwareKey _hardwareKey;
         private Boolean _xmdsProcessing;
@@ -38,12 +39,7 @@
         public StatLog()
         {
             _stats = new Collection<Stat>();
-            _xmds = new xmds.xmds();
-            _xmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
-
-            // Register a listener for the XMDS stats
-            _xmds.SubmitStatsCompleted += new XiboClient.xmds.SubmitStatsCompletedEventHandler(_xmds_SubmitStatsCompleted);
-
+            
             // Get the key for this display
             _hardwareKey = new HardwareKey();
 
@@ -126,9 +122,10 @@
         /// <param name="stat"></param>
         public void RecordStat(Stat stat)
         {
-            if (!ApplicationSettings.Default.StatsEnabled) return;
+            if (!ApplicationSettings.Default.StatsEnabled) 
+                return;
 
-            System.Diagnostics.Debug.WriteLine(String.Format("Recording a Stat Record. Current Count = {0}", _stats.Count.ToString()), LogType.Audit.ToString());
+            Debug.WriteLine(String.Format("Recording a Stat Record. Current Count = {0}", _stats.Count.ToString()), LogType.Audit.ToString());
 
             _stats.Add(stat);
 
@@ -146,24 +143,20 @@
         /// </summary>
         public void Flush()
         {
-            System.Diagnostics.Debug.WriteLine(new LogMessage("Flush", String.Format("IN")), LogType.Audit.ToString());
+            Debug.WriteLine(new LogMessage("Flush", String.Format("IN")), LogType.Audit.ToString());
 
             // Determine if there is anything to flush
-            if (_stats.Count < 1 || _xmdsProcessing) return;
-
-            int threshold = ((int)ApplicationSettings.Default.CollectInterval * 5);
-
-            // Determine where we want to log.
-            if (ApplicationSettings.Default.XmdsLastConnection.AddSeconds(threshold) < DateTime.Now)
-            {
-                FlushToFile();
-            }
-            else
-            {
-                FlushToXmds();
-            }
-
-            System.Diagnostics.Debug.WriteLine(new LogMessage("Flush", String.Format("OUT")), LogType.Audit.ToString());
+            if (_stats.Count < 1) 
+                return;
+
+            // Flush to File
+            FlushToFile();
+
+            // See if there are any records to flush to XMDS
+            Thread logSubmit = new Thread(new ThreadStart(ProcessQueueToXmds));
+            logSubmit.Start();
+
+            Debug.WriteLine(new LogMessage("Flush", String.Format("OUT")), LogType.Audit.ToString());
         }
 
         /// <summary>
@@ -171,36 +164,24 @@
         /// </summary>
         private void FlushToFile()
         {
-            System.Diagnostics.Debug.WriteLine(new LogMessage("FlushToFile", String.Format("IN")), LogType.Audit.ToString());
+            Debug.WriteLine(new LogMessage("FlushToFile", String.Format("IN")), LogType.Audit.ToString());
 
             // There is something to flush - we want to parse the collection adding to the TextWriter each time.
             try
             {
                 // Open the Text Writer
-                StreamWriter tw = new StreamWriter(File.Open(ApplicationSettings.Default.LibraryPath + @"\" + ApplicationSettings.Default.StatsLogFile, FileMode.Append, FileAccess.Write, FileShare.Read), Encoding.UTF8);
-
-                try
+                using (StreamWriter tw = new StreamWriter(File.Open(string.Format("{0}_{1}", ApplicationSettings.Default.LibraryPath + @"\" + ApplicationSettings.Default.StatsLogFile, DateTime.Now.ToFileTimeUtc().ToString()), FileMode.Append, FileAccess.Write, FileShare.Read), Encoding.UTF8))
                 {
                     foreach (Stat stat in _stats)
                     {
                         tw.WriteLine(stat.ToString());
                     }
                 }
-                catch (Exception ex)
-                {
-                    System.Diagnostics.Trace.WriteLine(new LogMessage("FlushToFile", String.Format("Error writing stats line to file with exception {0}", ex.Message)), LogType.Error.ToString());
-                }
-                finally
-                {
-                    // Close the tw.
-                    tw.Close();
-                    tw.Dispose();
-                }
             }
             catch (Exception ex)
             {
                 // Log this exception
-                System.Diagnostics.Trace.WriteLine(new LogMessage("FlushToFile", String.Format("Error writing stats to file with exception {0}", ex.Message)), LogType.Error.ToString());
+                Trace.WriteLine(new LogMessage("FlushToFile", String.Format("Error writing stats to file with exception {0}", ex.Message)), LogType.Error.ToString());
             }
             finally
             {
@@ -208,103 +189,60 @@
                 _stats.Clear();
             }
 
-            System.Diagnostics.Debug.WriteLine(new LogMessage("FlushToFile", String.Format("OUT")), LogType.Audit.ToString());
+            Debug.WriteLine(new LogMessage("FlushToFile", String.Format("OUT")), LogType.Audit.ToString());
         }
 
         /// <summary>
         /// Send the Stats to XMDS
         /// </summary>
-        private void FlushToXmds()
+        private void ProcessQueueToXmds()
         {
-            System.Diagnostics.Debug.WriteLine(new LogMessage("FlushToXmds", String.Format("IN")), LogType.Audit.ToString());
-
-            String stats;
-
-            stats = "<log>";
-
-            // Load the Stats collection into a string
-            try
-            {
-                foreach (Stat stat in _stats)
+            Debug.WriteLine(new LogMessage("FlushToXmds", String.Format("IN")), LogType.Audit.ToString());
+
+            int threshold = ((int)ApplicationSettings.Default.CollectInterval * 5);
+
+            // Determine where we want to log.
+            if (ApplicationSettings.Default.XmdsLastConnection.AddSeconds(threshold) < DateTime.Now && true)
+            {
+                return;
+            }
+
+            // Get a list of all the log files waiting to be sent to XMDS.
+            string[] logFiles = Directory.GetFiles(ApplicationSettings.Default.LibraryPath, "*" + ApplicationSettings.Default.StatsLogFile + "*");
+
+            foreach (string fileName in logFiles)
+            {
+                // If we have some, create an XMDS object
+                using (xmds.xmds logtoXmds = new xmds.xmds())
                 {
-                    stats += stat.ToString();
+                    logtoXmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
+
+                    // construct the log message
+                    StringBuilder builder = new StringBuilder();
+                    builder.Append("<log>");
+
+                    foreach (string entry in File.ReadAllLines(fileName))
+                        builder.Append(entry);
+
+                    builder.Append("</log>");
+
+                    try
+                    {
+                        logtoXmds.SubmitStats(ApplicationSettings.Default.Version, ApplicationSettings.Default.ServerKey, _hardwareKey.Key, builder.ToString());
+
+                        // Delete the file we are on
+                        File.Delete(fileName);
+                    }
+                    catch (Exception e)
+                    {
+                        Trace.WriteLine(new LogMessage("FlushToXmds", string.Format("Exception when submitting to XMDS: {0}", e.Message)), LogType.Error.ToString());
+                    }
                 }
             }
-            catch (Exception ex)
-            {
-                System.Diagnostics.Trace.WriteLine(new LogMessage("FlushToXmds", String.Format("Error converting stat to a string {0}", ex.Message)), LogType.Error.ToString());
-            }
-
-            stats += "</log>";
-
-            // Store the stats as the last sent (so we have a record if it fails)
-            _lastSubmit = stats;
-
-            // Clear the stats collection
-            _stats.Clear();
-            
-            // Submit the string to XMDS
-            _xmdsProcessing = true;
-
-            _xmds.SubmitStatsAsync(ApplicationSettings.Default.Version, ApplicationSettings.Default.ServerKey, _hardwareKey.Key, stats);
 
             // Log out
             System.Diagnostics.Debug.WriteLine(new LogMessage("FlushToXmds", String.Format("OUT")), LogType.Audit.ToString());
         }
-
-        /// <summary>
-        /// Capture the XMDS call and see if it went well
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void _xmds_SubmitStatsCompleted(object sender, XiboClient.xmds.SubmitStatsCompletedEventArgs e)
-        {
-            System.Diagnostics.Debug.WriteLine(new LogMessage("_xmds_SubmitStatsCompleted", String.Format("IN")), LogType.Audit.ToString());
-
-            _xmdsProcessing = false;
-
-            // Test if we succeeded or not
-            if (e.Error != null)
-            {
-                // We had an error, log it.
-                System.Diagnostics.Trace.WriteLine(new LogMessage("_xmds_SubmitStatsCompleted", String.Format("Error during Submit to XMDS {0}", e.Error.Message)), LogType.Error.ToString());
-
-                // Dump the stats to a file instead
-                if (_lastSubmit != "")
-                {
-                    try
-                    {
-                        // Open the Text Writer
-                        StreamWriter tw = new StreamWriter(File.Open(ApplicationSettings.Default.LibraryPath + @"\" + ApplicationSettings.Default.StatsLogFile, FileMode.Append, FileAccess.Write, FileShare.Read), Encoding.UTF8);
-
-                        try
-                        {
-                            tw.Write(_lastSubmit);
-                        }
-                        catch (Exception ex)
-                        {
-                            // Log this exception
-                            System.Diagnostics.Trace.WriteLine(new LogMessage("_xmds_SubmitStatsCompleted", String.Format("Error writing stats to file with exception {0}", ex.Message)), LogType.Error.ToString());
-                        }
-                        finally
-                        {
-                            tw.Close();
-                            tw.Dispose();
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        // Log this exception
-                        System.Diagnostics.Trace.WriteLine(new LogMessage("_xmds_SubmitStatsCompleted", String.Format("Could not open the file with exception {0}", ex.Message)), LogType.Error.ToString());
-                    }
-                }
-            }
-
-            // Clear the last sumbit
-            _lastSubmit = "";
-
-            System.Diagnostics.Debug.WriteLine(new LogMessage("_xmds_SubmitStatsCompleted", String.Format("OUT")), LogType.Audit.ToString());
-        }
     }
 
     class Stat 

=== modified file 'client/dotNET/Logic/ApplicationSettings.cs'
--- client/dotNET/Logic/ApplicationSettings.cs	2014-09-16 10:27:10 +0000
+++ client/dotNET/Logic/ApplicationSettings.cs	2014-10-21 16:06:26 +0000
@@ -36,9 +36,9 @@
         private static string _default = "default";
 
         // Application Specific Settings we want to protect
-        private string _clientVersion = "1.7.0-alpha";
+        private string _clientVersion = "1.7.0-alpha2";
         private string _version = "4";
-        private int _clientCodeVersion = 100;
+        private int _clientCodeVersion = 101;
 
         public string ClientVersion { get { return _clientVersion; } }
         public string Version { get { return _version; } }

=== modified file 'client/dotNET/Logic/RequiredFiles.cs'
--- client/dotNET/Logic/RequiredFiles.cs	2014-08-30 14:17:18 +0000
+++ client/dotNET/Logic/RequiredFiles.cs	2014-10-21 16:06:26 +0000
@@ -435,9 +435,9 @@
         public bool Complete;
         public bool Http;
 
-        public int ChunkOffset;
-        public int ChunkSize;
-        public int Size;
+        public double ChunkOffset;
+        public double ChunkSize;
+        public double Size;
         public int Retrys;
 
         // Resource nodes

=== modified file 'client/dotNET/Logic/ScheduleManager.cs'
--- client/dotNET/Logic/ScheduleManager.cs	2014-09-16 16:40:30 +0000
+++ client/dotNET/Logic/ScheduleManager.cs	2014-10-21 16:06:26 +0000
@@ -30,6 +30,7 @@
 using XiboClient.Log;
 using System.Threading;
 using XiboClient.Logic;
+using System.Globalization;
 
 /// 17/02/12 Dan Added a static method to get the schedule XML from disk into a string and to write it to the disk
 /// 20/02/12 Dan Tweaked log types on a few trace messages
@@ -351,39 +352,46 @@
                 // Node name
                 temp.NodeName = node.Name;
 
-                // Pull attributes from layout nodes
-                XmlAttributeCollection attributes = node.Attributes;
-
-                // All nodes have file properties
-                temp.layoutFile = attributes["file"].Value;
-                
-                // Replace the .xml extension with nothing
-                string replace = ".xml";
-                string layoutFile = temp.layoutFile.TrimEnd(replace.ToCharArray());
-
-                // Set these on the temp layoutschedule
-                temp.layoutFile = ApplicationSettings.Default.LibraryPath + @"\" + layoutFile + @".xlf";
-                temp.id = int.Parse(layoutFile);
-
-                // Get attributes that only exist on the default
-                if (temp.NodeName != "default")
-                {
-                    // Priority flag
-                    temp.Priority = (attributes["priority"].Value == "1") ? true : false;
-
-                    // Get the fromdt,todt
-                    temp.FromDt = DateTime.Parse(attributes["fromdt"].Value);
-                    temp.ToDt = DateTime.Parse(attributes["todt"].Value);
-
-                    // Pull out the scheduleid if there is one
-                    string scheduleId = "";
-                    if (attributes["scheduleid"] != null) scheduleId = attributes["scheduleid"].Value;
-
-                    // Add it to the layout schedule
-                    if (scheduleId != "") temp.scheduleid = int.Parse(scheduleId);
-                }
-
-                _layoutSchedule.Add(temp);
+                if (temp.NodeName == "dependants")
+                {
+                    // Do nothing for now
+                }
+                else
+                {
+                    // Pull attributes from layout nodes
+                    XmlAttributeCollection attributes = node.Attributes;
+
+                    // All nodes have file properties
+                    temp.layoutFile = attributes["file"].Value;
+
+                    // Replace the .xml extension with nothing
+                    string replace = ".xml";
+                    string layoutFile = temp.layoutFile.TrimEnd(replace.ToCharArray());
+
+                    // Set these on the temp layoutschedule
+                    temp.layoutFile = ApplicationSettings.Default.LibraryPath + @"\" + layoutFile + @".xlf";
+                    temp.id = int.Parse(layoutFile);
+
+                    // Get attributes that only exist on the default
+                    if (temp.NodeName != "default")
+                    {
+                        // Priority flag
+                        temp.Priority = (attributes["priority"].Value == "1") ? true : false;
+
+                        // Get the fromdt,todt
+                        temp.FromDt = DateTime.Parse(attributes["fromdt"].Value, CultureInfo.InvariantCulture);
+                        temp.ToDt = DateTime.Parse(attributes["todt"].Value, CultureInfo.InvariantCulture);
+
+                        // Pull out the scheduleid if there is one
+                        string scheduleId = "";
+                        if (attributes["scheduleid"] != null) scheduleId = attributes["scheduleid"].Value;
+
+                        // Add it to the layout schedule
+                        if (scheduleId != "") temp.scheduleid = int.Parse(scheduleId);
+                    }
+
+                    _layoutSchedule.Add(temp);
+                }
             }
 
             // Clean up

=== modified file 'client/dotNET/Logic/ScreenShot.cs'
--- client/dotNET/Logic/ScreenShot.cs	2014-09-16 10:27:10 +0000
+++ client/dotNET/Logic/ScreenShot.cs	2014-10-21 16:06:26 +0000
@@ -30,6 +30,7 @@
                     
                     using (xmds.xmds screenShotXmds = new xmds.xmds())
                     {
+                        screenShotXmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
                         screenShotXmds.SubmitScreenShotCompleted += screenShotXmds_SubmitScreenShotCompleted;
                         screenShotXmds.SubmitScreenShotAsync(ApplicationSettings.Default.Version, ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, bytes);
                     }

=== modified file 'client/dotNET/Media/CefWebMedia.cs'
--- client/dotNET/Media/CefWebMedia.cs	2014-09-01 13:33:50 +0000
+++ client/dotNET/Media/CefWebMedia.cs	2014-10-21 16:06:26 +0000
@@ -19,7 +19,6 @@
         private bool _startWhenReady = false;
         private string _filePath;
         private RegionOptions _options;
-        private TemporaryFile _temporaryFile;
         private CefWebBrowser _webView;
 
         public CefWebMedia(RegionOptions options)
@@ -31,10 +30,7 @@
 
             // Set the file path
             _filePath = ApplicationSettings.Default.LibraryPath + @"\" + _options.mediaid + ".htm";
-
-            // We will need a temporary file to store this HTML
-            _temporaryFile = new TemporaryFile();
-
+            
             Color backgroundColor = ColorTranslator.FromHtml(_options.backgroundColor);
 
             CefBrowserSettings settings = new CefBrowserSettings();
@@ -52,7 +48,7 @@
             if (HtmlReady())
             {
                 // Write to temporary file
-                SaveToTemporaryFile();
+                ReadControlMeta();
 
                 _startWhenReady = true;
             }
@@ -86,7 +82,7 @@
 
             if (_startWhenReady)
                 // Navigate to temp file
-                _webView.Browser.GetMainFrame().LoadUrl(_temporaryFile.Path);
+                _webView.Browser.GetMainFrame().LoadUrl(_filePath);
         }
 
         void _webView_LoadEnd(object sender, LoadEndEventArgs e)
@@ -116,32 +112,21 @@
             if (_options.LayoutModifiedDate.CompareTo(lastWriteDate) > 0 || DateTime.Now.CompareTo(lastWriteDate.AddHours(_options.updateInterval * 1.0 / 60.0)) > 0)
                 return false;
             else
+            {
+                UpdateCacheIfNecessary();
                 return true;
+            }
         }
 
         /// <summary>
         /// Updates the position of the background and saves to a temporary file
         /// </summary>
-        private void SaveToTemporaryFile()
+        private void ReadControlMeta()
         {
             // read the contents of the file
             using (StreamReader reader = new StreamReader(_filePath))
             {
-                string cachedFile = reader.ReadToEnd();
-
-                // Handle the background
-                String bodyStyle;
-
-                if (_options.backgroundImage == null || _options.backgroundImage == "")
-                {
-                    bodyStyle = "background-color:" + _options.backgroundColor + " ;";
-                }
-                else
-                {
-                    bodyStyle = "background-image: url('" + _options.backgroundImage.Replace('\\', '/') + "'); background-attachment:fixed; background-color:" + _options.backgroundColor + "; background-repeat: no-repeat; background-position: " + _options.backgroundLeft + "px " + _options.backgroundTop + "px;";
-                }
-
-                string html = cachedFile.Replace("</head>", "<style type='text/css'>body {" + bodyStyle + " }</style></head>");
+                string html = reader.ReadToEnd();
 
                 // We also want to parse out the duration using a regular expression
                 try
@@ -158,8 +143,6 @@
                 {
                     Trace.WriteLine(new LogMessage("Html - SaveToTemporaryFile", "Unable to pull duration using RegEx").ToString());
                 }
-
-                _temporaryFile.FileContent = html;
             }
         }
 
@@ -194,18 +177,36 @@
                 }
                 else
                 {
+                    // Ammend the resource file so that we can open it directly from the library (this is better than using a tempoary file)
+                    string cachedFile = e.Result;
+
+                    // Handle the background
+                    String bodyStyle;
+
+                    if (_options.backgroundImage == null || _options.backgroundImage == "")
+                    {
+                        bodyStyle = "background-color:" + _options.backgroundColor + " ;";
+                    }
+                    else
+                    {
+                        bodyStyle = "background-image: url('" + _options.backgroundImage.Replace('\\', '/') + "'); background-attachment:fixed; background-color:" + _options.backgroundColor + "; background-repeat: no-repeat; background-position: " + _options.backgroundLeft + "px " + _options.backgroundTop + "px;";
+                    }
+
+                    string html = cachedFile.Replace("</head>", "<style type='text/css'>body {" + bodyStyle + " }</style></head>");
+                    html = html.Replace("[[ViewPortWidth]]", _width.ToString());
+
                     // Write to the library
                     using (StreamWriter sw = new StreamWriter(File.Open(_filePath, FileMode.Create, FileAccess.Write, FileShare.Read)))
                     {
-                        sw.Write(e.Result);
+                        sw.Write(html);
                         sw.Close();
                     }
 
-                    // Write to temporary file
-                    SaveToTemporaryFile();
+                    // Read the control meta back out
+                    ReadControlMeta();
 
                     // Handle Navigate in here because we will not have done it during first load
-                    _webView.Browser.GetMainFrame().LoadUrl(_temporaryFile.Path);
+                    _webView.Browser.GetMainFrame().LoadUrl(_filePath);
                 }
             }
             catch (ObjectDisposedException)
@@ -223,6 +224,45 @@
         }
 
         /// <summary>
+        /// Updates the Cache File with the necessary client side injected items
+        /// </summary>
+        private void UpdateCacheIfNecessary()
+        {
+            // Ammend the resource file so that we can open it directly from the library (this is better than using a tempoary file)
+            string cachedFile = "";
+
+            using (StreamReader reader = new StreamReader(File.Open(_filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)))
+            {
+                cachedFile = reader.ReadToEnd();
+            }
+
+            if (cachedFile.Contains("[[ViewPortWidth]]"))
+            {
+                // Handle the background
+                String bodyStyle;
+
+                if (_options.backgroundImage == null || _options.backgroundImage == "")
+                {
+                    bodyStyle = "background-color:" + _options.backgroundColor + " ;";
+                }
+                else
+                {
+                    bodyStyle = "background-image: url('" + _options.backgroundImage.Replace('\\', '/') + "'); background-attachment:fixed; background-color:" + _options.backgroundColor + "; background-repeat: no-repeat; background-position: " + _options.backgroundLeft + "px " + _options.backgroundTop + "px;";
+                }
+
+                string html = cachedFile.Replace("</head>", "<style type='text/css'>body {" + bodyStyle + " }</style></head>");
+                html = html.Replace("[[ViewPortWidth]]", _width.ToString());
+
+                // Write to the library
+                using (StreamWriter sw = new StreamWriter(File.Open(_filePath, FileMode.Create, FileAccess.Write, FileShare.Read)))
+                {
+                    sw.Write(html);
+                    sw.Close();
+                }
+            }
+        }
+
+        /// <summary>
         /// Dispose of this text item
         /// </summary>
         /// <param name="disposing"></param>
@@ -242,17 +282,6 @@
                 {
                     Trace.WriteLine(new LogMessage("WebBrowser still in use.", String.Format("Dispose")));
                 }
-
-                // Delete the temporary file
-                try
-                {
-                    if (_temporaryFile != null)
-                        _temporaryFile.Dispose();
-                }
-                catch
-                {
-                    Debug.WriteLine("Unable to delete temporary file", "CefWebMedia - Dispose");
-                }
             }
 
             base.Dispose(disposing);

=== modified file 'client/dotNET/Media/IeWebMedia.cs'
--- client/dotNET/Media/IeWebMedia.cs	2014-09-01 13:33:50 +0000
+++ client/dotNET/Media/IeWebMedia.cs	2014-10-21 16:06:26 +0000
@@ -36,7 +36,6 @@
         private bool _disposed = false;
         private string _filePath;
         private RegionOptions _options;
-        private TemporaryFile _temporaryFile;
         private WebBrowser _webBrowser;
 
         public IeWebMedia(RegionOptions options)
@@ -49,9 +48,6 @@
             // Set the file path
             _filePath = ApplicationSettings.Default.LibraryPath + @"\" + _options.mediaid + ".htm";
 
-            // We will need a temporary file to store this HTML
-            _temporaryFile = new TemporaryFile();
-
             // Create the web view we will use
             _webBrowser = new WebBrowser();
             _webBrowser.DocumentCompleted += _webBrowser_DocumentCompleted;
@@ -64,10 +60,10 @@
             if (HtmlReady())
             {
                 // Write to temporary file
-                SaveToTemporaryFile();
+                ReadControlMeta();
 
                 // Navigate to temp file
-                _webBrowser.Navigate(_temporaryFile.Path);
+                _webBrowser.Navigate(_filePath);
             }
             else
             {
@@ -109,34 +105,23 @@
             if (_options.LayoutModifiedDate.CompareTo(lastWriteDate) > 0 || DateTime.Now.CompareTo(lastWriteDate.AddHours(_options.updateInterval * 1.0 / 60.0)) > 0)
                 return false;
             else
+            {
+                UpdateCacheIfNecessary();
                 return true;
+            }
         }
 
         /// <summary>
         /// Updates the position of the background and saves to a temporary file
         /// </summary>
-        private void SaveToTemporaryFile()
+        private void ReadControlMeta()
         {
             // read the contents of the file
             using (StreamReader reader = new StreamReader(_filePath))
             {
-                string cachedFile = reader.ReadToEnd();
-
-                // Handle the background
-                String bodyStyle;
-
-                if (_options.backgroundImage == null || _options.backgroundImage == "")
-                {
-                    bodyStyle = "background-color:" + _options.backgroundColor + " ;";
-                }
-                else
-                {
-                    bodyStyle = "background-image: url('" + _options.backgroundImage.Replace('\\', '/') + "'); background-attachment:fixed; background-color:" + _options.backgroundColor + "; background-repeat: no-repeat; background-position: " + _options.backgroundLeft + "px " + _options.backgroundTop + "px;";
-                }
-
-                string html = cachedFile.Replace("</head>", "<style type='text/css'>body {" + bodyStyle + " }</style></head>");
-
-                // We also want to parse out the duration using a regular expression
+                string html = reader.ReadToEnd();
+
+                // Parse out the duration using a regular expression
                 try
                 {
                     Match match = Regex.Match(html, "<!-- DURATION=(.*?) -->");
@@ -151,8 +136,6 @@
                 {
                     Trace.WriteLine(new LogMessage("Html - SaveToTemporaryFile", "Unable to pull duration using RegEx").ToString());
                 }
-
-                _temporaryFile.FileContent = html;
             }
         }
 
@@ -187,18 +170,36 @@
                 }
                 else
                 {
+                    // Ammend the resource file so that we can open it directly from the library (this is better than using a tempoary file)
+                    string cachedFile = e.Result;
+
+                    // Handle the background
+                    String bodyStyle;
+
+                    if (_options.backgroundImage == null || _options.backgroundImage == "")
+                    {
+                        bodyStyle = "background-color:" + _options.backgroundColor + " ;";
+                    }
+                    else
+                    {
+                        bodyStyle = "background-image: url('" + _options.backgroundImage.Replace('\\', '/') + "'); background-attachment:fixed; background-color:" + _options.backgroundColor + "; background-repeat: no-repeat; background-position: " + _options.backgroundLeft + "px " + _options.backgroundTop + "px;";
+                    }
+
+                    string html = cachedFile.Replace("</head>", "<style type='text/css'>body {" + bodyStyle + " }</style></head>");
+                    html = html.Replace("[[ViewPortWidth]]", _width.ToString());
+
                     // Write to the library
                     using (StreamWriter sw = new StreamWriter(File.Open(_filePath, FileMode.Create, FileAccess.Write, FileShare.Read)))
                     {
-                        sw.Write(e.Result);
+                        sw.Write(html);
                         sw.Close();
                     }
 
-                    // Write to temporary file
-                    SaveToTemporaryFile();
+                    // Read the control meta back out
+                    ReadControlMeta();
 
                     // Handle Navigate in here because we will not have done it during first load
-                    _webBrowser.Navigate(_temporaryFile.Path);
+                    _webBrowser.Navigate(_filePath);
                 }
             }
             catch (ObjectDisposedException)
@@ -216,6 +217,45 @@
         }
 
         /// <summary>
+        /// Updates the Cache File with the necessary client side injected items
+        /// </summary>
+        private void UpdateCacheIfNecessary()
+        {
+            // Ammend the resource file so that we can open it directly from the library (this is better than using a tempoary file)
+            string cachedFile = "";
+
+            using (StreamReader reader = new StreamReader(File.Open(_filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)))
+            {
+                cachedFile = reader.ReadToEnd();
+            }
+
+            if (cachedFile.Contains("[[ViewPortWidth]]"))
+            {
+                // Handle the background
+                String bodyStyle;
+
+                if (_options.backgroundImage == null || _options.backgroundImage == "")
+                {
+                    bodyStyle = "background-color:" + _options.backgroundColor + " ;";
+                }
+                else
+                {
+                    bodyStyle = "background-image: url('" + _options.backgroundImage.Replace('\\', '/') + "'); background-attachment:fixed; background-color:" + _options.backgroundColor + "; background-repeat: no-repeat; background-position: " + _options.backgroundLeft + "px " + _options.backgroundTop + "px;";
+                }
+
+                string html = cachedFile.Replace("</head>", "<style type='text/css'>body {" + bodyStyle + " }</style></head>");
+                html = html.Replace("[[ViewPortWidth]]", _width.ToString());
+
+                // Write to the library
+                using (StreamWriter sw = new StreamWriter(File.Open(_filePath, FileMode.Create, FileAccess.Write, FileShare.Read)))
+                {
+                    sw.Write(html);
+                    sw.Close();
+                }
+            }
+        }
+
+        /// <summary>
         /// Dispose of this text item
         /// </summary>
         /// <param name="disposing"></param>
@@ -234,17 +274,6 @@
                 {
                     Debug.WriteLine(new LogMessage("WebBrowser still in use.", String.Format("Dispose")));
                 }
-
-                // Delete the temporary file
-                try
-                {
-                    if (_temporaryFile != null)
-                        _temporaryFile.Dispose();
-                }
-                catch
-                {
-                    Debug.WriteLine("Unable to delete temporary file", "WebMedia - Dispose");
-                }
             }
 
             base.Dispose(disposing);

=== modified file 'client/dotNET/Media/ShellCommand.cs'
--- client/dotNET/Media/ShellCommand.cs	2014-08-29 19:31:56 +0000
+++ client/dotNET/Media/ShellCommand.cs	2014-10-21 16:06:26 +0000
@@ -47,16 +47,20 @@
                     string[] allowedCommands = ApplicationSettings.Default.ShellCommandAllowList.Split(',');
 
                     // Check we are allowed to execute the command
+                    bool found = false;
+
                     foreach (string allowedCommand in allowedCommands)
                     {
                         if (_command.StartsWith(allowedCommand))
                         {
+                            found = true;
                             ExecuteShellCommand();
                             break;
                         }
                     }
 
-                    Trace.WriteLine(new LogMessage("ShellCommand - RenderMedia", "Shell Commands not in allow list: " + ApplicationSettings.Default.ShellCommandAllowList), LogType.Error.ToString());
+                    if (!found)
+                        Trace.WriteLine(new LogMessage("ShellCommand - RenderMedia", "Shell Commands not in allow list: " + ApplicationSettings.Default.ShellCommandAllowList), LogType.Error.ToString());
                 }
                 else
                 {

=== removed file 'client/dotNET/Media/TemporaryFile.cs'
--- client/dotNET/Media/TemporaryFile.cs	2014-08-29 19:31:56 +0000
+++ client/dotNET/Media/TemporaryFile.cs	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Reflection;
-using System.Diagnostics;
-
-namespace XiboClient
-{
-    /// <summary>
-    /// A temporary html object.
-    /// Once FileContent is set it will contain the complete HTML page
-    /// </summary>
-    class TemporaryFile : IDisposable
-    {
-        private String _fileContent;
-        private String _filePath;
-
-        /// <summary>
-        /// The File content - can only be set once.
-        /// </summary>
-        public String FileContent
-        {
-            set
-            {
-                // Set the contents of the file
-                _fileContent = value;
-
-                // Create the temporary file
-                Store();
-            }
-        }
-
-        public String Path
-        {
-            get
-            {
-                return _filePath;
-            }
-        }
-
-        /// <summary>
-        /// Stores the file
-        /// </summary>
-        private void Store()
-        {
-            // Create a temporary file
-            _filePath = System.IO.Path.GetTempFileName();
-
-            Debug.WriteLine(_filePath);
-
-            // Write it to the file
-            using (StreamWriter sw = new StreamWriter(File.Open(_filePath, FileMode.Create, FileAccess.Write, FileShare.Read)))
-            {
-                sw.Write(_fileContent);
-                sw.Close();
-            }
-        }
-
-
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            // Remove the temporary file
-            File.Delete(_filePath);
-        }
-
-        #endregion
-    }
-}

=== modified file 'client/dotNET/Web References/xmds/Reference.cs'
--- client/dotNET/Web References/xmds/Reference.cs	2014-09-15 16:58:36 +0000
+++ client/dotNET/Web References/xmds/Reference.cs	2014-10-21 16:06:26 +0000
@@ -55,7 +55,7 @@
         
         /// <remarks/>
         public xmds() {
-            this.Url = "http://172.28.128.4/xmds.php";
+            this.Url = "http://172.28.128.3/xmds.php";
             if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
                 this.UseDefaultCredentials = true;
                 this.useDefaultCredentialsSetExplicitly = false;
@@ -125,7 +125,7 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#RegisterDisplay", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("ActivationMessage")]
-        public string RegisterDisplay(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string macAddress, string version) {
+        public string RegisterDisplay(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress, string version) {
             object[] results = this.Invoke("RegisterDisplay", new object[] {
                         serverKey,
                         hardwareKey,
@@ -133,18 +133,19 @@
                         clientType,
                         clientVersion,
                         clientCode,
+                        operatingSystem,
                         macAddress,
                         version});
             return ((string)(results[0]));
         }
         
         /// <remarks/>
-        public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string macAddress, string version) {
-            this.RegisterDisplayAsync(serverKey, hardwareKey, displayName, clientType, clientVersion, clientCode, macAddress, version, null);
+        public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress, string version) {
+            this.RegisterDisplayAsync(serverKey, hardwareKey, displayName, clientType, clientVersion, clientCode, operatingSystem, macAddress, version, null);
         }
         
         /// <remarks/>
-        public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string macAddress, string version, object userState) {
+        public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress, string version, object userState) {
             if ((this.RegisterDisplayOperationCompleted == null)) {
                 this.RegisterDisplayOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRegisterDisplayOperationCompleted);
             }
@@ -155,6 +156,7 @@
                         clientType,
                         clientVersion,
                         clientCode,
+                        operatingSystem,
                         macAddress,
                         version}, this.RegisterDisplayOperationCompleted, userState);
         }
@@ -203,7 +205,7 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#GetFile", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("file", DataType="base64Binary")]
-        public byte[] GetFile(string serverKey, string hardwareKey, int fileId, string fileType, int chunkOffset, int chuckSize, string version) {
+        public byte[] GetFile(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize, string version) {
             object[] results = this.Invoke("GetFile", new object[] {
                         serverKey,
                         hardwareKey,
@@ -216,12 +218,12 @@
         }
         
         /// <remarks/>
-        public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, int chunkOffset, int chuckSize, string version) {
+        public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize, string version) {
             this.GetFileAsync(serverKey, hardwareKey, fileId, fileType, chunkOffset, chuckSize, version, null);
         }
         
         /// <remarks/>
-        public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, int chunkOffset, int chuckSize, string version, object userState) {
+        public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize, string version, object userState) {
             if ((this.GetFileOperationCompleted == null)) {
                 this.GetFileOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFileOperationCompleted);
             }

=== modified file 'client/dotNET/Web References/xmds/Reference.map'
--- client/dotNET/Web References/xmds/Reference.map	2014-09-13 12:58:57 +0000
+++ client/dotNET/Web References/xmds/Reference.map	2014-10-21 16:06:26 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://172.28.128.4/xmds.php?WSDL" filename="xmds.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://172.28.128.3/xmds.php?WSDL" filename="xmds.wsdl" />
   </Results>
 </DiscoveryClientResultsFile>
\ No newline at end of file

=== modified file 'client/dotNET/Web References/xmds/xmds.wsdl'
--- client/dotNET/Web References/xmds/xmds.wsdl	2014-09-15 16:58:36 +0000
+++ client/dotNET/Web References/xmds/xmds.wsdl	2014-10-21 16:06:26 +0000
@@ -13,6 +13,7 @@
     <wsdl:part name="clientType" type="xsd:string" />
     <wsdl:part name="clientVersion" type="xsd:string" />
     <wsdl:part name="clientCode" type="xsd:int" />
+    <wsdl:part name="operatingSystem" type="xsd:string" />
     <wsdl:part name="macAddress" type="xsd:string" />
     <wsdl:part name="version" type="xsd:string" />
   </wsdl:message>
@@ -32,8 +33,8 @@
     <wsdl:part name="hardwareKey" type="xsd:string" />
     <wsdl:part name="fileId" type="xsd:int" />
     <wsdl:part name="fileType" type="xsd:string" />
-    <wsdl:part name="chunkOffset" type="xsd:int" />
-    <wsdl:part name="chuckSize" type="xsd:int" />
+    <wsdl:part name="chunkOffset" type="xsd:double" />
+    <wsdl:part name="chuckSize" type="xsd:double" />
     <wsdl:part name="version" type="xsd:string" />
   </wsdl:message>
   <wsdl:message name="GetFileResponse">
@@ -275,7 +276,7 @@
   </wsdl:binding>
   <wsdl:service name="xmds">
     <wsdl:port name="xmdsPort" binding="tns:xmdsBinding">
-      <soap:address location="http://172.28.128.4/xmds.php" />
+      <soap:address location="http://172.28.128.3/xmds.php" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file

=== modified file 'client/dotNET/XiboClient.csproj'
--- client/dotNET/XiboClient.csproj	2014-09-19 11:39:04 +0000
+++ client/dotNET/XiboClient.csproj	2014-10-21 16:06:26 +0000
@@ -124,7 +124,6 @@
     <Compile Include="Media\PowerPoint.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Media\TemporaryFile.cs" />
     <Compile Include="Media\VideoDS.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -263,10 +262,10 @@
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://172.28.128.4/xmds.php%3fWSDL">
+    <WebReferenceUrl Include="http://172.28.128.3/xmds.php%3fWSDL">
       <UrlBehavior>Static</UrlBehavior>
       <RelPath>Web References\xmds\</RelPath>
-      <UpdateFromURL>http://172.28.128.4/xmds.php%3fWSDL</UpdateFromURL>
+      <UpdateFromURL>http://172.28.128.3/xmds.php%3fWSDL</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>

=== modified file 'client/dotNET/XmdsAgents/FileAgent.cs'
--- client/dotNET/XmdsAgents/FileAgent.cs	2014-08-28 12:59:20 +0000
+++ client/dotNET/XmdsAgents/FileAgent.cs	2014-10-21 16:06:26 +0000
@@ -240,7 +240,7 @@
                             // Has the offset reached the total size?
                             if (file.Size > file.ChunkOffset)
                             {
-                                int remaining = file.Size - file.ChunkOffset;
+                                double remaining = file.Size - file.ChunkOffset;
 
                                 // There is still more to come
                                 if (remaining < file.ChunkSize)

=== modified file 'client/dotNET/XmdsAgents/RegisterAgent.cs'
--- client/dotNET/XmdsAgents/RegisterAgent.cs	2014-09-16 10:27:10 +0000
+++ client/dotNET/XmdsAgents/RegisterAgent.cs	2014-10-21 16:06:26 +0000
@@ -71,7 +71,7 @@
                             xmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
                             xmds.UseDefaultCredentials = false;
 
-                            RegisterAgent.ProcessRegisterXml(xmds.RegisterDisplay(ApplicationSettings.Default.ServerKey, key.Key, ApplicationSettings.Default.DisplayName, "windows", ApplicationSettings.Default.ClientVersion, ApplicationSettings.Default.ClientCodeVersion, key.MacAddress, ApplicationSettings.Default.Version));
+                            RegisterAgent.ProcessRegisterXml(xmds.RegisterDisplay(ApplicationSettings.Default.ServerKey, key.Key, ApplicationSettings.Default.DisplayName, "windows", ApplicationSettings.Default.ClientVersion, ApplicationSettings.Default.ClientCodeVersion, Environment.OSVersion.ToString(), key.MacAddress, ApplicationSettings.Default.Version));
 
                             // Set the flag to indicate we have a connection to XMDS
                             ApplicationSettings.Default.XmdsLastConnection = DateTime.Now;

=== modified file 'client/dotNET/default.config.xml'
--- client/dotNET/default.config.xml	2014-09-16 16:40:30 +0000
+++ client/dotNET/default.config.xml	2014-10-21 16:06:26 +0000
@@ -32,7 +32,7 @@
   <CursorStartPosition>Bottom Right</CursorStartPosition>
   <ClientInformationKeyCode>I</ClientInformationKeyCode>
   <Licensed>0</Licensed>
-  <StatsFlushCount>50</StatsFlushCount>
+  <StatsFlushCount>10</StatsFlushCount>
   <CollectInterval>900</CollectInterval>
   <MaxConcurrentDownloads>5</MaxConcurrentDownloads>
   <PowerpointEnabled>false</PowerpointEnabled>