Index: Sections/TestService.cs
===================================================================
--- Sections/TestService.cs	(revision 28043)
+++ Sections/TestService.cs	(working copy)
@@ -263,7 +263,7 @@
         {
           mpGroupBox1.Visible = true;
           mpGroupBox1.Text = String.Format("Status of card {0}", card.Name);
-          mpLabelTunerLocked.Text = card.IsTunerLocked ? "yes" : "no";
+          mpLabelTunerLocked.Text = card.IsTunerLocked ? "Yes" : "No";
           progressBarLevel.Value = Math.Min(100, card.SignalLevel);
           mpLabelSignalLevel.Text = card.SignalLevel.ToString();
           progressBarQuality.Value = Math.Min(100, card.SignalQuality);
Index: Sections/TestService.Designer.cs
===================================================================
--- Sections/TestService.Designer.cs	(revision 28043)
+++ Sections/TestService.Designer.cs	(working copy)
@@ -28,259 +28,261 @@
     /// </summary>
     private void InitializeComponent()
     {
-      this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TestService));
-      this.progressBarQuality = new System.Windows.Forms.ProgressBar();
-      this.progressBarLevel = new System.Windows.Forms.ProgressBar();
-      this.label2 = new System.Windows.Forms.Label();
-      this.label1 = new System.Windows.Forms.Label();
-      this.mpLabel3 = new MediaPortal.UserInterface.Controls.MPLabel();
-      this.mpLabelTunerLocked = new MediaPortal.UserInterface.Controls.MPLabel();
-      this.mpLabelChannel = new MediaPortal.UserInterface.Controls.MPLabel();
-      this.label12 = new System.Windows.Forms.Label();
-      this.mpGroupBox1 = new MediaPortal.UserInterface.Controls.MPGroupBox();
-      this.label3 = new System.Windows.Forms.Label();
-      this.txtDisc = new MediaPortal.UserInterface.Controls.MPNumericTextBox();
-      this.txtBytes = new MediaPortal.UserInterface.Controls.MPNumericTextBox();
-      this.label4 = new System.Windows.Forms.Label();
-      this.mpLabelSignalQuality = new MediaPortal.UserInterface.Controls.MPLabel();
-      this.mpLabelSignalLevel = new MediaPortal.UserInterface.Controls.MPLabel();
-      this.mpLabelRecording = new MediaPortal.UserInterface.Controls.MPLabel();
-      this.mpLabelTimeShift = new MediaPortal.UserInterface.Controls.MPLabel();
-      this.mpLabel1 = new MediaPortal.UserInterface.Controls.MPLabel();
-      this.mpButtonTimeShift = new MediaPortal.UserInterface.Controls.MPButton();
-      this.mpButtonRec = new MediaPortal.UserInterface.Controls.MPButton();
-      this.timer1 = new System.Windows.Forms.Timer(this.components);
-      this.mpListView1 = new MediaPortal.UserInterface.Controls.MPListView();
-      this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
-      this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
-      this.columnHeader3 = new System.Windows.Forms.ColumnHeader();
-      this.columnHeader4 = new System.Windows.Forms.ColumnHeader();
-      this.columnHeader5 = new System.Windows.Forms.ColumnHeader();
-      this.User = new System.Windows.Forms.ColumnHeader();
-      this.cardName = new System.Windows.Forms.ColumnHeader();
-      this.subchannels = new System.Windows.Forms.ColumnHeader();
-      this.buttonRestart = new System.Windows.Forms.Button();
-      this.mpButtonReGrabEpg = new MediaPortal.UserInterface.Controls.MPButton();
-      this.imageList1 = new System.Windows.Forms.ImageList(this.components);
-      this.mpComboBoxChannels = new SetupControls.ComboBoxEx();
-      this.comboBoxGroups = new SetupControls.ComboBoxEx();
-      this.mpLabel2 = new MediaPortal.UserInterface.Controls.MPLabel();
-      this.mpGroupBox1.SuspendLayout();
-      this.SuspendLayout();
-      // 
-      // progressBarQuality
-      // 
-      this.progressBarQuality.Location = new System.Drawing.Point(113, 102);
-      this.progressBarQuality.Name = "progressBarQuality";
-      this.progressBarQuality.Size = new System.Drawing.Size(303, 10);
-      this.progressBarQuality.TabIndex = 52;
-      // 
-      // progressBarLevel
-      // 
-      this.progressBarLevel.Location = new System.Drawing.Point(113, 79);
-      this.progressBarLevel.Name = "progressBarLevel";
-      this.progressBarLevel.Size = new System.Drawing.Size(303, 10);
-      this.progressBarLevel.TabIndex = 51;
-      // 
-      // label2
-      // 
-      this.label2.AutoSize = true;
-      this.label2.Location = new System.Drawing.Point(21, 99);
-      this.label2.Name = "label2";
-      this.label2.Size = new System.Drawing.Size(72, 13);
-      this.label2.TabIndex = 50;
-      this.label2.Text = "Signal quality:";
-      // 
-      // label1
-      // 
-      this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(21, 76);
-      this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(64, 13);
-      this.label1.TabIndex = 49;
-      this.label1.Text = "Signal level:";
-      // 
-      // mpLabel3
-      // 
-      this.mpLabel3.AutoSize = true;
-      this.mpLabel3.Location = new System.Drawing.Point(21, 47);
-      this.mpLabel3.Name = "mpLabel3";
-      this.mpLabel3.Size = new System.Drawing.Size(49, 13);
-      this.mpLabel3.TabIndex = 47;
-      this.mpLabel3.Text = "Channel:";
-      // 
-      // mpLabelTunerLocked
-      // 
-      this.mpLabelTunerLocked.AutoSize = true;
-      this.mpLabelTunerLocked.Location = new System.Drawing.Point(113, 24);
-      this.mpLabelTunerLocked.Name = "mpLabelTunerLocked";
-      this.mpLabelTunerLocked.Size = new System.Drawing.Size(19, 13);
-      this.mpLabelTunerLocked.TabIndex = 46;
-      this.mpLabelTunerLocked.Text = "no";
-      // 
-      // mpLabelChannel
-      // 
-      this.mpLabelChannel.AutoEllipsis = true;
-      this.mpLabelChannel.Location = new System.Drawing.Point(113, 47);
-      this.mpLabelChannel.Name = "mpLabelChannel";
-      this.mpLabelChannel.Size = new System.Drawing.Size(303, 26);
-      this.mpLabelChannel.TabIndex = 48;
-      // 
-      // label12
-      // 
-      this.label12.AutoSize = true;
-      this.label12.Location = new System.Drawing.Point(21, 24);
-      this.label12.Name = "label12";
-      this.label12.Size = new System.Drawing.Size(73, 13);
-      this.label12.TabIndex = 45;
-      this.label12.Text = "Tuner locked:";
-      // 
-      // mpGroupBox1
-      // 
-      this.mpGroupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.mpGroupBox1.Controls.Add(this.label3);
-      this.mpGroupBox1.Controls.Add(this.txtDisc);
-      this.mpGroupBox1.Controls.Add(this.txtBytes);
-      this.mpGroupBox1.Controls.Add(this.label4);
-      this.mpGroupBox1.Controls.Add(this.mpLabelSignalQuality);
-      this.mpGroupBox1.Controls.Add(this.mpLabelSignalLevel);
-      this.mpGroupBox1.Controls.Add(this.mpLabelRecording);
-      this.mpGroupBox1.Controls.Add(this.mpLabelTimeShift);
-      this.mpGroupBox1.Controls.Add(this.label1);
-      this.mpGroupBox1.Controls.Add(this.progressBarQuality);
-      this.mpGroupBox1.Controls.Add(this.label12);
-      this.mpGroupBox1.Controls.Add(this.progressBarLevel);
-      this.mpGroupBox1.Controls.Add(this.mpLabelChannel);
-      this.mpGroupBox1.Controls.Add(this.label2);
-      this.mpGroupBox1.Controls.Add(this.mpLabelTunerLocked);
-      this.mpGroupBox1.Controls.Add(this.mpLabel3);
-      this.mpGroupBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-      this.mpGroupBox1.Location = new System.Drawing.Point(12, 12);
-      this.mpGroupBox1.Name = "mpGroupBox1";
-      this.mpGroupBox1.Size = new System.Drawing.Size(446, 177);
-      this.mpGroupBox1.TabIndex = 53;
-      this.mpGroupBox1.TabStop = false;
-      this.mpGroupBox1.Text = "Status:";
-      // 
-      // label3
-      // 
-      this.label3.AutoSize = true;
-      this.label3.Location = new System.Drawing.Point(21, 129);
-      this.label3.Name = "label3";
-      this.label3.Size = new System.Drawing.Size(120, 13);
-      this.label3.TabIndex = 70;
-      this.label3.Text = "TS packets processed: ";
-      // 
-      // txtDisc
-      // 
-      this.txtDisc.AcceptsReturn = true;
-      this.txtDisc.Location = new System.Drawing.Point(353, 126);
-      this.txtDisc.Name = "txtDisc";
-      this.txtDisc.ReadOnly = true;
-      this.txtDisc.Size = new System.Drawing.Size(80, 20);
-      this.txtDisc.TabIndex = 69;
-      this.txtDisc.Text = "0";
-      this.txtDisc.Value = 0;
-      // 
-      // txtBytes
-      // 
-      this.txtBytes.Location = new System.Drawing.Point(137, 126);
-      this.txtBytes.Name = "txtBytes";
-      this.txtBytes.ReadOnly = true;
-      this.txtBytes.Size = new System.Drawing.Size(118, 20);
-      this.txtBytes.TabIndex = 68;
-      this.txtBytes.Text = "0";
-      this.txtBytes.Value = 0;
-      // 
-      // label4
-      // 
-      this.label4.AutoSize = true;
-      this.label4.Location = new System.Drawing.Point(261, 129);
-      this.label4.Name = "label4";
-      this.label4.Size = new System.Drawing.Size(78, 13);
-      this.label4.TabIndex = 60;
-      this.label4.Text = "Discontinuities:";
-      // 
-      // mpLabelSignalQuality
-      // 
-      this.mpLabelSignalQuality.AutoSize = true;
-      this.mpLabelSignalQuality.Location = new System.Drawing.Point(420, 99);
-      this.mpLabelSignalQuality.Name = "mpLabelSignalQuality";
-      this.mpLabelSignalQuality.Size = new System.Drawing.Size(13, 13);
-      this.mpLabelSignalQuality.TabIndex = 58;
-      this.mpLabelSignalQuality.Text = "0";
-      // 
-      // mpLabelSignalLevel
-      // 
-      this.mpLabelSignalLevel.AutoSize = true;
-      this.mpLabelSignalLevel.Location = new System.Drawing.Point(420, 76);
-      this.mpLabelSignalLevel.Name = "mpLabelSignalLevel";
-      this.mpLabelSignalLevel.Size = new System.Drawing.Size(13, 13);
-      this.mpLabelSignalLevel.TabIndex = 57;
-      this.mpLabelSignalLevel.Text = "0";
-      // 
-      // mpLabelRecording
-      // 
-      this.mpLabelRecording.AutoSize = true;
-      this.mpLabelRecording.Location = new System.Drawing.Point(27, 152);
-      this.mpLabelRecording.Name = "mpLabelRecording";
-      this.mpLabelRecording.Size = new System.Drawing.Size(0, 13);
-      this.mpLabelRecording.TabIndex = 56;
-      // 
-      // mpLabelTimeShift
-      // 
-      this.mpLabelTimeShift.AutoSize = true;
-      this.mpLabelTimeShift.Location = new System.Drawing.Point(27, 129);
-      this.mpLabelTimeShift.Name = "mpLabelTimeShift";
-      this.mpLabelTimeShift.Size = new System.Drawing.Size(0, 13);
-      this.mpLabelTimeShift.TabIndex = 55;
-      // 
-      // mpLabel1
-      // 
-      this.mpLabel1.AutoSize = true;
-      this.mpLabel1.Location = new System.Drawing.Point(9, 223);
-      this.mpLabel1.Name = "mpLabel1";
-      this.mpLabel1.Size = new System.Drawing.Size(49, 13);
-      this.mpLabel1.TabIndex = 55;
-      this.mpLabel1.Text = "Channel:";
-      // 
-      // mpButtonTimeShift
-      // 
-      this.mpButtonTimeShift.Location = new System.Drawing.Point(221, 218);
-      this.mpButtonTimeShift.Name = "mpButtonTimeShift";
-      this.mpButtonTimeShift.Size = new System.Drawing.Size(115, 23);
-      this.mpButtonTimeShift.TabIndex = 56;
-      this.mpButtonTimeShift.Text = "TimeShift";
-      this.mpButtonTimeShift.UseVisualStyleBackColor = true;
-      this.mpButtonTimeShift.Click += new System.EventHandler(this.mpButtonTimeShift_Click);
-      // 
-      // mpButtonRec
-      // 
-      this.mpButtonRec.Enabled = false;
-      this.mpButtonRec.Location = new System.Drawing.Point(343, 218);
-      this.mpButtonRec.Name = "mpButtonRec";
-      this.mpButtonRec.Size = new System.Drawing.Size(115, 23);
-      this.mpButtonRec.TabIndex = 57;
-      this.mpButtonRec.Text = "Record";
-      this.mpButtonRec.UseVisualStyleBackColor = true;
-      this.mpButtonRec.Click += new System.EventHandler(this.mpButtonRec_Click);
-      // 
-      // timer1
-      // 
-      this.timer1.Interval = 1000;
-      this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-      // 
-      // mpListView1
-      // 
-      this.mpListView1.AllowDrop = true;
-      this.mpListView1.AllowRowReorder = true;
-      this.mpListView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.mpListView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+        this.components = new System.ComponentModel.Container();
+        System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TestService));
+        this.progressBarQuality = new System.Windows.Forms.ProgressBar();
+        this.progressBarLevel = new System.Windows.Forms.ProgressBar();
+        this.label2 = new System.Windows.Forms.Label();
+        this.label1 = new System.Windows.Forms.Label();
+        this.mpLabel3 = new MediaPortal.UserInterface.Controls.MPLabel();
+        this.mpLabelTunerLocked = new MediaPortal.UserInterface.Controls.MPLabel();
+        this.mpLabelChannel = new MediaPortal.UserInterface.Controls.MPLabel();
+        this.label12 = new System.Windows.Forms.Label();
+        this.mpGroupBox1 = new MediaPortal.UserInterface.Controls.MPGroupBox();
+        this.label3 = new System.Windows.Forms.Label();
+        this.txtDisc = new MediaPortal.UserInterface.Controls.MPNumericTextBox();
+        this.txtBytes = new MediaPortal.UserInterface.Controls.MPNumericTextBox();
+        this.label4 = new System.Windows.Forms.Label();
+        this.mpLabelSignalQuality = new MediaPortal.UserInterface.Controls.MPLabel();
+        this.mpLabelSignalLevel = new MediaPortal.UserInterface.Controls.MPLabel();
+        this.mpLabelRecording = new MediaPortal.UserInterface.Controls.MPLabel();
+        this.mpLabelTimeShift = new MediaPortal.UserInterface.Controls.MPLabel();
+        this.mpLabel1 = new MediaPortal.UserInterface.Controls.MPLabel();
+        this.mpButtonTimeShift = new MediaPortal.UserInterface.Controls.MPButton();
+        this.mpButtonRec = new MediaPortal.UserInterface.Controls.MPButton();
+        this.timer1 = new System.Windows.Forms.Timer(this.components);
+        this.mpListView1 = new MediaPortal.UserInterface.Controls.MPListView();
+        this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.User = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.cardName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.subchannels = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.buttonRestart = new System.Windows.Forms.Button();
+        this.mpButtonReGrabEpg = new MediaPortal.UserInterface.Controls.MPButton();
+        this.imageList1 = new System.Windows.Forms.ImageList(this.components);
+        this.mpComboBoxChannels = new SetupControls.ComboBoxEx();
+        this.comboBoxGroups = new SetupControls.ComboBoxEx();
+        this.mpLabel2 = new MediaPortal.UserInterface.Controls.MPLabel();
+        this.mpGroupBox1.SuspendLayout();
+        this.SuspendLayout();
+        // 
+        // progressBarQuality
+        // 
+        this.progressBarQuality.Location = new System.Drawing.Point(111, 102);
+        this.progressBarQuality.Name = "progressBarQuality";
+        this.progressBarQuality.Size = new System.Drawing.Size(303, 10);
+        this.progressBarQuality.TabIndex = 52;
+        // 
+        // progressBarLevel
+        // 
+        this.progressBarLevel.Location = new System.Drawing.Point(111, 79);
+        this.progressBarLevel.Name = "progressBarLevel";
+        this.progressBarLevel.Size = new System.Drawing.Size(303, 10);
+        this.progressBarLevel.TabIndex = 51;
+        // 
+        // label2
+        // 
+        this.label2.AutoSize = true;
+        this.label2.Location = new System.Drawing.Point(21, 99);
+        this.label2.Name = "label2";
+        this.label2.Size = new System.Drawing.Size(72, 13);
+        this.label2.TabIndex = 50;
+        this.label2.Text = "Signal quality:";
+        // 
+        // label1
+        // 
+        this.label1.AutoSize = true;
+        this.label1.Location = new System.Drawing.Point(21, 76);
+        this.label1.Name = "label1";
+        this.label1.Size = new System.Drawing.Size(64, 13);
+        this.label1.TabIndex = 49;
+        this.label1.Text = "Signal level:";
+        // 
+        // mpLabel3
+        // 
+        this.mpLabel3.AutoSize = true;
+        this.mpLabel3.Location = new System.Drawing.Point(21, 38);
+        this.mpLabel3.Name = "mpLabel3";
+        this.mpLabel3.Size = new System.Drawing.Size(49, 13);
+        this.mpLabel3.TabIndex = 47;
+        this.mpLabel3.Text = "Channel:";
+        // 
+        // mpLabelTunerLocked
+        // 
+        this.mpLabelTunerLocked.AutoSize = true;
+        this.mpLabelTunerLocked.Location = new System.Drawing.Point(113, 16);
+        this.mpLabelTunerLocked.Name = "mpLabelTunerLocked";
+        this.mpLabelTunerLocked.Size = new System.Drawing.Size(19, 13);
+        this.mpLabelTunerLocked.TabIndex = 46;
+        this.mpLabelTunerLocked.Text = "no";
+        // 
+        // mpLabelChannel
+        // 
+        this.mpLabelChannel.AutoEllipsis = true;
+        this.mpLabelChannel.Location = new System.Drawing.Point(113, 38);
+        this.mpLabelChannel.Name = "mpLabelChannel";
+        this.mpLabelChannel.Size = new System.Drawing.Size(303, 26);
+        this.mpLabelChannel.TabIndex = 48;
+        this.mpLabelChannel.Text = "Channel Info\r\nChannel Info";
+        // 
+        // label12
+        // 
+        this.label12.AutoSize = true;
+        this.label12.Location = new System.Drawing.Point(21, 16);
+        this.label12.Name = "label12";
+        this.label12.Size = new System.Drawing.Size(73, 13);
+        this.label12.TabIndex = 45;
+        this.label12.Text = "Tuner locked:";
+        // 
+        // mpGroupBox1
+        // 
+        this.mpGroupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                    | System.Windows.Forms.AnchorStyles.Right)));
+        this.mpGroupBox1.Controls.Add(this.label3);
+        this.mpGroupBox1.Controls.Add(this.txtDisc);
+        this.mpGroupBox1.Controls.Add(this.txtBytes);
+        this.mpGroupBox1.Controls.Add(this.label4);
+        this.mpGroupBox1.Controls.Add(this.mpLabelSignalQuality);
+        this.mpGroupBox1.Controls.Add(this.mpLabelSignalLevel);
+        this.mpGroupBox1.Controls.Add(this.mpLabelRecording);
+        this.mpGroupBox1.Controls.Add(this.mpLabelTimeShift);
+        this.mpGroupBox1.Controls.Add(this.label1);
+        this.mpGroupBox1.Controls.Add(this.progressBarQuality);
+        this.mpGroupBox1.Controls.Add(this.label12);
+        this.mpGroupBox1.Controls.Add(this.progressBarLevel);
+        this.mpGroupBox1.Controls.Add(this.mpLabelChannel);
+        this.mpGroupBox1.Controls.Add(this.label2);
+        this.mpGroupBox1.Controls.Add(this.mpLabelTunerLocked);
+        this.mpGroupBox1.Controls.Add(this.mpLabel3);
+        this.mpGroupBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+        this.mpGroupBox1.Location = new System.Drawing.Point(12, 12);
+        this.mpGroupBox1.Name = "mpGroupBox1";
+        this.mpGroupBox1.Size = new System.Drawing.Size(446, 177);
+        this.mpGroupBox1.TabIndex = 53;
+        this.mpGroupBox1.TabStop = false;
+        this.mpGroupBox1.Text = "Status:";
+        // 
+        // label3
+        // 
+        this.label3.AutoSize = true;
+        this.label3.Location = new System.Drawing.Point(21, 126);
+        this.label3.Name = "label3";
+        this.label3.Size = new System.Drawing.Size(120, 13);
+        this.label3.TabIndex = 70;
+        this.label3.Text = "TS packets processed: ";
+        // 
+        // txtDisc
+        // 
+        this.txtDisc.AcceptsReturn = true;
+        this.txtDisc.Location = new System.Drawing.Point(353, 123);
+        this.txtDisc.Name = "txtDisc";
+        this.txtDisc.ReadOnly = true;
+        this.txtDisc.Size = new System.Drawing.Size(80, 20);
+        this.txtDisc.TabIndex = 69;
+        this.txtDisc.Text = "0";
+        this.txtDisc.Value = 0;
+        // 
+        // txtBytes
+        // 
+        this.txtBytes.Location = new System.Drawing.Point(145, 123);
+        this.txtBytes.Name = "txtBytes";
+        this.txtBytes.ReadOnly = true;
+        this.txtBytes.Size = new System.Drawing.Size(118, 20);
+        this.txtBytes.TabIndex = 68;
+        this.txtBytes.Text = "0";
+        this.txtBytes.Value = 0;
+        // 
+        // label4
+        // 
+        this.label4.AutoSize = true;
+        this.label4.Location = new System.Drawing.Point(269, 126);
+        this.label4.Name = "label4";
+        this.label4.Size = new System.Drawing.Size(78, 13);
+        this.label4.TabIndex = 60;
+        this.label4.Text = "Discontinuities:";
+        // 
+        // mpLabelSignalQuality
+        // 
+        this.mpLabelSignalQuality.AutoSize = true;
+        this.mpLabelSignalQuality.Location = new System.Drawing.Point(420, 99);
+        this.mpLabelSignalQuality.Name = "mpLabelSignalQuality";
+        this.mpLabelSignalQuality.Size = new System.Drawing.Size(13, 13);
+        this.mpLabelSignalQuality.TabIndex = 58;
+        this.mpLabelSignalQuality.Text = "0";
+        // 
+        // mpLabelSignalLevel
+        // 
+        this.mpLabelSignalLevel.AutoSize = true;
+        this.mpLabelSignalLevel.Location = new System.Drawing.Point(420, 76);
+        this.mpLabelSignalLevel.Name = "mpLabelSignalLevel";
+        this.mpLabelSignalLevel.Size = new System.Drawing.Size(13, 13);
+        this.mpLabelSignalLevel.TabIndex = 57;
+        this.mpLabelSignalLevel.Text = "0";
+        // 
+        // mpLabelRecording
+        // 
+        this.mpLabelRecording.AutoSize = true;
+        this.mpLabelRecording.Location = new System.Drawing.Point(21, 151);
+        this.mpLabelRecording.Name = "mpLabelRecording";
+        this.mpLabelRecording.Size = new System.Drawing.Size(54, 13);
+        this.mpLabelRecording.TabIndex = 56;
+        this.mpLabelRecording.Text = "tsfilename";
+        // 
+        // mpLabelTimeShift
+        // 
+        this.mpLabelTimeShift.AutoSize = true;
+        this.mpLabelTimeShift.Location = new System.Drawing.Point(21, 151);
+        this.mpLabelTimeShift.Name = "mpLabelTimeShift";
+        this.mpLabelTimeShift.Size = new System.Drawing.Size(54, 13);
+        this.mpLabelTimeShift.TabIndex = 55;
+        this.mpLabelTimeShift.Text = "tsfilename";
+        // 
+        // mpLabel1
+        // 
+        this.mpLabel1.AutoSize = true;
+        this.mpLabel1.Location = new System.Drawing.Point(9, 223);
+        this.mpLabel1.Name = "mpLabel1";
+        this.mpLabel1.Size = new System.Drawing.Size(49, 13);
+        this.mpLabel1.TabIndex = 55;
+        this.mpLabel1.Text = "Channel:";
+        // 
+        // mpButtonTimeShift
+        // 
+        this.mpButtonTimeShift.Location = new System.Drawing.Point(221, 218);
+        this.mpButtonTimeShift.Name = "mpButtonTimeShift";
+        this.mpButtonTimeShift.Size = new System.Drawing.Size(115, 23);
+        this.mpButtonTimeShift.TabIndex = 56;
+        this.mpButtonTimeShift.Text = "TimeShift";
+        this.mpButtonTimeShift.UseVisualStyleBackColor = true;
+        this.mpButtonTimeShift.Click += new System.EventHandler(this.mpButtonTimeShift_Click);
+        // 
+        // mpButtonRec
+        // 
+        this.mpButtonRec.Enabled = false;
+        this.mpButtonRec.Location = new System.Drawing.Point(343, 218);
+        this.mpButtonRec.Name = "mpButtonRec";
+        this.mpButtonRec.Size = new System.Drawing.Size(115, 23);
+        this.mpButtonRec.TabIndex = 57;
+        this.mpButtonRec.Text = "Record";
+        this.mpButtonRec.UseVisualStyleBackColor = true;
+        this.mpButtonRec.Click += new System.EventHandler(this.mpButtonRec_Click);
+        // 
+        // timer1
+        // 
+        this.timer1.Interval = 1000;
+        this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+        // 
+        // mpListView1
+        // 
+        this.mpListView1.AllowDrop = true;
+        this.mpListView1.AllowRowReorder = true;
+        this.mpListView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                    | System.Windows.Forms.AnchorStyles.Left)
+                    | System.Windows.Forms.AnchorStyles.Right)));
+        this.mpListView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.columnHeader1,
             this.columnHeader2,
             this.columnHeader3,
@@ -289,140 +291,140 @@
             this.User,
             this.cardName,
             this.subchannels});
-      this.mpListView1.FullRowSelect = true;
-      this.mpListView1.HideSelection = false;
-      this.mpListView1.IsChannelListView = false;
-      this.mpListView1.Location = new System.Drawing.Point(12, 252);
-      this.mpListView1.MultiSelect = false;
-      this.mpListView1.Name = "mpListView1";
-      this.mpListView1.Size = new System.Drawing.Size(446, 134);
-      this.mpListView1.TabIndex = 58;
-      this.mpListView1.UseCompatibleStateImageBehavior = false;
-      this.mpListView1.View = System.Windows.Forms.View.Details;
-      // 
-      // columnHeader1
-      // 
-      this.columnHeader1.Text = "Card";
-      this.columnHeader1.Width = 35;
-      // 
-      // columnHeader2
-      // 
-      this.columnHeader2.Text = "Type";
-      this.columnHeader2.Width = 40;
-      // 
-      // columnHeader3
-      // 
-      this.columnHeader3.Text = "State";
-      // 
-      // columnHeader4
-      // 
-      this.columnHeader4.Text = "Name";
-      this.columnHeader4.Width = 120;
-      // 
-      // columnHeader5
-      // 
-      this.columnHeader5.Text = "Scrambled";
-      this.columnHeader5.Width = 65;
-      // 
-      // User
-      // 
-      this.User.Text = "User";
-      // 
-      // cardName
-      // 
-      this.cardName.Text = "Card Name";
-      this.cardName.Width = 120;
-      // 
-      // subchannels
-      // 
-      this.subchannels.Text = "Subchannels";
-      this.subchannels.Width = 100;
-      // 
-      // buttonRestart
-      // 
-      this.buttonRestart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.buttonRestart.Location = new System.Drawing.Point(241, 392);
-      this.buttonRestart.Name = "buttonRestart";
-      this.buttonRestart.Size = new System.Drawing.Size(95, 23);
-      this.buttonRestart.TabIndex = 59;
-      this.buttonRestart.Text = "Restart Service";
-      this.buttonRestart.UseVisualStyleBackColor = true;
-      this.buttonRestart.Click += new System.EventHandler(this.buttonRestart_Click);
-      // 
-      // mpButtonReGrabEpg
-      // 
-      this.mpButtonReGrabEpg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.mpButtonReGrabEpg.Location = new System.Drawing.Point(343, 392);
-      this.mpButtonReGrabEpg.Name = "mpButtonReGrabEpg";
-      this.mpButtonReGrabEpg.Size = new System.Drawing.Size(115, 23);
-      this.mpButtonReGrabEpg.TabIndex = 60;
-      this.mpButtonReGrabEpg.Text = "Refresh DVB EPG";
-      this.mpButtonReGrabEpg.UseVisualStyleBackColor = true;
-      this.mpButtonReGrabEpg.Click += new System.EventHandler(this.mpButtonReGrabEpg_Click);
-      // 
-      // imageList1
-      // 
-      this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
-      this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
-      this.imageList1.Images.SetKeyName(0, "radio_fta_.png");
-      this.imageList1.Images.SetKeyName(1, "radio_scrambled.png");
-      this.imageList1.Images.SetKeyName(2, "icon.radio_scrambled_and_fta.png");
-      this.imageList1.Images.SetKeyName(3, "tv_fta_.png");
-      this.imageList1.Images.SetKeyName(4, "tv_scrambled.png");
-      this.imageList1.Images.SetKeyName(5, "icon.tv_scrambled_and_fta.png");
-      // 
-      // mpComboBoxChannels
-      // 
-      this.mpComboBoxChannels.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
-      this.mpComboBoxChannels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.mpComboBoxChannels.FormattingEnabled = true;
-      this.mpComboBoxChannels.ImageList = null;
-      this.mpComboBoxChannels.Location = new System.Drawing.Point(64, 220);
-      this.mpComboBoxChannels.Name = "mpComboBoxChannels";
-      this.mpComboBoxChannels.Size = new System.Drawing.Size(151, 21);
-      this.mpComboBoxChannels.TabIndex = 54;
-      // 
-      // comboBoxGroups
-      // 
-      this.comboBoxGroups.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
-      this.comboBoxGroups.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.comboBoxGroups.FormattingEnabled = true;
-      this.comboBoxGroups.ImageList = this.imageList1;
-      this.comboBoxGroups.Location = new System.Drawing.Point(64, 196);
-      this.comboBoxGroups.Name = "comboBoxGroups";
-      this.comboBoxGroups.Size = new System.Drawing.Size(151, 21);
-      this.comboBoxGroups.TabIndex = 61;
-      this.comboBoxGroups.SelectedIndexChanged += new System.EventHandler(this.comboBoxGroups_SelectedIndexChanged);
-      // 
-      // mpLabel2
-      // 
-      this.mpLabel2.AutoSize = true;
-      this.mpLabel2.Location = new System.Drawing.Point(9, 199);
-      this.mpLabel2.Name = "mpLabel2";
-      this.mpLabel2.Size = new System.Drawing.Size(39, 13);
-      this.mpLabel2.TabIndex = 62;
-      this.mpLabel2.Text = "Group:";
-      // 
-      // TestService
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.mpLabel2);
-      this.Controls.Add(this.comboBoxGroups);
-      this.Controls.Add(this.mpButtonReGrabEpg);
-      this.Controls.Add(this.buttonRestart);
-      this.Controls.Add(this.mpListView1);
-      this.Controls.Add(this.mpButtonRec);
-      this.Controls.Add(this.mpButtonTimeShift);
-      this.Controls.Add(this.mpLabel1);
-      this.Controls.Add(this.mpComboBoxChannels);
-      this.Controls.Add(this.mpGroupBox1);
-      this.Name = "TestService";
-      this.Size = new System.Drawing.Size(470, 450);
-      this.mpGroupBox1.ResumeLayout(false);
-      this.mpGroupBox1.PerformLayout();
-      this.ResumeLayout(false);
-      this.PerformLayout();
+        this.mpListView1.FullRowSelect = true;
+        this.mpListView1.HideSelection = false;
+        this.mpListView1.IsChannelListView = false;
+        this.mpListView1.Location = new System.Drawing.Point(12, 252);
+        this.mpListView1.MultiSelect = false;
+        this.mpListView1.Name = "mpListView1";
+        this.mpListView1.Size = new System.Drawing.Size(446, 134);
+        this.mpListView1.TabIndex = 58;
+        this.mpListView1.UseCompatibleStateImageBehavior = false;
+        this.mpListView1.View = System.Windows.Forms.View.Details;
+        // 
+        // columnHeader1
+        // 
+        this.columnHeader1.Text = "Card";
+        this.columnHeader1.Width = 35;
+        // 
+        // columnHeader2
+        // 
+        this.columnHeader2.Text = "Type";
+        this.columnHeader2.Width = 40;
+        // 
+        // columnHeader3
+        // 
+        this.columnHeader3.Text = "State";
+        // 
+        // columnHeader4
+        // 
+        this.columnHeader4.Text = "Name";
+        this.columnHeader4.Width = 120;
+        // 
+        // columnHeader5
+        // 
+        this.columnHeader5.Text = "Scrambled";
+        this.columnHeader5.Width = 65;
+        // 
+        // User
+        // 
+        this.User.Text = "User";
+        // 
+        // cardName
+        // 
+        this.cardName.Text = "Card Name";
+        this.cardName.Width = 120;
+        // 
+        // subchannels
+        // 
+        this.subchannels.Text = "Subchannels";
+        this.subchannels.Width = 100;
+        // 
+        // buttonRestart
+        // 
+        this.buttonRestart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.buttonRestart.Location = new System.Drawing.Point(241, 392);
+        this.buttonRestart.Name = "buttonRestart";
+        this.buttonRestart.Size = new System.Drawing.Size(95, 23);
+        this.buttonRestart.TabIndex = 59;
+        this.buttonRestart.Text = "Restart Service";
+        this.buttonRestart.UseVisualStyleBackColor = true;
+        this.buttonRestart.Click += new System.EventHandler(this.buttonRestart_Click);
+        // 
+        // mpButtonReGrabEpg
+        // 
+        this.mpButtonReGrabEpg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+        this.mpButtonReGrabEpg.Location = new System.Drawing.Point(343, 392);
+        this.mpButtonReGrabEpg.Name = "mpButtonReGrabEpg";
+        this.mpButtonReGrabEpg.Size = new System.Drawing.Size(115, 23);
+        this.mpButtonReGrabEpg.TabIndex = 60;
+        this.mpButtonReGrabEpg.Text = "Refresh DVB EPG";
+        this.mpButtonReGrabEpg.UseVisualStyleBackColor = true;
+        this.mpButtonReGrabEpg.Click += new System.EventHandler(this.mpButtonReGrabEpg_Click);
+        // 
+        // imageList1
+        // 
+        this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+        this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+        this.imageList1.Images.SetKeyName(0, "radio_fta_.png");
+        this.imageList1.Images.SetKeyName(1, "radio_scrambled.png");
+        this.imageList1.Images.SetKeyName(2, "icon.radio_scrambled_and_fta.png");
+        this.imageList1.Images.SetKeyName(3, "tv_fta_.png");
+        this.imageList1.Images.SetKeyName(4, "tv_scrambled.png");
+        this.imageList1.Images.SetKeyName(5, "icon.tv_scrambled_and_fta.png");
+        // 
+        // mpComboBoxChannels
+        // 
+        this.mpComboBoxChannels.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+        this.mpComboBoxChannels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+        this.mpComboBoxChannels.FormattingEnabled = true;
+        this.mpComboBoxChannels.ImageList = null;
+        this.mpComboBoxChannels.Location = new System.Drawing.Point(64, 220);
+        this.mpComboBoxChannels.Name = "mpComboBoxChannels";
+        this.mpComboBoxChannels.Size = new System.Drawing.Size(151, 21);
+        this.mpComboBoxChannels.TabIndex = 54;
+        // 
+        // comboBoxGroups
+        // 
+        this.comboBoxGroups.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+        this.comboBoxGroups.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+        this.comboBoxGroups.FormattingEnabled = true;
+        this.comboBoxGroups.ImageList = this.imageList1;
+        this.comboBoxGroups.Location = new System.Drawing.Point(64, 196);
+        this.comboBoxGroups.Name = "comboBoxGroups";
+        this.comboBoxGroups.Size = new System.Drawing.Size(151, 21);
+        this.comboBoxGroups.TabIndex = 61;
+        this.comboBoxGroups.SelectedIndexChanged += new System.EventHandler(this.comboBoxGroups_SelectedIndexChanged);
+        // 
+        // mpLabel2
+        // 
+        this.mpLabel2.AutoSize = true;
+        this.mpLabel2.Location = new System.Drawing.Point(9, 199);
+        this.mpLabel2.Name = "mpLabel2";
+        this.mpLabel2.Size = new System.Drawing.Size(39, 13);
+        this.mpLabel2.TabIndex = 62;
+        this.mpLabel2.Text = "Group:";
+        // 
+        // TestService
+        // 
+        this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+        this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+        this.Controls.Add(this.mpLabel2);
+        this.Controls.Add(this.comboBoxGroups);
+        this.Controls.Add(this.mpButtonReGrabEpg);
+        this.Controls.Add(this.buttonRestart);
+        this.Controls.Add(this.mpListView1);
+        this.Controls.Add(this.mpButtonRec);
+        this.Controls.Add(this.mpButtonTimeShift);
+        this.Controls.Add(this.mpLabel1);
+        this.Controls.Add(this.mpComboBoxChannels);
+        this.Controls.Add(this.mpGroupBox1);
+        this.Name = "TestService";
+        this.Size = new System.Drawing.Size(470, 450);
+        this.mpGroupBox1.ResumeLayout(false);
+        this.mpGroupBox1.PerformLayout();
+        this.ResumeLayout(false);
+        this.PerformLayout();
 
     }
 
Index: Sections/TvCards.Designer.cs
===================================================================
--- Sections/TvCards.Designer.cs	(revision 28043)
+++ Sections/TvCards.Designer.cs	(working copy)
@@ -28,357 +28,357 @@
     /// </summary>
     private void InitializeComponent()
     {
-      this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TvCards));
-      this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
-      this.placeInHybridCardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.imageList1 = new System.Windows.Forms.ImageList(this.components);
-      this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-      this.deleteCardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.deleteEntireHybridCardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.label3 = new System.Windows.Forms.Label();
-      this.mpCheckBox1 = new MediaPortal.UserInterface.Controls.MPCheckBox();
-      this.columnHeader5 = new System.Windows.Forms.ColumnHeader();
-      this.columnHeader6 = new System.Windows.Forms.ColumnHeader();
-      this.columnHeader7 = new System.Windows.Forms.ColumnHeader();
-      this.columnHeader8 = new System.Windows.Forms.ColumnHeader();
-      this.groupBox4 = new System.Windows.Forms.GroupBox();
-      this.label8 = new System.Windows.Forms.Label();
-      this.mpCheckBox2 = new MediaPortal.UserInterface.Controls.MPCheckBox();
-      this.label9 = new System.Windows.Forms.Label();
-      this.mpCheckBox3 = new MediaPortal.UserInterface.Controls.MPCheckBox();
-      this.tabPage2 = new System.Windows.Forms.TabPage();
-      this.treeView1 = new System.Windows.Forms.TreeView();
-      this.tabPage1 = new System.Windows.Forms.TabPage();
-      this.grpIPTV = new System.Windows.Forms.GroupBox();
-      this.label26 = new System.Windows.Forms.Label();
-      this.iptvUpDown = new System.Windows.Forms.NumericUpDown();
-      this.label25 = new System.Windows.Forms.Label();
-      this.linkLabelHybridCard = new System.Windows.Forms.LinkLabel();
-      this.labelHybridCard = new System.Windows.Forms.Label();
-      this.labelCardPriority = new System.Windows.Forms.Label();
-      this.buttonRemove = new System.Windows.Forms.Button();
-      this.mpListView1 = new MediaPortal.UserInterface.Controls.MPListView();
-      this.colEnabled = new System.Windows.Forms.ColumnHeader();
-      this.colPriority = new System.Windows.Forms.ColumnHeader();
-      this.colType = new System.Windows.Forms.ColumnHeader();
-      this.colCAM = new System.Windows.Forms.ColumnHeader();
-      this.colCAMLimit = new System.Windows.Forms.ColumnHeader();
-      this.colId = new System.Windows.Forms.ColumnHeader();
-      this.colName = new System.Windows.Forms.ColumnHeader();
-      this.colInit = new System.Windows.Forms.ColumnHeader();
-      this.colGrabEpg = new System.Windows.Forms.ColumnHeader();
-      this.buttonEdit = new System.Windows.Forms.Button();
-      this.buttonUp = new System.Windows.Forms.Button();
-      this.buttonDown = new System.Windows.Forms.Button();
-      this.tabPage3 = new System.Windows.Forms.TabPage();
-      this.label10 = new System.Windows.Forms.Label();
-      this.label5 = new System.Windows.Forms.Label();
-      this.groupBox2 = new System.Windows.Forms.GroupBox();
-      this.mpComboBoxCard = new MediaPortal.UserInterface.Controls.MPComboBox();
-      this.pictureBox1 = new System.Windows.Forms.PictureBox();
-      this.label4 = new System.Windows.Forms.Label();
-      this.label6 = new System.Windows.Forms.Label();
-      this.mpLabel1 = new MediaPortal.UserInterface.Controls.MPLabel();
-      this.label2 = new System.Windows.Forms.Label();
-      this.label1 = new System.Windows.Forms.Label();
-      this.tabControl1 = new System.Windows.Forms.TabControl();
-      this.colDevicePath = new System.Windows.Forms.ColumnHeader();
-      this.contextMenuStrip2.SuspendLayout();
-      this.contextMenuStrip1.SuspendLayout();
-      this.tabPage2.SuspendLayout();
-      this.tabPage1.SuspendLayout();
-      this.grpIPTV.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.iptvUpDown)).BeginInit();
-      this.tabPage3.SuspendLayout();
-      this.groupBox2.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-      this.tabControl1.SuspendLayout();
-      this.SuspendLayout();
-      // 
-      // contextMenuStrip2
-      // 
-      this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+        this.components = new System.ComponentModel.Container();
+        System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TvCards));
+        this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
+        this.placeInHybridCardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+        this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+        this.imageList1 = new System.Windows.Forms.ImageList(this.components);
+        this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+        this.deleteCardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+        this.deleteEntireHybridCardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+        this.label3 = new System.Windows.Forms.Label();
+        this.mpCheckBox1 = new MediaPortal.UserInterface.Controls.MPCheckBox();
+        this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.columnHeader6 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.groupBox4 = new System.Windows.Forms.GroupBox();
+        this.label8 = new System.Windows.Forms.Label();
+        this.mpCheckBox2 = new MediaPortal.UserInterface.Controls.MPCheckBox();
+        this.label9 = new System.Windows.Forms.Label();
+        this.mpCheckBox3 = new MediaPortal.UserInterface.Controls.MPCheckBox();
+        this.tabPage2 = new System.Windows.Forms.TabPage();
+        this.treeView1 = new System.Windows.Forms.TreeView();
+        this.tabPage1 = new System.Windows.Forms.TabPage();
+        this.grpIPTV = new System.Windows.Forms.GroupBox();
+        this.label26 = new System.Windows.Forms.Label();
+        this.iptvUpDown = new System.Windows.Forms.NumericUpDown();
+        this.label25 = new System.Windows.Forms.Label();
+        this.linkLabelHybridCard = new System.Windows.Forms.LinkLabel();
+        this.labelHybridCard = new System.Windows.Forms.Label();
+        this.labelCardPriority = new System.Windows.Forms.Label();
+        this.buttonRemove = new System.Windows.Forms.Button();
+        this.mpListView1 = new MediaPortal.UserInterface.Controls.MPListView();
+        this.colEnabled = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.colPriority = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.colType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.colCAM = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.colCAMLimit = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.colId = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.colName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.colInit = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.colGrabEpg = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.colDevicePath = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+        this.buttonEdit = new System.Windows.Forms.Button();
+        this.buttonUp = new System.Windows.Forms.Button();
+        this.buttonDown = new System.Windows.Forms.Button();
+        this.tabPage3 = new System.Windows.Forms.TabPage();
+        this.label10 = new System.Windows.Forms.Label();
+        this.label5 = new System.Windows.Forms.Label();
+        this.groupBox2 = new System.Windows.Forms.GroupBox();
+        this.mpComboBoxCard = new MediaPortal.UserInterface.Controls.MPComboBox();
+        this.pictureBox1 = new System.Windows.Forms.PictureBox();
+        this.label4 = new System.Windows.Forms.Label();
+        this.label6 = new System.Windows.Forms.Label();
+        this.mpLabel1 = new MediaPortal.UserInterface.Controls.MPLabel();
+        this.label2 = new System.Windows.Forms.Label();
+        this.label1 = new System.Windows.Forms.Label();
+        this.tabControl1 = new System.Windows.Forms.TabControl();
+        this.contextMenuStrip2.SuspendLayout();
+        this.contextMenuStrip1.SuspendLayout();
+        this.tabPage2.SuspendLayout();
+        this.tabPage1.SuspendLayout();
+        this.grpIPTV.SuspendLayout();
+        ((System.ComponentModel.ISupportInitialize)(this.iptvUpDown)).BeginInit();
+        this.tabPage3.SuspendLayout();
+        this.groupBox2.SuspendLayout();
+        ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+        this.tabControl1.SuspendLayout();
+        this.SuspendLayout();
+        // 
+        // contextMenuStrip2
+        // 
+        this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.placeInHybridCardToolStripMenuItem});
-      this.contextMenuStrip2.Name = "contextMenuStrip2";
-      this.contextMenuStrip2.Size = new System.Drawing.Size(151, 26);
-      // 
-      // placeInHybridCardToolStripMenuItem
-      // 
-      this.placeInHybridCardToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+        this.contextMenuStrip2.Name = "contextMenuStrip2";
+        this.contextMenuStrip2.Size = new System.Drawing.Size(153, 26);
+        // 
+        // placeInHybridCardToolStripMenuItem
+        // 
+        this.placeInHybridCardToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.newToolStripMenuItem});
-      this.placeInHybridCardToolStripMenuItem.Name = "placeInHybridCardToolStripMenuItem";
-      this.placeInHybridCardToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
-      this.placeInHybridCardToolStripMenuItem.Text = "Place in group";
-      // 
-      // newToolStripMenuItem
-      // 
-      this.newToolStripMenuItem.Name = "newToolStripMenuItem";
-      this.newToolStripMenuItem.Size = new System.Drawing.Size(96, 22);
-      this.newToolStripMenuItem.Text = "new";
-      // 
-      // imageList1
-      // 
-      this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
-      this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
-      this.imageList1.Images.SetKeyName(0, "card.gif");
-      // 
-      // contextMenuStrip1
-      // 
-      this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+        this.placeInHybridCardToolStripMenuItem.Name = "placeInHybridCardToolStripMenuItem";
+        this.placeInHybridCardToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+        this.placeInHybridCardToolStripMenuItem.Text = "Place in group";
+        // 
+        // newToolStripMenuItem
+        // 
+        this.newToolStripMenuItem.Name = "newToolStripMenuItem";
+        this.newToolStripMenuItem.Size = new System.Drawing.Size(105, 22);
+        this.newToolStripMenuItem.Text = "new";
+        // 
+        // imageList1
+        // 
+        this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+        this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+        this.imageList1.Images.SetKeyName(0, "card.gif");
+        // 
+        // contextMenuStrip1
+        // 
+        this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.deleteCardToolStripMenuItem,
             this.deleteEntireHybridCardToolStripMenuItem});
-      this.contextMenuStrip1.Name = "contextMenuStrip1";
-      this.contextMenuStrip1.Size = new System.Drawing.Size(204, 48);
-      // 
-      // deleteCardToolStripMenuItem
-      // 
-      this.deleteCardToolStripMenuItem.Name = "deleteCardToolStripMenuItem";
-      this.deleteCardToolStripMenuItem.Size = new System.Drawing.Size(203, 22);
-      this.deleteCardToolStripMenuItem.Text = "Delete card";
-      this.deleteCardToolStripMenuItem.Click += new System.EventHandler(this.deleteCardToolStripMenuItem_Click);
-      // 
-      // deleteEntireHybridCardToolStripMenuItem
-      // 
-      this.deleteEntireHybridCardToolStripMenuItem.Name = "deleteEntireHybridCardToolStripMenuItem";
-      this.deleteEntireHybridCardToolStripMenuItem.Size = new System.Drawing.Size(203, 22);
-      this.deleteEntireHybridCardToolStripMenuItem.Text = "Delete entire hybrid card";
-      this.deleteEntireHybridCardToolStripMenuItem.Click += new System.EventHandler(this.deleteEntireHybridCardToolStripMenuItem_Click);
-      // 
-      // label3
-      // 
-      this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.label3.Location = new System.Drawing.Point(11, 117);
-      this.label3.Name = "label3";
-      this.label3.Size = new System.Drawing.Size(434, 18);
-      this.label3.TabIndex = 22;
-      this.label3.Text = "Note: This enables you to adjust CAM parameters like PIN requests if required.";
-      // 
-      // mpCheckBox1
-      // 
-      this.mpCheckBox1.AutoSize = true;
-      this.mpCheckBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-      this.mpCheckBox1.Location = new System.Drawing.Point(14, 29);
-      this.mpCheckBox1.Name = "mpCheckBox1";
-      this.mpCheckBox1.Size = new System.Drawing.Size(149, 17);
-      this.mpCheckBox1.TabIndex = 21;
-      this.mpCheckBox1.Text = "Enable WinTV-CI tray icon";
-      this.mpCheckBox1.UseVisualStyleBackColor = true;
-      // 
-      // columnHeader5
-      // 
-      this.columnHeader5.Text = "Enabled";
-      this.columnHeader5.Width = 110;
-      // 
-      // columnHeader6
-      // 
-      this.columnHeader6.Text = "Priority";
-      // 
-      // columnHeader7
-      // 
-      this.columnHeader7.Text = "Type";
-      // 
-      // columnHeader8
-      // 
-      this.columnHeader8.Text = "Name";
-      this.columnHeader8.Width = 200;
-      // 
-      // groupBox4
-      // 
-      this.groupBox4.Location = new System.Drawing.Point(0, 0);
-      this.groupBox4.Name = "groupBox4";
-      this.groupBox4.Size = new System.Drawing.Size(200, 100);
-      this.groupBox4.TabIndex = 0;
-      this.groupBox4.TabStop = false;
-      // 
-      // label8
-      // 
-      this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.label8.Location = new System.Drawing.Point(11, 117);
-      this.label8.Name = "label8";
-      this.label8.Size = new System.Drawing.Size(434, 18);
-      this.label8.TabIndex = 22;
-      this.label8.Text = "Note: This enables you to adjust CAM parameters like PIN requests if required.";
-      // 
-      // mpCheckBox2
-      // 
-      this.mpCheckBox2.AutoSize = true;
-      this.mpCheckBox2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-      this.mpCheckBox2.Location = new System.Drawing.Point(14, 29);
-      this.mpCheckBox2.Name = "mpCheckBox2";
-      this.mpCheckBox2.Size = new System.Drawing.Size(149, 17);
-      this.mpCheckBox2.TabIndex = 21;
-      this.mpCheckBox2.Text = "Enable WinTV-CI tray icon";
-      this.mpCheckBox2.UseVisualStyleBackColor = true;
-      // 
-      // label9
-      // 
-      this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.label9.Location = new System.Drawing.Point(11, 160);
-      this.label9.Name = "label9";
-      this.label9.Size = new System.Drawing.Size(434, 18);
-      this.label9.TabIndex = 22;
-      this.label9.Text = "Note: This enables you to adjust CAM parameters like PIN requests if required.";
-      // 
-      // mpCheckBox3
-      // 
-      this.mpCheckBox3.AutoSize = true;
-      this.mpCheckBox3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-      this.mpCheckBox3.Location = new System.Drawing.Point(14, 29);
-      this.mpCheckBox3.Name = "mpCheckBox3";
-      this.mpCheckBox3.Size = new System.Drawing.Size(149, 17);
-      this.mpCheckBox3.TabIndex = 21;
-      this.mpCheckBox3.Text = "Enable WinTV-CI tray icon";
-      this.mpCheckBox3.UseVisualStyleBackColor = true;
-      // 
-      // tabPage2
-      // 
-      this.tabPage2.Controls.Add(this.treeView1);
-      this.tabPage2.Location = new System.Drawing.Point(4, 22);
-      this.tabPage2.Name = "tabPage2";
-      this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-      this.tabPage2.Size = new System.Drawing.Size(460, 384);
-      this.tabPage2.TabIndex = 1;
-      this.tabPage2.Text = "Hybrid cards";
-      this.tabPage2.UseVisualStyleBackColor = true;
-      // 
-      // treeView1
-      // 
-      this.treeView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.treeView1.ContextMenuStrip = this.contextMenuStrip1;
-      this.treeView1.ImageIndex = 0;
-      this.treeView1.ImageList = this.imageList1;
-      this.treeView1.Location = new System.Drawing.Point(9, 11);
-      this.treeView1.Name = "treeView1";
-      this.treeView1.SelectedImageIndex = 0;
-      this.treeView1.Size = new System.Drawing.Size(437, 328);
-      this.treeView1.TabIndex = 0;
-      // 
-      // tabPage1
-      // 
-      this.tabPage1.Controls.Add(this.grpIPTV);
-      this.tabPage1.Controls.Add(this.linkLabelHybridCard);
-      this.tabPage1.Controls.Add(this.labelHybridCard);
-      this.tabPage1.Controls.Add(this.labelCardPriority);
-      this.tabPage1.Controls.Add(this.buttonRemove);
-      this.tabPage1.Controls.Add(this.mpListView1);
-      this.tabPage1.Controls.Add(this.buttonEdit);
-      this.tabPage1.Controls.Add(this.buttonUp);
-      this.tabPage1.Controls.Add(this.buttonDown);
-      this.tabPage1.Location = new System.Drawing.Point(4, 22);
-      this.tabPage1.Name = "tabPage1";
-      this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-      this.tabPage1.Size = new System.Drawing.Size(460, 384);
-      this.tabPage1.TabIndex = 0;
-      this.tabPage1.Text = "Cards";
-      this.tabPage1.UseVisualStyleBackColor = true;
-      // 
-      // grpIPTV
-      // 
-      this.grpIPTV.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.grpIPTV.Controls.Add(this.label26);
-      this.grpIPTV.Controls.Add(this.iptvUpDown);
-      this.grpIPTV.Controls.Add(this.label25);
-      this.grpIPTV.Location = new System.Drawing.Point(6, 6);
-      this.grpIPTV.Name = "grpIPTV";
-      this.grpIPTV.Size = new System.Drawing.Size(437, 73);
-      this.grpIPTV.TabIndex = 83;
-      this.grpIPTV.TabStop = false;
-      this.grpIPTV.Text = "DVB-IP (IPTV) Cards";
-      // 
-      // label26
-      // 
-      this.label26.Location = new System.Drawing.Point(6, 16);
-      this.label26.Name = "label26";
-      this.label26.Size = new System.Drawing.Size(425, 28);
-      this.label26.TabIndex = 2;
-      this.label26.Text = "If you have enough bandwidth, you can select number of independent IPTV cards,\r\nt" +
-          "hat will be created. You can then watch different channels on different computer" +
-          "s";
-      // 
-      // iptvUpDown
-      // 
-      this.iptvUpDown.Location = new System.Drawing.Point(124, 47);
-      this.iptvUpDown.Name = "iptvUpDown";
-      this.iptvUpDown.Size = new System.Drawing.Size(47, 20);
-      this.iptvUpDown.TabIndex = 1;
-      this.iptvUpDown.Value = new decimal(new int[] {
+        this.contextMenuStrip1.Name = "contextMenuStrip1";
+        this.contextMenuStrip1.Size = new System.Drawing.Size(205, 48);
+        // 
+        // deleteCardToolStripMenuItem
+        // 
+        this.deleteCardToolStripMenuItem.Name = "deleteCardToolStripMenuItem";
+        this.deleteCardToolStripMenuItem.Size = new System.Drawing.Size(204, 22);
+        this.deleteCardToolStripMenuItem.Text = "Delete card";
+        this.deleteCardToolStripMenuItem.Click += new System.EventHandler(this.deleteCardToolStripMenuItem_Click);
+        // 
+        // deleteEntireHybridCardToolStripMenuItem
+        // 
+        this.deleteEntireHybridCardToolStripMenuItem.Name = "deleteEntireHybridCardToolStripMenuItem";
+        this.deleteEntireHybridCardToolStripMenuItem.Size = new System.Drawing.Size(204, 22);
+        this.deleteEntireHybridCardToolStripMenuItem.Text = "Delete entire hybrid card";
+        this.deleteEntireHybridCardToolStripMenuItem.Click += new System.EventHandler(this.deleteEntireHybridCardToolStripMenuItem_Click);
+        // 
+        // label3
+        // 
+        this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+        this.label3.Location = new System.Drawing.Point(11, 117);
+        this.label3.Name = "label3";
+        this.label3.Size = new System.Drawing.Size(434, 18);
+        this.label3.TabIndex = 22;
+        this.label3.Text = "Note: This enables you to adjust CAM parameters like PIN requests if required.";
+        // 
+        // mpCheckBox1
+        // 
+        this.mpCheckBox1.AutoSize = true;
+        this.mpCheckBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+        this.mpCheckBox1.Location = new System.Drawing.Point(14, 29);
+        this.mpCheckBox1.Name = "mpCheckBox1";
+        this.mpCheckBox1.Size = new System.Drawing.Size(149, 17);
+        this.mpCheckBox1.TabIndex = 21;
+        this.mpCheckBox1.Text = "Enable WinTV-CI tray icon";
+        this.mpCheckBox1.UseVisualStyleBackColor = true;
+        // 
+        // columnHeader5
+        // 
+        this.columnHeader5.Text = "Enabled";
+        this.columnHeader5.Width = 110;
+        // 
+        // columnHeader6
+        // 
+        this.columnHeader6.Text = "Priority";
+        // 
+        // columnHeader7
+        // 
+        this.columnHeader7.Text = "Type";
+        // 
+        // columnHeader8
+        // 
+        this.columnHeader8.Text = "Name";
+        this.columnHeader8.Width = 200;
+        // 
+        // groupBox4
+        // 
+        this.groupBox4.Location = new System.Drawing.Point(0, 0);
+        this.groupBox4.Name = "groupBox4";
+        this.groupBox4.Size = new System.Drawing.Size(200, 100);
+        this.groupBox4.TabIndex = 0;
+        this.groupBox4.TabStop = false;
+        // 
+        // label8
+        // 
+        this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+        this.label8.Location = new System.Drawing.Point(11, 117);
+        this.label8.Name = "label8";
+        this.label8.Size = new System.Drawing.Size(434, 18);
+        this.label8.TabIndex = 22;
+        this.label8.Text = "Note: This enables you to adjust CAM parameters like PIN requests if required.";
+        // 
+        // mpCheckBox2
+        // 
+        this.mpCheckBox2.AutoSize = true;
+        this.mpCheckBox2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+        this.mpCheckBox2.Location = new System.Drawing.Point(14, 29);
+        this.mpCheckBox2.Name = "mpCheckBox2";
+        this.mpCheckBox2.Size = new System.Drawing.Size(149, 17);
+        this.mpCheckBox2.TabIndex = 21;
+        this.mpCheckBox2.Text = "Enable WinTV-CI tray icon";
+        this.mpCheckBox2.UseVisualStyleBackColor = true;
+        // 
+        // label9
+        // 
+        this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+        this.label9.Location = new System.Drawing.Point(11, 160);
+        this.label9.Name = "label9";
+        this.label9.Size = new System.Drawing.Size(434, 18);
+        this.label9.TabIndex = 22;
+        this.label9.Text = "Note: This enables you to adjust CAM parameters like PIN requests if required.";
+        // 
+        // mpCheckBox3
+        // 
+        this.mpCheckBox3.AutoSize = true;
+        this.mpCheckBox3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+        this.mpCheckBox3.Location = new System.Drawing.Point(14, 29);
+        this.mpCheckBox3.Name = "mpCheckBox3";
+        this.mpCheckBox3.Size = new System.Drawing.Size(149, 17);
+        this.mpCheckBox3.TabIndex = 21;
+        this.mpCheckBox3.Text = "Enable WinTV-CI tray icon";
+        this.mpCheckBox3.UseVisualStyleBackColor = true;
+        // 
+        // tabPage2
+        // 
+        this.tabPage2.Controls.Add(this.treeView1);
+        this.tabPage2.Location = new System.Drawing.Point(4, 22);
+        this.tabPage2.Name = "tabPage2";
+        this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+        this.tabPage2.Size = new System.Drawing.Size(460, 384);
+        this.tabPage2.TabIndex = 1;
+        this.tabPage2.Text = "Hybrid cards";
+        this.tabPage2.UseVisualStyleBackColor = true;
+        // 
+        // treeView1
+        // 
+        this.treeView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                    | System.Windows.Forms.AnchorStyles.Left)
+                    | System.Windows.Forms.AnchorStyles.Right)));
+        this.treeView1.ContextMenuStrip = this.contextMenuStrip1;
+        this.treeView1.ImageIndex = 0;
+        this.treeView1.ImageList = this.imageList1;
+        this.treeView1.Location = new System.Drawing.Point(9, 11);
+        this.treeView1.Name = "treeView1";
+        this.treeView1.SelectedImageIndex = 0;
+        this.treeView1.Size = new System.Drawing.Size(437, 328);
+        this.treeView1.TabIndex = 0;
+        // 
+        // tabPage1
+        // 
+        this.tabPage1.Controls.Add(this.grpIPTV);
+        this.tabPage1.Controls.Add(this.linkLabelHybridCard);
+        this.tabPage1.Controls.Add(this.labelHybridCard);
+        this.tabPage1.Controls.Add(this.labelCardPriority);
+        this.tabPage1.Controls.Add(this.buttonRemove);
+        this.tabPage1.Controls.Add(this.mpListView1);
+        this.tabPage1.Controls.Add(this.buttonEdit);
+        this.tabPage1.Controls.Add(this.buttonUp);
+        this.tabPage1.Controls.Add(this.buttonDown);
+        this.tabPage1.Location = new System.Drawing.Point(4, 22);
+        this.tabPage1.Name = "tabPage1";
+        this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+        this.tabPage1.Size = new System.Drawing.Size(460, 384);
+        this.tabPage1.TabIndex = 0;
+        this.tabPage1.Text = "Cards";
+        this.tabPage1.UseVisualStyleBackColor = true;
+        // 
+        // grpIPTV
+        // 
+        this.grpIPTV.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                    | System.Windows.Forms.AnchorStyles.Right)));
+        this.grpIPTV.Controls.Add(this.label26);
+        this.grpIPTV.Controls.Add(this.iptvUpDown);
+        this.grpIPTV.Controls.Add(this.label25);
+        this.grpIPTV.Location = new System.Drawing.Point(6, 6);
+        this.grpIPTV.Name = "grpIPTV";
+        this.grpIPTV.Size = new System.Drawing.Size(437, 73);
+        this.grpIPTV.TabIndex = 83;
+        this.grpIPTV.TabStop = false;
+        this.grpIPTV.Text = "DVB-IP (IPTV) Cards";
+        // 
+        // label26
+        // 
+        this.label26.Location = new System.Drawing.Point(6, 16);
+        this.label26.Name = "label26";
+        this.label26.Size = new System.Drawing.Size(425, 28);
+        this.label26.TabIndex = 2;
+        this.label26.Text = "If you have enough bandwidth you can enable multiple IPTV cards so that you can w" +
+            "atch/record multiple channels simultaneously";
+        // 
+        // iptvUpDown
+        // 
+        this.iptvUpDown.Location = new System.Drawing.Point(124, 47);
+        this.iptvUpDown.Name = "iptvUpDown";
+        this.iptvUpDown.Size = new System.Drawing.Size(47, 20);
+        this.iptvUpDown.TabIndex = 1;
+        this.iptvUpDown.Value = new decimal(new int[] {
             1,
             0,
             0,
             0});
-      this.iptvUpDown.ValueChanged += new System.EventHandler(this.iptvUpDown_ValueChanged);
-      // 
-      // label25
-      // 
-      this.label25.AutoSize = true;
-      this.label25.Location = new System.Drawing.Point(6, 49);
-      this.label25.Name = "label25";
-      this.label25.Size = new System.Drawing.Size(112, 13);
-      this.label25.TabIndex = 0;
-      this.label25.Text = "Number of IPTV cards";
-      // 
-      // linkLabelHybridCard
-      // 
-      this.linkLabelHybridCard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.linkLabelHybridCard.AutoSize = true;
-      this.linkLabelHybridCard.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold);
-      this.linkLabelHybridCard.Location = new System.Drawing.Point(254, 314);
-      this.linkLabelHybridCard.Name = "linkLabelHybridCard";
-      this.linkLabelHybridCard.Size = new System.Drawing.Size(65, 13);
-      this.linkLabelHybridCard.TabIndex = 6;
-      this.linkLabelHybridCard.TabStop = true;
-      this.linkLabelHybridCard.Text = "in the wiki";
-      this.linkLabelHybridCard.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelHybridCard_LinkClicked);
-      // 
-      // labelHybridCard
-      // 
-      this.labelHybridCard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.labelHybridCard.AutoSize = true;
-      this.labelHybridCard.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold);
-      this.labelHybridCard.Location = new System.Drawing.Point(3, 314);
-      this.labelHybridCard.Name = "labelHybridCard";
-      this.labelHybridCard.Size = new System.Drawing.Size(252, 13);
-      this.labelHybridCard.TabIndex = 5;
-      this.labelHybridCard.Text = "Note2: Configure hybrid cards as described";
-      // 
-      // labelCardPriority
-      // 
-      this.labelCardPriority.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.labelCardPriority.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.labelCardPriority.Location = new System.Drawing.Point(3, 300);
-      this.labelCardPriority.Name = "labelCardPriority";
-      this.labelCardPriority.Size = new System.Drawing.Size(256, 13);
-      this.labelCardPriority.TabIndex = 4;
-      this.labelCardPriority.Text = "Note1: Priority 1 means lowest priority";
-      // 
-      // buttonRemove
-      // 
-      this.buttonRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.buttonRemove.Enabled = false;
-      this.buttonRemove.Location = new System.Drawing.Point(371, 336);
-      this.buttonRemove.Name = "buttonRemove";
-      this.buttonRemove.Size = new System.Drawing.Size(75, 23);
-      this.buttonRemove.TabIndex = 3;
-      this.buttonRemove.Text = "Remove";
-      this.buttonRemove.UseVisualStyleBackColor = true;
-      this.buttonRemove.Click += new System.EventHandler(this.buttonRemove_Click);
-      // 
-      // mpListView1
-      // 
-      this.mpListView1.AllowRowReorder = false;
-      this.mpListView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.mpListView1.CheckBoxes = true;
-      this.mpListView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+        this.iptvUpDown.ValueChanged += new System.EventHandler(this.iptvUpDown_ValueChanged);
+        // 
+        // label25
+        // 
+        this.label25.AutoSize = true;
+        this.label25.Location = new System.Drawing.Point(6, 49);
+        this.label25.Name = "label25";
+        this.label25.Size = new System.Drawing.Size(112, 13);
+        this.label25.TabIndex = 0;
+        this.label25.Text = "Number of IPTV cards";
+        // 
+        // linkLabelHybridCard
+        // 
+        this.linkLabelHybridCard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.linkLabelHybridCard.AutoSize = true;
+        this.linkLabelHybridCard.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold);
+        this.linkLabelHybridCard.Location = new System.Drawing.Point(254, 314);
+        this.linkLabelHybridCard.Name = "linkLabelHybridCard";
+        this.linkLabelHybridCard.Size = new System.Drawing.Size(65, 13);
+        this.linkLabelHybridCard.TabIndex = 6;
+        this.linkLabelHybridCard.TabStop = true;
+        this.linkLabelHybridCard.Text = "in the wiki";
+        this.linkLabelHybridCard.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelHybridCard_LinkClicked);
+        // 
+        // labelHybridCard
+        // 
+        this.labelHybridCard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.labelHybridCard.AutoSize = true;
+        this.labelHybridCard.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold);
+        this.labelHybridCard.Location = new System.Drawing.Point(3, 314);
+        this.labelHybridCard.Name = "labelHybridCard";
+        this.labelHybridCard.Size = new System.Drawing.Size(252, 13);
+        this.labelHybridCard.TabIndex = 5;
+        this.labelHybridCard.Text = "Note2: Configure hybrid cards as described";
+        // 
+        // labelCardPriority
+        // 
+        this.labelCardPriority.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.labelCardPriority.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+        this.labelCardPriority.Location = new System.Drawing.Point(3, 300);
+        this.labelCardPriority.Name = "labelCardPriority";
+        this.labelCardPriority.Size = new System.Drawing.Size(256, 13);
+        this.labelCardPriority.TabIndex = 4;
+        this.labelCardPriority.Text = "Note1: Priority 1 means lowest priority";
+        // 
+        // buttonRemove
+        // 
+        this.buttonRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+        this.buttonRemove.Enabled = false;
+        this.buttonRemove.Location = new System.Drawing.Point(371, 336);
+        this.buttonRemove.Name = "buttonRemove";
+        this.buttonRemove.Size = new System.Drawing.Size(75, 23);
+        this.buttonRemove.TabIndex = 3;
+        this.buttonRemove.Text = "Remove";
+        this.buttonRemove.UseVisualStyleBackColor = true;
+        this.buttonRemove.Click += new System.EventHandler(this.buttonRemove_Click);
+        // 
+        // mpListView1
+        // 
+        this.mpListView1.AllowDrop = true;
+        this.mpListView1.AllowRowReorder = false;
+        this.mpListView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                    | System.Windows.Forms.AnchorStyles.Left)
+                    | System.Windows.Forms.AnchorStyles.Right)));
+        this.mpListView1.CheckBoxes = true;
+        this.mpListView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.colEnabled,
             this.colPriority,
             this.colType,
@@ -389,262 +389,262 @@
             this.colInit,
             this.colGrabEpg,
             this.colDevicePath});
-      this.mpListView1.ContextMenuStrip = this.contextMenuStrip2;
-      this.mpListView1.FullRowSelect = true;
-      this.mpListView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
-      this.mpListView1.HideSelection = false;
-      this.mpListView1.IsChannelListView = false;
-      this.mpListView1.LargeImageList = this.imageList1;
-      this.mpListView1.Location = new System.Drawing.Point(6, 85);
-      this.mpListView1.Name = "mpListView1";
-      this.mpListView1.Size = new System.Drawing.Size(440, 211);
-      this.mpListView1.SmallImageList = this.imageList1;
-      this.mpListView1.TabIndex = 0;
-      this.mpListView1.UseCompatibleStateImageBehavior = false;
-      this.mpListView1.View = System.Windows.Forms.View.Details;
-      this.mpListView1.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.mpListView1_ItemChecked);
-      this.mpListView1.SelectedIndexChanged += new System.EventHandler(this.mpListView1_SelectedIndexChanged);
-      // 
-      // colEnabled
-      // 
-      this.colEnabled.Text = "Enabled";
-      this.colEnabled.Width = 85;
-      // 
-      // colPriority
-      // 
-      this.colPriority.Text = "Priority";
-      this.colPriority.Width = 50;
-      // 
-      // colType
-      // 
-      this.colType.Text = "Type";
-      this.colType.Width = 50;
-      // 
-      // colCAM
-      // 
-      this.colCAM.Text = "CAM";
-      // 
-      // colCAMLimit
-      // 
-      this.colCAMLimit.Text = "CAM Limit";
-      this.colCAMLimit.Width = 65;
-      // 
-      // colId
-      // 
-      this.colId.Text = "Id";
-      // 
-      // colName
-      // 
-      this.colName.Text = "Name";
-      this.colName.Width = 130;
-      // 
-      // colInit
-      // 
-      this.colInit.Text = "Init";
-      this.colInit.Width = 50;
-      // 
-      // colGrabEpg
-      // 
-      this.colGrabEpg.Text = "Grab EPG";
-      // 
-      // buttonEdit
-      // 
-      this.buttonEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.buttonEdit.Enabled = false;
-      this.buttonEdit.Location = new System.Drawing.Point(290, 336);
-      this.buttonEdit.Name = "buttonEdit";
-      this.buttonEdit.Size = new System.Drawing.Size(75, 23);
-      this.buttonEdit.TabIndex = 2;
-      this.buttonEdit.Text = "Edit";
-      this.buttonEdit.UseVisualStyleBackColor = true;
-      this.buttonEdit.Click += new System.EventHandler(this.buttonEdit_Click);
-      // 
-      // buttonUp
-      // 
-      this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.buttonUp.Location = new System.Drawing.Point(6, 336);
-      this.buttonUp.Name = "buttonUp";
-      this.buttonUp.Size = new System.Drawing.Size(75, 23);
-      this.buttonUp.TabIndex = 2;
-      this.buttonUp.Text = "Up";
-      this.buttonUp.UseVisualStyleBackColor = true;
-      this.buttonUp.Click += new System.EventHandler(this.buttonUp_Click);
-      // 
-      // buttonDown
-      // 
-      this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.buttonDown.Location = new System.Drawing.Point(87, 336);
-      this.buttonDown.Name = "buttonDown";
-      this.buttonDown.Size = new System.Drawing.Size(75, 23);
-      this.buttonDown.TabIndex = 1;
-      this.buttonDown.Text = "Down";
-      this.buttonDown.UseVisualStyleBackColor = true;
-      this.buttonDown.Click += new System.EventHandler(this.buttonDown_Click);
-      // 
-      // tabPage3
-      // 
-      this.tabPage3.Controls.Add(this.label10);
-      this.tabPage3.Controls.Add(this.label5);
-      this.tabPage3.Controls.Add(this.groupBox2);
-      this.tabPage3.Location = new System.Drawing.Point(4, 22);
-      this.tabPage3.Name = "tabPage3";
-      this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
-      this.tabPage3.Size = new System.Drawing.Size(460, 384);
-      this.tabPage3.TabIndex = 2;
-      this.tabPage3.Text = "WinTV-CI";
-      this.tabPage3.UseVisualStyleBackColor = true;
-      // 
-      // label10
-      // 
-      this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.label10.Location = new System.Drawing.Point(17, 311);
-      this.label10.Name = "label10";
-      this.label10.Size = new System.Drawing.Size(434, 18);
-      this.label10.TabIndex = 39;
-      this.label10.Text = "Note: Changes may require a TVServer service restart.";
-      // 
-      // label5
-      // 
-      this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.label5.Location = new System.Drawing.Point(17, 343);
-      this.label5.Name = "label5";
-      this.label5.Size = new System.Drawing.Size(434, 18);
-      this.label5.TabIndex = 19;
-      this.label5.Text = "The MediaPortal team recommends driver version 1.3607.26137.0 or later.";
-      // 
-      // groupBox2
-      // 
-      this.groupBox2.Controls.Add(this.mpComboBoxCard);
-      this.groupBox2.Controls.Add(this.pictureBox1);
-      this.groupBox2.Controls.Add(this.label4);
-      this.groupBox2.Controls.Add(this.label6);
-      this.groupBox2.Controls.Add(this.mpLabel1);
-      this.groupBox2.Controls.Add(this.label2);
-      this.groupBox2.Controls.Add(this.label1);
-      this.groupBox2.Location = new System.Drawing.Point(6, 6);
-      this.groupBox2.Name = "groupBox2";
-      this.groupBox2.Size = new System.Drawing.Size(444, 291);
-      this.groupBox2.TabIndex = 0;
-      this.groupBox2.TabStop = false;
-      this.groupBox2.Text = "WinTV-CI card assignment";
-      // 
-      // mpComboBoxCard
-      // 
-      this.mpComboBoxCard.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.mpComboBoxCard.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.mpComboBoxCard.FormattingEnabled = true;
-      this.mpComboBoxCard.Location = new System.Drawing.Point(98, 52);
-      this.mpComboBoxCard.Name = "mpComboBoxCard";
-      this.mpComboBoxCard.Size = new System.Drawing.Size(325, 21);
-      this.mpComboBoxCard.TabIndex = 16;
-      this.mpComboBoxCard.SelectedIndexChanged += new System.EventHandler(this.mpComboBoxCard_SelectedIndexChanged);
-      // 
-      // pictureBox1
-      // 
-      this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-      this.pictureBox1.Location = new System.Drawing.Point(24, 52);
-      this.pictureBox1.Name = "pictureBox1";
-      this.pictureBox1.Size = new System.Drawing.Size(33, 23);
-      this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-      this.pictureBox1.TabIndex = 18;
-      this.pictureBox1.TabStop = false;
-      // 
-      // label4
-      // 
-      this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.label4.Location = new System.Drawing.Point(11, 31);
-      this.label4.Name = "label4";
-      this.label4.Size = new System.Drawing.Size(412, 18);
-      this.label4.TabIndex = 8;
-      this.label4.Text = "Select Hauppauge DVB card for the CI module to work with:-";
-      // 
-      // label6
-      // 
-      this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.label6.ForeColor = System.Drawing.Color.Red;
-      this.label6.Location = new System.Drawing.Point(11, 126);
-      this.label6.Name = "label6";
-      this.label6.Size = new System.Drawing.Size(412, 18);
-      this.label6.TabIndex = 20;
-      this.label6.Text = "DO NOT remove the USB device whilst TVServer is running.";
-      // 
-      // mpLabel1
-      // 
-      this.mpLabel1.AutoSize = true;
-      this.mpLabel1.Location = new System.Drawing.Point(63, 57);
-      this.mpLabel1.Name = "mpLabel1";
-      this.mpLabel1.Size = new System.Drawing.Size(32, 13);
-      this.mpLabel1.TabIndex = 17;
-      this.mpLabel1.Text = "Card:";
-      // 
-      // label2
-      // 
-      this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.label2.ForeColor = System.Drawing.Color.Red;
-      this.label2.Location = new System.Drawing.Point(11, 108);
-      this.label2.Name = "label2";
-      this.label2.Size = new System.Drawing.Size(412, 18);
-      this.label2.TabIndex = 6;
-      this.label2.Text = "This card MUST also only be from Hauppauge.";
-      // 
-      // label1
-      // 
-      this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.label1.ForeColor = System.Drawing.Color.Red;
-      this.label1.Location = new System.Drawing.Point(11, 92);
-      this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(412, 16);
-      this.label1.TabIndex = 5;
-      this.label1.Text = "Caution: The WinTV-CI should ONLY be used with 1x DVB card.";
-      // 
-      // tabControl1
-      // 
-      this.tabControl1.AccessibleName = "";
-      this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.tabControl1.Controls.Add(this.tabPage1);
-      this.tabControl1.Controls.Add(this.tabPage2);
-      this.tabControl1.Controls.Add(this.tabPage3);
-      this.tabControl1.Location = new System.Drawing.Point(3, 3);
-      this.tabControl1.Name = "tabControl1";
-      this.tabControl1.SelectedIndex = 0;
-      this.tabControl1.Size = new System.Drawing.Size(468, 410);
-      this.tabControl1.TabIndex = 3;
-      this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
-      // 
-      // colDevicePath
-      // 
-      this.colDevicePath.Text = "Device Path";
-      // 
-      // TvCards
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.tabControl1);
-      this.Name = "TvCards";
-      this.Size = new System.Drawing.Size(474, 416);
-      this.contextMenuStrip2.ResumeLayout(false);
-      this.contextMenuStrip1.ResumeLayout(false);
-      this.tabPage2.ResumeLayout(false);
-      this.tabPage1.ResumeLayout(false);
-      this.tabPage1.PerformLayout();
-      this.grpIPTV.ResumeLayout(false);
-      this.grpIPTV.PerformLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.iptvUpDown)).EndInit();
-      this.tabPage3.ResumeLayout(false);
-      this.groupBox2.ResumeLayout(false);
-      this.groupBox2.PerformLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-      this.tabControl1.ResumeLayout(false);
-      this.ResumeLayout(false);
+        this.mpListView1.ContextMenuStrip = this.contextMenuStrip2;
+        this.mpListView1.FullRowSelect = true;
+        this.mpListView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+        this.mpListView1.HideSelection = false;
+        this.mpListView1.IsChannelListView = false;
+        this.mpListView1.LargeImageList = this.imageList1;
+        this.mpListView1.Location = new System.Drawing.Point(6, 85);
+        this.mpListView1.Name = "mpListView1";
+        this.mpListView1.Size = new System.Drawing.Size(440, 211);
+        this.mpListView1.SmallImageList = this.imageList1;
+        this.mpListView1.TabIndex = 0;
+        this.mpListView1.UseCompatibleStateImageBehavior = false;
+        this.mpListView1.View = System.Windows.Forms.View.Details;
+        this.mpListView1.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.mpListView1_ItemChecked);
+        this.mpListView1.SelectedIndexChanged += new System.EventHandler(this.mpListView1_SelectedIndexChanged);
+        // 
+        // colEnabled
+        // 
+        this.colEnabled.Text = "Enabled";
+        this.colEnabled.Width = 85;
+        // 
+        // colPriority
+        // 
+        this.colPriority.Text = "Priority";
+        this.colPriority.Width = 50;
+        // 
+        // colType
+        // 
+        this.colType.Text = "Type";
+        this.colType.Width = 50;
+        // 
+        // colCAM
+        // 
+        this.colCAM.Text = "CAM";
+        // 
+        // colCAMLimit
+        // 
+        this.colCAMLimit.Text = "CAM Limit";
+        this.colCAMLimit.Width = 65;
+        // 
+        // colId
+        // 
+        this.colId.Text = "Id";
+        // 
+        // colName
+        // 
+        this.colName.Text = "Name";
+        this.colName.Width = 130;
+        // 
+        // colInit
+        // 
+        this.colInit.Text = "Init";
+        this.colInit.Width = 50;
+        // 
+        // colGrabEpg
+        // 
+        this.colGrabEpg.Text = "Grab EPG";
+        // 
+        // colDevicePath
+        // 
+        this.colDevicePath.Text = "Device Path";
+        // 
+        // buttonEdit
+        // 
+        this.buttonEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+        this.buttonEdit.Enabled = false;
+        this.buttonEdit.Location = new System.Drawing.Point(290, 336);
+        this.buttonEdit.Name = "buttonEdit";
+        this.buttonEdit.Size = new System.Drawing.Size(75, 23);
+        this.buttonEdit.TabIndex = 2;
+        this.buttonEdit.Text = "Edit";
+        this.buttonEdit.UseVisualStyleBackColor = true;
+        this.buttonEdit.Click += new System.EventHandler(this.buttonEdit_Click);
+        // 
+        // buttonUp
+        // 
+        this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.buttonUp.Location = new System.Drawing.Point(6, 336);
+        this.buttonUp.Name = "buttonUp";
+        this.buttonUp.Size = new System.Drawing.Size(75, 23);
+        this.buttonUp.TabIndex = 2;
+        this.buttonUp.Text = "Up";
+        this.buttonUp.UseVisualStyleBackColor = true;
+        this.buttonUp.Click += new System.EventHandler(this.buttonUp_Click);
+        // 
+        // buttonDown
+        // 
+        this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.buttonDown.Location = new System.Drawing.Point(87, 336);
+        this.buttonDown.Name = "buttonDown";
+        this.buttonDown.Size = new System.Drawing.Size(75, 23);
+        this.buttonDown.TabIndex = 1;
+        this.buttonDown.Text = "Down";
+        this.buttonDown.UseVisualStyleBackColor = true;
+        this.buttonDown.Click += new System.EventHandler(this.buttonDown_Click);
+        // 
+        // tabPage3
+        // 
+        this.tabPage3.Controls.Add(this.label10);
+        this.tabPage3.Controls.Add(this.label5);
+        this.tabPage3.Controls.Add(this.groupBox2);
+        this.tabPage3.Location = new System.Drawing.Point(4, 22);
+        this.tabPage3.Name = "tabPage3";
+        this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
+        this.tabPage3.Size = new System.Drawing.Size(460, 384);
+        this.tabPage3.TabIndex = 2;
+        this.tabPage3.Text = "WinTV-CI";
+        this.tabPage3.UseVisualStyleBackColor = true;
+        // 
+        // label10
+        // 
+        this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+        this.label10.Location = new System.Drawing.Point(17, 311);
+        this.label10.Name = "label10";
+        this.label10.Size = new System.Drawing.Size(434, 18);
+        this.label10.TabIndex = 39;
+        this.label10.Text = "Note: Changes may require a TVServer service restart.";
+        // 
+        // label5
+        // 
+        this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+        this.label5.Location = new System.Drawing.Point(17, 343);
+        this.label5.Name = "label5";
+        this.label5.Size = new System.Drawing.Size(434, 18);
+        this.label5.TabIndex = 19;
+        this.label5.Text = "The MediaPortal team recommends driver version 1.3607.26137.0 or later.";
+        // 
+        // groupBox2
+        // 
+        this.groupBox2.Controls.Add(this.mpComboBoxCard);
+        this.groupBox2.Controls.Add(this.pictureBox1);
+        this.groupBox2.Controls.Add(this.label4);
+        this.groupBox2.Controls.Add(this.label6);
+        this.groupBox2.Controls.Add(this.mpLabel1);
+        this.groupBox2.Controls.Add(this.label2);
+        this.groupBox2.Controls.Add(this.label1);
+        this.groupBox2.Location = new System.Drawing.Point(6, 6);
+        this.groupBox2.Name = "groupBox2";
+        this.groupBox2.Size = new System.Drawing.Size(444, 291);
+        this.groupBox2.TabIndex = 0;
+        this.groupBox2.TabStop = false;
+        this.groupBox2.Text = "WinTV-CI card assignment";
+        // 
+        // mpComboBoxCard
+        // 
+        this.mpComboBoxCard.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                    | System.Windows.Forms.AnchorStyles.Right)));
+        this.mpComboBoxCard.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+        this.mpComboBoxCard.FormattingEnabled = true;
+        this.mpComboBoxCard.Location = new System.Drawing.Point(98, 52);
+        this.mpComboBoxCard.Name = "mpComboBoxCard";
+        this.mpComboBoxCard.Size = new System.Drawing.Size(325, 21);
+        this.mpComboBoxCard.TabIndex = 16;
+        this.mpComboBoxCard.SelectedIndexChanged += new System.EventHandler(this.mpComboBoxCard_SelectedIndexChanged);
+        // 
+        // pictureBox1
+        // 
+        this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+        this.pictureBox1.Location = new System.Drawing.Point(24, 52);
+        this.pictureBox1.Name = "pictureBox1";
+        this.pictureBox1.Size = new System.Drawing.Size(33, 23);
+        this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+        this.pictureBox1.TabIndex = 18;
+        this.pictureBox1.TabStop = false;
+        // 
+        // label4
+        // 
+        this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+        this.label4.Location = new System.Drawing.Point(11, 31);
+        this.label4.Name = "label4";
+        this.label4.Size = new System.Drawing.Size(412, 18);
+        this.label4.TabIndex = 8;
+        this.label4.Text = "Select Hauppauge DVB card for the CI module to work with:-";
+        // 
+        // label6
+        // 
+        this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+        this.label6.ForeColor = System.Drawing.Color.Red;
+        this.label6.Location = new System.Drawing.Point(11, 126);
+        this.label6.Name = "label6";
+        this.label6.Size = new System.Drawing.Size(412, 18);
+        this.label6.TabIndex = 20;
+        this.label6.Text = "DO NOT remove the USB device whilst TVServer is running.";
+        // 
+        // mpLabel1
+        // 
+        this.mpLabel1.AutoSize = true;
+        this.mpLabel1.Location = new System.Drawing.Point(63, 57);
+        this.mpLabel1.Name = "mpLabel1";
+        this.mpLabel1.Size = new System.Drawing.Size(32, 13);
+        this.mpLabel1.TabIndex = 17;
+        this.mpLabel1.Text = "Card:";
+        // 
+        // label2
+        // 
+        this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+        this.label2.ForeColor = System.Drawing.Color.Red;
+        this.label2.Location = new System.Drawing.Point(11, 108);
+        this.label2.Name = "label2";
+        this.label2.Size = new System.Drawing.Size(412, 18);
+        this.label2.TabIndex = 6;
+        this.label2.Text = "This card MUST also only be from Hauppauge.";
+        // 
+        // label1
+        // 
+        this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+        this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+        this.label1.ForeColor = System.Drawing.Color.Red;
+        this.label1.Location = new System.Drawing.Point(11, 92);
+        this.label1.Name = "label1";
+        this.label1.Size = new System.Drawing.Size(412, 16);
+        this.label1.TabIndex = 5;
+        this.label1.Text = "Caution: The WinTV-CI should ONLY be used with 1x DVB card.";
+        // 
+        // tabControl1
+        // 
+        this.tabControl1.AccessibleName = "";
+        this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                    | System.Windows.Forms.AnchorStyles.Left)
+                    | System.Windows.Forms.AnchorStyles.Right)));
+        this.tabControl1.Controls.Add(this.tabPage1);
+        this.tabControl1.Controls.Add(this.tabPage2);
+        this.tabControl1.Controls.Add(this.tabPage3);
+        this.tabControl1.Location = new System.Drawing.Point(3, 3);
+        this.tabControl1.Name = "tabControl1";
+        this.tabControl1.SelectedIndex = 0;
+        this.tabControl1.Size = new System.Drawing.Size(468, 410);
+        this.tabControl1.TabIndex = 3;
+        this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
+        // 
+        // TvCards
+        // 
+        this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+        this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+        this.Controls.Add(this.tabControl1);
+        this.Name = "TvCards";
+        this.Size = new System.Drawing.Size(474, 416);
+        this.contextMenuStrip2.ResumeLayout(false);
+        this.contextMenuStrip1.ResumeLayout(false);
+        this.tabPage2.ResumeLayout(false);
+        this.tabPage1.ResumeLayout(false);
+        this.tabPage1.PerformLayout();
+        this.grpIPTV.ResumeLayout(false);
+        this.grpIPTV.PerformLayout();
+        ((System.ComponentModel.ISupportInitialize)(this.iptvUpDown)).EndInit();
+        this.tabPage3.ResumeLayout(false);
+        this.groupBox2.ResumeLayout(false);
+        this.groupBox2.PerformLayout();
+        ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+        this.tabControl1.ResumeLayout(false);
+        this.ResumeLayout(false);
 
     }
     #endregion
Index: SettingsForm.cs
===================================================================
--- SettingsForm.cs	(revision 28043)
+++ SettingsForm.cs	(working copy)
@@ -52,6 +52,7 @@
     public SetupTvSettingsForm(bool ShowAdvancedSettings)
     {
       showAdvancedSettings = ShowAdvancedSettings;
+      InitializeComponent();
       try
       {
         Init();
@@ -733,19 +734,21 @@
 
     private new void InitializeComponent()
     {
-      this.SuspendLayout();
-      // 
-      // sectionTree
-      // 
-      this.sectionTree.LineColor = System.Drawing.Color.Black;
-      // 
-      // SetupTvSettingsForm
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.ClientSize = new System.Drawing.Size(716, 537);
-      this.Name = "SetupTvSettingsForm";
-      this.ResumeLayout(false);
-      this.PerformLayout();
+        this.SuspendLayout();
+        // 
+        // sectionTree
+        // 
+        this.sectionTree.LineColor = System.Drawing.Color.Black;
+        // 
+        // SetupTvSettingsForm
+        // 
+        this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+        this.ClientSize = new System.Drawing.Size(716, 537);
+        this.MinimumSize = new System.Drawing.Size(724, 571);
+        this.Name = "SetupTvSettingsForm";
+        this.ResumeLayout(false);
+        this.PerformLayout();
+
     }
 
     #endregion
