Nemcio/ChanSort
1
0
Fork 0
mirror of https://github.com/PredatH0r/ChanSort.git synced 2026-01-17 12:52:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes:

Browse Source 
- fixed setting all Panasonic channel names to System.Byte[]
- fixed error during startup when reading MRUs
This commit is contained in:
hbeham
2013-11-20 09:55:42 +01:00
parent 78d29940ac
commit c8e5b98b47
6 changed files with 119 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChanSort.Loader.Panasonic/Serializer.cs
View File

@@ -11,7 +11,7 @@ namespace ChanSort.Loader.Panasonic
{
class Serializer : SerializerBase
{
private static readonly string ERR_FileFormatOrEncryption = "File uses an unknown format or encryption";
private const string ERR_FileFormatOrEncryption = "File uses an unknown format or encryption";
private static readonly int[] headerCypherTable;
private readonly ChannelList avbtChannels = new ChannelList(SignalSource.AnalogT | SignalSource.Tv | SignalSource.Radio, "Analog Antenna");
private readonly ChannelList avbcChannels = new ChannelList(SignalSource.AnalogC | SignalSource.Tv | SignalSource.Radio, "Analog Cable");
@@ -590,7 +590,7 @@ order by s.ntype,major_channel
cmd.Parameters.Add(new SQLiteParameter("@fav2", DbType.Int32));
cmd.Parameters.Add(new SQLiteParameter("@fav3", DbType.Int32));
cmd.Parameters.Add(new SQLiteParameter("@fav4", DbType.Int32));
cmd.Parameters.Add(new SQLiteParameter("@name", DbType.String));
cmd.Parameters.Add(new SQLiteParameter("@name", DbType.Binary));
cmd.Parameters.Add(new SQLiteParameter("@lock", DbType.Int32));
cmd.Parameters.Add(new SQLiteParameter("@skip", DbType.Int32));
cmd.Prepare();

8
ChanSort/MainForm.cs
View File

@@ -25,9 +25,9 @@ namespace ChanSort.Ui
{
public partial class MainForm : XtraForm
{
public const string AppVersion = "v2013-11-20";
public const string AppVersion = "v2013-11-20.2";
private const int MaxMruEntries = 8;
private const int MaxMruEntries = 10;
#region enum EditMode
private enum EditMode
@@ -950,7 +950,9 @@ namespace ChanSort.Ui
for (int i = MaxMruEntries-1; i >= 0; i--)
{
this.AddFileToMruList((string)Settings.Default.GetType().GetProperty("MruFile" + i).GetValue(Settings.Default, null));
var prop = Settings.Default.GetType().GetProperty("MruFile" + i);
if (prop != null)
this.AddFileToMruList((string)prop.GetValue(Settings.Default, null));
}
this.UpdateMruMenu();
}

60
ChanSort/Properties/Settings.Designer.cs generated
View File

@@ -370,5 +370,65 @@ namespace ChanSort.Ui.Properties {
this["MruFile4"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string MruFile5 {
get {
return ((string)(this["MruFile5"]));
}
set {
this["MruFile5"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string MruFile6 {
get {
return ((string)(this["MruFile6"]));
}
set {
this["MruFile6"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string MruFile7 {
get {
return ((string)(this["MruFile7"]));
}
set {
this["MruFile7"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string MruFile8 {
get {
return ((string)(this["MruFile8"]));
}
set {
this["MruFile8"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string MruFile9 {
get {
return ((string)(this["MruFile9"]));
}
set {
this["MruFile9"] = value;
}
}
}
}

15
ChanSort/Properties/Settings.settings
View File

@@ -89,5 +89,20 @@
<Setting Name="MruFile4" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="MruFile5" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="MruFile6" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="MruFile7" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="MruFile8" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="MruFile9" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
</SettingsFile>

53
ChanSort/app.config
View File

@@ -15,37 +15,37 @@
<value>0</value>
</setting>
<setting name="OutputListLayout" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InputFilterName" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InputFilterOldSlot" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InputFilterCrypt" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InputFilterNewSlot" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InputFilterChannel" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InputFilterUid" serializeAs="String">
<value/>
<value />
</setting>
<setting name="OutputFilterName" serializeAs="String">
<value/>
<value />
</setting>
<setting name="Language" serializeAs="String">
<value/>
<value />
</setting>
<setting name="OutputFilterNewSlot" serializeAs="String">
<value/>
<value />
</setting>
<setting name="Encoding" serializeAs="String">
<value/>
<value />
</setting>
<setting name="HideLeftList" serializeAs="String">
<value>False</value>
@@ -54,13 +54,13 @@
<value>0, 0</value>
</setting>
<setting name="InputGridLayoutAnalog" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InputGridLayoutDvbCT" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InputGridLayoutDvbS" serializeAs="String">
<value/>
<value />
</setting>
<setting name="LeftPanelWidth" serializeAs="String">
<value>0</value>
@@ -81,19 +81,34 @@
<value>True</value>
</setting>
<setting name="MruFile0" serializeAs="String">
<value/>
<value />
</setting>
<setting name="MruFile1" serializeAs="String">
<value/>
<value />
</setting>
<setting name="MruFile2" serializeAs="String">
<value/>
<value />
</setting>
<setting name="MruFile3" serializeAs="String">
<value/>
<value />
</setting>
<setting name="MruFile4" serializeAs="String">
<value/>
<value />
</setting>
<setting name="MruFile5" serializeAs="String">
<value />
</setting>
<setting name="MruFile6" serializeAs="String">
<value />
</setting>
<setting name="MruFile7" serializeAs="String">
<value />
</setting>
<setting name="MruFile8" serializeAs="String">
<value />
</setting>
<setting name="MruFile9" serializeAs="String">
<value />
</setting>
</ChanSort.Ui.Properties.Settings>
<GUI.Properties.Settings>

4
readme.txt
View File

@@ -1,6 +1,8 @@
Version v2013-11-20 =======================================================
Version v2013-11-20.2 =====================================================
Changes:
- Fix for v2013-11-20: Errormessage at program start
- Fix for v2013-11-20: Panasonic channel names were set incorrectly
- Panasonic: Handling of special characters in channel names
- Toshiba: channels didn't change their order for zapping in .zip/chmgt.db
channel lists (thanks to Kurt W. for the hint)