Nemcio/ChanSort
1
0
Fork 0
mirror of https://github.com/PredatH0r/ChanSort.git synced 2026-05-06 14:57:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- added UTF-16 Big Endian and Little Endian options to character set menu

Browse Source 
- Samsung .zip loader: auto-detect UTF-16 endianness and allow to change encoding after loading to UTF-16 LE/BE
  (some files use Little Endian format and show chinese characters when loaded with the default Big Endian format)
- Customized column order is now preserved across file formats and input sources

- Note about LG WebOS 5 files (e.g. CX series):
  It is still unclear what exact firmware version and conditions are needed to properly import a channel list.
  Users reported about varying success of an import, reaching from not possible at all, only after a factory reset,
  importing the same list twice or working just fine.
  The problems is not related to ChanSort, as it can be reproduced by exporting a list to USB, swapping channels
  in the TV's menu and trying to loading the previously exported list back. The TV may keep the swapped channels and
  show inconsistencies between the channel list in the settings menu and the EPG.

- upgrade to DevExpress 20.1.4
This commit is contained in:
Horst Beham
2020-07-12 02:39:43 +02:00
parent 6b25a1648d
commit 180ad35d8e
31 changed files with 1577 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
source/ChanSort/MainForm.cs
View File

@@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Drawing;
using System.Globalization;
using System.IO;
@@ -27,7 +26,6 @@ using DevExpress.XtraGrid.Views.Base;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using DevExpress.XtraTab;
using Timer = System.Windows.Forms.Timer;
namespace ChanSort.Ui
{
@@ -662,9 +660,6 @@ namespace ChanSort.Ui
private void ShowChannelList(ChannelList channelList)
{
if (this.CurrentChannelList != null)
this.SaveInputGridLayout(this.CurrentChannelList.SignalSource);
this.CurrentChannelList = channelList;
this.Editor.ChannelList = channelList;
@@ -1303,6 +1298,17 @@ namespace ChanSort.Ui
break;
}
}
if (Config.Default.LeftGridLayout != null)
{
var xml = Config.Default.LeftGridLayout;
this.gviewLeft.LoadLayoutFromXml(xml);
}
if (Config.Default.RightGridLayout != null)
{
var xml = Config.Default.RightGridLayout;
this.gviewRight.LoadLayoutFromXml(xml);
}
}
#endregion
@@ -1440,20 +1446,6 @@ namespace ChanSort.Ui
private void LoadInputGridLayout()
{
#if false
// code disabled because it causes unpredictable column order when working with different file formats which may of may not show columns
string newLayout;
var newSource = list.SignalSource;
if ((newSource & SignalSource.Analog) != 0)
newLayout = Config.Default.InputGridLayoutAnalog;
else if ((newSource & SignalSource.DvbS) != 0)
newLayout = Config.Default.InputGridLayoutDvbS;
else
newLayout = Config.Default.InputGridLayoutDvbCT;
if (!string.IsNullOrEmpty(newLayout))
this.SetGridLayout(this.gviewRight, newLayout);
#endif
this.ShowGridColumns(this.gviewLeft);
this.ShowGridColumns(this.gviewRight);
this.ClearRightFilter();
@@ -1463,26 +1455,10 @@ namespace ChanSort.Ui
#region ShowGridColumns()
private void ShowGridColumns(GridView gview)
private void ShowGridColumns(XGridView gview)
{
var visIndex = 0;
foreach (GridColumn col in gview.Columns)
col.VisibleIndex = GetGridColumnVisibility(col) ? visIndex++ : -1;
}
#endregion
#region SaveInputGridLayout()
private void SaveInputGridLayout(SignalSource signalSource)
{
var currentLayout = GetGridLayout(this.gviewRight);
if ((signalSource & SignalSource.Analog) != 0)
Config.Default.InputGridLayoutAnalog = currentLayout;
else if ((signalSource & SignalSource.DvbS) != 0)
Config.Default.InputGridLayoutDvbS = currentLayout;
else //if ((signalSource & SignalSource.DvbCT) != 0)
Config.Default.InputGridLayoutDvbCT = currentLayout;
gview.SetColumnVisibility(col, GetGridColumnVisibility(col));
}
#endregion
@@ -2698,28 +2674,18 @@ namespace ChanSort.Ui
Config.Default.Encoding = this.defaultEncoding.WebName;
Config.Default.Language = Thread.CurrentThread.CurrentUICulture.Name;
Config.Default.LeftPanelWidth = this.splitContainerControl1.SplitterPosition.Unscale(this.absScaleFactor.Width);
Config.Default.OutputListLayout = GetGridLayout(this.gviewLeft);
if (this.CurrentChannelList != null)
SaveInputGridLayout(this.CurrentChannelList.SignalSource);
Config.Default.ShowWarningsAfterLoading = this.miShowWarningsAfterLoad.Checked;
Config.Default.CloseGaps = this.cbCloseGap.Checked;
Config.Default.MruFiles.Clear();
Config.Default.MruFiles.AddRange(this.mruFiles);
Config.Default.ExplorerIntegration = this.miExplorerIntegration.Down;
Config.Default.CheckForUpdates = this.miCheckUpdates.Down;
Config.Default.LeftGridLayout = this.gviewLeft.SaveLayoutToXml();
Config.Default.RightGridLayout = this.gviewRight.SaveLayoutToXml();
Config.Default.Save();
}
private string GetGridLayout(GridView grid)
{
var stream = new MemoryStream();
grid.SaveLayoutToStream(stream, OptionsLayoutBase.FullLayout);
stream.Seek(0, SeekOrigin.Begin);
using (var rdr = new StreamReader(stream, Encoding.UTF8))
return rdr.ReadToEnd();
}
#endregion
#region ClearLeftFilter(), ClearRightFilter()
@@ -2998,7 +2964,7 @@ namespace ChanSort.Ui
#region Character set menu
private void MiUtf8Charset_ItemClick(object sender, ItemClickEventArgs e)
private void miUtf8Charset_ItemClick(object sender, ItemClickEventArgs e)
{
TryExecute(() => this.SetDefaultEncoding(Encoding.UTF8));
}
@@ -3013,6 +2979,16 @@ namespace ChanSort.Ui
TryExecute(ShowCharsetForm);
}
private void miUtf16BigEndian_ItemClick(object sender, ItemClickEventArgs e)
{
TryExecute(() => this.SetDefaultEncoding(Encoding.BigEndianUnicode));
}
private void miUtf16LittleEndian_ItemClick(object sender, ItemClickEventArgs e)
{
TryExecute(() => this.SetDefaultEncoding(Encoding.Unicode));
}
private void charsetForm_EncodingChanged(object sender, EncodingChangedEventArgs e)
{
SetDefaultEncoding(e.Encoding);