Nemcio/ChanSort
1
0
Fork 0
mirror of https://github.com/PredatH0r/ChanSort.git synced 2026-02-27 08:40:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed ChannelList.SignalSource semantics again:

Browse Source 
- constructor replaces empty masks with full masks (i.e. if no tv/radio/data bit is set, then all bits get set and the list can hold any such channels)
- DataRoot.GetChannelList(SignalSource) works now accordingly to ignore a mask when it is empty in the search criteria (as opposed to the list's SignalSource)
Added checkbox for Data/Other in the reference list dialog
This commit is contained in:
hbeham
2019-08-29 18:14:59 +02:00
parent 0cf97fe76c
commit 808ac88be2
14 changed files with 114 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/ChanSort.Api/Model/ChannelList.cs
View File

@@ -17,6 +17,13 @@ namespace ChanSort.Api
public ChannelList(SignalSource source, string caption)
{
if ((source & SignalSource.MaskAnalogDigital) == 0)
source |= SignalSource.MaskAnalogDigital;
if ((source & SignalSource.MaskAntennaCableSat) == 0)
source |= SignalSource.MaskAntennaCableSat;
if ((source & SignalSource.MaskTvRadioData) == 0)
source |= SignalSource.MaskTvRadioData;
this.SignalSource = source;
this.ShortCaption = caption;
this.FirstProgramNumber = (source & SignalSource.Digital) != 0 ? 1 : 0;

8
source/ChanSort.Api/Model/DataRoot.cs
View File

@@ -91,13 +91,13 @@ namespace ChanSort.Api
{
var listMask = list.SignalSource;
if ((listMask & SignalSource.MaskAnalogDigital) != 0 && (listMask & SignalSource.MaskAnalogDigital & searchMask) == 0) // digital/analog
if ((searchMask & SignalSource.MaskAnalogDigital) != 0 && (listMask & SignalSource.MaskAnalogDigital & searchMask) == 0) // digital/analog
continue;
if ((listMask & SignalSource.MaskAntennaCableSat) != 0 && (listMask & SignalSource.MaskAntennaCableSat & searchMask) == 0) // air/cable/sat/ip
if ((searchMask & SignalSource.MaskAntennaCableSat) != 0 && (listMask & SignalSource.MaskAntennaCableSat & searchMask) == 0) // air/cable/sat/ip
continue;
if ((listMask & SignalSource.MaskTvRadioData) != 0 && (listMask & SignalSource.MaskTvRadioData & searchMask) == 0) // tv/radio/data
if ((searchMask & SignalSource.MaskTvRadioData) != 0 && (listMask & SignalSource.MaskTvRadioData & searchMask) == 0) // tv/radio/data
continue;
if ((listMask & SignalSource.MaskProvider) != 0 && (listMask & SignalSource.MaskProvider) != (searchMask & SignalSource.MaskProvider)) // preset list
if ((searchMask & SignalSource.MaskProvider) != 0 && (listMask & SignalSource.MaskProvider) != (searchMask & SignalSource.MaskProvider)) // preset list
continue;
return list;
}

2
source/ChanSort.Loader.PhilipsXml/Serializer.cs
View File

@@ -198,7 +198,7 @@ namespace ChanSort.Loader.PhilipsXml
data.Add(attr.LocalName, attr.Value);
}
var chan = new Channel(curList.SignalSource, rowId, rowId, setupNode);
var chan = new Channel(curList.SignalSource & SignalSource.MaskAdInput, rowId, rowId, setupNode);
chan.OldProgramNr = -1;
chan.IsDeleted = false;
if (this.formatVersion == 1)

16
source/ChanSort.Loader.Sony/Serializer.cs
View File

@@ -41,13 +41,13 @@ namespace ChanSort.Loader.Sony
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbT | SignalSource.Tv, "DVB-T TV"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbT | SignalSource.Radio, "DVB-T Radio"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbT, "DVB-T Other"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbT | SignalSource.Data, "DVB-T Other"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbC | SignalSource.Tv, "DVB-C TV"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbC | SignalSource.Radio, "DVB-C Radio"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbC, "DVB-C Other"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS, "DVB-S"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS | SignalSource.Provider2, "DVB-S Preset"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS | SignalSource.Provider3, "DVB-S Ci"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbC | SignalSource.Data, "DVB-C Other"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS | SignalSource.Provider0, "DVB-S"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS | SignalSource.Provider1, "DVB-S Preset"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS | SignalSource.Provider2, "DVB-S Ci"));
foreach (var list in this.DataRoot.ChannelLists)
{
@@ -158,11 +158,11 @@ namespace ChanSort.Loader.Sony
else if (name == "sdbc")
ReadSdb(child, SignalSource.DvbC, 0x10000, "DvbC");
else if (name == "sdbgs")
ReadSdb(child, SignalSource.DvbS | SignalSource.Provider1, 0x20000, "DvbS");
ReadSdb(child, SignalSource.DvbS | SignalSource.Provider0, 0x20000, "DvbS");
else if (name == "sdbps")
ReadSdb(child, SignalSource.DvbS | SignalSource.Provider2, 0x30000, "DvbS");
ReadSdb(child, SignalSource.DvbS | SignalSource.Provider1, 0x30000, "DvbS");
else if (name == "sdbcis")
ReadSdb(child, SignalSource.DvbS | SignalSource.Provider3, 0x40000, "DvbS");
ReadSdb(child, SignalSource.DvbS | SignalSource.Provider2, 0x40000, "DvbS");
}
}
#endregion

6
source/ChanSort/MainForm.cs
View File

@@ -1479,13 +1479,7 @@ namespace ChanSort.Ui
else if (col.Tag is bool originalVisible && !originalVisible)
return false;
// find out what sort of channels the list may contain. If a mask yields all bits 0, it means that the list may contain everything
var source = list.SignalSource;
if ((source & SignalSource.MaskAnalogDigital) == 0)
source |= SignalSource.MaskAnalogDigital;
if ((source & SignalSource.MaskAntennaCableSat) == 0)
source |= SignalSource.MaskAntennaCableSat;
if (col == this.colSource) return list.IsMixedSourceFavoritesList;
if (col == this.colPrNr) return this.subListIndex > 0;
if (col == this.colChannelOrTransponder) return (source & SignalSource.Sat) == 0;

4
source/ChanSort/Properties/Resources.Designer.cs generated
View File

@@ -19,7 +19,7 @@ namespace ChanSort.Ui.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -491,7 +491,7 @@ namespace ChanSort.Ui.Properties {
}
/// <summary>
/// Looks up a localized string similar to Antenna,Cable,Sat,IP,Analog,Digital,TV,Radio.
/// Looks up a localized string similar to Antenna,Cable,Sat,IP,Analog,Digital,TV,Radio,Data.
/// </summary>
internal static string ReferenceListForm_AntennaCableSatIPAnalogDigitalTVRadio {
get {

2
source/ChanSort/Properties/Resources.de.resx
View File

@@ -269,7 +269,7 @@ Sollen die Programmnummern in fortlaufende Zahlen umgeändert werden?</value>
Mögliche Ursachen sind USB-Sticks, die mit NTFS formatiert sind (FAT32 sollte immer funktionieren) oder ein am TV durchgeführtes Firmwareupdate, ohne einen anschließenden neuen Suchlauf. Dabei kann dann unter Umständen die neue Firmware die alten Daten nicht korrekt exportieren.</value>
</data>
<data name="ReferenceListForm_AntennaCableSatIPAnalogDigitalTVRadio" xml:space="preserve">
<value>Antenne,Kabel,Sat,IP,Analog,Digital,TV,Radio</value>
<value>Antenne,Kabel,Sat,IP,Analog,Digital,TV,Radio,Daten</value>
</data>
<data name="ReferenceListForm_btnApply_ConflictHandling" xml:space="preserve">
<value>Wie soll vorgegangen werden, wenn eine Pr# bereits vergeben ist?</value>

2
source/ChanSort/Properties/Resources.resx
View File

@@ -267,7 +267,7 @@ or firmware upgrades without running a new channel scan.
(The new software in the TV might be unable to process the old channel data during the export.)</value>
</data>
<data name="ReferenceListForm_AntennaCableSatIPAnalogDigitalTVRadio" xml:space="preserve">
<value>Antenna,Cable,Sat,IP,Analog,Digital,TV,Radio</value>
<value>Antenna,Cable,Sat,IP,Analog,Digital,TV,Radio,Data</value>
</data>
<data name="ReferenceListForm_btnApply_ConflictHandling" xml:space="preserve">
<value>How do you want to handle it when a Pr# is already taken in the target list?</value>

2
source/ChanSort/Properties/Resources.ro.resx
View File

@@ -261,7 +261,7 @@ sau actualizări ale firmware-ului fără a efectua o nouă scanare a canalelor.
(Noul software din televizor ar putea să nu poată procesa datele vechi ale canalului în timpul exportului.)</value>
</data>
<data name="ReferenceListForm_AntennaCableSatIPAnalogDigitalTVRadio" xml:space="preserve">
<value>Antenă, Cablu, Sat, IP, analog, digital, TV, radio</value>
<value>Antenă, Cablu, Sat, IP, analog, digital, TV, radio, data</value>
</data>
<data name="ReferenceListForm_btnApply_ConflictHandling" xml:space="preserve">
<value>Cum doriți să o gestionați atunci când un Pr # este deja luat în lista țintă?</value>

9
source/ChanSort/Properties/licenses.licx
View File

@@ -1,6 +1,7 @@
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

21
source/ChanSort/ReferenceListForm.Designer.cs generated
View File

@@ -29,7 +29,11 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ReferenceListForm));
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.edFile = new DevExpress.XtraEditors.ButtonEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
@@ -65,6 +69,7 @@
this.groupControl2 = new DevExpress.XtraEditors.GroupControl();
this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
this.cbData = new DevExpress.XtraEditors.CheckEdit();
((System.ComponentModel.ISupportInitialize)(this.edFile.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rbAuto.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rbManual.Properties)).BeginInit();
@@ -86,6 +91,7 @@
this.groupControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.groupControl2)).BeginInit();
this.groupControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbData.Properties)).BeginInit();
this.SuspendLayout();
//
// labelControl1
@@ -98,7 +104,7 @@
resources.ApplyResources(this.edFile, "edFile");
this.edFile.Name = "edFile";
this.edFile.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("edFile.Properties.Buttons"))), resources.GetString("edFile.Properties.Buttons1"), ((int)(resources.GetObject("edFile.Properties.Buttons2"))), ((bool)(resources.GetObject("edFile.Properties.Buttons3"))), ((bool)(resources.GetObject("edFile.Properties.Buttons4"))), ((bool)(resources.GetObject("edFile.Properties.Buttons5"))), ((DevExpress.XtraEditors.ImageLocation)(resources.GetObject("edFile.Properties.Buttons6"))), ((System.Drawing.Image)(resources.GetObject("edFile.Properties.Buttons7"))), new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, resources.GetString("edFile.Properties.Buttons8"), ((object)(resources.GetObject("edFile.Properties.Buttons9"))), ((DevExpress.Utils.SuperToolTip)(resources.GetObject("edFile.Properties.Buttons10"))), ((bool)(resources.GetObject("edFile.Properties.Buttons11"))))});
new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("edFile.Properties.Buttons"))), resources.GetString("edFile.Properties.Buttons1"), ((int)(resources.GetObject("edFile.Properties.Buttons2"))), ((bool)(resources.GetObject("edFile.Properties.Buttons3"))), ((bool)(resources.GetObject("edFile.Properties.Buttons4"))), ((bool)(resources.GetObject("edFile.Properties.Buttons5"))), editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, resources.GetString("edFile.Properties.Buttons6"), ((object)(resources.GetObject("edFile.Properties.Buttons7"))), ((DevExpress.Utils.SuperToolTip)(resources.GetObject("edFile.Properties.Buttons8"))), ((DevExpress.Utils.ToolTipAnchor)(resources.GetObject("edFile.Properties.Buttons9"))))});
this.edFile.Properties.ReadOnly = true;
this.edFile.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.edFile_ButtonClick);
//
@@ -203,6 +209,7 @@
// grpManual
//
resources.ApplyResources(this.grpManual, "grpManual");
this.grpManual.Controls.Add(this.cbData);
this.grpManual.Controls.Add(this.cbConsecutive);
this.grpManual.Controls.Add(this.cbIp);
this.grpManual.Controls.Add(this.cbSat);
@@ -367,10 +374,19 @@
resources.ApplyResources(this.labelControl8, "labelControl8");
this.labelControl8.Name = "labelControl8";
//
// cbData
//
resources.ApplyResources(this.cbData, "cbData");
this.cbData.Name = "cbData";
this.cbData.Properties.AutoWidth = true;
this.cbData.Properties.Caption = resources.GetString("checkEdit1.Properties.Caption");
this.cbData.TabStop = false;
//
// ReferenceListForm
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnClose;
this.Controls.Add(this.groupControl2);
this.Controls.Add(this.groupControl1);
this.Controls.Add(this.btnClose);
@@ -402,6 +418,8 @@
this.groupControl1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.groupControl2)).EndInit();
this.groupControl2.ResumeLayout(false);
this.groupControl2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.cbData.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -443,5 +461,6 @@
private DevExpress.XtraEditors.CheckEdit cbCable;
private DevExpress.XtraEditors.HyperlinkLabelControl linkWiki;
private DevExpress.XtraEditors.CheckEdit cbConsecutive;
private DevExpress.XtraEditors.CheckEdit cbData;
}
}

10
source/ChanSort/ReferenceListForm.cs
View File

@@ -151,7 +151,7 @@ namespace ChanSort.Ui
list = (ChannelList) this.comboTarget.EditValue;
this.lblTargetInfo.Text = GetInfoText(list, false);
var canApply = (cbAnalog.Checked || cbDigital.Checked) && (cbTv.Checked || cbRadio.Checked);
var canApply = (cbAnalog.Checked || cbDigital.Checked) && (cbTv.Checked || cbRadio.Checked || cbData.Checked);
this.btnApply.Enabled = canApply;
}
@@ -164,14 +164,14 @@ namespace ChanSort.Ui
var src = list?.SignalSource ?? 0;
var sb = new StringBuilder();
var sigSource = new[] {SignalSource.Antenna, SignalSource.Cable, SignalSource.Sat, SignalSource.IP, SignalSource.Analog, SignalSource.Digital, SignalSource.Tv, SignalSource.Radio};
var sigSource = new[] {SignalSource.Antenna, SignalSource.Cable, SignalSource.Sat, SignalSource.IP, SignalSource.Analog, SignalSource.Digital, SignalSource.Tv, SignalSource.Radio, SignalSource.Data};
var infoText = Resources.ReferenceListForm_AntennaCableSatIPAnalogDigitalTVRadio.Split(',');
var controls = new[] {cbAntenna, cbCable, cbSat, cbIp, cbAnalog, cbDigital, cbTv, cbRadio };
var controls = new[] {cbAntenna, cbCable, cbSat, cbIp, cbAnalog, cbDigital, cbTv, cbRadio, cbData };
for (int i = 0, c = sigSource.Length; i < c; i++)
{
if ((src & sigSource[i]) != 0)
sb.Append(", ").Append(infoText[i]);
sb.Append(", ").Append(infoText[i].TrimEnd());
else
{
controls[i].Checked = false;
@@ -200,7 +200,7 @@ namespace ChanSort.Ui
}
if (!(this.cbAnalog.Checked && (ss & SignalSource.Analog) != 0 || this.cbDigital.Checked && (ss & SignalSource.Digital) != 0))
return false;
if (!(this.cbTv.Checked && (ss & SignalSource.Tv) != 0 || this.cbRadio.Checked && (ss & SignalSource.Radio) != 0))
if (!(this.cbTv.Checked && (ss & SignalSource.Tv) != 0 || this.cbRadio.Checked && (ss & SignalSource.Radio) != 0 || this.cbData.Checked && (ss & SignalSource.Data) != 0))
return false;
return true;
}

94
source/ChanSort/ReferenceListForm.resx
View File

@@ -172,24 +172,17 @@
<data name="edFile.Properties.Buttons5" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="DevExpress.XtraEditors.v19.1" name="DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="edFile.Properties.Buttons6" type="DevExpress.XtraEditors.ImageLocation, DevExpress.XtraEditors.v19.1">
<value>MiddleCenter</value>
<data name="edFile.Properties.Buttons6" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="edFile.Properties.Buttons7" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="edFile.Properties.Buttons8" xml:space="preserve">
<data name="edFile.Properties.Buttons8" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="edFile.Properties.Buttons9" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="edFile.Properties.Buttons10" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="edFile.Properties.Buttons11" type="System.Boolean, mscorlib">
<value>True</value>
<data name="edFile.Properties.Buttons9" type="DevExpress.Utils.ToolTipAnchor, DevExpress.Utils.v19.1">
<value>Default</value>
</data>
<data name="edFile.Size" type="System.Drawing.Size, System.Drawing">
<value>549, 20</value>
@@ -209,6 +202,7 @@
<data name="&gt;&gt;edFile.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<assembly alias="DevExpress.XtraEditors.v19.1" name="DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="labelControl2.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v19.1">
<value>Vertical</value>
</data>
@@ -314,7 +308,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;labelControl3.ZOrder" xml:space="preserve">
<value>15</value>
<value>16</value>
</data>
<data name="comboSource.Location" type="System.Drawing.Point, System.Drawing">
<value>123, 33</value>
@@ -338,7 +332,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;comboSource.ZOrder" xml:space="preserve">
<value>13</value>
<value>14</value>
</data>
<data name="comboTarget.Location" type="System.Drawing.Point, System.Drawing">
<value>123, 7</value>
@@ -362,7 +356,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;comboTarget.ZOrder" xml:space="preserve">
<value>16</value>
<value>17</value>
</data>
<data name="labelControl4.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 10</value>
@@ -386,7 +380,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;labelControl4.ZOrder" xml:space="preserve">
<value>17</value>
<value>18</value>
</data>
<data name="cbTv.Location" type="System.Drawing.Point, System.Drawing">
<value>123, 109</value>
@@ -410,7 +404,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;cbTv.ZOrder" xml:space="preserve">
<value>20</value>
<value>21</value>
</data>
<data name="cbRadio.Location" type="System.Drawing.Point, System.Drawing">
<value>204, 109</value>
@@ -434,7 +428,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;cbRadio.ZOrder" xml:space="preserve">
<value>21</value>
<value>22</value>
</data>
<data name="labelControl5.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 137</value>
@@ -443,7 +437,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>62, 13</value>
</data>
<data name="labelControl5.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
<value>18</value>
</data>
<data name="labelControl5.Text" xml:space="preserve">
<value>Start at Pr#:</value>
@@ -458,7 +452,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;labelControl5.ZOrder" xml:space="preserve">
<value>19</value>
<value>20</value>
</data>
<data name="labelControl6.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v19.1">
<value>Vertical</value>
@@ -470,7 +464,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>323, 26</value>
</data>
<data name="labelControl6.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
<value>20</value>
</data>
<data name="labelControl6.Text" xml:space="preserve">
<value>(i.e. let radio channels start at 5000 to avoid conflicts with TV channel numbers)</value>
@@ -485,7 +479,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;labelControl6.ZOrder" xml:space="preserve">
<value>18</value>
<value>19</value>
</data>
<data name="comboPrNr.EditValue" xml:space="preserve">
<value>1</value>
@@ -521,7 +515,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>140, 20</value>
</data>
<data name="comboPrNr.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
<value>19</value>
</data>
<data name="&gt;&gt;comboPrNr.Name" xml:space="preserve">
<value>comboPrNr</value>
@@ -533,11 +527,35 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;comboPrNr.ZOrder" xml:space="preserve">
<value>14</value>
<value>15</value>
</data>
<data name="grpManual.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="cbData.Location" type="System.Drawing.Point, System.Drawing">
<value>284, 109</value>
</data>
<data name="checkEdit1.Properties.Caption" xml:space="preserve">
<value>Data/Other</value>
</data>
<data name="cbData.Size" type="System.Drawing.Size, System.Drawing">
<value>77, 19</value>
</data>
<data name="cbData.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
</data>
<data name="&gt;&gt;cbData.Name" xml:space="preserve">
<value>cbData</value>
</data>
<data name="&gt;&gt;cbData.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;cbData.Parent" xml:space="preserve">
<value>grpManual</value>
</data>
<data name="&gt;&gt;cbData.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="cbConsecutive.Location" type="System.Drawing.Point, System.Drawing">
<value>123, 167</value>
</data>
@@ -560,7 +578,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;cbConsecutive.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="cbIp.Location" type="System.Drawing.Point, System.Drawing">
<value>368, 59</value>
@@ -584,7 +602,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;cbIp.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="cbSat.Location" type="System.Drawing.Point, System.Drawing">
<value>284, 59</value>
@@ -608,7 +626,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;cbSat.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="labelControl11.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 62</value>
@@ -632,7 +650,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;labelControl11.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="cbAntenna.Location" type="System.Drawing.Point, System.Drawing">
<value>123, 59</value>
@@ -656,7 +674,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;cbAntenna.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="cbCable.Location" type="System.Drawing.Point, System.Drawing">
<value>204, 59</value>
@@ -680,7 +698,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;cbCable.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="labelControl9.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 87</value>
@@ -704,7 +722,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;labelControl9.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="cbAnalog.Location" type="System.Drawing.Point, System.Drawing">
<value>123, 84</value>
@@ -728,7 +746,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;cbAnalog.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="cbDigital.Location" type="System.Drawing.Point, System.Drawing">
<value>204, 84</value>
@@ -752,7 +770,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;cbDigital.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="lblTargetInfo.Location" type="System.Drawing.Point, System.Drawing">
<value>308, 10</value>
@@ -776,7 +794,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;lblTargetInfo.ZOrder" xml:space="preserve">
<value>9</value>
<value>10</value>
</data>
<data name="lblSourceInfo.Location" type="System.Drawing.Point, System.Drawing">
<value>308, 36</value>
@@ -800,7 +818,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;lblSourceInfo.ZOrder" xml:space="preserve">
<value>10</value>
<value>11</value>
</data>
<data name="labelControl7.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 112</value>
@@ -824,7 +842,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;labelControl7.ZOrder" xml:space="preserve">
<value>11</value>
<value>12</value>
</data>
<data name="btnApply.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
@@ -836,7 +854,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>103, 23</value>
</data>
<data name="btnApply.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
<value>22</value>
</data>
<data name="btnApply.Text" xml:space="preserve">
<value>Apply</value>
@@ -851,7 +869,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
<value>grpManual</value>
</data>
<data name="&gt;&gt;btnApply.ZOrder" xml:space="preserve">
<value>12</value>
<value>13</value>
</data>
<data name="grpManual.Enabled" type="System.Boolean, mscorlib">
<value>False</value>

4
source/Test.Loader.Sony/SonyXmlTest.cs
View File

@@ -24,7 +24,9 @@ namespace Test.Loader.Sony
[TestMethod]
public void TestAndroidSatChannelsAddedToCorrectLists()
{
this.TestChannelsAddedToCorrectLists("android_sdb-sat.xml", SignalSource.DvbS, 1560, 1269, 291);
this.TestChannelsAddedToCorrectLists("android_sdb-sat.xml", SignalSource.DvbS, 1163, 1004, 159);
this.TestChannelsAddedToCorrectLists("android_sdb-sat.xml", SignalSource.DvbS | SignalSource.Provider1, 397, 265, 132);
this.TestChannelsAddedToCorrectLists("android_sdb-sat.xml", SignalSource.DvbS | SignalSource.Provider2, 0, 0, 0);
}
[TestMethod]