split up asyncform

diff --git a/src/LibCecTray/LibCECTray.csproj b/src/LibCecTray/LibCECTray.csproj
index 22d9252b0133af7abcfeb2ff6fbe48a76f2c342b..a91e11ccf7fb1803b32e3da0b456a71e7af58c7f 100644 (file)
--- a/src/LibCecTray/LibCECTray.csproj
+++ b/src/LibCecTray/LibCECTray.csproj
@@ -137,6 +137,7 @@
     <Compile Include="ui\About.Designer.cs">
       <DependentUpon>About.cs</DependentUpon>
     </Compile>
+    <Compile Include="ui\AsyncControls.cs" />
     <Compile Include="ui\AsyncForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -157,6 +158,7 @@
     <Compile Include="controller\applications\KeyInput.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ui\IAsyncControls.cs" />
     <EmbeddedResource Include="controller\applications\ApplicationControllerUI.resx">
       <DependentUpon>ApplicationControllerUI.cs</DependentUpon>
       <SubType>Designer</SubType>

diff --git a/src/LibCecTray/ui/AsyncControls.cs b/src/LibCecTray/ui/AsyncControls.cs
new file mode 100644 (file)
index 0000000..755ba0c
--- /dev/null
+++ b/src/LibCecTray/ui/AsyncControls.cs
@@ -0,0 +1,357 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using CecSharp;
+using LibCECTray.controller.applications;
+
+namespace LibCECTray.ui
+{
+    /// <summary>
+    /// Utility methods to change GUI content from another thread
+    /// </summary>
+    class AsyncControls
+    {
+        /// <summary>
+        /// Enable or disable a control
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="val">True to enable, false to disable</param>
+        public static void SetControlEnabled(Control container, Control control, bool val)
+        {
+            if (container == null || control == null) return;
+            if (container.InvokeRequired)
+            {
+                SetControlEnabledCallback d = SetControlEnabled;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, val });
+                }
+                catch { }
+            }
+            else
+            {
+                control.Enabled = val;
+            }
+        }
+        private delegate void SetControlEnabledCallback(Control container, Control control, bool val);
+
+        /// <summary>
+        /// Change the text label of a control
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="val">The new text</param>
+        public static void SetControlText(Control container, Control control, string val)
+        {
+            if (container == null || control == null) return;
+            if (container.InvokeRequired)
+            {
+                SetControlTextCallback d = SetControlText;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, val });
+                }
+                catch { }
+            }
+            else
+            {
+                control.Text = val;
+            }
+        }
+        private delegate void SetControlTextCallback(Control container, Control control, string val);
+
+        /// <summary>
+        /// Change the checked status of a checkbox
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="val">True to change to checked, false to change to unchecked</param>
+        public static void SetCheckboxChecked(Control container, CheckBox control, bool val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetCheckboxCheckedCallback d = SetCheckboxChecked;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, val });
+                }
+                catch { }
+            }
+            else
+            {
+                control.Checked = val;
+            }
+        }
+        private delegate void SetCheckboxCheckedCallback(Control container, CheckBox control, bool val);
+
+        /// <summary>
+        /// Change the checked status of an item in a CheckedListBox
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="index">The index of the checkbox in the list to change</param>
+        /// <param name="val">True to change to checked, false to change to unchecked</param>
+        public static void SetCheckboxItemChecked(Control container, CheckedListBox control, int index, bool val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetCheckboxItemCheckedCallback d = SetCheckboxItemChecked;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, index, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                control.SetItemChecked(index, val);
+            }
+        }
+        private delegate void SetCheckboxItemCheckedCallback(Control container, CheckedListBox control, int index, bool val);
+
+        /// <summary>
+        /// Changes the toolstrip menu text
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="item">The toolstrip menu item to change</param>
+        /// <param name="val">The new value</param>
+        public static void SetToolStripMenuText(Control container, ToolStripMenuItem item, string val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetToolStripMenuTextCallback d = SetToolStripMenuText;
+                try
+                {
+                    container.Invoke(d, new object[] { container, item, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                item.Text = val;
+            }
+        }
+        private delegate void SetToolStripMenuTextCallback(Control container, ToolStripMenuItem item, string val);
+
+        /// <summary>
+        /// Changes the progress value of a progress bar
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="val">The new percentage</param>
+        public static void SetProgressValue(Control container, ProgressBar control, int val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetProgressValueCallback d = SetProgressValue;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                control.Value = val;
+            }
+        }
+        private delegate void SetProgressValueCallback(Control container, ProgressBar control, int val);
+
+        /// <summary>
+        /// Replaces the items of a combobox
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="selectedIndex">The new selection index</param>
+        /// <param name="val">The new content</param>
+        public static void SetComboBoxItems(Control container, ComboBox control, int selectedIndex, object[] val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetComboBoxItemsCallback d = SetComboBoxItems;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, selectedIndex, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                control.Items.Clear();
+                control.Items.AddRange(val);
+                if (control.Items.Count > 0)
+                    control.SelectedIndex = selectedIndex;
+            }
+        }
+        private delegate void SetComboBoxItemsCallback(Control container, ComboBox control, int selectedIndex, object[] val);
+
+        /// <summary>
+        /// Make a control visible or invisible
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="val">True to make it visible, false to make it invisible</param>
+        public static void SetControlVisible(Control container, Control control, bool val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetControlVisibleCallback d = SetControlVisible;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                control.Visible = val;
+            }
+        }
+        private delegate void SetControlVisibleCallback(Control container, Control control, bool val);
+
+        /// <summary>
+        /// Display a new dialog
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to display</param>
+        /// <param name="modal">True to make it a modal dialog</param>
+        public static void DisplayDialog(Control container, Form control, bool modal)
+        {
+            if (container.InvokeRequired)
+            {
+                DisplayDialogCallback d = DisplayDialog;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, modal });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                if (modal)
+                    control.ShowDialog(container);
+                else
+                    control.Show(container);
+            }
+        }
+        private delegate void DisplayDialogCallback(Control container, Form control, bool modal);
+
+        /// <summary>
+        /// Hides a control
+        /// </summary>
+        /// <param name="container">The control to hide</param>
+        /// <param name="val">True to hide, false to show</param>
+        public static void SafeHide(Control container, bool val)
+        {
+            if (container.InvokeRequired)
+            {
+                SafeHideCallback d = SafeHide;
+                try
+                {
+                    container.Invoke(d, new object[] { container, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                if (val)
+                    container.Hide();
+                else
+                    container.Show();
+            }
+        }
+        private delegate void SafeHideCallback(Control container, bool val);
+
+        /// <summary>
+        /// Change the selected index
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="index">The new selected index</param>
+        public static void SetSelectedIndex(Control container, ComboBox control, int index)
+        {
+            if (container.InvokeRequired)
+            {
+                SetSelectedIndexCallback d = SetSelectedIndex;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, index });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                control.SelectedIndex = index;
+            }
+        }
+        private delegate void SetSelectedIndexCallback(Control container, ComboBox control, int index);
+
+        /// <summary>
+        /// Get the name of the selected tab in a TabControl
+        /// </summary>
+        /// <param name="container">The tab container</param>
+        /// <param name="tabPages">The tab pages</param>
+        /// <returns>The name of the selected tab</returns>
+        public static string GetSelectedTabName(TabControl container, TabControl.TabPageCollection tabPages)
+        {
+            if (container.InvokeRequired)
+            {
+                GetSelectedTabNameCallback d = GetSelectedTabName;
+                try
+                {
+                    return container.Invoke(d, new object[] { container, tabPages }) as string;
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                return tabPages[container.SelectedIndex].Name;
+            }
+            return string.Empty;
+        }
+        private delegate string GetSelectedTabNameCallback(TabControl container, TabControl.TabPageCollection tabPages);
+
+        /// <summary>
+        /// Selects the row with the given CecKeypress for a datagrid
+        /// </summary>
+        /// <param name="container">The datagrid container</param>
+        /// <param name="dgView">The datagrid</param>
+        /// <param name="key">The key to selected</param>
+        public static void SelectKeypressRow(Control container, DataGridView dgView, CecKeypress key)
+        {
+            if (dgView.InvokeRequired)
+            {
+                SelectKeypressRowCallback d = SelectKeypressRow;
+                try
+                {
+                    container.Invoke(d, new object[] { container, dgView, key });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                var rowIndex = -1;
+                foreach (DataGridViewRow row in dgView.Rows)
+                {
+                    CecButtonConfigItem item = row.DataBoundItem as CecButtonConfigItem;
+                    if (item != null && item.Key.Keycode == key.Keycode)
+                    {
+                        rowIndex = row.Index;
+                        row.Selected = true;
+                        item.Enabled = true;
+                    }
+                    else
+                    {
+                        row.Selected = false;
+                    }
+                }
+                if (rowIndex > -1)
+                    dgView.FirstDisplayedScrollingRowIndex = rowIndex;
+            }
+        }
+        private delegate void SelectKeypressRowCallback(Control container, DataGridView dgView, CecKeypress key);
+    }
+
+}

diff --git a/src/LibCecTray/ui/AsyncForm.cs b/src/LibCecTray/ui/AsyncForm.cs
index 464547bad2a57b173f633b7f61598065cdf15504..bba4e35d8e49d996be8a39ef6347ff56e7788eb5 100644 (file)
--- a/src/LibCecTray/ui/AsyncForm.cs
+++ b/src/LibCecTray/ui/AsyncForm.cs
@@ -37,370 +37,6 @@ using LibCECTray.controller.applications;
 
 namespace LibCECTray.ui
 {
-  interface IAsyncControls
-  {
-    void SetControlEnabled(Control control, bool val);
-    void SetControlText(Control control, string val);
-    void SetToolStripMenuText(ToolStripMenuItem item, string val);
-    void SetCheckboxChecked(CheckBox control, bool val);
-    void SetCheckboxItemChecked(CheckedListBox control, int index, bool val);
-    void SetProgressValue(ProgressBar control, int val);
-    void SetComboBoxItems(ComboBox control, int selectedIndex, object[] val);
-    void SetControlVisible(Control control, bool val);
-    void DisplayDialog(Form control, bool modal);
-    void SafeHide(bool val);
-    void SetSelectedIndex(ComboBox control, int index);
-    string GetSelectedTabName(TabControl container, TabControl.TabPageCollection tabPages);
-    void SelectKeypressRow(Control container, DataGridView dgView, CecKeypress key);
-  }
-
-  /// <summary>
-  /// Utility methods to change GUI content from another thread
-  /// </summary>
-  class AsyncControls
-  {
-    /// <summary>
-    /// Enable or disable a control
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="val">True to enable, false to disable</param>
-    public static void SetControlEnabled(Control container, Control control, bool val)
-    {
-      if (container == null || control == null) return;
-      if (container.InvokeRequired)
-      {
-        SetControlEnabledCallback d = SetControlEnabled;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, val });
-        }
-        catch { }
-      }
-      else
-      {
-        control.Enabled = val;
-      }
-    }
-    private delegate void SetControlEnabledCallback(Control container, Control control, bool val);
-
-    /// <summary>
-    /// Change the text label of a control
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="val">The new text</param>
-    public static void SetControlText(Control container, Control control, string val)
-    {
-      if (container == null || control == null) return;
-      if (container.InvokeRequired)
-      {
-        SetControlTextCallback d = SetControlText;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, val });
-        }
-        catch { }
-      }
-      else
-      {
-        control.Text = val;
-      }
-    }
-    private delegate void SetControlTextCallback(Control container, Control control, string val);
-
-    /// <summary>
-    /// Change the checked status of a checkbox
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="val">True to change to checked, false to change to unchecked</param>
-    public static void SetCheckboxChecked(Control container, CheckBox control, bool val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetCheckboxCheckedCallback d = SetCheckboxChecked;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, val });
-        }
-        catch { }
-      }
-      else
-      {
-        control.Checked = val;
-      }
-    }
-    private delegate void SetCheckboxCheckedCallback(Control container, CheckBox control, bool val);
-
-    /// <summary>
-    /// Change the checked status of an item in a CheckedListBox
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="index">The index of the checkbox in the list to change</param>
-    /// <param name="val">True to change to checked, false to change to unchecked</param>
-    public static void SetCheckboxItemChecked(Control container, CheckedListBox control, int index, bool val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetCheckboxItemCheckedCallback d = SetCheckboxItemChecked;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, index, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        control.SetItemChecked(index, val);
-      }
-    }
-    private delegate void SetCheckboxItemCheckedCallback(Control container, CheckedListBox control, int index, bool val);
-
-    /// <summary>
-    /// Changes the toolstrip menu text
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="item">The toolstrip menu item to change</param>
-    /// <param name="val">The new value</param>
-    public static void SetToolStripMenuText(Control container, ToolStripMenuItem item, string val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetToolStripMenuTextCallback d = SetToolStripMenuText;
-        try
-        {
-          container.Invoke(d, new object[] { container, item, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        item.Text = val;
-      }
-    }
-    private delegate void SetToolStripMenuTextCallback(Control container, ToolStripMenuItem item, string val);
-
-    /// <summary>
-    /// Changes the progress value of a progress bar
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="val">The new percentage</param>
-    public static void SetProgressValue(Control container, ProgressBar control, int val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetProgressValueCallback d = SetProgressValue;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        control.Value = val;
-      }
-    }
-    private delegate void SetProgressValueCallback(Control container, ProgressBar control, int val);
-
-    /// <summary>
-    /// Replaces the items of a combobox
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="selectedIndex">The new selection index</param>
-    /// <param name="val">The new content</param>
-    public static void SetComboBoxItems(Control container, ComboBox control, int selectedIndex, object[] val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetComboBoxItemsCallback d = SetComboBoxItems;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, selectedIndex, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        control.Items.Clear();
-        control.Items.AddRange(val);
-        if (control.Items.Count > 0)
-          control.SelectedIndex = selectedIndex;
-      }
-    }
-    private delegate void SetComboBoxItemsCallback(Control container, ComboBox control, int selectedIndex, object[] val);
-
-    /// <summary>
-    /// Make a control visible or invisible
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="val">True to make it visible, false to make it invisible</param>
-    public static void SetControlVisible(Control container, Control control, bool val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetControlVisibleCallback d = SetControlVisible;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        control.Visible = val;
-      }
-    }
-    private delegate void SetControlVisibleCallback(Control container, Control control, bool val);
-
-    /// <summary>
-    /// Display a new dialog
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to display</param>
-    /// <param name="modal">True to make it a modal dialog</param>
-    public static void DisplayDialog(Control container, Form control, bool modal)
-    {
-      if (container.InvokeRequired)
-      {
-        DisplayDialogCallback d = DisplayDialog;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, modal });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        if (modal)
-          control.ShowDialog(container);
-        else
-          control.Show(container);
-      }
-    }
-    private delegate void DisplayDialogCallback(Control container, Form control, bool modal);
-
-    /// <summary>
-    /// Hides a control
-    /// </summary>
-    /// <param name="container">The control to hide</param>
-    /// <param name="val">True to hide, false to show</param>
-    public static void SafeHide(Control container, bool val)
-    {
-      if (container.InvokeRequired)
-      {
-        SafeHideCallback d = SafeHide;
-        try
-        {
-          container.Invoke(d, new object[] { container, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        if (val)
-          container.Hide();
-        else
-          container.Show();
-      }
-    }
-    private delegate void SafeHideCallback(Control container, bool val);
-
-    /// <summary>
-    /// Change the selected index
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="index">The new selected index</param>
-    public static void SetSelectedIndex(Control container, ComboBox control, int index)
-    {
-      if (container.InvokeRequired)
-      {
-        SetSelectedIndexCallback d = SetSelectedIndex;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, index });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        control.SelectedIndex = index;
-      }
-    }
-    private delegate void SetSelectedIndexCallback(Control container, ComboBox control, int index);
-
-    /// <summary>
-    /// Get the name of the selected tab in a TabControl
-    /// </summary>
-    /// <param name="container">The tab container</param>
-    /// <param name="tabPages">The tab pages</param>
-    /// <returns>The name of the selected tab</returns>
-    public static string GetSelectedTabName(TabControl container, TabControl.TabPageCollection tabPages)
-    {
-      if (container.InvokeRequired)
-      {
-        GetSelectedTabNameCallback d = GetSelectedTabName;
-        try
-        {
-          return container.Invoke(d, new object[] { container, tabPages }) as string;
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        return tabPages[container.SelectedIndex].Name;
-      }
-      return string.Empty;
-    }
-    private delegate string GetSelectedTabNameCallback(TabControl container, TabControl.TabPageCollection tabPages);
-
-    /// <summary>
-    /// Selects the row with the given CecKeypress for a datagrid
-    /// </summary>
-    /// <param name="container">The datagrid container</param>
-    /// <param name="dgView">The datagrid</param>
-    /// <param name="key">The key to selected</param>
-    public static void SelectKeypressRow(Control container, DataGridView dgView, CecKeypress key)
-    {
-      if (dgView.InvokeRequired)
-      {
-        SelectKeypressRowCallback d = SelectKeypressRow;
-        try
-        {
-          container.Invoke(d, new object[] { container, dgView, key });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        var rowIndex = -1;
-        foreach (DataGridViewRow row in dgView.Rows)
-        {
-          CecButtonConfigItem item = row.DataBoundItem as CecButtonConfigItem;
-          if (item != null && item.Key.Keycode == key.Keycode)
-          {
-            rowIndex = row.Index;
-            row.Selected = true;
-            item.Enabled = true;
-          }
-          else
-          {
-            row.Selected = false;
-          }
-        }
-        if (rowIndex > -1)
-          dgView.FirstDisplayedScrollingRowIndex = rowIndex;
-      }
-    }
-    private delegate void SelectKeypressRowCallback(Control container, DataGridView dgView, CecKeypress key);
-  }
-
   /// <summary>
   /// Form that implements IAsyncControls
   /// </summary>

diff --git a/src/LibCecTray/ui/CECTray.Designer.cs b/src/LibCecTray/ui/CECTray.Designer.cs
index b153957fa27c8145417154ad9a2a030ad94ebdba..85c690f258fc970f2d989cc52f28a4fe71279324 100644 (file)
--- a/src/LibCecTray/ui/CECTray.Designer.cs
+++ b/src/LibCecTray/ui/CECTray.Designer.cs
@@ -15,746 +15,746 @@
     /// </summary>
     private void InitializeComponent()
     {
-      this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CECTray));
-      this.pProgress = new System.Windows.Forms.ProgressBar();
-      this.lStatus = new System.Windows.Forms.Label();
-      this.helpPortNumber = new System.Windows.Forms.ToolTip(this.components);
-      this.cbPortNumber = new System.Windows.Forms.ComboBox();
-      this.helpConnectedHDMIDevice = new System.Windows.Forms.ToolTip(this.components);
-      this.cbConnectedDevice = new System.Windows.Forms.ComboBox();
-      this.helpPhysicalAddress = new System.Windows.Forms.ToolTip(this.components);
-      this.tbPhysicalAddress = new System.Windows.Forms.TextBox();
-      this.helpDeviceType = new System.Windows.Forms.ToolTip(this.components);
-      this.cbDeviceType = new System.Windows.Forms.ComboBox();
-      this.cbVendorId = new System.Windows.Forms.ComboBox();
-      this.trayIcon = new System.Windows.Forms.NotifyIcon(this.components);
-      this.trayIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-      this.tsAdvanced = new System.Windows.Forms.ToolStripMenuItem();
-      this.tsMenuShowHide = new System.Windows.Forms.ToolStripMenuItem();
-      this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-      this.tsMenuClose = new System.Windows.Forms.ToolStripMenuItem();
-      this.LogOutput = new System.Windows.Forms.TabPage();
-      this.bSaveLog = new System.Windows.Forms.Button();
-      this.bClearLog = new System.Windows.Forms.Button();
-      this.cbLogDebug = new System.Windows.Forms.CheckBox();
-      this.cbLogTraffic = new System.Windows.Forms.CheckBox();
-      this.cbLogNotice = new System.Windows.Forms.CheckBox();
-      this.cbLogWarning = new System.Windows.Forms.CheckBox();
-      this.cbLogError = new System.Windows.Forms.CheckBox();
-      this.tbLog = new System.Windows.Forms.TextBox();
-      this.tbTestCommands = new System.Windows.Forms.TabPage();
-      this.bRescanDevices = new System.Windows.Forms.Button();
-      this.bMute = new System.Windows.Forms.Button();
-      this.bVolDown = new System.Windows.Forms.Button();
-      this.bVolUp = new System.Windows.Forms.Button();
-      this.bActivateSource = new System.Windows.Forms.Button();
-      this.bScan = new System.Windows.Forms.Button();
-      this.bStandby = new System.Windows.Forms.Button();
-      this.bSendImageViewOn = new System.Windows.Forms.Button();
-      this.lDestination = new System.Windows.Forms.Label();
-      this.cbCommandDestination = new System.Windows.Forms.ComboBox();
-      this.Configuration = new System.Windows.Forms.TabPage();
-      this.cbOverrideAddress = new System.Windows.Forms.CheckBox();
-      this.bReloadConfig = new System.Windows.Forms.Button();
-      this.cbVendorOverride = new System.Windows.Forms.CheckBox();
-      this.lPowerOff = new System.Windows.Forms.Label();
-      this.cbPowerOffDevices = new System.Windows.Forms.CheckedListBox();
-      this.lWakeDevices = new System.Windows.Forms.Label();
-      this.cbWakeDevices = new System.Windows.Forms.CheckedListBox();
-      this.cbActivateSource = new System.Windows.Forms.CheckBox();
-      this.lPlayerConfig = new System.Windows.Forms.Label();
-      this.lAdapterConfig = new System.Windows.Forms.Label();
-      this.bClose = new System.Windows.Forms.Button();
-      this.bSaveConfig = new System.Windows.Forms.Button();
-      this.lDeviceType = new System.Windows.Forms.Label();
-      this.lConnectedDevice = new System.Windows.Forms.Label();
-      this.lPortNumber = new System.Windows.Forms.Label();
-      this.tabPanel = new System.Windows.Forms.TabControl();
-      this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-      this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.hideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.advancedModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.applicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.addNewApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.cbStartMinimised = new System.Windows.Forms.CheckBox();
-      this.trayIconMenu.SuspendLayout();
-      this.LogOutput.SuspendLayout();
-      this.tbTestCommands.SuspendLayout();
-      this.Configuration.SuspendLayout();
-      this.tabPanel.SuspendLayout();
-      this.menuStrip1.SuspendLayout();
-      this.SuspendLayout();
-      // 
-      // pProgress
-      // 
-      this.pProgress.Location = new System.Drawing.Point(314, 407);
-      this.pProgress.Name = "pProgress";
-      this.pProgress.Size = new System.Drawing.Size(298, 23);
-      this.pProgress.TabIndex = 1;
-      // 
-      // lStatus
-      // 
-      this.lStatus.AutoSize = true;
-      this.lStatus.Location = new System.Drawing.Point(12, 416);
-      this.lStatus.Name = "lStatus";
-      this.lStatus.Size = new System.Drawing.Size(61, 13);
-      this.lStatus.TabIndex = 2;
-      this.lStatus.Text = "Initialising...";
-      // 
-      // cbPortNumber
-      // 
-      this.cbPortNumber.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append;
-      this.cbPortNumber.Enabled = false;
-      this.cbPortNumber.FormattingEnabled = true;
-      this.cbPortNumber.Location = new System.Drawing.Point(174, 40);
-      this.cbPortNumber.Name = "cbPortNumber";
-      this.cbPortNumber.Size = new System.Drawing.Size(133, 21);
-      this.cbPortNumber.TabIndex = 11;
-      this.cbPortNumber.Text = "global_hdmi_port";
-      this.helpPortNumber.SetToolTip(this.cbPortNumber, "The HDMI port number, to which you connected your USB-CEC adapter.");
-      // 
-      // cbConnectedDevice
-      // 
-      this.cbConnectedDevice.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append;
-      this.cbConnectedDevice.Enabled = false;
-      this.cbConnectedDevice.FormattingEnabled = true;
-      this.cbConnectedDevice.Location = new System.Drawing.Point(174, 67);
-      this.cbConnectedDevice.Name = "cbConnectedDevice";
-      this.cbConnectedDevice.Size = new System.Drawing.Size(133, 21);
-      this.cbConnectedDevice.TabIndex = 5;
-      this.cbConnectedDevice.Text = "global_connected_to_hdmi_device";
-      this.helpConnectedHDMIDevice.SetToolTip(this.cbConnectedDevice, "The HDMI device to which the USB-CEC adapter is connected");
-      // 
-      // tbPhysicalAddress
-      // 
-      this.tbPhysicalAddress.Enabled = false;
-      this.tbPhysicalAddress.Location = new System.Drawing.Point(174, 95);
-      this.tbPhysicalAddress.MaxLength = 4;
-      this.tbPhysicalAddress.Name = "tbPhysicalAddress";
-      this.tbPhysicalAddress.Size = new System.Drawing.Size(38, 20);
-      this.tbPhysicalAddress.TabIndex = 6;
-      this.tbPhysicalAddress.Text = "global_override_physical_address";
-      this.helpPhysicalAddress.SetToolTip(this.tbPhysicalAddress, "The physical address of the adapter. Leave this untouched if you want to autodete" +
-              "ct this value.");
-      // 
-      // cbDeviceType
-      // 
-      this.cbDeviceType.Enabled = false;
-      this.cbDeviceType.FormattingEnabled = true;
-      this.cbDeviceType.Location = new System.Drawing.Point(174, 123);
-      this.cbDeviceType.Name = "cbDeviceType";
-      this.cbDeviceType.Size = new System.Drawing.Size(133, 21);
-      this.cbDeviceType.TabIndex = 14;
-      this.cbDeviceType.Text = "global_device_type";
-      this.helpDeviceType.SetToolTip(this.cbDeviceType, "Set this to \'Player\' when your TV is having problems with \'Recorder\'");
-      // 
-      // cbVendorId
-      // 
-      this.cbVendorId.Enabled = false;
-      this.cbVendorId.FormattingEnabled = true;
-      this.cbVendorId.Location = new System.Drawing.Point(174, 153);
-      this.cbVendorId.Name = "cbVendorId";
-      this.cbVendorId.Size = new System.Drawing.Size(133, 21);
-      this.cbVendorId.TabIndex = 28;
-      this.cbVendorId.Text = "global_override_tv_vendor";
-      this.helpDeviceType.SetToolTip(this.cbVendorId, "Only set this value when autodetection isn\'t working");
-      // 
-      // trayIcon
-      // 
-      this.trayIcon.ContextMenuStrip = this.trayIconMenu;
-      this.trayIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("trayIcon.Icon")));
-      this.trayIcon.Text = "Pulse-Eight USB-CEC Adapter";
-      this.trayIcon.Visible = true;
-      this.trayIcon.Click += new System.EventHandler(this.TrayIconClick);
-      // 
-      // trayIconMenu
-      // 
-      this.trayIconMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CECTray));
+            this.pProgress = new System.Windows.Forms.ProgressBar();
+            this.lStatus = new System.Windows.Forms.Label();
+            this.helpPortNumber = new System.Windows.Forms.ToolTip(this.components);
+            this.cbPortNumber = new System.Windows.Forms.ComboBox();
+            this.helpConnectedHDMIDevice = new System.Windows.Forms.ToolTip(this.components);
+            this.cbConnectedDevice = new System.Windows.Forms.ComboBox();
+            this.helpPhysicalAddress = new System.Windows.Forms.ToolTip(this.components);
+            this.tbPhysicalAddress = new System.Windows.Forms.TextBox();
+            this.helpDeviceType = new System.Windows.Forms.ToolTip(this.components);
+            this.cbDeviceType = new System.Windows.Forms.ComboBox();
+            this.cbVendorId = new System.Windows.Forms.ComboBox();
+            this.trayIcon = new System.Windows.Forms.NotifyIcon(this.components);
+            this.trayIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.tsAdvanced = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsMenuShowHide = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsMenuClose = new System.Windows.Forms.ToolStripMenuItem();
+            this.LogOutput = new System.Windows.Forms.TabPage();
+            this.bSaveLog = new System.Windows.Forms.Button();
+            this.bClearLog = new System.Windows.Forms.Button();
+            this.cbLogDebug = new System.Windows.Forms.CheckBox();
+            this.cbLogTraffic = new System.Windows.Forms.CheckBox();
+            this.cbLogNotice = new System.Windows.Forms.CheckBox();
+            this.cbLogWarning = new System.Windows.Forms.CheckBox();
+            this.cbLogError = new System.Windows.Forms.CheckBox();
+            this.tbLog = new System.Windows.Forms.TextBox();
+            this.tbTestCommands = new System.Windows.Forms.TabPage();
+            this.bRescanDevices = new System.Windows.Forms.Button();
+            this.bMute = new System.Windows.Forms.Button();
+            this.bVolDown = new System.Windows.Forms.Button();
+            this.bVolUp = new System.Windows.Forms.Button();
+            this.bActivateSource = new System.Windows.Forms.Button();
+            this.bScan = new System.Windows.Forms.Button();
+            this.bStandby = new System.Windows.Forms.Button();
+            this.bSendImageViewOn = new System.Windows.Forms.Button();
+            this.lDestination = new System.Windows.Forms.Label();
+            this.cbCommandDestination = new System.Windows.Forms.ComboBox();
+            this.Configuration = new System.Windows.Forms.TabPage();
+            this.cbStartMinimised = new System.Windows.Forms.CheckBox();
+            this.cbOverrideAddress = new System.Windows.Forms.CheckBox();
+            this.bReloadConfig = new System.Windows.Forms.Button();
+            this.cbVendorOverride = new System.Windows.Forms.CheckBox();
+            this.lPowerOff = new System.Windows.Forms.Label();
+            this.cbPowerOffDevices = new System.Windows.Forms.CheckedListBox();
+            this.lWakeDevices = new System.Windows.Forms.Label();
+            this.cbWakeDevices = new System.Windows.Forms.CheckedListBox();
+            this.cbActivateSource = new System.Windows.Forms.CheckBox();
+            this.lPlayerConfig = new System.Windows.Forms.Label();
+            this.lAdapterConfig = new System.Windows.Forms.Label();
+            this.bClose = new System.Windows.Forms.Button();
+            this.bSaveConfig = new System.Windows.Forms.Button();
+            this.lDeviceType = new System.Windows.Forms.Label();
+            this.lConnectedDevice = new System.Windows.Forms.Label();
+            this.lPortNumber = new System.Windows.Forms.Label();
+            this.tabPanel = new System.Windows.Forms.TabControl();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.hideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.advancedModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.applicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.addNewApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.trayIconMenu.SuspendLayout();
+            this.LogOutput.SuspendLayout();
+            this.tbTestCommands.SuspendLayout();
+            this.Configuration.SuspendLayout();
+            this.tabPanel.SuspendLayout();
+            this.menuStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // pProgress
+            // 
+            this.pProgress.Location = new System.Drawing.Point(314, 407);
+            this.pProgress.Name = "pProgress";
+            this.pProgress.Size = new System.Drawing.Size(298, 23);
+            this.pProgress.TabIndex = 1;
+            // 
+            // lStatus
+            // 
+            this.lStatus.AutoSize = true;
+            this.lStatus.Location = new System.Drawing.Point(12, 416);
+            this.lStatus.Name = "lStatus";
+            this.lStatus.Size = new System.Drawing.Size(61, 13);
+            this.lStatus.TabIndex = 2;
+            this.lStatus.Text = "Initialising...";
+            // 
+            // cbPortNumber
+            // 
+            this.cbPortNumber.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append;
+            this.cbPortNumber.Enabled = false;
+            this.cbPortNumber.FormattingEnabled = true;
+            this.cbPortNumber.Location = new System.Drawing.Point(174, 40);
+            this.cbPortNumber.Name = "cbPortNumber";
+            this.cbPortNumber.Size = new System.Drawing.Size(133, 21);
+            this.cbPortNumber.TabIndex = 11;
+            this.cbPortNumber.Text = "global_hdmi_port";
+            this.helpPortNumber.SetToolTip(this.cbPortNumber, "The HDMI port number, to which you connected your USB-CEC adapter.");
+            // 
+            // cbConnectedDevice
+            // 
+            this.cbConnectedDevice.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append;
+            this.cbConnectedDevice.Enabled = false;
+            this.cbConnectedDevice.FormattingEnabled = true;
+            this.cbConnectedDevice.Location = new System.Drawing.Point(174, 67);
+            this.cbConnectedDevice.Name = "cbConnectedDevice";
+            this.cbConnectedDevice.Size = new System.Drawing.Size(133, 21);
+            this.cbConnectedDevice.TabIndex = 5;
+            this.cbConnectedDevice.Text = "global_connected_to_hdmi_device";
+            this.helpConnectedHDMIDevice.SetToolTip(this.cbConnectedDevice, "The HDMI device to which the USB-CEC adapter is connected");
+            // 
+            // tbPhysicalAddress
+            // 
+            this.tbPhysicalAddress.Enabled = false;
+            this.tbPhysicalAddress.Location = new System.Drawing.Point(174, 95);
+            this.tbPhysicalAddress.MaxLength = 4;
+            this.tbPhysicalAddress.Name = "tbPhysicalAddress";
+            this.tbPhysicalAddress.Size = new System.Drawing.Size(38, 20);
+            this.tbPhysicalAddress.TabIndex = 6;
+            this.tbPhysicalAddress.Text = "global_override_physical_address";
+            this.helpPhysicalAddress.SetToolTip(this.tbPhysicalAddress, "The physical address of the adapter. Leave this untouched if you want to autodete" +
+        "ct this value.");
+            // 
+            // cbDeviceType
+            // 
+            this.cbDeviceType.Enabled = false;
+            this.cbDeviceType.FormattingEnabled = true;
+            this.cbDeviceType.Location = new System.Drawing.Point(174, 123);
+            this.cbDeviceType.Name = "cbDeviceType";
+            this.cbDeviceType.Size = new System.Drawing.Size(133, 21);
+            this.cbDeviceType.TabIndex = 14;
+            this.cbDeviceType.Text = "global_device_type";
+            this.helpDeviceType.SetToolTip(this.cbDeviceType, "Set this to \'Player\' when your TV is having problems with \'Recorder\'");
+            // 
+            // cbVendorId
+            // 
+            this.cbVendorId.Enabled = false;
+            this.cbVendorId.FormattingEnabled = true;
+            this.cbVendorId.Location = new System.Drawing.Point(174, 153);
+            this.cbVendorId.Name = "cbVendorId";
+            this.cbVendorId.Size = new System.Drawing.Size(133, 21);
+            this.cbVendorId.TabIndex = 28;
+            this.cbVendorId.Text = "global_override_tv_vendor";
+            this.helpDeviceType.SetToolTip(this.cbVendorId, "Only set this value when autodetection isn\'t working");
+            // 
+            // trayIcon
+            // 
+            this.trayIcon.ContextMenuStrip = this.trayIconMenu;
+            this.trayIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("trayIcon.Icon")));
+            this.trayIcon.Text = "Pulse-Eight USB-CEC Adapter";
+            this.trayIcon.Visible = true;
+            this.trayIcon.Click += new System.EventHandler(this.TrayIconClick);
+            // 
+            // trayIconMenu
+            // 
+            this.trayIconMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsAdvanced,
             this.tsMenuShowHide,
             this.toolStripSeparator1,
             this.tsMenuClose});
-      this.trayIconMenu.Name = "trayIconMenu";
-      this.trayIconMenu.Size = new System.Drawing.Size(162, 76);
-      // 
-      // tsAdvanced
-      // 
-      this.tsAdvanced.Name = "tsAdvanced";
-      this.tsAdvanced.Size = new System.Drawing.Size(161, 22);
-      this.tsAdvanced.Text = "Advanced mode";
-      this.tsAdvanced.Click += new System.EventHandler(this.TsAdvancedClick);
-      // 
-      // tsMenuShowHide
-      // 
-      this.tsMenuShowHide.Name = "tsMenuShowHide";
-      this.tsMenuShowHide.Size = new System.Drawing.Size(161, 22);
-      this.tsMenuShowHide.Text = "Hide";
-      this.tsMenuShowHide.Click += new System.EventHandler(this.TsMenuShowHideClick);
-      // 
-      // toolStripSeparator1
-      // 
-      this.toolStripSeparator1.Name = "toolStripSeparator1";
-      this.toolStripSeparator1.Size = new System.Drawing.Size(158, 6);
-      // 
-      // tsMenuClose
-      // 
-      this.tsMenuClose.Name = "tsMenuClose";
-      this.tsMenuClose.Size = new System.Drawing.Size(161, 22);
-      this.tsMenuClose.Text = "Exit";
-      this.tsMenuClose.Click += new System.EventHandler(this.TsMenuCloseClick);
-      // 
-      // LogOutput
-      // 
-      this.LogOutput.Controls.Add(this.bSaveLog);
-      this.LogOutput.Controls.Add(this.bClearLog);
-      this.LogOutput.Controls.Add(this.cbLogDebug);
-      this.LogOutput.Controls.Add(this.cbLogTraffic);
-      this.LogOutput.Controls.Add(this.cbLogNotice);
-      this.LogOutput.Controls.Add(this.cbLogWarning);
-      this.LogOutput.Controls.Add(this.cbLogError);
-      this.LogOutput.Controls.Add(this.tbLog);
-      this.LogOutput.Location = new System.Drawing.Point(4, 22);
-      this.LogOutput.Name = "LogOutput";
-      this.LogOutput.Padding = new System.Windows.Forms.Padding(3);
-      this.LogOutput.Size = new System.Drawing.Size(592, 344);
-      this.LogOutput.TabIndex = 1;
-      this.LogOutput.Text = "Log Output";
-      this.LogOutput.UseVisualStyleBackColor = true;
-      // 
-      // bSaveLog
-      // 
-      this.bSaveLog.Location = new System.Drawing.Point(429, 318);
-      this.bSaveLog.Name = "bSaveLog";
-      this.bSaveLog.Size = new System.Drawing.Size(75, 23);
-      this.bSaveLog.TabIndex = 7;
-      this.bSaveLog.Text = "Persist";
-      this.bSaveLog.UseVisualStyleBackColor = true;
-      this.bSaveLog.Click += new System.EventHandler(this.BSaveLogClick);
-      // 
-      // bClearLog
-      // 
-      this.bClearLog.Location = new System.Drawing.Point(510, 318);
-      this.bClearLog.Name = "bClearLog";
-      this.bClearLog.Size = new System.Drawing.Size(75, 23);
-      this.bClearLog.TabIndex = 6;
-      this.bClearLog.Text = "Clear";
-      this.bClearLog.UseVisualStyleBackColor = true;
-      this.bClearLog.Click += new System.EventHandler(this.BClearLogClick);
-      // 
-      // cbLogDebug
-      // 
-      this.cbLogDebug.AutoSize = true;
-      this.cbLogDebug.Checked = true;
-      this.cbLogDebug.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.cbLogDebug.Location = new System.Drawing.Point(268, 324);
-      this.cbLogDebug.Name = "cbLogDebug";
-      this.cbLogDebug.Size = new System.Drawing.Size(58, 17);
-      this.cbLogDebug.TabIndex = 5;
-      this.cbLogDebug.Text = "Debug";
-      this.cbLogDebug.UseVisualStyleBackColor = true;
-      // 
-      // cbLogTraffic
-      // 
-      this.cbLogTraffic.AutoSize = true;
-      this.cbLogTraffic.Checked = true;
-      this.cbLogTraffic.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.cbLogTraffic.Location = new System.Drawing.Point(206, 324);
-      this.cbLogTraffic.Name = "cbLogTraffic";
-      this.cbLogTraffic.Size = new System.Drawing.Size(56, 17);
-      this.cbLogTraffic.TabIndex = 4;
-      this.cbLogTraffic.Text = "Traffic";
-      this.cbLogTraffic.UseVisualStyleBackColor = true;
-      // 
-      // cbLogNotice
-      // 
-      this.cbLogNotice.AutoSize = true;
-      this.cbLogNotice.Checked = true;
-      this.cbLogNotice.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.cbLogNotice.Location = new System.Drawing.Point(137, 324);
-      this.cbLogNotice.Name = "cbLogNotice";
-      this.cbLogNotice.Size = new System.Drawing.Size(62, 17);
-      this.cbLogNotice.TabIndex = 3;
-      this.cbLogNotice.Text = "Notices";
-      this.cbLogNotice.UseVisualStyleBackColor = true;
-      // 
-      // cbLogWarning
-      // 
-      this.cbLogWarning.AutoSize = true;
-      this.cbLogWarning.Checked = true;
-      this.cbLogWarning.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.cbLogWarning.Location = new System.Drawing.Point(65, 324);
-      this.cbLogWarning.Name = "cbLogWarning";
-      this.cbLogWarning.Size = new System.Drawing.Size(66, 17);
-      this.cbLogWarning.TabIndex = 2;
-      this.cbLogWarning.Text = "Warning";
-      this.cbLogWarning.UseVisualStyleBackColor = true;
-      // 
-      // cbLogError
-      // 
-      this.cbLogError.AutoSize = true;
-      this.cbLogError.Checked = true;
-      this.cbLogError.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.cbLogError.Location = new System.Drawing.Point(6, 324);
-      this.cbLogError.Name = "cbLogError";
-      this.cbLogError.Size = new System.Drawing.Size(53, 17);
-      this.cbLogError.TabIndex = 1;
-      this.cbLogError.Text = "Errors";
-      this.cbLogError.UseVisualStyleBackColor = true;
-      // 
-      // tbLog
-      // 
-      this.tbLog.Location = new System.Drawing.Point(6, 0);
-      this.tbLog.Multiline = true;
-      this.tbLog.Name = "tbLog";
-      this.tbLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-      this.tbLog.Size = new System.Drawing.Size(580, 312);
-      this.tbLog.TabIndex = 0;
-      // 
-      // tbTestCommands
-      // 
-      this.tbTestCommands.Controls.Add(this.bRescanDevices);
-      this.tbTestCommands.Controls.Add(this.bMute);
-      this.tbTestCommands.Controls.Add(this.bVolDown);
-      this.tbTestCommands.Controls.Add(this.bVolUp);
-      this.tbTestCommands.Controls.Add(this.bActivateSource);
-      this.tbTestCommands.Controls.Add(this.bScan);
-      this.tbTestCommands.Controls.Add(this.bStandby);
-      this.tbTestCommands.Controls.Add(this.bSendImageViewOn);
-      this.tbTestCommands.Controls.Add(this.lDestination);
-      this.tbTestCommands.Controls.Add(this.cbCommandDestination);
-      this.tbTestCommands.Location = new System.Drawing.Point(4, 22);
-      this.tbTestCommands.Name = "tbTestCommands";
-      this.tbTestCommands.Padding = new System.Windows.Forms.Padding(3);
-      this.tbTestCommands.Size = new System.Drawing.Size(592, 344);
-      this.tbTestCommands.TabIndex = 3;
-      this.tbTestCommands.Text = "CEC tester";
-      this.tbTestCommands.UseVisualStyleBackColor = true;
-      // 
-      // bRescanDevices
-      // 
-      this.bRescanDevices.Enabled = false;
-      this.bRescanDevices.Location = new System.Drawing.Point(424, 65);
-      this.bRescanDevices.Name = "bRescanDevices";
-      this.bRescanDevices.Size = new System.Drawing.Size(150, 23);
-      this.bRescanDevices.TabIndex = 9;
-      this.bRescanDevices.Text = "Re-scan devices";
-      this.bRescanDevices.UseVisualStyleBackColor = true;
-      this.bRescanDevices.Click += new System.EventHandler(this.BRescanDevicesClick);
-      // 
-      // bMute
-      // 
-      this.bMute.Enabled = false;
-      this.bMute.Location = new System.Drawing.Point(164, 65);
-      this.bMute.Name = "bMute";
-      this.bMute.Size = new System.Drawing.Size(150, 23);
-      this.bMute.TabIndex = 8;
-      this.bMute.Text = "Mute";
-      this.bMute.UseVisualStyleBackColor = true;
-      this.bMute.Click += new System.EventHandler(this.BMuteClick);
-      // 
-      // bVolDown
-      // 
-      this.bVolDown.Enabled = false;
-      this.bVolDown.Location = new System.Drawing.Point(164, 36);
-      this.bVolDown.Name = "bVolDown";
-      this.bVolDown.Size = new System.Drawing.Size(150, 23);
-      this.bVolDown.TabIndex = 7;
-      this.bVolDown.Text = "Volume down";
-      this.bVolDown.UseVisualStyleBackColor = true;
-      this.bVolDown.Click += new System.EventHandler(this.BVolDownClick);
-      // 
-      // bVolUp
-      // 
-      this.bVolUp.Enabled = false;
-      this.bVolUp.Location = new System.Drawing.Point(164, 7);
-      this.bVolUp.Name = "bVolUp";
-      this.bVolUp.Size = new System.Drawing.Size(150, 23);
-      this.bVolUp.TabIndex = 6;
-      this.bVolUp.Text = "Volume up";
-      this.bVolUp.UseVisualStyleBackColor = true;
-      this.bVolUp.Click += new System.EventHandler(this.BVolUpClick);
-      // 
-      // bActivateSource
-      // 
-      this.bActivateSource.Enabled = false;
-      this.bActivateSource.Location = new System.Drawing.Point(8, 65);
-      this.bActivateSource.Name = "bActivateSource";
-      this.bActivateSource.Size = new System.Drawing.Size(150, 23);
-      this.bActivateSource.TabIndex = 5;
-      this.bActivateSource.Text = "Make device active";
-      this.bActivateSource.UseVisualStyleBackColor = true;
-      this.bActivateSource.Click += new System.EventHandler(this.BActivateSourceClick);
-      // 
-      // bScan
-      // 
-      this.bScan.Enabled = false;
-      this.bScan.Location = new System.Drawing.Point(8, 94);
-      this.bScan.Name = "bScan";
-      this.bScan.Size = new System.Drawing.Size(150, 23);
-      this.bScan.TabIndex = 4;
-      this.bScan.Text = "Device information";
-      this.bScan.UseVisualStyleBackColor = true;
-      this.bScan.Click += new System.EventHandler(this.BScanClick);
-      // 
-      // bStandby
-      // 
-      this.bStandby.Enabled = false;
-      this.bStandby.Location = new System.Drawing.Point(8, 36);
-      this.bStandby.Name = "bStandby";
-      this.bStandby.Size = new System.Drawing.Size(150, 23);
-      this.bStandby.TabIndex = 3;
-      this.bStandby.Text = "Put device in standby";
-      this.bStandby.UseVisualStyleBackColor = true;
-      this.bStandby.Click += new System.EventHandler(this.BStandbyClick);
-      // 
-      // bSendImageViewOn
-      // 
-      this.bSendImageViewOn.Enabled = false;
-      this.bSendImageViewOn.Location = new System.Drawing.Point(8, 7);
-      this.bSendImageViewOn.Name = "bSendImageViewOn";
-      this.bSendImageViewOn.Size = new System.Drawing.Size(150, 23);
-      this.bSendImageViewOn.TabIndex = 2;
-      this.bSendImageViewOn.Text = "Power on device";
-      this.bSendImageViewOn.UseVisualStyleBackColor = true;
-      this.bSendImageViewOn.Click += new System.EventHandler(this.BSendImageViewOnClick);
-      // 
-      // lDestination
-      // 
-      this.lDestination.AutoSize = true;
-      this.lDestination.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.lDestination.Location = new System.Drawing.Point(420, 3);
-      this.lDestination.Name = "lDestination";
-      this.lDestination.Size = new System.Drawing.Size(138, 24);
-      this.lDestination.TabIndex = 1;
-      this.lDestination.Text = "Target device";
-      // 
-      // cbCommandDestination
-      // 
-      this.cbCommandDestination.FormattingEnabled = true;
-      this.cbCommandDestination.Items.AddRange(new object[] {
+            this.trayIconMenu.Name = "trayIconMenu";
+            this.trayIconMenu.Size = new System.Drawing.Size(152, 76);
+            // 
+            // tsAdvanced
+            // 
+            this.tsAdvanced.Name = "tsAdvanced";
+            this.tsAdvanced.Size = new System.Drawing.Size(151, 22);
+            this.tsAdvanced.Text = "Advanced mode";
+            this.tsAdvanced.Click += new System.EventHandler(this.TsAdvancedClick);
+            // 
+            // tsMenuShowHide
+            // 
+            this.tsMenuShowHide.Name = "tsMenuShowHide";
+            this.tsMenuShowHide.Size = new System.Drawing.Size(151, 22);
+            this.tsMenuShowHide.Text = "Hide";
+            this.tsMenuShowHide.Click += new System.EventHandler(this.TsMenuShowHideClick);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(148, 6);
+            // 
+            // tsMenuClose
+            // 
+            this.tsMenuClose.Name = "tsMenuClose";
+            this.tsMenuClose.Size = new System.Drawing.Size(151, 22);
+            this.tsMenuClose.Text = "Exit";
+            this.tsMenuClose.Click += new System.EventHandler(this.TsMenuCloseClick);
+            // 
+            // LogOutput
+            // 
+            this.LogOutput.Controls.Add(this.bSaveLog);
+            this.LogOutput.Controls.Add(this.bClearLog);
+            this.LogOutput.Controls.Add(this.cbLogDebug);
+            this.LogOutput.Controls.Add(this.cbLogTraffic);
+            this.LogOutput.Controls.Add(this.cbLogNotice);
+            this.LogOutput.Controls.Add(this.cbLogWarning);
+            this.LogOutput.Controls.Add(this.cbLogError);
+            this.LogOutput.Controls.Add(this.tbLog);
+            this.LogOutput.Location = new System.Drawing.Point(4, 22);
+            this.LogOutput.Name = "LogOutput";
+            this.LogOutput.Padding = new System.Windows.Forms.Padding(3);
+            this.LogOutput.Size = new System.Drawing.Size(592, 344);
+            this.LogOutput.TabIndex = 1;
+            this.LogOutput.Text = "Log Output";
+            this.LogOutput.UseVisualStyleBackColor = true;
+            // 
+            // bSaveLog
+            // 
+            this.bSaveLog.Location = new System.Drawing.Point(429, 318);
+            this.bSaveLog.Name = "bSaveLog";
+            this.bSaveLog.Size = new System.Drawing.Size(75, 23);
+            this.bSaveLog.TabIndex = 7;
+            this.bSaveLog.Text = "Save";
+            this.bSaveLog.UseVisualStyleBackColor = true;
+            this.bSaveLog.Click += new System.EventHandler(this.BSaveLogClick);
+            // 
+            // bClearLog
+            // 
+            this.bClearLog.Location = new System.Drawing.Point(510, 318);
+            this.bClearLog.Name = "bClearLog";
+            this.bClearLog.Size = new System.Drawing.Size(75, 23);
+            this.bClearLog.TabIndex = 6;
+            this.bClearLog.Text = "Clear";
+            this.bClearLog.UseVisualStyleBackColor = true;
+            this.bClearLog.Click += new System.EventHandler(this.BClearLogClick);
+            // 
+            // cbLogDebug
+            // 
+            this.cbLogDebug.AutoSize = true;
+            this.cbLogDebug.Checked = true;
+            this.cbLogDebug.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbLogDebug.Location = new System.Drawing.Point(268, 324);
+            this.cbLogDebug.Name = "cbLogDebug";
+            this.cbLogDebug.Size = new System.Drawing.Size(58, 17);
+            this.cbLogDebug.TabIndex = 5;
+            this.cbLogDebug.Text = "Debug";
+            this.cbLogDebug.UseVisualStyleBackColor = true;
+            // 
+            // cbLogTraffic
+            // 
+            this.cbLogTraffic.AutoSize = true;
+            this.cbLogTraffic.Checked = true;
+            this.cbLogTraffic.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbLogTraffic.Location = new System.Drawing.Point(206, 324);
+            this.cbLogTraffic.Name = "cbLogTraffic";
+            this.cbLogTraffic.Size = new System.Drawing.Size(56, 17);
+            this.cbLogTraffic.TabIndex = 4;
+            this.cbLogTraffic.Text = "Traffic";
+            this.cbLogTraffic.UseVisualStyleBackColor = true;
+            // 
+            // cbLogNotice
+            // 
+            this.cbLogNotice.AutoSize = true;
+            this.cbLogNotice.Checked = true;
+            this.cbLogNotice.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbLogNotice.Location = new System.Drawing.Point(137, 324);
+            this.cbLogNotice.Name = "cbLogNotice";
+            this.cbLogNotice.Size = new System.Drawing.Size(62, 17);
+            this.cbLogNotice.TabIndex = 3;
+            this.cbLogNotice.Text = "Notices";
+            this.cbLogNotice.UseVisualStyleBackColor = true;
+            // 
+            // cbLogWarning
+            // 
+            this.cbLogWarning.AutoSize = true;
+            this.cbLogWarning.Checked = true;
+            this.cbLogWarning.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbLogWarning.Location = new System.Drawing.Point(65, 324);
+            this.cbLogWarning.Name = "cbLogWarning";
+            this.cbLogWarning.Size = new System.Drawing.Size(66, 17);
+            this.cbLogWarning.TabIndex = 2;
+            this.cbLogWarning.Text = "Warning";
+            this.cbLogWarning.UseVisualStyleBackColor = true;
+            // 
+            // cbLogError
+            // 
+            this.cbLogError.AutoSize = true;
+            this.cbLogError.Checked = true;
+            this.cbLogError.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbLogError.Location = new System.Drawing.Point(6, 324);
+            this.cbLogError.Name = "cbLogError";
+            this.cbLogError.Size = new System.Drawing.Size(53, 17);
+            this.cbLogError.TabIndex = 1;
+            this.cbLogError.Text = "Errors";
+            this.cbLogError.UseVisualStyleBackColor = true;
+            // 
+            // tbLog
+            // 
+            this.tbLog.Location = new System.Drawing.Point(6, 0);
+            this.tbLog.Multiline = true;
+            this.tbLog.Name = "tbLog";
+            this.tbLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.tbLog.Size = new System.Drawing.Size(580, 312);
+            this.tbLog.TabIndex = 0;
+            // 
+            // tbTestCommands
+            // 
+            this.tbTestCommands.Controls.Add(this.bRescanDevices);
+            this.tbTestCommands.Controls.Add(this.bMute);
+            this.tbTestCommands.Controls.Add(this.bVolDown);
+            this.tbTestCommands.Controls.Add(this.bVolUp);
+            this.tbTestCommands.Controls.Add(this.bActivateSource);
+            this.tbTestCommands.Controls.Add(this.bScan);
+            this.tbTestCommands.Controls.Add(this.bStandby);
+            this.tbTestCommands.Controls.Add(this.bSendImageViewOn);
+            this.tbTestCommands.Controls.Add(this.lDestination);
+            this.tbTestCommands.Controls.Add(this.cbCommandDestination);
+            this.tbTestCommands.Location = new System.Drawing.Point(4, 22);
+            this.tbTestCommands.Name = "tbTestCommands";
+            this.tbTestCommands.Padding = new System.Windows.Forms.Padding(3);
+            this.tbTestCommands.Size = new System.Drawing.Size(592, 344);
+            this.tbTestCommands.TabIndex = 3;
+            this.tbTestCommands.Text = "CEC tester";
+            this.tbTestCommands.UseVisualStyleBackColor = true;
+            // 
+            // bRescanDevices
+            // 
+            this.bRescanDevices.Enabled = false;
+            this.bRescanDevices.Location = new System.Drawing.Point(424, 65);
+            this.bRescanDevices.Name = "bRescanDevices";
+            this.bRescanDevices.Size = new System.Drawing.Size(150, 23);
+            this.bRescanDevices.TabIndex = 9;
+            this.bRescanDevices.Text = "Re-scan devices";
+            this.bRescanDevices.UseVisualStyleBackColor = true;
+            this.bRescanDevices.Click += new System.EventHandler(this.BRescanDevicesClick);
+            // 
+            // bMute
+            // 
+            this.bMute.Enabled = false;
+            this.bMute.Location = new System.Drawing.Point(164, 65);
+            this.bMute.Name = "bMute";
+            this.bMute.Size = new System.Drawing.Size(150, 23);
+            this.bMute.TabIndex = 8;
+            this.bMute.Text = "Mute";
+            this.bMute.UseVisualStyleBackColor = true;
+            this.bMute.Click += new System.EventHandler(this.BMuteClick);
+            // 
+            // bVolDown
+            // 
+            this.bVolDown.Enabled = false;
+            this.bVolDown.Location = new System.Drawing.Point(164, 36);
+            this.bVolDown.Name = "bVolDown";
+            this.bVolDown.Size = new System.Drawing.Size(150, 23);
+            this.bVolDown.TabIndex = 7;
+            this.bVolDown.Text = "Volume down";
+            this.bVolDown.UseVisualStyleBackColor = true;
+            this.bVolDown.Click += new System.EventHandler(this.BVolDownClick);
+            // 
+            // bVolUp
+            // 
+            this.bVolUp.Enabled = false;
+            this.bVolUp.Location = new System.Drawing.Point(164, 7);
+            this.bVolUp.Name = "bVolUp";
+            this.bVolUp.Size = new System.Drawing.Size(150, 23);
+            this.bVolUp.TabIndex = 6;
+            this.bVolUp.Text = "Volume up";
+            this.bVolUp.UseVisualStyleBackColor = true;
+            this.bVolUp.Click += new System.EventHandler(this.BVolUpClick);
+            // 
+            // bActivateSource
+            // 
+            this.bActivateSource.Enabled = false;
+            this.bActivateSource.Location = new System.Drawing.Point(8, 65);
+            this.bActivateSource.Name = "bActivateSource";
+            this.bActivateSource.Size = new System.Drawing.Size(150, 23);
+            this.bActivateSource.TabIndex = 5;
+            this.bActivateSource.Text = "Make device active";
+            this.bActivateSource.UseVisualStyleBackColor = true;
+            this.bActivateSource.Click += new System.EventHandler(this.BActivateSourceClick);
+            // 
+            // bScan
+            // 
+            this.bScan.Enabled = false;
+            this.bScan.Location = new System.Drawing.Point(8, 94);
+            this.bScan.Name = "bScan";
+            this.bScan.Size = new System.Drawing.Size(150, 23);
+            this.bScan.TabIndex = 4;
+            this.bScan.Text = "Device information";
+            this.bScan.UseVisualStyleBackColor = true;
+            this.bScan.Click += new System.EventHandler(this.BScanClick);
+            // 
+            // bStandby
+            // 
+            this.bStandby.Enabled = false;
+            this.bStandby.Location = new System.Drawing.Point(8, 36);
+            this.bStandby.Name = "bStandby";
+            this.bStandby.Size = new System.Drawing.Size(150, 23);
+            this.bStandby.TabIndex = 3;
+            this.bStandby.Text = "Put device in standby";
+            this.bStandby.UseVisualStyleBackColor = true;
+            this.bStandby.Click += new System.EventHandler(this.BStandbyClick);
+            // 
+            // bSendImageViewOn
+            // 
+            this.bSendImageViewOn.Enabled = false;
+            this.bSendImageViewOn.Location = new System.Drawing.Point(8, 7);
+            this.bSendImageViewOn.Name = "bSendImageViewOn";
+            this.bSendImageViewOn.Size = new System.Drawing.Size(150, 23);
+            this.bSendImageViewOn.TabIndex = 2;
+            this.bSendImageViewOn.Text = "Power on device";
+            this.bSendImageViewOn.UseVisualStyleBackColor = true;
+            this.bSendImageViewOn.Click += new System.EventHandler(this.BSendImageViewOnClick);
+            // 
+            // lDestination
+            // 
+            this.lDestination.AutoSize = true;
+            this.lDestination.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lDestination.Location = new System.Drawing.Point(420, 3);
+            this.lDestination.Name = "lDestination";
+            this.lDestination.Size = new System.Drawing.Size(138, 24);
+            this.lDestination.TabIndex = 1;
+            this.lDestination.Text = "Target device";
+            // 
+            // cbCommandDestination
+            // 
+            this.cbCommandDestination.FormattingEnabled = true;
+            this.cbCommandDestination.Items.AddRange(new object[] {
             "0: TV",
             "F: Broadcast"});
-      this.cbCommandDestination.Location = new System.Drawing.Point(437, 30);
-      this.cbCommandDestination.Name = "cbCommandDestination";
-      this.cbCommandDestination.Size = new System.Drawing.Size(121, 21);
-      this.cbCommandDestination.TabIndex = 0;
-      this.cbCommandDestination.Text = "0: TV";
-      this.cbCommandDestination.SelectedIndexChanged += new System.EventHandler(this.CbCommandDestinationSelectedIndexChanged);
-      // 
-      // Configuration
-      // 
-      this.Configuration.Controls.Add(this.cbStartMinimised);
-      this.Configuration.Controls.Add(this.cbOverrideAddress);
-      this.Configuration.Controls.Add(this.bReloadConfig);
-      this.Configuration.Controls.Add(this.cbVendorOverride);
-      this.Configuration.Controls.Add(this.cbVendorId);
-      this.Configuration.Controls.Add(this.lPowerOff);
-      this.Configuration.Controls.Add(this.cbPowerOffDevices);
-      this.Configuration.Controls.Add(this.lWakeDevices);
-      this.Configuration.Controls.Add(this.cbWakeDevices);
-      this.Configuration.Controls.Add(this.cbActivateSource);
-      this.Configuration.Controls.Add(this.lPlayerConfig);
-      this.Configuration.Controls.Add(this.lAdapterConfig);
-      this.Configuration.Controls.Add(this.cbDeviceType);
-      this.Configuration.Controls.Add(this.bClose);
-      this.Configuration.Controls.Add(this.bSaveConfig);
-      this.Configuration.Controls.Add(this.cbPortNumber);
-      this.Configuration.Controls.Add(this.tbPhysicalAddress);
-      this.Configuration.Controls.Add(this.cbConnectedDevice);
-      this.Configuration.Controls.Add(this.lDeviceType);
-      this.Configuration.Controls.Add(this.lConnectedDevice);
-      this.Configuration.Controls.Add(this.lPortNumber);
-      this.Configuration.Location = new System.Drawing.Point(4, 22);
-      this.Configuration.Name = "Configuration";
-      this.Configuration.Padding = new System.Windows.Forms.Padding(3);
-      this.Configuration.Size = new System.Drawing.Size(592, 344);
-      this.Configuration.TabIndex = 0;
-      this.Configuration.Text = "Configuration";
-      this.Configuration.UseVisualStyleBackColor = true;
-      // 
-      // cbOverrideAddress
-      // 
-      this.cbOverrideAddress.AutoSize = true;
-      this.cbOverrideAddress.Enabled = false;
-      this.cbOverrideAddress.Location = new System.Drawing.Point(10, 97);
-      this.cbOverrideAddress.Name = "cbOverrideAddress";
-      this.cbOverrideAddress.Size = new System.Drawing.Size(151, 17);
-      this.cbOverrideAddress.TabIndex = 31;
-      this.cbOverrideAddress.Text = "override_physical_address";
-      this.cbOverrideAddress.UseVisualStyleBackColor = true;
-      // 
-      // bReloadConfig
-      // 
-      this.bReloadConfig.Enabled = false;
-      this.bReloadConfig.Location = new System.Drawing.Point(357, 315);
-      this.bReloadConfig.Name = "bReloadConfig";
-      this.bReloadConfig.Size = new System.Drawing.Size(125, 23);
-      this.bReloadConfig.TabIndex = 30;
-      this.bReloadConfig.Text = "Reset configuration";
-      this.bReloadConfig.UseVisualStyleBackColor = true;
-      this.bReloadConfig.Click += new System.EventHandler(this.BReloadConfigClick);
-      // 
-      // cbVendorOverride
-      // 
-      this.cbVendorOverride.AutoSize = true;
-      this.cbVendorOverride.Enabled = false;
-      this.cbVendorOverride.Location = new System.Drawing.Point(10, 156);
-      this.cbVendorOverride.Name = "cbVendorOverride";
-      this.cbVendorOverride.Size = new System.Drawing.Size(118, 17);
-      this.cbVendorOverride.TabIndex = 29;
-      this.cbVendorOverride.Text = "override_tv_vendor";
-      this.cbVendorOverride.UseVisualStyleBackColor = true;
-      // 
-      // lPowerOff
-      // 
-      this.lPowerOff.AutoSize = true;
-      this.lPowerOff.Location = new System.Drawing.Point(448, 35);
-      this.lPowerOff.Name = "lPowerOff";
-      this.lPowerOff.Size = new System.Drawing.Size(87, 13);
-      this.lPowerOff.TabIndex = 26;
-      this.lPowerOff.Text = "standby_devices";
-      // 
-      // cbPowerOffDevices
-      // 
-      this.cbPowerOffDevices.Enabled = false;
-      this.cbPowerOffDevices.FormattingEnabled = true;
-      this.cbPowerOffDevices.Items.AddRange(new object[] {
+            this.cbCommandDestination.Location = new System.Drawing.Point(437, 30);
+            this.cbCommandDestination.Name = "cbCommandDestination";
+            this.cbCommandDestination.Size = new System.Drawing.Size(121, 21);
+            this.cbCommandDestination.TabIndex = 0;
+            this.cbCommandDestination.Text = "0: TV";
+            this.cbCommandDestination.SelectedIndexChanged += new System.EventHandler(this.CbCommandDestinationSelectedIndexChanged);
+            // 
+            // Configuration
+            // 
+            this.Configuration.Controls.Add(this.cbStartMinimised);
+            this.Configuration.Controls.Add(this.cbOverrideAddress);
+            this.Configuration.Controls.Add(this.bReloadConfig);
+            this.Configuration.Controls.Add(this.cbVendorOverride);
+            this.Configuration.Controls.Add(this.cbVendorId);
+            this.Configuration.Controls.Add(this.lPowerOff);
+            this.Configuration.Controls.Add(this.cbPowerOffDevices);
+            this.Configuration.Controls.Add(this.lWakeDevices);
+            this.Configuration.Controls.Add(this.cbWakeDevices);
+            this.Configuration.Controls.Add(this.cbActivateSource);
+            this.Configuration.Controls.Add(this.lPlayerConfig);
+            this.Configuration.Controls.Add(this.lAdapterConfig);
+            this.Configuration.Controls.Add(this.cbDeviceType);
+            this.Configuration.Controls.Add(this.bClose);
+            this.Configuration.Controls.Add(this.bSaveConfig);
+            this.Configuration.Controls.Add(this.cbPortNumber);
+            this.Configuration.Controls.Add(this.tbPhysicalAddress);
+            this.Configuration.Controls.Add(this.cbConnectedDevice);
+            this.Configuration.Controls.Add(this.lDeviceType);
+            this.Configuration.Controls.Add(this.lConnectedDevice);
+            this.Configuration.Controls.Add(this.lPortNumber);
+            this.Configuration.Location = new System.Drawing.Point(4, 22);
+            this.Configuration.Name = "Configuration";
+            this.Configuration.Padding = new System.Windows.Forms.Padding(3);
+            this.Configuration.Size = new System.Drawing.Size(592, 344);
+            this.Configuration.TabIndex = 0;
+            this.Configuration.Text = "Configuration";
+            this.Configuration.UseVisualStyleBackColor = true;
+            // 
+            // cbStartMinimised
+            // 
+            this.cbStartMinimised.AutoSize = true;
+            this.cbStartMinimised.Enabled = false;
+            this.cbStartMinimised.Location = new System.Drawing.Point(9, 232);
+            this.cbStartMinimised.Name = "cbStartMinimised";
+            this.cbStartMinimised.Size = new System.Drawing.Size(118, 17);
+            this.cbStartMinimised.TabIndex = 32;
+            this.cbStartMinimised.Text = "global_start_hidden";
+            this.cbStartMinimised.UseVisualStyleBackColor = true;
+            // 
+            // cbOverrideAddress
+            // 
+            this.cbOverrideAddress.AutoSize = true;
+            this.cbOverrideAddress.Enabled = false;
+            this.cbOverrideAddress.Location = new System.Drawing.Point(10, 97);
+            this.cbOverrideAddress.Name = "cbOverrideAddress";
+            this.cbOverrideAddress.Size = new System.Drawing.Size(151, 17);
+            this.cbOverrideAddress.TabIndex = 31;
+            this.cbOverrideAddress.Text = "override_physical_address";
+            this.cbOverrideAddress.UseVisualStyleBackColor = true;
+            // 
+            // bReloadConfig
+            // 
+            this.bReloadConfig.Enabled = false;
+            this.bReloadConfig.Location = new System.Drawing.Point(357, 315);
+            this.bReloadConfig.Name = "bReloadConfig";
+            this.bReloadConfig.Size = new System.Drawing.Size(125, 23);
+            this.bReloadConfig.TabIndex = 30;
+            this.bReloadConfig.Text = "Reset configuration";
+            this.bReloadConfig.UseVisualStyleBackColor = true;
+            this.bReloadConfig.Click += new System.EventHandler(this.BReloadConfigClick);
+            // 
+            // cbVendorOverride
+            // 
+            this.cbVendorOverride.AutoSize = true;
+            this.cbVendorOverride.Enabled = false;
+            this.cbVendorOverride.Location = new System.Drawing.Point(10, 156);
+            this.cbVendorOverride.Name = "cbVendorOverride";
+            this.cbVendorOverride.Size = new System.Drawing.Size(118, 17);
+            this.cbVendorOverride.TabIndex = 29;
+            this.cbVendorOverride.Text = "override_tv_vendor";
+            this.cbVendorOverride.UseVisualStyleBackColor = true;
+            // 
+            // lPowerOff
+            // 
+            this.lPowerOff.AutoSize = true;
+            this.lPowerOff.Location = new System.Drawing.Point(448, 35);
+            this.lPowerOff.Name = "lPowerOff";
+            this.lPowerOff.Size = new System.Drawing.Size(87, 13);
+            this.lPowerOff.TabIndex = 26;
+            this.lPowerOff.Text = "standby_devices";
+            // 
+            // cbPowerOffDevices
+            // 
+            this.cbPowerOffDevices.Enabled = false;
+            this.cbPowerOffDevices.FormattingEnabled = true;
+            this.cbPowerOffDevices.Items.AddRange(new object[] {
             "global_standby_devices"});
-      this.cbPowerOffDevices.Location = new System.Drawing.Point(450, 52);
-      this.cbPowerOffDevices.Name = "cbPowerOffDevices";
-      this.cbPowerOffDevices.Size = new System.Drawing.Size(118, 94);
-      this.cbPowerOffDevices.TabIndex = 25;
-      // 
-      // lWakeDevices
-      // 
-      this.lWakeDevices.AutoSize = true;
-      this.lWakeDevices.Location = new System.Drawing.Point(328, 35);
-      this.lWakeDevices.Name = "lWakeDevices";
-      this.lWakeDevices.Size = new System.Drawing.Size(76, 13);
-      this.lWakeDevices.TabIndex = 24;
-      this.lWakeDevices.Text = "wake_devices";
-      // 
-      // cbWakeDevices
-      // 
-      this.cbWakeDevices.Enabled = false;
-      this.cbWakeDevices.FormattingEnabled = true;
-      this.cbWakeDevices.Items.AddRange(new object[] {
+            this.cbPowerOffDevices.Location = new System.Drawing.Point(450, 52);
+            this.cbPowerOffDevices.Name = "cbPowerOffDevices";
+            this.cbPowerOffDevices.Size = new System.Drawing.Size(118, 94);
+            this.cbPowerOffDevices.TabIndex = 25;
+            // 
+            // lWakeDevices
+            // 
+            this.lWakeDevices.AutoSize = true;
+            this.lWakeDevices.Location = new System.Drawing.Point(328, 35);
+            this.lWakeDevices.Name = "lWakeDevices";
+            this.lWakeDevices.Size = new System.Drawing.Size(76, 13);
+            this.lWakeDevices.TabIndex = 24;
+            this.lWakeDevices.Text = "wake_devices";
+            // 
+            // cbWakeDevices
+            // 
+            this.cbWakeDevices.Enabled = false;
+            this.cbWakeDevices.FormattingEnabled = true;
+            this.cbWakeDevices.Items.AddRange(new object[] {
             "global_wake_devices"});
-      this.cbWakeDevices.Location = new System.Drawing.Point(320, 52);
-      this.cbWakeDevices.Name = "cbWakeDevices";
-      this.cbWakeDevices.Size = new System.Drawing.Size(118, 94);
-      this.cbWakeDevices.TabIndex = 23;
-      // 
-      // cbActivateSource
-      // 
-      this.cbActivateSource.AutoSize = true;
-      this.cbActivateSource.Enabled = false;
-      this.cbActivateSource.Location = new System.Drawing.Point(9, 209);
-      this.cbActivateSource.Name = "cbActivateSource";
-      this.cbActivateSource.Size = new System.Drawing.Size(136, 17);
-      this.cbActivateSource.TabIndex = 19;
-      this.cbActivateSource.Text = "global_activate_source";
-      this.cbActivateSource.UseVisualStyleBackColor = true;
-      // 
-      // lPlayerConfig
-      // 
-      this.lPlayerConfig.AutoSize = true;
-      this.lPlayerConfig.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.lPlayerConfig.Location = new System.Drawing.Point(6, 182);
-      this.lPlayerConfig.Name = "lPlayerConfig";
-      this.lPlayerConfig.Size = new System.Drawing.Size(198, 24);
-      this.lPlayerConfig.TabIndex = 16;
-      this.lPlayerConfig.Text = "Player Configuration";
-      // 
-      // lAdapterConfig
-      // 
-      this.lAdapterConfig.AutoSize = true;
-      this.lAdapterConfig.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.lAdapterConfig.Location = new System.Drawing.Point(6, 3);
-      this.lAdapterConfig.Name = "lAdapterConfig";
-      this.lAdapterConfig.Size = new System.Drawing.Size(213, 24);
-      this.lAdapterConfig.TabIndex = 15;
-      this.lAdapterConfig.Text = "Adapter Configuration";
-      // 
-      // bClose
-      // 
-      this.bClose.Enabled = false;
-      this.bClose.Location = new System.Drawing.Point(95, 315);
-      this.bClose.Name = "bClose";
-      this.bClose.Size = new System.Drawing.Size(125, 23);
-      this.bClose.TabIndex = 13;
-      this.bClose.Text = "Close";
-      this.bClose.UseVisualStyleBackColor = true;
-      this.bClose.Click += new System.EventHandler(this.BCancelClick);
-      // 
-      // bSaveConfig
-      // 
-      this.bSaveConfig.Enabled = false;
-      this.bSaveConfig.Location = new System.Drawing.Point(226, 315);
-      this.bSaveConfig.Name = "bSaveConfig";
-      this.bSaveConfig.Size = new System.Drawing.Size(125, 23);
-      this.bSaveConfig.TabIndex = 12;
-      this.bSaveConfig.Text = "Persist configuration";
-      this.bSaveConfig.UseVisualStyleBackColor = true;
-      this.bSaveConfig.Click += new System.EventHandler(this.BSaveClick);
-      // 
-      // lDeviceType
-      // 
-      this.lDeviceType.AutoSize = true;
-      this.lDeviceType.Location = new System.Drawing.Point(6, 126);
-      this.lDeviceType.Name = "lDeviceType";
-      this.lDeviceType.Size = new System.Drawing.Size(65, 13);
-      this.lDeviceType.TabIndex = 3;
-      this.lDeviceType.Text = "device_type";
-      // 
-      // lConnectedDevice
-      // 
-      this.lConnectedDevice.AutoSize = true;
-      this.lConnectedDevice.Location = new System.Drawing.Point(6, 70);
-      this.lConnectedDevice.Name = "lConnectedDevice";
-      this.lConnectedDevice.Size = new System.Drawing.Size(139, 13);
-      this.lConnectedDevice.TabIndex = 1;
-      this.lConnectedDevice.Text = "connected_to_hdmi_device";
-      // 
-      // lPortNumber
-      // 
-      this.lPortNumber.AutoSize = true;
-      this.lPortNumber.Location = new System.Drawing.Point(6, 43);
-      this.lPortNumber.Name = "lPortNumber";
-      this.lPortNumber.Size = new System.Drawing.Size(53, 13);
-      this.lPortNumber.TabIndex = 0;
-      this.lPortNumber.Text = "hdmi_port";
-      // 
-      // tabPanel
-      // 
-      this.tabPanel.Controls.Add(this.Configuration);
-      this.tabPanel.Controls.Add(this.tbTestCommands);
-      this.tabPanel.Controls.Add(this.LogOutput);
-      this.tabPanel.Location = new System.Drawing.Point(12, 27);
-      this.tabPanel.Name = "tabPanel";
-      this.tabPanel.SelectedIndex = 0;
-      this.tabPanel.Size = new System.Drawing.Size(600, 370);
-      this.tabPanel.TabIndex = 0;
-      this.tabPanel.SelectedIndexChanged += new System.EventHandler(this.TabControl1SelectedIndexChanged);
-      // 
-      // menuStrip1
-      // 
-      this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cbWakeDevices.Location = new System.Drawing.Point(320, 52);
+            this.cbWakeDevices.Name = "cbWakeDevices";
+            this.cbWakeDevices.Size = new System.Drawing.Size(118, 94);
+            this.cbWakeDevices.TabIndex = 23;
+            // 
+            // cbActivateSource
+            // 
+            this.cbActivateSource.AutoSize = true;
+            this.cbActivateSource.Enabled = false;
+            this.cbActivateSource.Location = new System.Drawing.Point(9, 209);
+            this.cbActivateSource.Name = "cbActivateSource";
+            this.cbActivateSource.Size = new System.Drawing.Size(136, 17);
+            this.cbActivateSource.TabIndex = 19;
+            this.cbActivateSource.Text = "global_activate_source";
+            this.cbActivateSource.UseVisualStyleBackColor = true;
+            // 
+            // lPlayerConfig
+            // 
+            this.lPlayerConfig.AutoSize = true;
+            this.lPlayerConfig.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lPlayerConfig.Location = new System.Drawing.Point(6, 182);
+            this.lPlayerConfig.Name = "lPlayerConfig";
+            this.lPlayerConfig.Size = new System.Drawing.Size(198, 24);
+            this.lPlayerConfig.TabIndex = 16;
+            this.lPlayerConfig.Text = "Player Configuration";
+            // 
+            // lAdapterConfig
+            // 
+            this.lAdapterConfig.AutoSize = true;
+            this.lAdapterConfig.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lAdapterConfig.Location = new System.Drawing.Point(6, 3);
+            this.lAdapterConfig.Name = "lAdapterConfig";
+            this.lAdapterConfig.Size = new System.Drawing.Size(213, 24);
+            this.lAdapterConfig.TabIndex = 15;
+            this.lAdapterConfig.Text = "Adapter Configuration";
+            // 
+            // bClose
+            // 
+            this.bClose.Enabled = false;
+            this.bClose.Location = new System.Drawing.Point(95, 315);
+            this.bClose.Name = "bClose";
+            this.bClose.Size = new System.Drawing.Size(125, 23);
+            this.bClose.TabIndex = 13;
+            this.bClose.Text = "Close";
+            this.bClose.UseVisualStyleBackColor = true;
+            this.bClose.Click += new System.EventHandler(this.BCancelClick);
+            // 
+            // bSaveConfig
+            // 
+            this.bSaveConfig.Enabled = false;
+            this.bSaveConfig.Location = new System.Drawing.Point(226, 315);
+            this.bSaveConfig.Name = "bSaveConfig";
+            this.bSaveConfig.Size = new System.Drawing.Size(125, 23);
+            this.bSaveConfig.TabIndex = 12;
+            this.bSaveConfig.Text = "Persist configuration";
+            this.bSaveConfig.UseVisualStyleBackColor = true;
+            this.bSaveConfig.Click += new System.EventHandler(this.BSaveClick);
+            // 
+            // lDeviceType
+            // 
+            this.lDeviceType.AutoSize = true;
+            this.lDeviceType.Location = new System.Drawing.Point(6, 126);
+            this.lDeviceType.Name = "lDeviceType";
+            this.lDeviceType.Size = new System.Drawing.Size(65, 13);
+            this.lDeviceType.TabIndex = 3;
+            this.lDeviceType.Text = "device_type";
+            // 
+            // lConnectedDevice
+            // 
+            this.lConnectedDevice.AutoSize = true;
+            this.lConnectedDevice.Location = new System.Drawing.Point(6, 70);
+            this.lConnectedDevice.Name = "lConnectedDevice";
+            this.lConnectedDevice.Size = new System.Drawing.Size(139, 13);
+            this.lConnectedDevice.TabIndex = 1;
+            this.lConnectedDevice.Text = "connected_to_hdmi_device";
+            // 
+            // lPortNumber
+            // 
+            this.lPortNumber.AutoSize = true;
+            this.lPortNumber.Location = new System.Drawing.Point(6, 43);
+            this.lPortNumber.Name = "lPortNumber";
+            this.lPortNumber.Size = new System.Drawing.Size(53, 13);
+            this.lPortNumber.TabIndex = 0;
+            this.lPortNumber.Text = "hdmi_port";
+            // 
+            // tabPanel
+            // 
+            this.tabPanel.Controls.Add(this.Configuration);
+            this.tabPanel.Controls.Add(this.tbTestCommands);
+            this.tabPanel.Controls.Add(this.LogOutput);
+            this.tabPanel.Location = new System.Drawing.Point(12, 27);
+            this.tabPanel.Name = "tabPanel";
+            this.tabPanel.SelectedIndex = 0;
+            this.tabPanel.Size = new System.Drawing.Size(600, 370);
+            this.tabPanel.TabIndex = 0;
+            this.tabPanel.SelectedIndexChanged += new System.EventHandler(this.TabControl1SelectedIndexChanged);
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.fileToolStripMenuItem,
             this.applicationsToolStripMenuItem,
             this.helpToolStripMenuItem});
-      this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-      this.menuStrip1.Name = "menuStrip1";
-      this.menuStrip1.Size = new System.Drawing.Size(624, 24);
-      this.menuStrip1.TabIndex = 3;
-      this.menuStrip1.Text = "menuStrip1";
-      // 
-      // fileToolStripMenuItem
-      // 
-      this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(624, 24);
+            this.menuStrip1.TabIndex = 3;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // fileToolStripMenuItem
+            // 
+            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.hideToolStripMenuItem,
             this.advancedModeToolStripMenuItem,
             this.closeToolStripMenuItem});
-      this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-      this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
-      this.fileToolStripMenuItem.Text = "File";
-      // 
-      // hideToolStripMenuItem
-      // 
-      this.hideToolStripMenuItem.Name = "hideToolStripMenuItem";
-      this.hideToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
-      this.hideToolStripMenuItem.Text = "Hide";
-      this.hideToolStripMenuItem.Click += new System.EventHandler(this.HideToolStripMenuItemClick);
-      // 
-      // advancedModeToolStripMenuItem
-      // 
-      this.advancedModeToolStripMenuItem.Name = "advancedModeToolStripMenuItem";
-      this.advancedModeToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
-      this.advancedModeToolStripMenuItem.Text = "Advanced mode";
-      this.advancedModeToolStripMenuItem.Click += new System.EventHandler(this.AdvancedModeToolStripMenuItemClick);
-      // 
-      // closeToolStripMenuItem
-      // 
-      this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
-      this.closeToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
-      this.closeToolStripMenuItem.Text = "Close";
-      this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItemClick);
-      // 
-      // applicationsToolStripMenuItem
-      // 
-      this.applicationsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
+            this.fileToolStripMenuItem.Text = "File";
+            // 
+            // hideToolStripMenuItem
+            // 
+            this.hideToolStripMenuItem.Name = "hideToolStripMenuItem";
+            this.hideToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
+            this.hideToolStripMenuItem.Text = "Hide";
+            this.hideToolStripMenuItem.Click += new System.EventHandler(this.HideToolStripMenuItemClick);
+            // 
+            // advancedModeToolStripMenuItem
+            // 
+            this.advancedModeToolStripMenuItem.Name = "advancedModeToolStripMenuItem";
+            this.advancedModeToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
+            this.advancedModeToolStripMenuItem.Text = "Advanced mode";
+            this.advancedModeToolStripMenuItem.Click += new System.EventHandler(this.AdvancedModeToolStripMenuItemClick);
+            // 
+            // closeToolStripMenuItem
+            // 
+            this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
+            this.closeToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
+            this.closeToolStripMenuItem.Text = "Close";
+            this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItemClick);
+            // 
+            // applicationsToolStripMenuItem
+            // 
+            this.applicationsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.addNewApplicationToolStripMenuItem});
-      this.applicationsToolStripMenuItem.Enabled = false;
-      this.applicationsToolStripMenuItem.Name = "applicationsToolStripMenuItem";
-      this.applicationsToolStripMenuItem.Size = new System.Drawing.Size(85, 20);
-      this.applicationsToolStripMenuItem.Text = "Applications";
-      // 
-      // addNewApplicationToolStripMenuItem
-      // 
-      this.addNewApplicationToolStripMenuItem.Enabled = false;
-      this.addNewApplicationToolStripMenuItem.Name = "addNewApplicationToolStripMenuItem";
-      this.addNewApplicationToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
-      this.addNewApplicationToolStripMenuItem.Text = "Add new application";
-      this.addNewApplicationToolStripMenuItem.Click += new System.EventHandler(this.AddNewApplicationToolStripMenuItemClick);
-      // 
-      // helpToolStripMenuItem
-      // 
-      this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.applicationsToolStripMenuItem.Enabled = false;
+            this.applicationsToolStripMenuItem.Name = "applicationsToolStripMenuItem";
+            this.applicationsToolStripMenuItem.Size = new System.Drawing.Size(76, 20);
+            this.applicationsToolStripMenuItem.Text = "Applications";
+            // 
+            // addNewApplicationToolStripMenuItem
+            // 
+            this.addNewApplicationToolStripMenuItem.Enabled = false;
+            this.addNewApplicationToolStripMenuItem.Name = "addNewApplicationToolStripMenuItem";
+            this.addNewApplicationToolStripMenuItem.Size = new System.Drawing.Size(170, 22);
+            this.addNewApplicationToolStripMenuItem.Text = "Add new application";
+            this.addNewApplicationToolStripMenuItem.Click += new System.EventHandler(this.AddNewApplicationToolStripMenuItemClick);
+            // 
+            // helpToolStripMenuItem
+            // 
+            this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.aboutToolStripMenuItem});
-      this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
-      this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
-      this.helpToolStripMenuItem.Text = "Help";
-      // 
-      // aboutToolStripMenuItem
-      // 
-      this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-      this.aboutToolStripMenuItem.Size = new System.Drawing.Size(107, 22);
-      this.aboutToolStripMenuItem.Text = "About";
-      this.aboutToolStripMenuItem.Click += new System.EventHandler(this.AboutToolStripMenuItemClick);
-      // 
-      // cbStartMinimised
-      // 
-      this.cbStartMinimised.AutoSize = true;
-      this.cbStartMinimised.Enabled = false;
-      this.cbStartMinimised.Location = new System.Drawing.Point(9, 232);
-      this.cbStartMinimised.Name = "cbStartMinimised";
-      this.cbStartMinimised.Size = new System.Drawing.Size(118, 17);
-      this.cbStartMinimised.TabIndex = 32;
-      this.cbStartMinimised.Text = "global_start_hidden";
-      this.cbStartMinimised.UseVisualStyleBackColor = true;
-      // 
-      // CECTray
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(624, 442);
-      this.Controls.Add(this.menuStrip1);
-      this.Controls.Add(this.lStatus);
-      this.Controls.Add(this.pProgress);
-      this.Controls.Add(this.tabPanel);
-      this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-      this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-      this.MainMenuStrip = this.menuStrip1;
-      this.MaximizeBox = false;
-      this.Name = "CECTray";
-      this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-      this.Resize += new System.EventHandler(this.CECTrayResize);
-      this.trayIconMenu.ResumeLayout(false);
-      this.LogOutput.ResumeLayout(false);
-      this.LogOutput.PerformLayout();
-      this.tbTestCommands.ResumeLayout(false);
-      this.tbTestCommands.PerformLayout();
-      this.Configuration.ResumeLayout(false);
-      this.Configuration.PerformLayout();
-      this.tabPanel.ResumeLayout(false);
-      this.menuStrip1.ResumeLayout(false);
-      this.menuStrip1.PerformLayout();
-      this.ResumeLayout(false);
-      this.PerformLayout();
+            this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
+            this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
+            this.helpToolStripMenuItem.Text = "Help";
+            // 
+            // aboutToolStripMenuItem
+            // 
+            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+            this.aboutToolStripMenuItem.Text = "About";
+            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.AboutToolStripMenuItemClick);
+            // 
+            // CECTray
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(624, 442);
+            this.Controls.Add(this.menuStrip1);
+            this.Controls.Add(this.lStatus);
+            this.Controls.Add(this.pProgress);
+            this.Controls.Add(this.tabPanel);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MainMenuStrip = this.menuStrip1;
+            this.MaximizeBox = false;
+            this.Name = "CECTray";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Resize += new System.EventHandler(this.CECTrayResize);
+            this.trayIconMenu.ResumeLayout(false);
+            this.LogOutput.ResumeLayout(false);
+            this.LogOutput.PerformLayout();
+            this.tbTestCommands.ResumeLayout(false);
+            this.tbTestCommands.PerformLayout();
+            this.Configuration.ResumeLayout(false);
+            this.Configuration.PerformLayout();
+            this.tabPanel.ResumeLayout(false);
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
     }
 

diff --git a/src/LibCecTray/ui/IAsyncControls.cs b/src/LibCecTray/ui/IAsyncControls.cs
new file mode 100644 (file)
index 0000000..478b7eb
--- /dev/null
+++ b/src/LibCecTray/ui/IAsyncControls.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using CecSharp;
+
+namespace LibCECTray.ui
+{
+    interface IAsyncControls
+    {
+        void SetControlEnabled(Control control, bool val);
+        void SetControlText(Control control, string val);
+        void SetToolStripMenuText(ToolStripMenuItem item, string val);
+        void SetCheckboxChecked(CheckBox control, bool val);
+        void SetCheckboxItemChecked(CheckedListBox control, int index, bool val);
+        void SetProgressValue(ProgressBar control, int val);
+        void SetComboBoxItems(ComboBox control, int selectedIndex, object[] val);
+        void SetControlVisible(Control control, bool val);
+        void DisplayDialog(Form control, bool modal);
+        void SafeHide(bool val);
+        void SetSelectedIndex(ComboBox control, int index);
+        string GetSelectedTabName(TabControl container, TabControl.TabPageCollection tabPages);
+        void SelectKeypressRow(Control container, DataGridView dgView, CecKeypress key);
+    }
+}