Merge lp:~dangarner/xibo/client-161 into lp:xibo/1.7

[Dan Garner]

=== added file 'client/dotNET/KeyStore.cs'
--- client/dotNET/KeyStore.cs	1970-01-01 00:00:00 +0000
+++ client/dotNET/KeyStore.cs	2014-05-26 09:22:33 +0000
@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
+
+namespace XiboClient
+{
+    /// <summary>
+    /// The KeyStoreEventHandler is used by the KeyPress event of the KeyStore
+    /// class. It notifies listeners of a named key press.
+    /// </summary>
+    /// <param name="name">The name of the key.</param>
+    public delegate void KeyStoreEventHandler(string name);
+
+    class KeyStore : IMessageFilter
+    {
+        // Interop
+        [DllImport("user32.dll")]
+        static extern short GetKeyState(Keys key);
+
+        // Windows message constants
+        private const int WM_KEYDOWN = 0x100;
+        private const int WM_KEYUP = 0x101;
+
+        // The singleton instance
+        private static KeyStore s_instance = null;
+
+        // The modifier keys
+        private bool _shift = false;
+        private bool _control = false;
+
+        // The definitions
+        private Dictionary<Keys, string> _definitions;
+
+        // The KeyPressed Event
+        public event KeyStoreEventHandler KeyPress;
+
+        /// <summary>
+        /// Adds a key definition to the store.
+        /// </summary>
+        /// <param name="name">The name of the key.</param>
+        /// <param name="key">The key</param>
+        /// <param name="modifiers">The modifiers (shift, control)</param>
+        public void AddKeyDefinition(string name, Keys key, Keys modifiers)
+        {
+            Keys combined = key | modifiers;
+
+            _definitions[combined] = name;
+        }
+
+        /// <summary>
+        /// The filter message.
+        /// </summary>
+        public bool PreFilterMessage(ref Message m)
+        {
+            bool handled = false;
+            Keys key = Keys.None;
+
+            switch (m.Msg)
+            {
+                case WM_KEYUP:
+                    key = (Keys)m.WParam;
+                    handled = HandleModifier(key, false);
+                    break;
+
+                case WM_KEYDOWN:
+                    key = (Keys)m.WParam;
+                    handled = HandleModifier(key, true);
+                    if (false == handled)
+                    {
+                        // If one of the defined keys was pressed then we
+                        // raise an event.
+                        handled = HandleDefinedKey(key);
+                    }
+                    break;
+            }
+
+            return handled;
+        }
+
+        /// <summary>
+        /// Compares a key against the definitions, and raises an event
+        /// if there is a match.
+        /// </summary>
+        /// <param name="key">The key</param>
+        /// <returns>True if the key was one of the defined key combinations.</returns>
+        private bool HandleDefinedKey(Keys key)
+        {
+            bool handled = false;
+
+            Keys combined = key;
+            if (_shift) combined |= Keys.Shift;
+            if (_control) combined |= Keys.Control;
+
+            // If we have found a matching combination then we
+            // raise an event.
+            string name = null;
+            if (true == _definitions.TryGetValue(combined, out name))
+            {
+                OnKeyPress(name);
+
+                handled = true;
+            }
+            return handled;
+        }
+
+        /// <summary>
+        /// Attempt to handle a modifier key, and return a boolean indicating if a modifier key was
+        /// handled.
+        /// </summary>
+        /// <param name="key">The key</param>
+        /// <param name="isDown">True if the key is pressed; False if it is released.</param>
+        /// <returns>True if a modifier key was selected; False otherwise.</returns>
+        private bool HandleModifier(Keys key, bool isDown)
+        {
+            bool handled = false;
+
+            switch (key)
+            {
+                case Keys.RControlKey:
+                case Keys.ControlKey:
+                    _control = isDown;
+                    handled = true;
+                    break;
+
+                case Keys.RShiftKey:
+                case Keys.ShiftKey:
+                    _shift = isDown;
+                    handled = true;
+                    break;
+            }
+
+            return handled;
+        }
+
+        /// <summary>
+        /// Raises the KeyPress event.
+        /// </summary>
+        /// <param name="name">The name of the key.</param>
+        private void OnKeyPress(string name)
+        {
+            // Raise event
+            if (null != KeyPress) KeyPress(name);
+
+            // Check if modifier keys were released in the mean time.
+            _control =
+                -127 == GetKeyState(Keys.ControlKey) ||
+                -127 == GetKeyState(Keys.RControlKey);
+
+            _shift =
+                -127 == GetKeyState(Keys.ShiftKey) ||
+                -127 == GetKeyState(Keys.RShiftKey);
+
+        }
+
+        /// <summary>
+        /// Returns the singleton instance.
+        /// </summary>
+        public static KeyStore Instance
+        {
+            get
+            {
+                if (null == s_instance)
+                    s_instance = new KeyStore();
+
+                return s_instance;
+            }
+        }
+
+        // The constructor is private because this is a singleton class.
+        private KeyStore()
+        {
+            _definitions = new Dictionary<Keys, string>();
+        }
+    }
+}

=== modified file 'client/dotNET/MainForm.cs'
--- client/dotNET/MainForm.cs	2013-11-03 22:44:50 +0000
+++ client/dotNET/MainForm.cs	2014-05-26 09:22:33 +0000
@@ -1,6 +1,6 @@
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-13 Daniel Garner
+ * Copyright (C) 2006-14 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -35,6 +35,7 @@
 using XiboClient.Log;
 using System.Threading;
 using XiboClient.Properties;
+using System.Runtime.InteropServices;
 
 namespace XiboClient
 {
@@ -59,6 +60,18 @@
 
         private delegate void ChangeToNextLayoutDelegate(string layoutPath);
 
+        [FlagsAttribute]
+        enum EXECUTION_STATE : uint
+        {
+            ES_AWAYMODE_REQUIRED = 0x00000040,
+            ES_CONTINUOUS = 0x80000000,
+            ES_DISPLAY_REQUIRED = 0x00000002,
+            ES_SYSTEM_REQUIRED = 0x00000001
+        }
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
+
         public MainForm()
         {
             InitializeComponent();
@@ -95,10 +108,24 @@
             _clientInfoForm.Hide();
 
             // Add a message filter to listen for the i key
-            KeyFilter keyFilter = new KeyFilter();
-            keyFilter.ClientInfoForm = _clientInfoForm;
-
-            Application.AddMessageFilter(keyFilter);
+            Application.AddMessageFilter(KeyStore.Instance);
+
+            // Define the hotkey
+            Keys key;
+            try
+            {
+                key = (Keys)Enum.Parse(typeof(Keys), Settings.Default.ClientInformationKeyCode.ToUpper());
+            }
+            catch
+            {
+                // Default back to I
+                key = Keys.I;
+            }
+
+            KeyStore.Instance.AddKeyDefinition("ClientInfo", key, ((Settings.Default.ClientInfomationCtrlKey) ? Keys.Control : Keys.None));
+
+            // Register a handler for the key event
+            KeyStore.Instance.KeyPress += Instance_KeyPress;
 
             // Trace listener for Client Info
             ClientInfoTraceListener clientInfoTraceListener = new ClientInfoTraceListener(_clientInfoForm);
@@ -116,6 +143,25 @@
         }
 
         /// <summary>
+        /// Handle the Key Event
+        /// </summary>
+        /// <param name="name"></param>
+        void Instance_KeyPress(string name)
+        {
+            if (name != "ClientInfo")
+                return;
+
+            // Toggle
+            if (_clientInfoForm.Visible)
+                _clientInfoForm.Hide();
+            else
+            {
+                _clientInfoForm.Show();
+                _clientInfoForm.BringToFront();
+            }
+        }
+
+        /// <summary>
         /// Called after the form has been shown
         /// </summary>
         /// <param name="sender"></param>
@@ -271,6 +317,8 @@
         {
             try
             {
+                SetThreadExecutionState(EXECUTION_STATE.ES_DISPLAY_REQUIRED | EXECUTION_STATE.ES_SYSTEM_REQUIRED | EXECUTION_STATE.ES_CONTINUOUS);
+
                 // TODO: Check we are never out of the UI thread at this point
 
                 DestroyLayout();
@@ -733,38 +781,4 @@
             }
         }
     }
-
-    /// <summary>
-    /// Key Filter to show the Client Information Screen
-    /// </summary>
-    public class KeyFilter : IMessageFilter
-    {
-        public ClientInfo ClientInfoForm;
-
-        public bool PreFilterMessage(ref Message msg)
-        {
-            const int WM_KEYDOWN = 0x100;
-            const int WM_SYSKEYDOWN = 0x104;
-
-            // Only interested in Key Down messages
-            if ((msg.Msg == WM_KEYDOWN) || (msg.Msg == WM_SYSKEYDOWN))
-            {
-                Keys keyCode = (Keys)(int)msg.WParam & Keys.KeyCode;
-
-                if (keyCode == Keys.I)
-                {
-                    // Toggle
-                    if (ClientInfoForm.Visible)
-                        ClientInfoForm.Hide();
-                    else
-                    {
-                        ClientInfoForm.Show();
-                        ClientInfoForm.BringToFront();
-                    }
-                }
-            }
-
-            return false;
-        }
-    }
 }
\ No newline at end of file

=== modified file 'client/dotNET/OptionForm.Designer.cs'
--- client/dotNET/OptionForm.Designer.cs	2013-05-01 19:24:35 +0000
+++ client/dotNET/OptionForm.Designer.cs	2014-05-26 09:22:33 +0000
@@ -82,6 +82,8 @@
             this.clientHeight = new System.Windows.Forms.NumericUpDown();
             this.clientWidth = new System.Windows.Forms.NumericUpDown();
             this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.cursorStartPosition = new System.Windows.Forms.ComboBox();
+            this.label22 = new System.Windows.Forms.Label();
             this.logToDiskLocation = new System.Windows.Forms.TextBox();
             this.label21 = new System.Windows.Forms.Label();
             this.showInTaskbar = new System.Windows.Forms.CheckBox();
@@ -104,8 +106,9 @@
             this.folderBrowserLibrary = new System.Windows.Forms.FolderBrowserDialog();
             this.splashScreenOverride = new System.Windows.Forms.OpenFileDialog();
             this.xmds1 = new XiboClient.xmds.xmds();
-            this.label22 = new System.Windows.Forms.Label();
-            this.cursorStartPosition = new System.Windows.Forms.ComboBox();
+            this.label23 = new System.Windows.Forms.Label();
+            this.clientInfoHotKeyTextBox = new System.Windows.Forms.TextBox();
+            this.clientInfoCtrlModifierCheckBox = new System.Windows.Forms.CheckBox();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.nupScrollStepAmount)).BeginInit();
@@ -684,6 +687,9 @@
             // 
             // tabPage5
             // 
+            this.tabPage5.Controls.Add(this.clientInfoCtrlModifierCheckBox);
+            this.tabPage5.Controls.Add(this.clientInfoHotKeyTextBox);
+            this.tabPage5.Controls.Add(this.label23);
             this.tabPage5.Controls.Add(this.cursorStartPosition);
             this.tabPage5.Controls.Add(this.label22);
             this.tabPage5.Controls.Add(this.logToDiskLocation);
@@ -707,17 +713,39 @@
             this.tabPage5.Text = "Advanced";
             this.tabPage5.UseVisualStyleBackColor = true;
             // 
+            // cursorStartPosition
+            // 
+            this.cursorStartPosition.FormattingEnabled = true;
+            this.cursorStartPosition.Items.AddRange(new object[] {
+            "Top Left",
+            "Top Right",
+            "Bottom Left",
+            "Bottom Right"});
+            this.cursorStartPosition.Location = new System.Drawing.Point(161, 128);
+            this.cursorStartPosition.Name = "cursorStartPosition";
+            this.cursorStartPosition.Size = new System.Drawing.Size(263, 21);
+            this.cursorStartPosition.TabIndex = 21;
+            // 
+            // label22
+            // 
+            this.label22.AutoSize = true;
+            this.label22.Location = new System.Drawing.Point(5, 131);
+            this.label22.Name = "label22";
+            this.label22.Size = new System.Drawing.Size(102, 13);
+            this.label22.TabIndex = 20;
+            this.label22.Text = "Cursor Start Position";
+            // 
             // logToDiskLocation
             // 
-            this.logToDiskLocation.Location = new System.Drawing.Point(176, 176);
+            this.logToDiskLocation.Location = new System.Drawing.Point(161, 99);
             this.logToDiskLocation.Name = "logToDiskLocation";
-            this.logToDiskLocation.Size = new System.Drawing.Size(121, 20);
+            this.logToDiskLocation.Size = new System.Drawing.Size(263, 20);
             this.logToDiskLocation.TabIndex = 19;
             // 
             // label21
             // 
             this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(20, 179);
+            this.label21.Location = new System.Drawing.Point(5, 102);
             this.label21.Name = "label21";
             this.label21.Size = new System.Drawing.Size(105, 13);
             this.label21.TabIndex = 18;
@@ -726,7 +754,7 @@
             // showInTaskbar
             // 
             this.showInTaskbar.AutoSize = true;
-            this.showInTaskbar.Location = new System.Drawing.Point(176, 238);
+            this.showInTaskbar.Location = new System.Drawing.Point(51, 220);
             this.showInTaskbar.Name = "showInTaskbar";
             this.showInTaskbar.Size = new System.Drawing.Size(130, 17);
             this.showInTaskbar.TabIndex = 17;
@@ -736,7 +764,7 @@
             // label20
             // 
             this.label20.AutoSize = true;
-            this.label20.Location = new System.Drawing.Point(20, 151);
+            this.label20.Location = new System.Drawing.Point(5, 73);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(54, 13);
             this.label20.TabIndex = 16;
@@ -749,15 +777,15 @@
             "audit",
             "info",
             "error"});
-            this.logLevel.Location = new System.Drawing.Point(176, 148);
+            this.logLevel.Location = new System.Drawing.Point(161, 70);
             this.logLevel.Name = "logLevel";
-            this.logLevel.Size = new System.Drawing.Size(121, 21);
+            this.logLevel.Size = new System.Drawing.Size(263, 21);
             this.logLevel.TabIndex = 15;
             // 
             // label19
             // 
             this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(20, 123);
+            this.label19.Location = new System.Drawing.Point(225, 10);
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(138, 13);
             this.label19.TabIndex = 14;
@@ -765,14 +793,14 @@
             // 
             // maxConcurrentDownloads
             // 
-            this.maxConcurrentDownloads.Location = new System.Drawing.Point(176, 121);
+            this.maxConcurrentDownloads.Location = new System.Drawing.Point(381, 8);
             this.maxConcurrentDownloads.Minimum = new decimal(new int[] {
             1,
             0,
             0,
             0});
             this.maxConcurrentDownloads.Name = "maxConcurrentDownloads";
-            this.maxConcurrentDownloads.Size = new System.Drawing.Size(121, 20);
+            this.maxConcurrentDownloads.Size = new System.Drawing.Size(43, 20);
             this.maxConcurrentDownloads.TabIndex = 13;
             this.maxConcurrentDownloads.Value = new decimal(new int[] {
             1,
@@ -783,7 +811,7 @@
             // label18
             // 
             this.label18.AutoSize = true;
-            this.label18.Location = new System.Drawing.Point(20, 98);
+            this.label18.Location = new System.Drawing.Point(5, 43);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(127, 13);
             this.label18.TabIndex = 12;
@@ -791,15 +819,15 @@
             // 
             // shellCommandAllowList
             // 
-            this.shellCommandAllowList.Location = new System.Drawing.Point(176, 95);
+            this.shellCommandAllowList.Location = new System.Drawing.Point(161, 40);
             this.shellCommandAllowList.Name = "shellCommandAllowList";
-            this.shellCommandAllowList.Size = new System.Drawing.Size(121, 20);
+            this.shellCommandAllowList.Size = new System.Drawing.Size(263, 20);
             this.shellCommandAllowList.TabIndex = 11;
             // 
             // enableShellCommandsCb
             // 
             this.enableShellCommandsCb.AutoSize = true;
-            this.enableShellCommandsCb.Location = new System.Drawing.Point(176, 72);
+            this.enableShellCommandsCb.Location = new System.Drawing.Point(247, 220);
             this.enableShellCommandsCb.Name = "enableShellCommandsCb";
             this.enableShellCommandsCb.Size = new System.Drawing.Size(140, 17);
             this.enableShellCommandsCb.TabIndex = 10;
@@ -809,7 +837,7 @@
             // doubleBufferingCheckBox
             // 
             this.doubleBufferingCheckBox.AutoSize = true;
-            this.doubleBufferingCheckBox.Location = new System.Drawing.Point(176, 49);
+            this.doubleBufferingCheckBox.Location = new System.Drawing.Point(247, 197);
             this.doubleBufferingCheckBox.Name = "doubleBufferingCheckBox";
             this.doubleBufferingCheckBox.Size = new System.Drawing.Size(141, 17);
             this.doubleBufferingCheckBox.TabIndex = 4;
@@ -818,9 +846,9 @@
             // 
             // numericUpDownEmptyRegions
             // 
-            this.numericUpDownEmptyRegions.Location = new System.Drawing.Point(176, 23);
+            this.numericUpDownEmptyRegions.Location = new System.Drawing.Point(161, 8);
             this.numericUpDownEmptyRegions.Name = "numericUpDownEmptyRegions";
-            this.numericUpDownEmptyRegions.Size = new System.Drawing.Size(121, 20);
+            this.numericUpDownEmptyRegions.Size = new System.Drawing.Size(44, 20);
             this.numericUpDownEmptyRegions.TabIndex = 1;
             this.numericUpDownEmptyRegions.Value = new decimal(new int[] {
             10,
@@ -831,7 +859,7 @@
             // label15
             // 
             this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(20, 25);
+            this.label15.Location = new System.Drawing.Point(5, 10);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(136, 13);
             this.label15.TabIndex = 0;
@@ -896,27 +924,31 @@
             this.xmds1.Url = "http://localhost/Xibo/server/xmds.php";
             this.xmds1.UseDefaultCredentials = false;
             // 
-            // label22
-            // 
-            this.label22.AutoSize = true;
-            this.label22.Location = new System.Drawing.Point(23, 206);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(102, 13);
-            this.label22.TabIndex = 20;
-            this.label22.Text = "Cursor Start Position";
-            // 
-            // cursorStartPosition
-            // 
-            this.cursorStartPosition.FormattingEnabled = true;
-            this.cursorStartPosition.Items.AddRange(new object[] {
-            "Top Left",
-            "Top Right",
-            "Bottom Left",
-            "Bottom Right"});
-            this.cursorStartPosition.Location = new System.Drawing.Point(176, 203);
-            this.cursorStartPosition.Name = "cursorStartPosition";
-            this.cursorStartPosition.Size = new System.Drawing.Size(121, 21);
-            this.cursorStartPosition.TabIndex = 21;
+            // label23
+            // 
+            this.label23.AutoSize = true;
+            this.label23.Location = new System.Drawing.Point(5, 158);
+            this.label23.Name = "label23";
+            this.label23.Size = new System.Drawing.Size(92, 13);
+            this.label23.TabIndex = 22;
+            this.label23.Text = "Client Info HotKey";
+            // 
+            // clientInfoHotKeyTextBox
+            // 
+            this.clientInfoHotKeyTextBox.Location = new System.Drawing.Point(161, 158);
+            this.clientInfoHotKeyTextBox.Name = "clientInfoHotKeyTextBox";
+            this.clientInfoHotKeyTextBox.Size = new System.Drawing.Size(263, 20);
+            this.clientInfoHotKeyTextBox.TabIndex = 23;
+            // 
+            // clientInfoCtrlModifierCheckBox
+            // 
+            this.clientInfoCtrlModifierCheckBox.AutoSize = true;
+            this.clientInfoCtrlModifierCheckBox.Location = new System.Drawing.Point(51, 197);
+            this.clientInfoCtrlModifierCheckBox.Name = "clientInfoCtrlModifierCheckBox";
+            this.clientInfoCtrlModifierCheckBox.Size = new System.Drawing.Size(177, 17);
+            this.clientInfoCtrlModifierCheckBox.TabIndex = 24;
+            this.clientInfoCtrlModifierCheckBox.Text = "Client Info CTRL Key Required?";
+            this.clientInfoCtrlModifierCheckBox.UseVisualStyleBackColor = true;
             // 
             // OptionForm
             // 
@@ -1037,5 +1069,8 @@
         private System.Windows.Forms.TextBox logToDiskLocation;
         private System.Windows.Forms.Label label22;
         private System.Windows.Forms.ComboBox cursorStartPosition;
+        private System.Windows.Forms.CheckBox clientInfoCtrlModifierCheckBox;
+        private System.Windows.Forms.TextBox clientInfoHotKeyTextBox;
+        private System.Windows.Forms.Label label23;
     }
 }
\ No newline at end of file

=== modified file 'client/dotNET/OptionForm.cs'
--- client/dotNET/OptionForm.cs	2014-02-09 15:08:13 +0000
+++ client/dotNET/OptionForm.cs	2014-05-26 09:22:33 +0000
@@ -1,6 +1,6 @@
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-2012 Daniel Garner
+ * Copyright (C) 2006-2014 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -105,6 +105,8 @@
             logToDiskLocation.Text = Settings.Default.LogToDiskLocation;
             showInTaskbar.Checked = Settings.Default.ShowInTaskbar;
             cursorStartPosition.Text = Settings.Default.CursorStartPosition;
+            clientInfoHotKeyTextBox.Text = Settings.Default.ClientInformationKeyCode;
+            clientInfoCtrlModifierCheckBox.Checked = Settings.Default.ClientInfomationCtrlKey;
 
             Debug.WriteLine("Loaded Options Form", "OptionForm");
         }
@@ -202,6 +204,8 @@
                 Settings.Default.LogToDiskLocation = logToDiskLocation.Text;
                 Settings.Default.ShowInTaskbar = showInTaskbar.Checked;
                 Settings.Default.CursorStartPosition = cursorStartPosition.Text;
+                Settings.Default.ClientInformationKeyCode = clientInfoHotKeyTextBox.Text;
+                Settings.Default.ClientInfomationCtrlKey = clientInfoCtrlModifierCheckBox.Checked;
 
                 // Commit these changes back to the user settings
                 Settings.Default.Save();

=== modified file 'client/dotNET/Properties/Settings.Designer.cs'
--- client/dotNET/Properties/Settings.Designer.cs	2014-03-09 14:46:20 +0000
+++ client/dotNET/Properties/Settings.Designer.cs	2014-05-26 09:22:33 +0000
@@ -541,5 +541,29 @@
                 return ((int)(this["ClientCodeVersion"]));
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("I")]
+        public string ClientInformationKeyCode {
+            get {
+                return ((string)(this["ClientInformationKeyCode"]));
+            }
+            set {
+                this["ClientInformationKeyCode"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool ClientInfomationCtrlKey {
+            get {
+                return ((bool)(this["ClientInfomationCtrlKey"]));
+            }
+            set {
+                this["ClientInfomationCtrlKey"] = value;
+            }
+        }
     }
 }

=== modified file 'client/dotNET/Properties/Settings.settings'
--- client/dotNET/Properties/Settings.settings	2014-03-09 14:46:20 +0000
+++ client/dotNET/Properties/Settings.settings	2014-05-26 09:22:33 +0000
@@ -140,5 +140,11 @@
     <Setting Name="ClientCodeVersion" Type="System.Int32" Scope="Application">
       <Value Profile="(Default)">83</Value>
     </Setting>
+    <Setting Name="ClientInformationKeyCode" Type="System.String" Scope="User">
+      <Value Profile="(Default)">I</Value>
+    </Setting>
+    <Setting Name="ClientInfomationCtrlKey" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file

=== modified file 'client/dotNET/XiboClient.csproj'
--- client/dotNET/XiboClient.csproj	2013-11-09 12:14:38 +0000
+++ client/dotNET/XiboClient.csproj	2014-05-26 09:22:33 +0000
@@ -116,6 +116,7 @@
     </Compile>
     <Compile Include="BlackList.cs" />
     <Compile Include="CacheManager.cs" />
+    <Compile Include="KeyStore.cs" />
     <Compile Include="RegionOptions.cs" />
     <Compile Include="TemporaryFile.cs" />
     <Compile Include="VideoDS.cs">

=== modified file 'client/dotNET/app.config'
--- client/dotNET/app.config	2014-03-09 14:46:20 +0000
+++ client/dotNET/app.config	2014-05-26 09:22:33 +0000
@@ -115,6 +115,12 @@
    <setting name="CursorStartPosition" serializeAs="String">
     <value>Bottom Right</value>
    </setting>
+   <setting name="ClientInformationKeyCode" serializeAs="String">
+    <value>I</value>
+   </setting>
+   <setting name="ClientInfomationCtrlKey" serializeAs="String">
+    <value>False</value>
+   </setting>
   </XiboClient.Properties.Settings>
 	</userSettings>
 	<applicationSettings>