Merge lp:~dangarner/xibo/client-132 into lp:xibo/1.3

[Dan Garner]

=== modified file 'client/dotNET/CacheManager.cs'
--- client/dotNET/CacheManager.cs	2011-02-16 17:06:01 +0000
+++ client/dotNET/CacheManager.cs	2012-01-22 15:34:34 +0000
@@ -222,7 +222,7 @@
         /// <returns></returns>
         public bool IsValidLayout(string layoutFile)
         {
-            Debug.WriteLine("Checking Layout " + layoutFile + " is valid");
+            Debug.WriteLine("Checking if Layout " + layoutFile + " is valid");
 
             if (!IsValidPath(layoutFile))
                 return false;
@@ -245,7 +245,10 @@
 
                         // Get the path and see if its valid
                         if (!IsValidPath(media.InnerText))
+                        {
+                            Debug.WriteLine("Invalid Media: " + media.Attributes["id"].Value.ToString());
                             return false;
+                        }
 
                         break;
 
@@ -254,6 +257,8 @@
                 }
             }
 
+            Debug.WriteLine("Layout " + layoutFile + " is valid");
+
             return true;
         }
 
 
=== modified file 'client/dotNET/HardwareKey.cs'
--- client/dotNET/HardwareKey.cs	2010-04-19 21:45:10 +0000
+++ client/dotNET/HardwareKey.cs	2012-01-22 15:34:34 +0000
@@ -27,30 +27,44 @@
 {
     class HardwareKey
     {
+        private string _hardwareKey;
+        private string _macAddress;
+
+        public string MacAddress
+        {
+            get
+            {
+                return _macAddress;
+            }
+        }
+
         public HardwareKey()
         {
             System.Diagnostics.Debug.WriteLine("[IN]", "HardwareKey");
 
             // Get the key from the Settings
-            hardwareKey = Properties.Settings.Default.hardwareKey;
+            _hardwareKey = Properties.Settings.Default.hardwareKey;
 
             // Is the key empty?
-            if (hardwareKey == "")
+            if (_hardwareKey == "")
             {
                 try
                 {
                     // Calculate the Hardware key from the CPUID and Volume Serial
-                    hardwareKey = Hashes.MD5(GetCPUId() + GetVolumeSerial("C"));
+                    _hardwareKey = Hashes.MD5(GetCPUId() + GetVolumeSerial("C"));
                 }
                 catch
                 {
-                    hardwareKey = "Change for Unique Key";
+                    _hardwareKey = "Change for Unique Key";
                 }
 
                 // Store the key
-                Properties.Settings.Default.hardwareKey = hardwareKey;
+                Properties.Settings.Default.hardwareKey = _hardwareKey;
             }
 
+            // Get the Mac Address
+            _macAddress = GetMACAddress();
+
             System.Diagnostics.Debug.WriteLine("[OUT]", "HardwareKey");
         }
 
@@ -61,7 +75,7 @@
         {
             get 
             { 
-                return this.hardwareKey; 
+                return this._hardwareKey; 
             }
         }
 
@@ -71,10 +85,10 @@
         public void Regenerate()
         {
             // Calculate the Hardware key from the CPUID and Volume Serial
-            hardwareKey = Hashes.MD5(GetCPUId() + GetVolumeSerial("C"));
+            _hardwareKey = Hashes.MD5(GetCPUId() + GetVolumeSerial("C"));
 
             // Store the key
-            Properties.Settings.Default.hardwareKey = hardwareKey;
+            Properties.Settings.Default.hardwareKey = _hardwareKey;
             Properties.Settings.Default.Save();
         }
 
@@ -105,6 +119,7 @@
             ManagementClass mc = new ManagementClass("Win32_NetworkAdapterConfiguration");
             ManagementObjectCollection moc = mc.GetInstances();
             string MACAddress = String.Empty;
+
             foreach (ManagementObject mo in moc)
             {
                 if (MACAddress == String.Empty)  // only return MAC Address from first card
@@ -113,7 +128,7 @@
                 }
                 mo.Dispose();
             }
-            MACAddress = MACAddress.Replace(":", "");
+            
             return MACAddress;
         }
 
@@ -141,7 +156,5 @@
 
             return cpuInfo;
         }
-
-        private string hardwareKey;
     }
 }
 
=== modified file 'client/dotNET/MainForm.Designer.cs'
--- client/dotNET/MainForm.Designer.cs	2009-12-31 11:38:50 +0000
+++ client/dotNET/MainForm.Designer.cs	2012-01-22 15:34:34 +0000
@@ -1,3 +1,4 @@
+using XiboClient.Properties;
 namespace XiboClient
 {
     partial class MainForm
@@ -38,7 +39,7 @@
             this.BackColor = System.Drawing.Color.Black;
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.ClientSize = new System.Drawing.Size(1024, 768);
-            this.DoubleBuffered = true;
+            this.DoubleBuffered = Settings.Default.DoubleBuffering;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "MainForm";
 
=== modified file 'client/dotNET/MainForm.cs'
--- client/dotNET/MainForm.cs	2011-09-06 20:46:43 +0000
+++ client/dotNET/MainForm.cs	2012-01-22 15:34:34 +0000
@@ -70,6 +70,9 @@
                 _clientSize = SystemInformation.PrimaryMonitorSize;
             }
 
+            // Setup the proxy information
+            OptionForm.SetGlobalProxy();
+
             _statLog = new StatLog();
 
             this.FormClosing += new FormClosingEventHandler(MainForm_FormClosing);
@@ -419,6 +422,7 @@
                 if (region.ChildNodes.Count == 0)
                 {
                     Debug.WriteLine("A region with no media detected");
+                    continue;
                 }
 
                 //each region
 
=== modified file 'client/dotNET/Media.cs'
--- client/dotNET/Media.cs	2011-06-05 15:21:16 +0000
+++ client/dotNET/Media.cs	2012-01-22 15:34:34 +0000
@@ -21,6 +21,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Windows.Forms;
+using XiboClient.Properties;
 
 namespace XiboClient
 {
@@ -48,8 +49,11 @@
             this.BackColor = System.Drawing.Color.Transparent;
             this.TransparencyKey = System.Drawing.Color.White;
 
-            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
-            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            if (Settings.Default.DoubleBuffering)
+            {
+                SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+                SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            }
         }
 
         protected void StartTimer()
 
=== modified file 'client/dotNET/OptionForm.Designer.cs'
--- client/dotNET/OptionForm.Designer.cs	2011-07-16 13:13:44 +0000
+++ client/dotNET/OptionForm.Designer.cs	2012-01-22 15:34:34 +0000
@@ -75,11 +75,11 @@
             this.clientHeight = new System.Windows.Forms.NumericUpDown();
             this.clientWidth = new System.Windows.Forms.NumericUpDown();
             this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.doubleBufferingCheckBox = new System.Windows.Forms.CheckBox();
             this.enableMouseCb = new System.Windows.Forms.CheckBox();
             this.cbExpireModifiedLayouts = new System.Windows.Forms.CheckBox();
-            this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDownEmptyRegions = new System.Windows.Forms.NumericUpDown();
             this.label15 = new System.Windows.Forms.Label();
-            this.buttonReset = new System.Windows.Forms.Button();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -101,7 +101,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.clientHeight)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.clientWidth)).BeginInit();
             this.tabPage5.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownEmptyRegions)).BeginInit();
             this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -134,7 +134,6 @@
             // 
             // buttonSaveSettings
             // 
-            this.buttonSaveSettings.Enabled = false;
             this.buttonSaveSettings.Location = new System.Drawing.Point(200, 320);
             this.buttonSaveSettings.Name = "buttonSaveSettings";
             this.buttonSaveSettings.Size = new System.Drawing.Size(75, 23);
@@ -183,7 +182,6 @@
             // 
             // nupScrollStepAmount
             // 
-            this.nupScrollStepAmount.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::XiboClient.Properties.Settings.Default, "scrollStepAmount", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.nupScrollStepAmount.Location = new System.Drawing.Point(184, 145);
             this.nupScrollStepAmount.Minimum = new decimal(new int[] {
             1,
@@ -193,7 +191,11 @@
             this.nupScrollStepAmount.Name = "nupScrollStepAmount";
             this.nupScrollStepAmount.Size = new System.Drawing.Size(76, 20);
             this.nupScrollStepAmount.TabIndex = 16;
-            this.nupScrollStepAmount.Value = global::XiboClient.Properties.Settings.Default.scrollStepAmount;
+            this.nupScrollStepAmount.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             // 
             // label10
             // 
@@ -257,66 +259,56 @@
             // 
             // tbHardwareKey
             // 
-            this.tbHardwareKey.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::XiboClient.Properties.Settings.Default, "hardwareKey", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.tbHardwareKey.Location = new System.Drawing.Point(184, 119);
             this.tbHardwareKey.Name = "tbHardwareKey";
             this.tbHardwareKey.Size = new System.Drawing.Size(237, 20);
             this.tbHardwareKey.TabIndex = 14;
-            this.tbHardwareKey.Text = global::XiboClient.Properties.Settings.Default.hardwareKey;
             // 
             // checkBoxStats
             // 
             this.checkBoxStats.AutoSize = true;
-            this.checkBoxStats.Checked = global::XiboClient.Properties.Settings.Default.statsEnabled;
+            this.checkBoxStats.Checked = true;
             this.checkBoxStats.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.checkBoxStats.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::XiboClient.Properties.Settings.Default, "statsEnabled", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.checkBoxStats.Location = new System.Drawing.Point(184, 204);
             this.checkBoxStats.Name = "checkBoxStats";
             this.checkBoxStats.Size = new System.Drawing.Size(104, 17);
             this.checkBoxStats.TabIndex = 0;
             this.checkBoxStats.Text = "Enable Statistics";
             this.checkBoxStats.UseVisualStyleBackColor = true;
-            this.checkBoxStats.CheckedChanged += new System.EventHandler(this.checkBoxStats_CheckedChanged);
             // 
             // checkBoxPowerPoint
             // 
             this.checkBoxPowerPoint.AutoSize = true;
-            this.checkBoxPowerPoint.Checked = global::XiboClient.Properties.Settings.Default.powerpointEnabled;
-            this.checkBoxPowerPoint.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::XiboClient.Properties.Settings.Default, "powerpointEnabled", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.checkBoxPowerPoint.Location = new System.Drawing.Point(184, 181);
             this.checkBoxPowerPoint.Name = "checkBoxPowerPoint";
             this.checkBoxPowerPoint.Size = new System.Drawing.Size(116, 17);
             this.checkBoxPowerPoint.TabIndex = 12;
             this.checkBoxPowerPoint.Text = "Enable PowerPoint";
             this.checkBoxPowerPoint.UseVisualStyleBackColor = true;
-            this.checkBoxPowerPoint.CheckedChanged += new System.EventHandler(this.checkBoxPowerPoint_CheckedChanged);
             // 
             // textBoxXmdsUri
             // 
-            this.textBoxXmdsUri.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::XiboClient.Properties.Settings.Default, "serverURI", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.textBoxXmdsUri.Location = new System.Drawing.Point(184, 11);
             this.textBoxXmdsUri.Name = "textBoxXmdsUri";
             this.textBoxXmdsUri.Size = new System.Drawing.Size(237, 20);
             this.textBoxXmdsUri.TabIndex = 0;
-            this.textBoxXmdsUri.Text = global::XiboClient.Properties.Settings.Default.serverURI;
+            this.textBoxXmdsUri.Text = "http://localhost/xibo";
             // 
             // textBoxServerKey
             // 
-            this.textBoxServerKey.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::XiboClient.Properties.Settings.Default, "ServerKey", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.textBoxServerKey.Location = new System.Drawing.Point(184, 38);
             this.textBoxServerKey.Name = "textBoxServerKey";
             this.textBoxServerKey.Size = new System.Drawing.Size(237, 20);
             this.textBoxServerKey.TabIndex = 2;
-            this.textBoxServerKey.Text = global::XiboClient.Properties.Settings.Default.ServerKey;
+            this.textBoxServerKey.Text = "yourserverkey";
             // 
             // textBoxLibraryPath
             // 
-            this.textBoxLibraryPath.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::XiboClient.Properties.Settings.Default, "LibraryPath", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.textBoxLibraryPath.Location = new System.Drawing.Point(184, 65);
             this.textBoxLibraryPath.Name = "textBoxLibraryPath";
             this.textBoxLibraryPath.Size = new System.Drawing.Size(156, 20);
             this.textBoxLibraryPath.TabIndex = 4;
-            this.textBoxLibraryPath.Text = global::XiboClient.Properties.Settings.Default.LibraryPath;
+            this.textBoxLibraryPath.Text = "DEFAULT";
             // 
             // tabPage2
             // 
@@ -396,19 +388,17 @@
             this.labelXmdsUrl.AutoSize = true;
             this.labelXmdsUrl.Location = new System.Drawing.Point(139, 10);
             this.labelXmdsUrl.Name = "labelXmdsUrl";
-            this.labelXmdsUrl.Size = new System.Drawing.Size(338, 13);
+            this.labelXmdsUrl.Size = new System.Drawing.Size(299, 13);
             this.labelXmdsUrl.TabIndex = 3;
-            this.labelXmdsUrl.Text = global::XiboClient.Properties.Settings.Default.XiboClient_xmds_xmds;
+            this.labelXmdsUrl.Text = "http://localhost/Series%201.3/131-datasets/server/xmds.php";
             // 
             // textBoxDisplayName
             // 
-            this.textBoxDisplayName.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::XiboClient.Properties.Settings.Default, "displayName", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.textBoxDisplayName.Location = new System.Drawing.Point(142, 37);
             this.textBoxDisplayName.Name = "textBoxDisplayName";
             this.textBoxDisplayName.Size = new System.Drawing.Size(264, 20);
             this.textBoxDisplayName.TabIndex = 0;
-            this.textBoxDisplayName.Text = global::XiboClient.Properties.Settings.Default.displayName;
-            this.textBoxDisplayName.TextChanged += new System.EventHandler(this.textBoxDisplayName_TextChanged);
+            this.textBoxDisplayName.Text = "COMPUTERNAME";
             // 
             // tabPage3
             // 
@@ -448,31 +438,25 @@
             // 
             // textBoxProxyDomain
             // 
-            this.textBoxProxyDomain.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::XiboClient.Properties.Settings.Default, "ProxyDomain", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.textBoxProxyDomain.Location = new System.Drawing.Point(99, 95);
             this.textBoxProxyDomain.Name = "textBoxProxyDomain";
             this.textBoxProxyDomain.Size = new System.Drawing.Size(171, 20);
             this.textBoxProxyDomain.TabIndex = 7;
-            this.textBoxProxyDomain.Text = global::XiboClient.Properties.Settings.Default.ProxyDomain;
             // 
             // maskedTextBoxProxyPass
             // 
-            this.maskedTextBoxProxyPass.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::XiboClient.Properties.Settings.Default, "ProxyPassword", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.maskedTextBoxProxyPass.Location = new System.Drawing.Point(99, 67);
             this.maskedTextBoxProxyPass.Name = "maskedTextBoxProxyPass";
             this.maskedTextBoxProxyPass.Size = new System.Drawing.Size(171, 20);
             this.maskedTextBoxProxyPass.TabIndex = 5;
-            this.maskedTextBoxProxyPass.Text = global::XiboClient.Properties.Settings.Default.ProxyPassword;
             this.maskedTextBoxProxyPass.UseSystemPasswordChar = true;
             // 
             // textBoxProxyUser
             // 
-            this.textBoxProxyUser.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::XiboClient.Properties.Settings.Default, "ProxyUser", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.textBoxProxyUser.Location = new System.Drawing.Point(99, 41);
             this.textBoxProxyUser.Name = "textBoxProxyUser";
             this.textBoxProxyUser.Size = new System.Drawing.Size(171, 20);
             this.textBoxProxyUser.TabIndex = 3;
-            this.textBoxProxyUser.Text = global::XiboClient.Properties.Settings.Default.ProxyUser;
             // 
             // labelProxyDomain
             // 
@@ -557,7 +541,6 @@
             // 
             // offsetX
             // 
-            this.offsetX.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::XiboClient.Properties.Settings.Default, "offsetX", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.offsetX.Location = new System.Drawing.Point(77, 67);
             this.offsetX.Maximum = new decimal(new int[] {
             10000,
@@ -567,12 +550,9 @@
             this.offsetX.Name = "offsetX";
             this.offsetX.Size = new System.Drawing.Size(77, 20);
             this.offsetX.TabIndex = 6;
-            this.offsetX.Value = global::XiboClient.Properties.Settings.Default.offsetX;
-            this.offsetX.ValueChanged += new System.EventHandler(this.offsetX_ValueChanged_1);
             // 
             // offsetY
             // 
-            this.offsetY.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::XiboClient.Properties.Settings.Default, "offsetY", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.offsetY.Location = new System.Drawing.Point(77, 94);
             this.offsetY.Maximum = new decimal(new int[] {
             10000,
@@ -582,12 +562,9 @@
             this.offsetY.Name = "offsetY";
             this.offsetY.Size = new System.Drawing.Size(77, 20);
             this.offsetY.TabIndex = 7;
-            this.offsetY.Value = global::XiboClient.Properties.Settings.Default.offsetY;
-            this.offsetY.ValueChanged += new System.EventHandler(this.offsetY_ValueChanged_1);
             // 
             // clientHeight
             // 
-            this.clientHeight.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::XiboClient.Properties.Settings.Default, "sizeY", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.clientHeight.Location = new System.Drawing.Point(77, 41);
             this.clientHeight.Maximum = new decimal(new int[] {
             10000,
@@ -597,12 +574,9 @@
             this.clientHeight.Name = "clientHeight";
             this.clientHeight.Size = new System.Drawing.Size(77, 20);
             this.clientHeight.TabIndex = 5;
-            this.clientHeight.Value = global::XiboClient.Properties.Settings.Default.sizeY;
-            this.clientHeight.ValueChanged += new System.EventHandler(this.clientHeight_ValueChanged_1);
             // 
             // clientWidth
             // 
-            this.clientWidth.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::XiboClient.Properties.Settings.Default, "sizeX", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.clientWidth.Location = new System.Drawing.Point(77, 15);
             this.clientWidth.Maximum = new decimal(new int[] {
             10000,
@@ -612,14 +586,13 @@
             this.clientWidth.Name = "clientWidth";
             this.clientWidth.Size = new System.Drawing.Size(77, 20);
             this.clientWidth.TabIndex = 4;
-            this.clientWidth.Value = global::XiboClient.Properties.Settings.Default.sizeX;
-            this.clientWidth.ValueChanged += new System.EventHandler(this.clientWidth_ValueChanged_1);
             // 
             // tabPage5
             // 
+            this.tabPage5.Controls.Add(this.doubleBufferingCheckBox);
             this.tabPage5.Controls.Add(this.enableMouseCb);
             this.tabPage5.Controls.Add(this.cbExpireModifiedLayouts);
-            this.tabPage5.Controls.Add(this.numericUpDown1);
+            this.tabPage5.Controls.Add(this.numericUpDownEmptyRegions);
             this.tabPage5.Controls.Add(this.label15);
             this.tabPage5.Location = new System.Drawing.Point(4, 22);
             this.tabPage5.Name = "tabPage5";
@@ -629,43 +602,51 @@
             this.tabPage5.Text = "Advanced";
             this.tabPage5.UseVisualStyleBackColor = true;
             // 
+            // doubleBufferingCheckBox
+            // 
+            this.doubleBufferingCheckBox.AutoSize = true;
+            this.doubleBufferingCheckBox.Location = new System.Drawing.Point(176, 140);
+            this.doubleBufferingCheckBox.Name = "doubleBufferingCheckBox";
+            this.doubleBufferingCheckBox.Size = new System.Drawing.Size(141, 17);
+            this.doubleBufferingCheckBox.TabIndex = 4;
+            this.doubleBufferingCheckBox.Text = "Enable Double Buffering";
+            this.doubleBufferingCheckBox.UseVisualStyleBackColor = true;
+            // 
             // enableMouseCb
             // 
             this.enableMouseCb.AutoSize = true;
-            this.enableMouseCb.Checked = global::XiboClient.Properties.Settings.Default.EnableMouse;
+            this.enableMouseCb.Checked = true;
             this.enableMouseCb.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.enableMouseCb.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::XiboClient.Properties.Settings.Default, "EnableMouse", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.enableMouseCb.Location = new System.Drawing.Point(176, 103);
             this.enableMouseCb.Name = "enableMouseCb";
             this.enableMouseCb.Size = new System.Drawing.Size(94, 17);
             this.enableMouseCb.TabIndex = 3;
             this.enableMouseCb.Text = "Enable Mouse";
             this.enableMouseCb.UseVisualStyleBackColor = true;
-            this.enableMouseCb.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
             // 
             // cbExpireModifiedLayouts
             // 
             this.cbExpireModifiedLayouts.AutoSize = true;
-            this.cbExpireModifiedLayouts.Checked = global::XiboClient.Properties.Settings.Default.expireModifiedLayouts;
+            this.cbExpireModifiedLayouts.Checked = true;
             this.cbExpireModifiedLayouts.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.cbExpireModifiedLayouts.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::XiboClient.Properties.Settings.Default, "expireModifiedLayouts", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.cbExpireModifiedLayouts.Location = new System.Drawing.Point(176, 66);
             this.cbExpireModifiedLayouts.Name = "cbExpireModifiedLayouts";
             this.cbExpireModifiedLayouts.Size = new System.Drawing.Size(243, 17);
             this.cbExpireModifiedLayouts.TabIndex = 2;
             this.cbExpireModifiedLayouts.Text = "Expire modified layouts while they are playing?";
             this.cbExpireModifiedLayouts.UseVisualStyleBackColor = true;
-            this.cbExpireModifiedLayouts.CheckedChanged += new System.EventHandler(this.cbExpireModifiedLayouts_CheckedChanged);
-            // 
-            // numericUpDown1
-            // 
-            this.numericUpDown1.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::XiboClient.Properties.Settings.Default, "emptyLayoutDuration", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.numericUpDown1.Location = new System.Drawing.Point(176, 23);
-            this.numericUpDown1.Name = "numericUpDown1";
-            this.numericUpDown1.Size = new System.Drawing.Size(91, 20);
-            this.numericUpDown1.TabIndex = 1;
-            this.numericUpDown1.Value = global::XiboClient.Properties.Settings.Default.emptyLayoutDuration;
-            this.numericUpDown1.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged);
+            // 
+            // numericUpDownEmptyRegions
+            // 
+            this.numericUpDownEmptyRegions.Location = new System.Drawing.Point(176, 23);
+            this.numericUpDownEmptyRegions.Name = "numericUpDownEmptyRegions";
+            this.numericUpDownEmptyRegions.Size = new System.Drawing.Size(91, 20);
+            this.numericUpDownEmptyRegions.TabIndex = 1;
+            this.numericUpDownEmptyRegions.Value = new decimal(new int[] {
+            10,
+            0,
+            0,
+            0});
             // 
             // label15
             // 
@@ -676,16 +657,6 @@
             this.label15.TabIndex = 0;
             this.label15.Text = "Duration for Empty Regions";
             // 
-            // buttonReset
-            // 
-            this.buttonReset.Location = new System.Drawing.Point(281, 320);
-            this.buttonReset.Name = "buttonReset";
-            this.buttonReset.Size = new System.Drawing.Size(75, 23);
-            this.buttonReset.TabIndex = 11;
-            this.buttonReset.Text = "Reset";
-            this.buttonReset.UseVisualStyleBackColor = true;
-            this.buttonReset.Click += new System.EventHandler(this.buttonReset_Click);
-            // 
             // menuStrip1
             // 
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -749,7 +720,6 @@
             this.Controls.Add(this.menuStrip1);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.buttonSaveSettings);
-            this.Controls.Add(this.buttonReset);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MainMenuStrip = this.menuStrip1;
             this.Name = "OptionForm";
@@ -773,7 +743,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.clientWidth)).EndInit();
             this.tabPage5.ResumeLayout(false);
             this.tabPage5.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownEmptyRegions)).EndInit();
             this.menuStrip1.ResumeLayout(false);
             this.menuStrip1.PerformLayout();
             this.ResumeLayout(false);
@@ -810,7 +780,6 @@
         private System.Windows.Forms.NumericUpDown numericUpDownCollect;
         private System.Windows.Forms.FolderBrowserDialog folderBrowserLibrary;
         private System.Windows.Forms.Button buttonLibrary;
-        private System.Windows.Forms.Button buttonReset;
         private System.Windows.Forms.ToolStripMenuItem onlineHelpToolStripMenuItem;
         private System.Windows.Forms.CheckBox checkBoxPowerPoint;
         private System.Windows.Forms.CheckBox checkBoxStats;
@@ -838,9 +807,10 @@
         private System.Windows.Forms.NumericUpDown offsetX;
         private System.Windows.Forms.NumericUpDown clientHeight;
         private System.Windows.Forms.TabPage tabPage5;
-        private System.Windows.Forms.NumericUpDown numericUpDown1;
+        private System.Windows.Forms.NumericUpDown numericUpDownEmptyRegions;
         private System.Windows.Forms.Label label15;
         private System.Windows.Forms.CheckBox cbExpireModifiedLayouts;
         private System.Windows.Forms.CheckBox enableMouseCb;
+        private System.Windows.Forms.CheckBox doubleBufferingCheckBox;
     }
 }
 \ No newline at end of file
 
=== modified file 'client/dotNET/OptionForm.cs'
--- client/dotNET/OptionForm.cs	2011-07-16 13:13:44 +0000
+++ client/dotNET/OptionForm.cs	2012-01-22 15:34:34 +0000
@@ -1,6 +1,6 @@
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
+ * Copyright (C) 2006-11 Daniel Garner and James Packer
  *
  * This file is part of Xibo.
  *
@@ -26,109 +26,86 @@
 using System.Text;
 using System.Net;
 using System.Windows.Forms;
+using XiboClient.Properties;
+using System.Diagnostics;
 
 namespace XiboClient
 {
     public partial class OptionForm : Form
     {
+        private HardwareKey _hardwareKey;
+
+
         public OptionForm()
         {
-            System.Diagnostics.Debug.WriteLine("[IN]", "OptionForm");
+            InitializeComponent();
+
             System.Diagnostics.Debug.WriteLine("Initialise Option Form Components", "OptionForm");
 
             // Get a hardware key here, just in case we havent been able to get one before
-            hardwareKey = new HardwareKey();
-
-            InitializeComponent();
-
-            System.Diagnostics.Debug.WriteLine("Register some Event Handlers", "OptionForm");
-
-            this.xmds1.RegisterDisplayCompleted += new XiboClient.xmds.RegisterDisplayCompletedEventHandler(xmds1_RegisterDisplayCompleted);
+            _hardwareKey = new HardwareKey();
+
+            // XMDS completed event
+            xmds1.RegisterDisplayCompleted += new XiboClient.xmds.RegisterDisplayCompletedEventHandler(xmds1_RegisterDisplayCompleted);
             
-            // Bind some events to the settings fields
-            textBoxXmdsUri.TextChanged += new EventHandler(setting_TextChanged);
-            textBoxServerKey.TextChanged += new EventHandler(setting_TextChanged);
-            textBoxLibraryPath.TextChanged += new EventHandler(setting_TextChanged);
-            numericUpDownCollect.ValueChanged += new EventHandler(setting_TextChanged);
-            nupScrollStepAmount.ValueChanged += new EventHandler(nupScrollStepAmount_ValueChanged);
-
-            // Bind some events to the proxy settings fields
-            textBoxProxyUser.TextChanged += new EventHandler(proxySetting_TextChanged);
-            maskedTextBoxProxyPass.TextChanged += new EventHandler(proxySetting_TextChanged);
-            textBoxProxyDomain.TextChanged += new EventHandler(proxySetting_TextChanged);
-            tbHardwareKey.TextChanged += new EventHandler(tbHardwareKey_TextChanged);
-
-            clientHeight.ValueChanged += new EventHandler(clientHeight_ValueChanged);
-            clientWidth.ValueChanged += new EventHandler(clientWidth_ValueChanged);
-            offsetX.ValueChanged += new EventHandler(offsetX_ValueChanged);
-            offsetY.ValueChanged += new EventHandler(offsetY_ValueChanged);
-
-            System.Diagnostics.Debug.WriteLine("Getting the Library Path", "OptionForm");
+            // Library Path
             if (Properties.Settings.Default.LibraryPath == "DEFAULT")
             {
+                Debug.WriteLine("Getting the Library Path", "OptionForm");
                 Properties.Settings.Default.LibraryPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Xibo Library";
                 Properties.Settings.Default.Save();
             }
 
-            System.Diagnostics.Debug.WriteLine("Getting the display Name", "OptionForm");
-            if (Properties.Settings.Default.displayName == "COMPUTERNAME")
+            // Computer name if the display name hasnt been set yet
+            if (Settings.Default.displayName == "COMPUTERNAME")
             {
-                Properties.Settings.Default.displayName = Environment.MachineName;
-                Properties.Settings.Default.Save();
+                Debug.WriteLine("Getting the display Name", "OptionForm");
+                Settings.Default.displayName = Environment.MachineName;
+                Settings.Default.Save();
             }
 
-            System.Diagnostics.Debug.WriteLine("About to call SetGlobalProxy", "OptionForm");
+            // Set global proxy information
             OptionForm.SetGlobalProxy();
 
-            System.Diagnostics.Debug.WriteLine("[OUT]", "OptionForm");
-        }
-
-        void offsetY_ValueChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        void offsetX_ValueChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        void clientWidth_ValueChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        void clientHeight_ValueChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        void nupScrollStepAmount_ValueChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        void tbHardwareKey_TextChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        void proxySetting_TextChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
+            // Settings Tab
+            textBoxXmdsUri.Text = Settings.Default.serverURI;
+            textBoxServerKey.Text = Settings.Default.ServerKey;
+            textBoxLibraryPath.Text = Settings.Default.LibraryPath;
+            tbHardwareKey.Text = Settings.Default.hardwareKey;
+            numericUpDownCollect.Value = Settings.Default.collectInterval;
+            checkBoxPowerPoint.Checked = Settings.Default.powerpointEnabled;
+            checkBoxStats.Checked = Settings.Default.statsEnabled;
+            nupScrollStepAmount.Value = Settings.Default.scrollStepAmount;
+
+            // Register Tab
+            labelXmdsUrl.Text = Settings.Default.XiboClient_xmds_xmds;
+            textBoxDisplayName.Text = Settings.Default.displayName;
+
+            // Proxy Tab
+            textBoxProxyUser.Text = Settings.Default.ProxyUser;
+            maskedTextBoxProxyPass.Text = Settings.Default.ProxyPassword;
+            textBoxProxyDomain.Text = Settings.Default.ProxyDomain;
+
+            // Client Tab
+            clientWidth.Value = Settings.Default.sizeX;
+            clientHeight.Value = Settings.Default.sizeY;
+            offsetX.Value = Settings.Default.offsetX;
+            offsetY.Value = Settings.Default.offsetY;
+
+            // Advanced Tab
+            numericUpDownEmptyRegions.Value = Settings.Default.emptyLayoutDuration;
+            cbExpireModifiedLayouts.Checked = Settings.Default.expireModifiedLayouts;
+            enableMouseCb.Checked = Settings.Default.EnableMouse;
+            doubleBufferingCheckBox.Checked = Settings.Default.DoubleBuffering;            
+
+            System.Diagnostics.Debug.WriteLine("Loaded Options Form", "OptionForm");
         }
 
         /// <summary>
-        /// Fired when a setting is changed
+        /// Register display completed
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        void setting_TextChanged(object sender, EventArgs e)
-        {
-            //Set the button to be enabled
-            buttonSaveSettings.Enabled = true;
-        }
-
         void xmds1_RegisterDisplayCompleted(object sender, XiboClient.xmds.RegisterDisplayCompletedEventArgs e)
         {
             if (e.Error != null)
@@ -145,19 +122,25 @@
             }
         }
 
+        /// <summary>
+        /// Register display clicked
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void buttonRegister_Click(object sender, EventArgs e)
         {
             // Make a new hardware key just in case we have changed it in the form.
-            hardwareKey = new HardwareKey();
+            _hardwareKey = new HardwareKey();
 
             textBoxResults.Text = "Sending Request";
 
-            this.xmds1.Url = Properties.Settings.Default.XiboClient_xmds_xmds;
+            Settings.Default.XiboClient_xmds_xmds = textBoxXmdsUri.Text.TrimEnd('/') + @"/xmds.php";
+            xmds1.Url = Settings.Default.XiboClient_xmds_xmds;
 
             Properties.Settings.Default.displayName = textBoxDisplayName.Text;
             Properties.Settings.Default.Save();
 
-            xmds1.RegisterDisplayAsync(Properties.Settings.Default.ServerKey, hardwareKey.Key, textBoxDisplayName.Text, Properties.Settings.Default.Version);
+            xmds1.RegisterDisplayAsync(Properties.Settings.Default.ServerKey, _hardwareKey.Key, textBoxDisplayName.Text, Properties.Settings.Default.Version);
         }
 
        /// <summary>
@@ -169,44 +152,43 @@
         {
             try
             {
-                buttonSaveSettings.Enabled = false;
-
                 // Simple settings
-                Properties.Settings.Default.ServerKey = textBoxServerKey.Text;
-                Properties.Settings.Default.LibraryPath = textBoxLibraryPath.Text.TrimEnd('\\');
-                Properties.Settings.Default.serverURI = textBoxXmdsUri.Text;
-                Properties.Settings.Default.collectInterval = numericUpDownCollect.Value;
-                Properties.Settings.Default.powerpointEnabled = checkBoxPowerPoint.Checked;
-                Properties.Settings.Default.statsEnabled = checkBoxStats.Checked;
-                Properties.Settings.Default.XiboClient_xmds_xmds = textBoxXmdsUri.Text.TrimEnd('/') + @"/xmds.php";
-                Properties.Settings.Default.hardwareKey = tbHardwareKey.Text;
-                Properties.Settings.Default.scrollStepAmount = nupScrollStepAmount.Value;
-                Properties.Settings.Default.EnableMouse = enableMouseCb.Checked;
+                Settings.Default.ServerKey = textBoxServerKey.Text;
+                Settings.Default.LibraryPath = textBoxLibraryPath.Text.TrimEnd('\\');
+                Settings.Default.serverURI = textBoxXmdsUri.Text;
+                Settings.Default.collectInterval = numericUpDownCollect.Value;
+                Settings.Default.powerpointEnabled = checkBoxPowerPoint.Checked;
+                Settings.Default.statsEnabled = checkBoxStats.Checked;
+                Settings.Default.XiboClient_xmds_xmds = textBoxXmdsUri.Text.TrimEnd('/') + @"/xmds.php";
+                Settings.Default.hardwareKey = tbHardwareKey.Text;
+                Settings.Default.scrollStepAmount = nupScrollStepAmount.Value;
+                Settings.Default.EnableMouse = enableMouseCb.Checked;
+                Settings.Default.DoubleBuffering = doubleBufferingCheckBox.Checked;
 
                 // Also tweak the address of the xmds1
                 xmds1.Url = Properties.Settings.Default.XiboClient_xmds_xmds;
                 labelXmdsUrl.Text = Properties.Settings.Default.XiboClient_xmds_xmds;
 
                 // Proxy Settings
-                Properties.Settings.Default.ProxyUser = textBoxProxyUser.Text;
-                Properties.Settings.Default.ProxyPassword = maskedTextBoxProxyPass.Text;
-                Properties.Settings.Default.ProxyDomain = textBoxProxyDomain.Text;
+                Settings.Default.ProxyUser = textBoxProxyUser.Text;
+                Settings.Default.ProxyPassword = maskedTextBoxProxyPass.Text;
+                Settings.Default.ProxyDomain = textBoxProxyDomain.Text;
 
                 // Change the default Proxy class
                 OptionForm.SetGlobalProxy();
 
                 // Client settings
-                Properties.Settings.Default.sizeX = clientWidth.Value;
-                Properties.Settings.Default.sizeY = clientHeight.Value;
-                Properties.Settings.Default.offsetX = offsetX.Value;
-                Properties.Settings.Default.offsetY = offsetY.Value;
+                Settings.Default.sizeX = clientWidth.Value;
+                Settings.Default.sizeY = clientHeight.Value;
+                Settings.Default.offsetX = offsetX.Value;
+                Settings.Default.offsetY = offsetY.Value;
 
                 // Advanced settings
-                Properties.Settings.Default.expireModifiedLayouts = cbExpireModifiedLayouts.Checked;
-                Properties.Settings.Default.emptyLayoutDuration = numericUpDown1.Value;
+                Settings.Default.expireModifiedLayouts = cbExpireModifiedLayouts.Checked;
+                Settings.Default.emptyLayoutDuration = numericUpDownEmptyRegions.Value;
 
                 // Commit these changes back to the user settings
-                Properties.Settings.Default.Save();
+                Settings.Default.Save();
             }
             catch (Exception ex)
             {
@@ -219,7 +201,6 @@
             this.Close();
         }
 
-        private HardwareKey hardwareKey;
 
         private void buttonLibrary_Click(object sender, EventArgs e)
         {
@@ -233,25 +214,12 @@
             }
         }
 
-        private void buttonReset_Click(object sender, EventArgs e)
-        {
-            if (MessageBox.Show("Reset to Default Settings?", "Xibo: Are you sure", MessageBoxButtons.YesNo) == DialogResult.Yes)
-            {
-                Properties.Settings.Default.Reset();
-            }
-
-            // Make sure the special settings are delt with
-            Properties.Settings.Default.LibraryPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Xibo Library";
-            Properties.Settings.Default.displayName = Environment.MachineName;
-            Properties.Settings.Default.Save();
-        }
-
         private void onlineHelpToolStripMenuItem_Click(object sender, EventArgs e)
         {
             // open URL in separate instance of default browser
             try
             {
-                System.Diagnostics.Process.Start("http://www.xibo.org.uk/manual");
+                System.Diagnostics.Process.Start("http://wiki.xibo.org.uk/wiki/Manual:TOC");
             }
             catch
             {
@@ -265,31 +233,6 @@
             about.ShowDialog();
         }
 
-        private void checkBoxPowerPoint_CheckedChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-
-            if (checkBoxPowerPoint.Checked)
-            {
-                // PowerPoint enabled
-                // check for it installed
-
-                // enable the IE setting?
-            }
-
-            return;
-        }
-
-        private void checkBoxStats_CheckedChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        private void checkBoxAudit_CheckedChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
         private void buttonDisplayAdmin_Click(object sender, EventArgs e)
         {
             // open URL in separate instance of default browser
@@ -303,97 +246,58 @@
             }
         }
 
-        private void buttonProxySave_Click(object sender, EventArgs e)
-        {
-            
-        }
-
         /// <summary>
         /// Sets up the global proxy
         /// </summary>
         public static void SetGlobalProxy()
         {
-            System.Diagnostics.Debug.WriteLine("[IN]", "SetGlobalProxy");
+            Debug.WriteLine("[IN]", "SetGlobalProxy");
 
-            System.Diagnostics.Debug.WriteLine("Trying to detect a proxy.", "SetGlobalProxy");
+            Debug.WriteLine("Trying to detect a proxy.", "SetGlobalProxy");
             
             if (Properties.Settings.Default.ProxyUser != "")
             {
-                System.Diagnostics.Debug.WriteLine("Creating a network credential using the Proxy User.", "SetGlobalProxy");
-                NetworkCredential nc = new NetworkCredential(Properties.Settings.Default.ProxyUser, Properties.Settings.Default.ProxyPassword);
-                if (Properties.Settings.Default.ProxyDomain != "") nc.Domain = Properties.Settings.Default.ProxyDomain;
+                // disable expect100Continue
+                ServicePointManager.Expect100Continue = false;
+
+                Debug.WriteLine("Creating a network credential using the Proxy User.", "SetGlobalProxy");
+
+                NetworkCredential nc = new NetworkCredential(Settings.Default.ProxyUser, Settings.Default.ProxyPassword);
+
+                if (Properties.Settings.Default.ProxyDomain != "") 
+                    nc.Domain = Properties.Settings.Default.ProxyDomain;
 
                 WebRequest.DefaultWebProxy.Credentials = nc;
             }
             else
             {
-                System.Diagnostics.Debug.WriteLine("No Proxy.", "SetGlobalProxy");
+                Debug.WriteLine("No Proxy.", "SetGlobalProxy");
                 WebRequest.DefaultWebProxy.Credentials = null;
             }
 
             // What if the URL for XMDS has a SSL certificate?
             ServicePointManager.ServerCertificateValidationCallback += delegate(object sender, X509Certificate certificate, X509Chain chain, System.Net.Security.SslPolicyErrors sslPolicyErrors)
             {
-                System.Diagnostics.Debug.WriteLine("[IN]", "ServerCertificateValidationCallback");
+                Debug.WriteLine("[IN]", "ServerCertificateValidationCallback");
                 bool validationResult = false;
 
-                System.Diagnostics.Debug.WriteLine(certificate.Subject);
-                System.Diagnostics.Debug.WriteLine(certificate.Issuer);
+                Debug.WriteLine(certificate.Subject);
+                Debug.WriteLine(certificate.Issuer);
 
                 if (sslPolicyErrors != System.Net.Security.SslPolicyErrors.None)
                 {
-                    System.Diagnostics.Debug.WriteLine(sslPolicyErrors.ToString());
+                    Debug.WriteLine(sslPolicyErrors.ToString());
                 }
 
                 validationResult = true;
 
-                System.Diagnostics.Debug.WriteLine("[OUT]", "ServerCertificateValidationCallback");
+                Debug.WriteLine("[OUT]", "ServerCertificateValidationCallback");
                 return validationResult;
             };
 
-            System.Diagnostics.Debug.WriteLine("[OUT]", "SetGlobalProxy");
+            Debug.WriteLine("[OUT]", "SetGlobalProxy");
 
             return;
         }
-
-        private void numericUpDown1_ValueChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        private void cbExpireModifiedLayouts_CheckedChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        private void clientWidth_ValueChanged_1(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        private void clientHeight_ValueChanged_1(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        private void offsetX_ValueChanged_1(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        private void offsetY_ValueChanged_1(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        private void textBoxDisplayName_TextChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
-
-        private void checkBox1_CheckedChanged(object sender, EventArgs e)
-        {
-            buttonSaveSettings.Enabled = true;
-        }
     }
 }
 \ No newline at end of file
 
=== modified file 'client/dotNET/Properties/Settings.Designer.cs'
--- client/dotNET/Properties/Settings.Designer.cs	2011-09-24 11:06:51 +0000
+++ client/dotNET/Properties/Settings.Designer.cs	2012-01-22 15:34:34 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4961
+//     Runtime Version:2.0.50727.5448
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -394,5 +394,17 @@
                 this["EnableMouse"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool DoubleBuffering {
+            get {
+                return ((bool)(this["DoubleBuffering"]));
+            }
+            set {
+                this["DoubleBuffering"] = value;
+            }
+        }
     }
 }
 
=== modified file 'client/dotNET/Properties/Settings.settings'
--- client/dotNET/Properties/Settings.settings	2011-09-24 11:06:51 +0000
+++ client/dotNET/Properties/Settings.settings	2012-01-22 15:34:34 +0000
@@ -101,5 +101,8 @@
     <Setting Name="EnableMouse" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="DoubleBuffering" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
 \ No newline at end of file
 
=== modified file 'client/dotNET/Region.cs'
--- client/dotNET/Region.cs	2011-09-06 20:46:43 +0000
+++ client/dotNET/Region.cs	2012-01-22 15:34:34 +0000
@@ -23,6 +23,7 @@
 using System.Windows.Forms;
 using System.Xml;
 using System.Diagnostics;
+using XiboClient.Properties;
 
 namespace XiboClient
 {
@@ -68,8 +69,11 @@
             this.Size = new System.Drawing.Size(options.width, options.height);
             this.BackColor = System.Drawing.Color.Transparent;
 
-            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
-            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            if (Settings.Default.DoubleBuffering)
+            {
+                SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+                SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            }
 
             // Create a new BlackList for us to use
             blackList = new BlackList();
 
=== modified file 'client/dotNET/RequiredFiles.cs'
--- client/dotNET/RequiredFiles.cs	2011-02-16 11:25:56 +0000
+++ client/dotNET/RequiredFiles.cs	2012-01-22 15:34:34 +0000
@@ -187,7 +187,7 @@
                     rf.FileType, rf.Id.ToString(), rf.Complete.ToString(), rf.LastChecked.ToString(), rf.Md5);
             }
 
-            xml = string.Format("<files>{0}</files>", xml);
+            xml = string.Format("<files macAddress=\"{1}\">{0}</files>", xml, hardwareKey.MacAddress);
 
             _report.MediaInventoryAsync(Properties.Settings.Default.Version, Properties.Settings.Default.ServerKey,
                 hardwareKey.Key, xml);
 
=== modified file 'client/dotNET/app.config'
--- client/dotNET/app.config	2011-09-24 11:06:51 +0000
+++ client/dotNET/app.config	2012-01-22 15:34:34 +0000
@@ -85,6 +85,9 @@
             <setting name="EnableMouse" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="DoubleBuffering" serializeAs="String">
+                <value>True</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </userSettings>
     <applicationSettings>