mantis 3636

- re-enable PMT-based video/audio detection for channel type detection
- default to using ONID + TSID + SID for DVB-S, DVB-C and DVB-T channel identification (channel movement detection must be explicitly enabled)
- default to using URL for DVB-IP channel identification (channel movement can be enabled)
- disable all fields when scanning is active
- a few minor field movements for consistency
- fix field tab orders on scanning screens

TvEngine3/TVLibrary/SetupTv/Sections/CardAnalog.cs

@@ -841,9 +841,11 @@ private void DoTvScan()
         Card card = layer.GetCardByDevicePath(RemoteControl.Instance.CardDevice(_cardNumber));
         mpComboBoxCountry.Enabled = false;
         mpComboBoxSource.Enabled = false;
-        mpButtonScanRadio.Enabled = false;
         mpComboBoxSensitivity.Enabled = false;
-        mpButton1.Enabled = false;
+        checkBoxCreateSignalGroup.Enabled = false;
+        checkBoxNoMerge.Enabled = false;
+        mpButtonScanRadio.Enabled = false;
+        mpButtonAddSvideoChannels.Enabled = false;
         mpListView1.Items.Clear();
         CountryCollection countries = new CountryCollection();
         IUser user = new User();
@@ -1019,9 +1021,12 @@ private void DoTvScan()
         progressBar1.Value = 100;
         mpComboBoxCountry.Enabled = true;
         mpComboBoxSource.Enabled = true;
-        mpButtonScanRadio.Enabled = true;
         mpComboBoxSensitivity.Enabled = true;
-        mpButton1.Enabled = true;
+        checkBoxCreateSignalGroup.Enabled = true;
+        checkBoxNoMerge.Enabled = true;
+        mpButtonScanTv.Enabled = true;
+        mpButtonScanRadio.Enabled = true;
+        mpButtonAddSvideoChannels.Enabled = true;
         _isScanning = false;
         checkButton.Enabled = true;
       }
@@ -1125,8 +1130,10 @@ private void DoRadioScan()
         mpComboBoxCountry.Enabled = false;
         mpComboBoxSource.Enabled = false;
         mpComboBoxSensitivity.Enabled = false;
+        checkBoxCreateSignalGroup.Enabled = false;
+        checkBoxNoMerge.Enabled = false;
         mpButtonScanTv.Enabled = false;
-        mpButton1.Enabled = false;
+        mpButtonAddSvideoChannels.Enabled = false;
         UpdateStatus();
         mpListView1.Items.Clear();
         CountryCollection countries = new CountryCollection();
@@ -1235,10 +1242,12 @@ private void DoRadioScan()
         progressBar1.Value = 100;
         mpComboBoxCountry.Enabled = true;
         mpComboBoxSource.Enabled = true;
-        mpButtonScanRadio.Enabled = true;
-        mpButtonScanTv.Enabled = true;
         mpComboBoxSensitivity.Enabled = true;
-        mpButton1.Enabled = true;
+        checkBoxCreateSignalGroup.Enabled = true;
+        checkBoxNoMerge.Enabled = true;
+        mpButtonScanTv.Enabled = true;
+        mpButtonScanRadio.Enabled = true;
+        mpButtonAddSvideoChannels.Enabled = true;
         _isScanning = false;
       }
       ListViewItem lastItem =