From e4c51d12fa83ce449ac5e245e3a268136cb905c0 Mon Sep 17 00:00:00 2001 From: hbeham Date: Sun, 10 Feb 2019 15:56:03 +0100 Subject: [PATCH] - fixed "delete channels", which were added at the end regardless of the user selection - changed logic how channel lists can control which columns are visible in the UI - added column for PcrPid - removed column AudioPid from SCM lists - added handling for SCM lists where the value of the "hidden" flag is 255. (Guessing the hidden-status based on another field) --- source/ChanSort.Api/Controller/Editor.cs | 9 +- source/ChanSort.Api/Model/ChannelInfo.cs | 1 + .../HisDbSerializer.cs | 2 +- .../ChanSort.Loader.Panasonic/Serializer.cs | 2 + .../ChanSort.Loader.Samsung.ini | 4 +- .../ChanSort.Loader.Samsung/ScmChannelBase.cs | 13 +- .../ChanSort.Loader.Samsung/ScmSerializer.cs | 6 + .../ChanSort.Loader.SamsungJ/DbSerializer.cs | 14 +- source/ChanSort/MainForm.Designer.cs | 97 +++++---- source/ChanSort/MainForm.cs | 19 +- source/ChanSort/MainForm.resx | 189 +++++++++++++++--- source/ChanSort/Properties/licenses.licx | 6 + 12 files changed, 276 insertions(+), 86 deletions(-) diff --git a/source/ChanSort.Api/Controller/Editor.cs b/source/ChanSort.Api/Controller/Editor.cs index 1654769..8ee6510 100644 --- a/source/ChanSort.Api/Controller/Editor.cs +++ b/source/ChanSort.Api/Controller/Editor.cs @@ -372,8 +372,9 @@ namespace ChanSort.Api } } - int progNr = GetNewPogramNr(appChannel, ref maxProgNr); - appChannel.NewProgramNr = progNr; + int progNr = this.GetNewProgramNr(appChannel, ref maxProgNr); + if (mode != UnsortedChannelMode.MarkDeleted) + appChannel.NewProgramNr = progNr; } } } @@ -404,9 +405,9 @@ namespace ChanSort.Api #endregion - #region GetNewPogramNr() + #region GetNewProgramNr() - private int GetNewPogramNr(ChannelInfo appChannel, ref int maxPrNr) + private int GetNewProgramNr(ChannelInfo appChannel, ref int maxPrNr) { int prNr = appChannel.NewProgramNr; if (prNr > maxPrNr) diff --git a/source/ChanSort.Api/Model/ChannelInfo.cs b/source/ChanSort.Api/Model/ChannelInfo.cs index 724e7ae..10fc364 100644 --- a/source/ChanSort.Api/Model/ChannelInfo.cs +++ b/source/ChanSort.Api/Model/ChannelInfo.cs @@ -34,6 +34,7 @@ namespace ChanSort.Api public decimal FreqInMhz { get; set; } public char Polarity { get; set; } public int ServiceId { get; set; } + public int PcrPid { get; set; } public int VideoPid { get; set; } public int AudioPid { get; set; } public int OriginalNetworkId { get; set; } diff --git a/source/ChanSort.Loader.Hisense2017/HisDbSerializer.cs b/source/ChanSort.Loader.Hisense2017/HisDbSerializer.cs index 3af1cdb..10aa851 100644 --- a/source/ChanSort.Loader.Hisense2017/HisDbSerializer.cs +++ b/source/ChanSort.Loader.Hisense2017/HisDbSerializer.cs @@ -124,7 +124,7 @@ namespace ChanSort.Loader.Hisense2017 Features.CanHaveGaps = true; DataRoot.MixedSourceFavorites = true; DataRoot.SortedFavorites = true; - DataRoot.ShowDeletedChannels = true; + DataRoot.ShowDeletedChannels = false; } #endregion diff --git a/source/ChanSort.Loader.Panasonic/Serializer.cs b/source/ChanSort.Loader.Panasonic/Serializer.cs index 0f6f42e..252b874 100644 --- a/source/ChanSort.Loader.Panasonic/Serializer.cs +++ b/source/ChanSort.Loader.Panasonic/Serializer.cs @@ -320,8 +320,10 @@ namespace ChanSort.Loader.Panasonic this.DataRoot.AddChannelList(this.satipChannels); this.DataRoot.AddChannelList(this.freesatChannels); + // hide columns for fields that don't exist in Panasonic channel list foreach (var list in this.DataRoot.ChannelLists) { + list.VisibleColumnFieldNames.Remove("PcrPid"); list.VisibleColumnFieldNames.Remove("VideoPid"); list.VisibleColumnFieldNames.Remove("AudioPid"); } diff --git a/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.ini b/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.ini index 1bf5591..8203ffd 100644 --- a/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.ini +++ b/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.ini @@ -175,7 +175,7 @@ offEncrypted = 24 maskEncrypted = 0x01 offHidden = 25 - maskHidden = 0x01 + offHiddenAlt = 26 offSymbolRate = 28 offLock = 31 maskLock = 0x01 @@ -214,7 +214,7 @@ offEncrypted = 24 maskEncrypted = 0x01 offHidden = 25 - maskHidden = 0x01 + offHiddenAlt = 26 offSymbolRate = 28 offLock = 31 maskLock = 0x01 diff --git a/source/ChanSort.Loader.Samsung/ScmChannelBase.cs b/source/ChanSort.Loader.Samsung/ScmChannelBase.cs index 6a215a6..86d76bd 100644 --- a/source/ChanSort.Loader.Samsung/ScmChannelBase.cs +++ b/source/ChanSort.Loader.Samsung/ScmChannelBase.cs @@ -23,7 +23,9 @@ namespace ChanSort.Loader.Samsung // DVB private const string _Skip = "Skip"; private const string _Hidden = "Hidden"; + private const string _HiddenAlt = "HiddenAlt"; private const string _ServiceId = "offServiceId"; + private const string _PcrPid = "offPcrPid"; private const string _VideoPid = "offVideoPid"; private const string _AudioPid = "offAudioPid"; private const string _OriginalNetworkId = "offOriginalNetworkId"; @@ -61,12 +63,17 @@ namespace ChanSort.Loader.Samsung this.Name = data.GetString(_Name, data.Settings.GetInt("lenName")); this.Favorites = this.ParseRawFavorites(); this.Lock = data.GetFlag(_Lock); - this.Hidden = data.GetFlag(_Hidden); + int hiddenPrimary = data.GetByte(_Hidden); + if (hiddenPrimary == 255) + this.Hidden = data.GetByte(_HiddenAlt) != 0; + else + this.Hidden = hiddenPrimary != 0; this.Skip = data.GetFlag(_Skip); this.Encrypted = data.GetFlag(_Encrypted); this.IsDeleted = data.GetFlag(_Deleted, false) || !data.GetFlag(_IsActive, true); if (this.IsDeleted) this.OldProgramNr = -1; + this.AddDebug(data.Data, data.BaseOffset + 25, 3); } #endregion @@ -103,7 +110,7 @@ namespace ChanSort.Loader.Samsung { this.ShortName = data.GetString(_ShortName, data.Settings.GetInt("lenShortName")); this.ServiceId = data.GetWord(_ServiceId); - //this.PcrPid = data.GetWord(_PcrPid); + this.PcrPid = data.GetWord(_PcrPid); this.VideoPid = data.GetWord(_VideoPid); this.AudioPid = data.GetWord(_AudioPid); this.OriginalNetworkId = data.GetWord(_OriginalNetworkId); @@ -149,7 +156,7 @@ namespace ChanSort.Loader.Samsung mapping.SetFlag(_Deleted, this.NewProgramNr < 0); mapping.SetFlag(_IsActive, this.NewProgramNr >= 0); mapping.SetFlag(_Skip, this.Skip); - mapping.SetFlag(_Hidden, this.Hidden); + mapping.SetByte(this.mapping.GetByte(_Hidden) != 255 ? _Hidden : _HiddenAlt, this.Hidden ? 1 : 0); if (this.Encrypted != null) mapping.SetFlag(_Encrypted, this.Encrypted.Value); this.UpdateChecksum(); diff --git a/source/ChanSort.Loader.Samsung/ScmSerializer.cs b/source/ChanSort.Loader.Samsung/ScmSerializer.cs index 33cdfc8..9a2394e 100644 --- a/source/ChanSort.Loader.Samsung/ScmSerializer.cs +++ b/source/ChanSort.Loader.Samsung/ScmSerializer.cs @@ -136,6 +136,12 @@ namespace ChanSort.Loader.Samsung ReadDvbsChannels(zip, "map-CyfraPlusD", this.cyfraPlusChannels, out this.cyfraPlusFileContent, c.cyfraPlusChannelSize); ReadAstraHdPlusChannels(zip); } + + foreach (var list in this.DataRoot.ChannelLists) + { + list.VisibleColumnFieldNames.Add("PcrPid"); + list.VisibleColumnFieldNames.Remove("AudioPid"); + } } #endregion diff --git a/source/ChanSort.Loader.SamsungJ/DbSerializer.cs b/source/ChanSort.Loader.SamsungJ/DbSerializer.cs index b2cbe13..b87c5e8 100644 --- a/source/ChanSort.Loader.SamsungJ/DbSerializer.cs +++ b/source/ChanSort.Loader.SamsungJ/DbSerializer.cs @@ -10,6 +10,9 @@ using ICSharpCode.SharpZipLib.Zip; namespace ChanSort.Loader.SamsungJ { + /// + /// Loader for Samsung J/K/M/Q/N/... series .zip files + /// class DbSerializer : SerializerBase { private readonly Dictionary channelById = new Dictionary(); @@ -28,11 +31,12 @@ namespace ChanSort.Loader.SamsungJ this.DataRoot.SupportedFavorites = Favorites.A | Favorites.B | Favorites.C | Favorites.D | Favorites.E; this.DataRoot.SortedFavorites = true; this.DataRoot.AllowGapsInFavNumbers = false; + this.DataRoot.ShowDeletedChannels = false; } #endregion #region DisplayName - public override string DisplayName => "Samsung J-Series .zip Loader"; + public override string DisplayName => "Samsung .zip Loader"; #endregion @@ -519,7 +523,10 @@ namespace ChanSort.Loader.SamsungJ var channel = channelInfo as DbChannel; if (channel == null) // ignore reference list proxy channels continue; - + +#if false + // disabled, because channels should just be marked as deleted and not physically deleted + if (channel.NewProgramNr < 0) { // delete channel from all tables that have a reference to srvId @@ -527,10 +534,11 @@ namespace ChanSort.Loader.SamsungJ cmdDeleteSrv.ExecuteNonQuery(); continue; } +#endif // update channel record cmdUpdateSrv.Parameters["@id"].Value = channel.RecordIndex; - cmdUpdateSrv.Parameters["@nr"].Value = channel.NewProgramNr; + cmdUpdateSrv.Parameters["@nr"].Value = channel.IsDeleted ? -1 : channel.NewProgramNr; cmdUpdateSrv.Parameters["@lock"].Value = channel.Lock; cmdUpdateSrv.Parameters["@hidden"].Value = channel.Hidden; cmdUpdateSrv.Parameters["@numsel"].Value = !channel.Skip; diff --git a/source/ChanSort/MainForm.Designer.cs b/source/ChanSort/MainForm.Designer.cs index c3a13b8..16d938b 100644 --- a/source/ChanSort/MainForm.Designer.cs +++ b/source/ChanSort/MainForm.Designer.cs @@ -84,6 +84,7 @@ this.colNetworkId = new DevExpress.XtraGrid.Columns.GridColumn(); this.colTransportStreamId = new DevExpress.XtraGrid.Columns.GridColumn(); this.colServiceId = new DevExpress.XtraGrid.Columns.GridColumn(); + this.colPcrPid = new DevExpress.XtraGrid.Columns.GridColumn(); this.colVideoPid = new DevExpress.XtraGrid.Columns.GridColumn(); this.colAudioPid = new DevExpress.XtraGrid.Columns.GridColumn(); this.colSymbolRate = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -446,7 +447,7 @@ // // btnToggleLock // - this.btnToggleLock.ImageOptions.ImageIndex = 15; + this.btnToggleLock.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnToggleLock.ImageOptions.ImageIndex"))); this.btnToggleLock.ImageOptions.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnToggleLock, "btnToggleLock"); this.btnToggleLock.Name = "btnToggleLock"; @@ -493,14 +494,14 @@ resources.ApplyResources(this.btnClearLeftFilter, "btnClearLeftFilter"); this.btnClearLeftFilter.Appearance.Font = ((System.Drawing.Font)(resources.GetObject("btnClearLeftFilter.Appearance.Font"))); this.btnClearLeftFilter.Appearance.Options.UseFont = true; - this.btnClearLeftFilter.ImageOptions.ImageIndex = 28; + this.btnClearLeftFilter.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnClearLeftFilter.ImageOptions.ImageIndex"))); this.btnClearLeftFilter.ImageOptions.ImageList = this.globalImageCollection1; this.btnClearLeftFilter.Name = "btnClearLeftFilter"; this.btnClearLeftFilter.Click += new System.EventHandler(this.btnClearLeftFilter_Click); // // btnRenum // - this.btnRenum.ImageOptions.ImageIndex = 22; + this.btnRenum.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnRenum.ImageOptions.ImageIndex"))); this.btnRenum.ImageOptions.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnRenum, "btnRenum"); this.btnRenum.Name = "btnRenum"; @@ -508,7 +509,7 @@ // // btnDown // - this.btnDown.ImageOptions.ImageIndex = 25; + this.btnDown.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnDown.ImageOptions.ImageIndex"))); this.btnDown.ImageOptions.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnDown, "btnDown"); this.btnDown.Name = "btnDown"; @@ -516,7 +517,7 @@ // // btnUp // - this.btnUp.ImageOptions.ImageIndex = 24; + this.btnUp.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnUp.ImageOptions.ImageIndex"))); this.btnUp.ImageOptions.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnUp, "btnUp"); this.btnUp.Name = "btnUp"; @@ -524,7 +525,7 @@ // // btnRemoveLeft // - this.btnRemoveLeft.ImageOptions.ImageIndex = 11; + this.btnRemoveLeft.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnRemoveLeft.ImageOptions.ImageIndex"))); this.btnRemoveLeft.ImageOptions.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnRemoveLeft, "btnRemoveLeft"); this.btnRemoveLeft.Name = "btnRemoveLeft"; @@ -583,6 +584,7 @@ this.colNetworkId, this.colTransportStreamId, this.colServiceId, + this.colPcrPid, this.colVideoPid, this.colAudioPid, this.colSymbolRate, @@ -787,6 +789,12 @@ this.colServiceId.Name = "colServiceId"; this.colServiceId.OptionsColumn.AllowEdit = false; // + // colPcrPid + // + resources.ApplyResources(this.colPcrPid, "colPcrPid"); + this.colPcrPid.FieldName = "PcrPid"; + this.colPcrPid.Name = "colPcrPid"; + // // colVideoPid // resources.ApplyResources(this.colVideoPid, "colVideoPid"); @@ -882,7 +890,7 @@ // lblPredefinedList // this.lblPredefinedList.Appearance.Font = ((System.Drawing.Font)(resources.GetObject("lblPredefinedList.Appearance.Font"))); - this.lblPredefinedList.Appearance.ForeColor = ((System.Drawing.Color)(resources.GetObject("lblPredefinedList.Appearance.ForeColor"))); + this.lblPredefinedList.Appearance.ForeColor = System.Drawing.Color.Maroon; this.lblPredefinedList.Appearance.Options.UseFont = true; this.lblPredefinedList.Appearance.Options.UseForeColor = true; resources.ApplyResources(this.lblPredefinedList, "lblPredefinedList"); @@ -890,7 +898,7 @@ // // btnRemoveRight // - this.btnRemoveRight.ImageOptions.ImageIndex = 11; + this.btnRemoveRight.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnRemoveRight.ImageOptions.ImageIndex"))); this.btnRemoveRight.ImageOptions.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnRemoveRight, "btnRemoveRight"); this.btnRemoveRight.Name = "btnRemoveRight"; @@ -907,14 +915,14 @@ resources.ApplyResources(this.btnClearRightFilter, "btnClearRightFilter"); this.btnClearRightFilter.Appearance.Font = ((System.Drawing.Font)(resources.GetObject("btnClearRightFilter.Appearance.Font"))); this.btnClearRightFilter.Appearance.Options.UseFont = true; - this.btnClearRightFilter.ImageOptions.ImageIndex = 28; + this.btnClearRightFilter.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnClearRightFilter.ImageOptions.ImageIndex"))); this.btnClearRightFilter.ImageOptions.ImageList = this.globalImageCollection1; this.btnClearRightFilter.Name = "btnClearRightFilter"; this.btnClearRightFilter.Click += new System.EventHandler(this.btnClearRightFilter_Click); // // btnAdd // - this.btnAdd.ImageOptions.ImageIndex = 39; + this.btnAdd.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnAdd.ImageOptions.ImageIndex"))); this.btnAdd.ImageOptions.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnAdd, "btnAdd"); this.btnAdd.Name = "btnAdd"; @@ -1079,7 +1087,7 @@ resources.ApplyResources(this.miOpen, "miOpen"); this.miOpen.CategoryGuid = new System.Guid("e6c9a329-010b-4d79-8d4d-215e5f197ed3"); this.miOpen.Id = 5; - this.miOpen.ImageOptions.ImageIndex = 3; + this.miOpen.ImageOptions.ImageIndex = ((int)(resources.GetObject("miOpen.ImageOptions.ImageIndex"))); this.miOpen.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)); this.miOpen.Name = "miOpen"; this.miOpen.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miOpen_ItemClick); @@ -1090,7 +1098,7 @@ this.miReload.CategoryGuid = new System.Guid("e6c9a329-010b-4d79-8d4d-215e5f197ed3"); this.miReload.Enabled = false; this.miReload.Id = 7; - this.miReload.ImageOptions.ImageIndex = 5; + this.miReload.ImageOptions.ImageIndex = ((int)(resources.GetObject("miReload.ImageOptions.ImageIndex"))); this.miReload.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)); this.miReload.Name = "miReload"; this.miReload.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miReload_ItemClick); @@ -1100,7 +1108,7 @@ resources.ApplyResources(this.miRestoreOriginal, "miRestoreOriginal"); this.miRestoreOriginal.CategoryGuid = new System.Guid("e6c9a329-010b-4d79-8d4d-215e5f197ed3"); this.miRestoreOriginal.Id = 42; - this.miRestoreOriginal.ImageOptions.ImageIndex = 31; + this.miRestoreOriginal.ImageOptions.ImageIndex = ((int)(resources.GetObject("miRestoreOriginal.ImageOptions.ImageIndex"))); this.miRestoreOriginal.ItemShortcut = new DevExpress.XtraBars.BarShortcut(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.R)); this.miRestoreOriginal.Name = "miRestoreOriginal"; @@ -1111,7 +1119,7 @@ resources.ApplyResources(this.miFileInformation, "miFileInformation"); this.miFileInformation.CategoryGuid = new System.Guid("e6c9a329-010b-4d79-8d4d-215e5f197ed3"); this.miFileInformation.Id = 43; - this.miFileInformation.ImageOptions.ImageIndex = 30; + this.miFileInformation.ImageOptions.ImageIndex = ((int)(resources.GetObject("miFileInformation.ImageOptions.ImageIndex"))); this.miFileInformation.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)); this.miFileInformation.Name = "miFileInformation"; this.miFileInformation.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miFileInformation_ItemClick); @@ -1122,7 +1130,7 @@ this.miSave.CategoryGuid = new System.Guid("e6c9a329-010b-4d79-8d4d-215e5f197ed3"); this.miSave.Enabled = false; this.miSave.Id = 6; - this.miSave.ImageOptions.ImageIndex = 4; + this.miSave.ImageOptions.ImageIndex = ((int)(resources.GetObject("miSave.ImageOptions.ImageIndex"))); this.miSave.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)); this.miSave.Name = "miSave"; this.miSave.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miSave_ItemClick); @@ -1133,7 +1141,7 @@ this.miSaveAs.CategoryGuid = new System.Guid("e6c9a329-010b-4d79-8d4d-215e5f197ed3"); this.miSaveAs.Enabled = false; this.miSaveAs.Id = 8; - this.miSaveAs.ImageOptions.ImageIndex = 33; + this.miSaveAs.ImageOptions.ImageIndex = ((int)(resources.GetObject("miSaveAs.ImageOptions.ImageIndex"))); this.miSaveAs.ItemShortcut = new DevExpress.XtraBars.BarShortcut(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S)); this.miSaveAs.Name = "miSaveAs"; @@ -1144,7 +1152,7 @@ resources.ApplyResources(this.miOpenReferenceFile, "miOpenReferenceFile"); this.miOpenReferenceFile.CategoryGuid = new System.Guid("e6c9a329-010b-4d79-8d4d-215e5f197ed3"); this.miOpenReferenceFile.Id = 44; - this.miOpenReferenceFile.ImageOptions.ImageIndex = 23; + this.miOpenReferenceFile.ImageOptions.ImageIndex = ((int)(resources.GetObject("miOpenReferenceFile.ImageOptions.ImageIndex"))); this.miOpenReferenceFile.ItemShortcut = new DevExpress.XtraBars.BarShortcut(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.O)); this.miOpenReferenceFile.Name = "miOpenReferenceFile"; @@ -1161,7 +1169,7 @@ // resources.ApplyResources(this.miSaveReferenceFile, "miSaveReferenceFile"); this.miSaveReferenceFile.Id = 57; - this.miSaveReferenceFile.ImageOptions.ImageIndex = 6; + this.miSaveReferenceFile.ImageOptions.ImageIndex = ((int)(resources.GetObject("miSaveReferenceFile.ImageOptions.ImageIndex"))); this.miSaveReferenceFile.Name = "miSaveReferenceFile"; this.miSaveReferenceFile.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miSaveReferenceFile_ItemClick); // @@ -1169,7 +1177,7 @@ // resources.ApplyResources(this.miExcelExport, "miExcelExport"); this.miExcelExport.Id = 59; - this.miExcelExport.ImageOptions.ImageIndex = 32; + this.miExcelExport.ImageOptions.ImageIndex = ((int)(resources.GetObject("miExcelExport.ImageOptions.ImageIndex"))); this.miExcelExport.ItemShortcut = new DevExpress.XtraBars.BarShortcut(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.C)); this.miExcelExport.Name = "miExcelExport"; @@ -1179,7 +1187,7 @@ // resources.ApplyResources(this.miPrint, "miPrint"); this.miPrint.Id = 62; - this.miPrint.ImageOptions.ImageIndex = 34; + this.miPrint.ImageOptions.ImageIndex = ((int)(resources.GetObject("miPrint.ImageOptions.ImageIndex"))); this.miPrint.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)); this.miPrint.Name = "miPrint"; this.miPrint.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miPrint_ItemClick); @@ -1227,7 +1235,7 @@ resources.ApplyResources(this.miAddChannel, "miAddChannel"); this.miAddChannel.CategoryGuid = new System.Guid("d7eec464-59c9-4f45-88aa-602e64c81cc0"); this.miAddChannel.Id = 39; - this.miAddChannel.ImageOptions.ImageIndex = 26; + this.miAddChannel.ImageOptions.ImageIndex = ((int)(resources.GetObject("miAddChannel.ImageOptions.ImageIndex"))); this.miAddChannel.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Add)); this.miAddChannel.Name = "miAddChannel"; // @@ -1236,7 +1244,7 @@ resources.ApplyResources(this.miRemove, "miRemove"); this.miRemove.CategoryGuid = new System.Guid("d7eec464-59c9-4f45-88aa-602e64c81cc0"); this.miRemove.Id = 25; - this.miRemove.ImageOptions.ImageIndex = 11; + this.miRemove.ImageOptions.ImageIndex = ((int)(resources.GetObject("miRemove.ImageOptions.ImageIndex"))); this.miRemove.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X)); this.miRemove.Name = "miRemove"; this.miRemove.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miRemove_ItemClick); @@ -1246,7 +1254,7 @@ resources.ApplyResources(this.miRenameChannel, "miRenameChannel"); this.miRenameChannel.CategoryGuid = new System.Guid("d7eec464-59c9-4f45-88aa-602e64c81cc0"); this.miRenameChannel.Id = 52; - this.miRenameChannel.ImageOptions.ImageIndex = 29; + this.miRenameChannel.ImageOptions.ImageIndex = ((int)(resources.GetObject("miRenameChannel.ImageOptions.ImageIndex"))); this.miRenameChannel.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)); this.miRenameChannel.Name = "miRenameChannel"; this.miRenameChannel.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miRenameChannel_ItemClick); @@ -1256,7 +1264,7 @@ resources.ApplyResources(this.miSort, "miSort"); this.miSort.CategoryGuid = new System.Guid("d7eec464-59c9-4f45-88aa-602e64c81cc0"); this.miSort.Id = 40; - this.miSort.ImageOptions.ImageIndex = 21; + this.miSort.ImageOptions.ImageIndex = ((int)(resources.GetObject("miSort.ImageOptions.ImageIndex"))); this.miSort.Name = "miSort"; this.miSort.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miSort_ItemClick); // @@ -1265,7 +1273,7 @@ resources.ApplyResources(this.miRenum, "miRenum"); this.miRenum.CategoryGuid = new System.Guid("d7eec464-59c9-4f45-88aa-602e64c81cc0"); this.miRenum.Id = 41; - this.miRenum.ImageOptions.ImageIndex = 22; + this.miRenum.ImageOptions.ImageIndex = ((int)(resources.GetObject("miRenum.ImageOptions.ImageIndex"))); this.miRenum.Name = "miRenum"; this.miRenum.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miRenum_ItemClick); // @@ -1281,7 +1289,7 @@ resources.ApplyResources(this.mnuFavSet, "mnuFavSet"); this.mnuFavSet.CategoryGuid = new System.Guid("d7eec464-59c9-4f45-88aa-602e64c81cc0"); this.mnuFavSet.Id = 37; - this.mnuFavSet.ImageOptions.ImageIndex = 13; + this.mnuFavSet.ImageOptions.ImageIndex = ((int)(resources.GetObject("mnuFavSet.ImageOptions.ImageIndex"))); this.mnuFavSet.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(this.miFavASet), new DevExpress.XtraBars.LinkPersistInfo(this.miFavBSet), @@ -1414,7 +1422,7 @@ resources.ApplyResources(this.miLockOn, "miLockOn"); this.miLockOn.CategoryGuid = new System.Guid("d7eec464-59c9-4f45-88aa-602e64c81cc0"); this.miLockOn.Id = 27; - this.miLockOn.ImageOptions.ImageIndex = 15; + this.miLockOn.ImageOptions.ImageIndex = ((int)(resources.GetObject("miLockOn.ImageOptions.ImageIndex"))); this.miLockOn.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)); this.miLockOn.Name = "miLockOn"; this.miLockOn.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miLockOn_ItemClick); @@ -1434,7 +1442,7 @@ resources.ApplyResources(this.miSkipOn, "miSkipOn"); this.miSkipOn.CategoryGuid = new System.Guid("d7eec464-59c9-4f45-88aa-602e64c81cc0"); this.miSkipOn.Id = 29; - this.miSkipOn.ImageOptions.ImageIndex = 16; + this.miSkipOn.ImageOptions.ImageIndex = ((int)(resources.GetObject("miSkipOn.ImageOptions.ImageIndex"))); this.miSkipOn.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.K)); this.miSkipOn.Name = "miSkipOn"; this.miSkipOn.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miSkipOn_ItemClick); @@ -1454,7 +1462,7 @@ resources.ApplyResources(this.miHideOn, "miHideOn"); this.miHideOn.CategoryGuid = new System.Guid("d7eec464-59c9-4f45-88aa-602e64c81cc0"); this.miHideOn.Id = 31; - this.miHideOn.ImageOptions.ImageIndex = 17; + this.miHideOn.ImageOptions.ImageIndex = ((int)(resources.GetObject("miHideOn.ImageOptions.ImageIndex"))); this.miHideOn.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H)); this.miHideOn.Name = "miHideOn"; this.miHideOn.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miHideOn_ItemClick); @@ -1482,7 +1490,7 @@ // resources.ApplyResources(this.miTvSettings, "miTvSettings"); this.miTvSettings.Id = 48; - this.miTvSettings.ImageOptions.ImageIndex = 27; + this.miTvSettings.ImageOptions.ImageIndex = ((int)(resources.GetObject("miTvSettings.ImageOptions.ImageIndex"))); this.miTvSettings.Name = "miTvSettings"; this.miTvSettings.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miTvCountrySetup_ItemClick); // @@ -1510,7 +1518,7 @@ resources.ApplyResources(this.barSubItem1, "barSubItem1"); this.barSubItem1.CategoryGuid = new System.Guid("870e935c-f3d9-4202-9c58-87966069155d"); this.barSubItem1.Id = 0; - this.barSubItem1.ImageOptions.ImageIndex = 14; + this.barSubItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("barSubItem1.ImageOptions.ImageIndex"))); this.barSubItem1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(this.miEnglish), new DevExpress.XtraBars.LinkPersistInfo(this.miGerman), @@ -1527,7 +1535,7 @@ resources.ApplyResources(this.miEnglish, "miEnglish"); this.miEnglish.CategoryGuid = new System.Guid("870e935c-f3d9-4202-9c58-87966069155d"); this.miEnglish.Id = 2; - this.miEnglish.ImageOptions.ImageIndex = 0; + this.miEnglish.ImageOptions.ImageIndex = ((int)(resources.GetObject("miEnglish.ImageOptions.ImageIndex"))); this.miEnglish.Name = "miEnglish"; this.miEnglish.Tag = "en"; this.miEnglish.DownChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.miLanguage_DownChanged); @@ -1538,7 +1546,7 @@ resources.ApplyResources(this.miGerman, "miGerman"); this.miGerman.CategoryGuid = new System.Guid("870e935c-f3d9-4202-9c58-87966069155d"); this.miGerman.Id = 1; - this.miGerman.ImageOptions.ImageIndex = 1; + this.miGerman.ImageOptions.ImageIndex = ((int)(resources.GetObject("miGerman.ImageOptions.ImageIndex"))); this.miGerman.Name = "miGerman"; this.miGerman.Tag = "de-DE"; this.miGerman.DownChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.miLanguage_DownChanged); @@ -1548,7 +1556,7 @@ this.miPortuguese.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.Check; resources.ApplyResources(this.miPortuguese, "miPortuguese"); this.miPortuguese.Id = 60; - this.miPortuguese.ImageOptions.ImageIndex = 2; + this.miPortuguese.ImageOptions.ImageIndex = ((int)(resources.GetObject("miPortuguese.ImageOptions.ImageIndex"))); this.miPortuguese.Name = "miPortuguese"; this.miPortuguese.Tag = "pt-PT"; this.miPortuguese.DownChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.miLanguage_DownChanged); @@ -1558,7 +1566,7 @@ this.miRussian.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.Check; resources.ApplyResources(this.miRussian, "miRussian"); this.miRussian.Id = 93; - this.miRussian.ImageOptions.ImageIndex = 35; + this.miRussian.ImageOptions.ImageIndex = ((int)(resources.GetObject("miRussian.ImageOptions.ImageIndex"))); this.miRussian.Name = "miRussian"; this.miRussian.Tag = "ru-RU"; this.miRussian.DownChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.miLanguage_DownChanged); @@ -1568,7 +1576,7 @@ this.miCzech.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.Check; resources.ApplyResources(this.miCzech, "miCzech"); this.miCzech.Id = 95; - this.miCzech.ImageOptions.ImageIndex = 41; + this.miCzech.ImageOptions.ImageIndex = ((int)(resources.GetObject("miCzech.ImageOptions.ImageIndex"))); this.miCzech.Name = "miCzech"; this.miCzech.Tag = "cs-CZ"; this.miCzech.DownChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.miLanguage_DownChanged); @@ -1578,7 +1586,7 @@ this.miRomanian.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.Check; resources.ApplyResources(this.miRomanian, "miRomanian"); this.miRomanian.Id = 96; - this.miRomanian.ImageOptions.ImageIndex = 42; + this.miRomanian.ImageOptions.ImageIndex = ((int)(resources.GetObject("miRomanian.ImageOptions.ImageIndex"))); this.miRomanian.Name = "miRomanian"; this.miRomanian.Tag = "ro-RO"; this.miRomanian.DownChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.miLanguage_DownChanged); @@ -1588,7 +1596,7 @@ resources.ApplyResources(this.mnuCharset, "mnuCharset"); this.mnuCharset.CategoryGuid = new System.Guid("870e935c-f3d9-4202-9c58-87966069155d"); this.mnuCharset.Id = 15; - this.mnuCharset.ImageOptions.ImageIndex = 9; + this.mnuCharset.ImageOptions.ImageIndex = ((int)(resources.GetObject("mnuCharset.ImageOptions.ImageIndex"))); this.mnuCharset.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(this.miCharsetForm), new DevExpress.XtraBars.LinkPersistInfo(this.miIsoCharSets, true)}); @@ -1600,7 +1608,7 @@ resources.ApplyResources(this.miCharsetForm, "miCharsetForm"); this.miCharsetForm.CategoryGuid = new System.Guid("870e935c-f3d9-4202-9c58-87966069155d"); this.miCharsetForm.Id = 13; - this.miCharsetForm.ImageOptions.ImageIndex = 9; + this.miCharsetForm.ImageOptions.ImageIndex = ((int)(resources.GetObject("miCharsetForm.ImageOptions.ImageIndex"))); this.miCharsetForm.Name = "miCharsetForm"; this.miCharsetForm.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miCharset_ItemClick); // @@ -1624,7 +1632,7 @@ this.miAllowEditPredefinedLists.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.Check; resources.ApplyResources(this.miAllowEditPredefinedLists, "miAllowEditPredefinedLists"); this.miAllowEditPredefinedLists.Id = 94; - this.miAllowEditPredefinedLists.ImageOptions.ImageIndex = 37; + this.miAllowEditPredefinedLists.ImageOptions.ImageIndex = ((int)(resources.GetObject("miAllowEditPredefinedLists.ImageOptions.ImageIndex"))); this.miAllowEditPredefinedLists.Name = "miAllowEditPredefinedLists"; this.miAllowEditPredefinedLists.DownChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.miAllowEditPredefinedLists_DownChanged); // @@ -1806,7 +1814,7 @@ resources.ApplyResources(this.miAbout, "miAbout"); this.miAbout.CategoryGuid = new System.Guid("0d554574-30e8-4d31-9a70-da702a984260"); this.miAbout.Id = 11; - this.miAbout.ImageOptions.ImageIndex = 7; + this.miAbout.ImageOptions.ImageIndex = ((int)(resources.GetObject("miAbout.ImageOptions.ImageIndex"))); this.miAbout.Name = "miAbout"; this.miAbout.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miAbout_ItemClick); // @@ -1839,7 +1847,7 @@ resources.ApplyResources(this.miMoveUp, "miMoveUp"); this.miMoveUp.CategoryGuid = new System.Guid("d7eec464-59c9-4f45-88aa-602e64c81cc0"); this.miMoveUp.Id = 45; - this.miMoveUp.ImageOptions.ImageIndex = 24; + this.miMoveUp.ImageOptions.ImageIndex = ((int)(resources.GetObject("miMoveUp.ImageOptions.ImageIndex"))); this.miMoveUp.Name = "miMoveUp"; this.miMoveUp.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miMoveUp_ItemClick); // @@ -1848,7 +1856,7 @@ resources.ApplyResources(this.miMoveDown, "miMoveDown"); this.miMoveDown.CategoryGuid = new System.Guid("d7eec464-59c9-4f45-88aa-602e64c81cc0"); this.miMoveDown.Id = 46; - this.miMoveDown.ImageOptions.ImageIndex = 25; + this.miMoveDown.ImageOptions.ImageIndex = ((int)(resources.GetObject("miMoveDown.ImageOptions.ImageIndex"))); this.miMoveDown.Name = "miMoveDown"; this.miMoveDown.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miMoveDown_ItemClick); // @@ -1883,7 +1891,7 @@ this.picDonate.EditValue = global::ChanSort.Ui.Properties.Resources.Donate; this.picDonate.MenuManager = this.barManager1; this.picDonate.Name = "picDonate"; - this.picDonate.Properties.Appearance.BackColor = ((System.Drawing.Color)(resources.GetObject("picDonate.Properties.Appearance.BackColor"))); + this.picDonate.Properties.Appearance.BackColor = System.Drawing.Color.Transparent; this.picDonate.Properties.Appearance.Options.UseBackColor = true; this.picDonate.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; this.picDonate.Properties.PictureAlignment = System.Drawing.ContentAlignment.TopRight; @@ -2265,6 +2273,7 @@ private DevExpress.XtraGrid.Columns.GridColumn colSource; private DevExpress.XtraBars.BarButtonItem miCzech; private DevExpress.XtraBars.BarButtonItem miRomanian; + private DevExpress.XtraGrid.Columns.GridColumn colPcrPid; } } diff --git a/source/ChanSort/MainForm.cs b/source/ChanSort/MainForm.cs index c084bf5..8be4084 100644 --- a/source/ChanSort/MainForm.cs +++ b/source/ChanSort/MainForm.cs @@ -1453,8 +1453,16 @@ namespace ChanSort.Ui var list = this.CurrentChannelList; if (list == null) return false; + var filter = list.VisibleColumnFieldNames; - if (filter != null && !filter.Contains(col.FieldName)) + if (filter != null) + { + if (!filter.Contains(col.FieldName)) // force-hide without further checks + return false; + if (filter.Contains("+" + col.FieldName)) // force-show without further checks + return true; + } + else if (col.Tag is bool originalVisible && !originalVisible) return false; var source = list.SignalSource; @@ -1464,6 +1472,7 @@ namespace ChanSort.Ui if (col == this.colShortName) return (source & SignalSource.Digital) != 0; if (col == this.colEncrypted) return (source & SignalSource.Digital) != 0; if (col == this.colServiceId) return (source & SignalSource.Digital) != 0; + if (col == this.colPcrPid) return (source & SignalSource.Digital) != 0; if (col == this.colVideoPid) return (source & SignalSource.Digital) != 0; if (col == this.colAudioPid) return (source & SignalSource.Digital) != 0; //if (col == this.colServiceType) return (source & SignalSource.Digital) != 0; @@ -1475,15 +1484,15 @@ namespace ChanSort.Ui if (col == this.colProvider) return (source & SignalSource.Digital) != 0; if (col == this.colSatellite) return (source & SignalSource.Sat) != 0; if (col == this.colNetworkId) return (source & SignalSource.Digital) != 0; - if (col == this.colSymbolRate) return (source & SignalSource.Sat) != 0; + if (col == this.colSymbolRate) return (source & SignalSource.Digital) != 0; if (col == this.colIndex) return col.Visible; if (col == this.colUid) return col.Visible; - if (col == this.colDebug) return colDebug.Visible; + if (col == this.colDebug) return col.Visible; if (col == this.colSignalSource) return col.Visible; - if (col == this.colLogicalIndex) return colLogicalIndex.Visible; + if (col == this.colLogicalIndex) return col.Visible; if (col == this.colPolarity) return false; - return (bool)(col.Tag ?? false); + return true; } #endregion diff --git a/source/ChanSort/MainForm.resx b/source/ChanSort/MainForm.resx index 05b282f..d0a28de 100644 --- a/source/ChanSort/MainForm.resx +++ b/source/ChanSort/MainForm.resx @@ -305,6 +305,9 @@ 1 + + 15 + 600, 17 @@ -401,36 +404,66 @@ &Open TV data file... + + 3 + &Reload + + 5 + Restore backup + + 31 + File &information... + + 30 + &Save + + 4 + Save &as... + + 33 + Apply order from a reference list... + + 23 + Add channels from reference list... Save reference list... + + 6 + Export Excel list... + + 32 + &Print... + + 34 + &Quit @@ -443,18 +476,33 @@ &Add channels + + 26 + &Remove channels + + 11 + Rename channel + + 29 + Sor&t channels alphabetically + + 21 + Re&number channels + + 22 + Renumber favorites by Pr# @@ -464,6 +512,9 @@ Add to &Favorites + + 13 + &A @@ -500,18 +551,27 @@ &Lock channel: on + + 15 + Lock channel: off &Skip channel: on + + 16 + Skip channel: off &Hide channel: on + + 17 + Hide channel: off @@ -521,6 +581,9 @@ Device setting... + + 27 + Cleanup channel data @@ -533,30 +596,57 @@ &Language + + 14 + &English + + 0 + &Deutsch + + 1 + Português + + 2 + ру́сский + + 35 + Česky + + 41 + Română + + 42 + &Character set + + 9 + All &character sets... + + 9 + ISO character sets @@ -572,6 +662,9 @@ Your TV may malfunction when you edit a list with predefined channel numbers + + 37 + &Accessibility @@ -635,14 +728,17 @@ &About ChanSort... + + 7 + Tools - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNy4xLCBWZXJzaW9uPTE3 - LjEuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxOC4yLCBWZXJzaW9uPTE4 + LjIuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEZpbGUE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICKaPJ5gsBeU2NTSFe @@ -651,8 +747,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNy4xLCBWZXJzaW9uPTE3 - LjEuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxOC4yLCBWZXJzaW9uPTE4 + LjIuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEhlbHAE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICdEVVDegwMU2acNpw @@ -661,8 +757,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNy4xLCBWZXJzaW9uPTE3 - LjEuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxOC4yLCBWZXJzaW9uPTE4 + LjIuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEVkaXQE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICZMTu18lZRU+IqmAu @@ -671,8 +767,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNy4xLCBWZXJzaW9uPTE3 - LjEuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxOC4yLCBWZXJzaW9uPTE4 + LjIuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAAB09wdGlvbnME/P///wtTeXN0ZW0uR3VpZAsAAAACX2EC X2ICX2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICXJMOh9nzAkKc @@ -681,8 +777,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNy4xLCBWZXJzaW9uPTE3 - LjEuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxOC4yLCBWZXJzaW9uPTE4 + LjIuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAADUFjY2Vzc2liaWxpdHkE/P///wtTeXN0ZW0uR3VpZAsA AAACX2ECX2ICX2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICeIvz @@ -776,9 +872,15 @@ Move up + + 24 + Move down + + 25 + swap @@ -915,9 +1017,6 @@ 1266, 4 - - Transparent - 166, 54 @@ -1150,7 +1249,7 @@ globalImageCollection1 - ChanSort.Ui.GlobalImageCollection, ChanSort, Version=1.0.6597.38723, Culture=neutral, PublicKeyToken=null + ChanSort.Ui.GlobalImageCollection, ChanSort, Version=1.0.6980.23278, Culture=neutral, PublicKeyToken=null gviewRight @@ -1284,6 +1383,12 @@ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + colPcrPid + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + colVideoPid @@ -1861,7 +1966,7 @@ DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - 01/23/2018 21:33:41 + 02/10/2019 13:13:51 16, 16 @@ -2034,6 +2139,9 @@ Tahoma, 8.25pt, style=Strikeout + + 28 + 295, 4 @@ -2061,6 +2169,9 @@ 6 + + 22 + 98, 5 @@ -2088,6 +2199,9 @@ 7 + + 25 + 34, 5 @@ -2115,6 +2229,9 @@ 8 + + 24 + 5, 5 @@ -2142,6 +2259,9 @@ 9 + + 11 + 63, 5 @@ -2472,6 +2592,21 @@ 45 + + PCR PID + + + Program Clock Reference Packet-ID + + + True + + + 16 + + + 40 + Video PID @@ -2479,7 +2614,7 @@ True - 16 + 17 40 @@ -2491,7 +2626,7 @@ True - 17 + 18 40 @@ -2503,7 +2638,7 @@ True - 18 + 19 40 @@ -2521,7 +2656,7 @@ True - 19 + 20 Network Operator @@ -2530,7 +2665,7 @@ True - 20 + 21 Provider @@ -2539,7 +2674,7 @@ True - 21 + 22 Uid @@ -2604,9 +2739,6 @@ Tahoma, 12pt, style=Bold - - Maroon - 291, 7 @@ -2640,6 +2772,9 @@ specific provider, satellite or country lists. 0 + + 11 + 34, 5 @@ -2703,6 +2838,9 @@ specific provider, satellite or country lists. Tahoma, 8.25pt, style=Strikeout + + 28 + 198, 5 @@ -2730,6 +2868,9 @@ specific provider, satellite or country lists. 3 + + 39 + 5, 5 diff --git a/source/ChanSort/Properties/licenses.licx b/source/ChanSort/Properties/licenses.licx index e69de29..5bc8ce0 100644 --- a/source/ChanSort/Properties/licenses.licx +++ b/source/ChanSort/Properties/licenses.licx @@ -0,0 +1,6 @@ +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a