From aaba300f2d35daa47b35ce1676becc3c439d01d3 Mon Sep 17 00:00:00 2001 From: hbeham Date: Wed, 27 Apr 2016 19:03:50 +0200 Subject: [PATCH] improved usability --- source/ChanSort.Api/Controller/Editor.cs | 5 +- source/ChanSort.Api/Model/ChannelInfo.cs | 13 +- source/ChanSort.Api/Model/ChannelList.cs | 5 +- source/ChanSort.Api/Model/DataRoot.cs | 2 +- .../HisDbSerializer.cs | 18 +- .../HisDbSerializerPlugin.cs | 2 +- .../ChanSort.Loader.Samsung/ScmSerializer.cs | 3 - source/ChanSort/MainForm.Designer.cs | 27 +- source/ChanSort/MainForm.cs | 73 +- source/ChanSort/MainForm.de.resx | 697 +++++----- source/ChanSort/MainForm.pt.resx | 434 +++---- source/ChanSort/MainForm.resx | 1142 +++++++++-------- source/ChanSort/MainForm.ru.resx | 588 ++++----- source/ChanSort/ReferenceListForm.cs | 4 +- source/changelog.md | 2 +- source/makeDistribZip.cmd | 2 +- 16 files changed, 1556 insertions(+), 1461 deletions(-) diff --git a/source/ChanSort.Api/Controller/Editor.cs b/source/ChanSort.Api/Controller/Editor.cs index 3f01b62..2d8bdd3 100644 --- a/source/ChanSort.Api/Controller/Editor.cs +++ b/source/ChanSort.Api/Controller/Editor.cs @@ -23,10 +23,7 @@ namespace ChanSort.Api int progNr = this.ChannelList.InsertProgramNumber; int relativeChannelNumber = 0; int progNrCopy = progNr; // prevent "access to modified closure" warning - foreach ( - var channel in - this.ChannelList.Channels.Where(c => c.GetPosition(this.SubListIndex) >= progNrCopy) - .OrderBy(c => c.GetPosition(this.SubListIndex))) + foreach (var channel in this.ChannelList.Channels.Where(c => c.GetPosition(this.SubListIndex) >= progNrCopy).OrderBy(c => c.GetPosition(this.SubListIndex))) { var curPos = channel.GetPosition(this.SubListIndex); int gap = count - (curPos - progNr - relativeChannelNumber); diff --git a/source/ChanSort.Api/Model/ChannelInfo.cs b/source/ChanSort.Api/Model/ChannelInfo.cs index ec7b287..d626c63 100644 --- a/source/ChanSort.Api/Model/ChannelInfo.cs +++ b/source/ChanSort.Api/Model/ChannelInfo.cs @@ -17,6 +17,7 @@ namespace ChanSort.Api public virtual bool IsDeleted { get; set; } public SignalSource SignalSource { get; set; } + public string Source { get; set; } public long RecordIndex { get; set; } public int RecordOrder { get; set; } public int OldProgramNr { get; set; } @@ -44,7 +45,8 @@ namespace ChanSort.Api public string Debug { get; private set; } public string SatPosition { get; set; } public Transponder Transponder { get; set; } - public IList FavIndex { get; private set; } + public List FavIndex { get; } + public List OldFavIndex { get; } public int ProgramNrPreset { get; set; } public bool IsNameModified { get; set; } @@ -54,8 +56,12 @@ namespace ChanSort.Api { this.NewProgramNr = -1; this.FavIndex = new List(MAX_FAV_LISTS); + this.OldFavIndex = new List(MAX_FAV_LISTS); for (int i = 0; i < MAX_FAV_LISTS; i++) + { this.FavIndex.Add(-1); + this.OldFavIndex.Add(-1); + } this.Name = ""; this.ShortName = ""; } @@ -248,6 +254,11 @@ namespace ChanSort.Api return subListIndex == 0 ? this.NewProgramNr : this.FavIndex[subListIndex - 1]; } + public int GetOldPosition(int subListIndex) + { + return subListIndex == 0 ? this.OldProgramNr : this.OldFavIndex[subListIndex - 1]; + } + public void SetPosition(int subListIndex, int newPos) { if (subListIndex == 0) diff --git a/source/ChanSort.Api/Model/ChannelList.cs b/source/ChanSort.Api/Model/ChannelList.cs index 42fba81..a60db98 100644 --- a/source/ChanSort.Api/Model/ChannelList.cs +++ b/source/ChanSort.Api/Model/ChannelList.cs @@ -30,7 +30,7 @@ namespace ChanSort.Api public int MaxChannelNameLength { get; set; } public int PresetProgramNrCount { get; private set; } public IList VisibleColumnFieldNames; - public bool IsMixedSouceFavoritesList { get; set; } + public bool IsMixedSourceFavoritesList { get; set; } #region Caption public string Caption @@ -82,6 +82,9 @@ namespace ChanSort.Api } } + for (int i = 0; i < ci.FavIndex.Count; i++) + ci.OldFavIndex[i] = ci.FavIndex[i]; + if (!isDupeProgNr) this.channelByProgNr[ci.OldProgramNr] = ci; diff --git a/source/ChanSort.Api/Model/DataRoot.cs b/source/ChanSort.Api/Model/DataRoot.cs index 503f4ee..0d3cc34 100644 --- a/source/ChanSort.Api/Model/DataRoot.cs +++ b/source/ChanSort.Api/Model/DataRoot.cs @@ -61,7 +61,7 @@ namespace ChanSort.Api public virtual void AddChannelList(ChannelList list) { this.channelLists.Add(list); - this.MixedSourceFavorites |= list.IsMixedSouceFavoritesList; + this.MixedSourceFavorites |= list.IsMixedSourceFavoritesList; } #endregion diff --git a/source/ChanSort.Loader.Hisense/HisDbSerializer.cs b/source/ChanSort.Loader.Hisense/HisDbSerializer.cs index d4bfb24..c311750 100644 --- a/source/ChanSort.Loader.Hisense/HisDbSerializer.cs +++ b/source/ChanSort.Loader.Hisense/HisDbSerializer.cs @@ -12,7 +12,7 @@ namespace ChanSort.Loader.Hisense { public class HisDbSerializer : SerializerBase { - public override string DisplayName => "Hisense *.db Loader"; + public override string DisplayName => "Hisense channel.db Loader"; #region enums and bitmasks @@ -106,15 +106,17 @@ namespace ChanSort.Loader.Hisense channelLists.Add(new ChannelList(SignalSource.Antenna | SignalSource.Cable | SignalSource.Sat | SignalSource.Analog | SignalSource.Digital | SignalSource.Radio | SignalSource.Tv, "CI 2")); channelLists.Add(new ChannelList(SignalSource.AnalogCT | SignalSource.DvbCT | SignalSource.DvbS | SignalSource.TvAndRadio, "Favorites")); - channelLists[channelLists.Count - 1].IsMixedSouceFavoritesList = true; + channelLists[channelLists.Count - 1].IsMixedSourceFavoritesList = true; foreach (var list in this.channelLists) { this.DataRoot.AddChannelList(list); list.VisibleColumnFieldNames = new List { + "OldPosition", "Position", - "OldProgramNr", + "Source", + "NewProgramNr", "Name", "ShortName", "Favorites", @@ -385,6 +387,7 @@ namespace ChanSort.Loader.Hisense enhanceChannelInfo(ci, r, 9); var list = this.channelLists[tableNr - 1]; + ci.Source = list.ShortCaption; this.DataRoot.AddChannel(list, ci); // add the channel to all favorites lists @@ -521,7 +524,6 @@ namespace ChanSort.Loader.Hisense private void UpdateChannel(SQLiteCommand cmd, ChannelInfo ci) { - //return; if (ci.RecordIndex < 0) // skip reference list proxy channels return; @@ -534,11 +536,11 @@ namespace ChanSort.Loader.Hisense if (!ci.Hidden && ci.NewProgramNr >= 0) setFlags |= NwMask.Visible; cmd.CommandText = $"update svl_{x} set channel_id=(channel_id&{0x3FFFF})|(@chnr << 18)" + - ", ch_id_txt=@chnr || ' 0'" + - ", ac_name=@name" + + $", ch_id_txt=@chnr || ' 0'" + + $", ac_name=@name" + $", option_mask=option_mask|{(int) (OptionMask.ChNumEdited | OptionMask.NameEdited)}" + - ", nw_mask=(nw_mask&@resetFlags)|@setFlags" + - " where svl_rec_id=@id"; + $", nw_mask=(nw_mask&@resetFlags)|@setFlags" + + $" where svl_rec_id=@id"; cmd.Parameters.Clear(); cmd.Parameters.Add("@id", DbType.Int32); cmd.Parameters.Add("@chnr", DbType.Int32); diff --git a/source/ChanSort.Loader.Hisense/HisDbSerializerPlugin.cs b/source/ChanSort.Loader.Hisense/HisDbSerializerPlugin.cs index 2738b04..cb47f42 100644 --- a/source/ChanSort.Loader.Hisense/HisDbSerializerPlugin.cs +++ b/source/ChanSort.Loader.Hisense/HisDbSerializerPlugin.cs @@ -13,7 +13,7 @@ namespace ChanSort.Loader.Hisense public class HisDbSerializerPlugin : ISerializerPlugin { public string PluginName => "Hisense *.db"; - public string FileFilter => "channel.db"; + public string FileFilter => "channel*.db"; #region CreateSerializer() public SerializerBase CreateSerializer(string inputFile) diff --git a/source/ChanSort.Loader.Samsung/ScmSerializer.cs b/source/ChanSort.Loader.Samsung/ScmSerializer.cs index 5973d82..7534ff1 100644 --- a/source/ChanSort.Loader.Samsung/ScmSerializer.cs +++ b/source/ChanSort.Loader.Samsung/ScmSerializer.cs @@ -645,10 +645,7 @@ namespace ChanSort.Loader.Samsung private void WriteChannels(ChannelList list, byte[] fileContent, FileStream stream) { foreach (var channel in list.Channels) - { channel.UpdateRawData(); - channel.OldProgramNr = channel.NewProgramNr; - } stream.Write(fileContent, 0, fileContent.Length); } diff --git a/source/ChanSort/MainForm.Designer.cs b/source/ChanSort/MainForm.Designer.cs index 18322a3..97275eb 100644 --- a/source/ChanSort/MainForm.Designer.cs +++ b/source/ChanSort/MainForm.Designer.cs @@ -66,6 +66,8 @@ this.colIndex = new DevExpress.XtraGrid.Columns.GridColumn(); this.colSlotOld = new DevExpress.XtraGrid.Columns.GridColumn(); this.colSlotNew = new DevExpress.XtraGrid.Columns.GridColumn(); + this.colSource = new DevExpress.XtraGrid.Columns.GridColumn(); + this.colPrNr = new DevExpress.XtraGrid.Columns.GridColumn(); this.colName = new DevExpress.XtraGrid.Columns.GridColumn(); this.colShortName = new DevExpress.XtraGrid.Columns.GridColumn(); this.colFavorites = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -302,6 +304,7 @@ this.gviewLeft.OptionsBehavior.EditorShowMode = DevExpress.Utils.EditorShowMode.MouseDown; this.gviewLeft.OptionsCustomization.AllowGroup = false; this.gviewLeft.OptionsCustomization.AllowQuickHideColumns = false; + this.gviewLeft.OptionsDetail.EnableMasterViewMode = false; this.gviewLeft.OptionsLayout.LayoutVersion = "2"; this.gviewLeft.OptionsSelection.MultiSelect = true; this.gviewLeft.OptionsView.ColumnAutoWidth = false; @@ -561,6 +564,8 @@ this.colIndex, this.colSlotOld, this.colSlotNew, + this.colSource, + this.colPrNr, this.colName, this.colShortName, this.colFavorites, @@ -591,11 +596,13 @@ this.gviewRight.Name = "gviewRight"; this.gviewRight.OptionsBehavior.EditorShowMode = DevExpress.Utils.EditorShowMode.MouseDown; this.gviewRight.OptionsCustomization.AllowGroup = false; - this.gviewRight.OptionsLayout.LayoutVersion = "3"; + this.gviewRight.OptionsDetail.EnableMasterViewMode = false; + this.gviewRight.OptionsLayout.LayoutVersion = "5"; this.gviewRight.OptionsSelection.MultiSelect = true; this.gviewRight.OptionsView.ColumnAutoWidth = false; this.gviewRight.OptionsView.ShowAutoFilterRow = true; this.gviewRight.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.Never; + this.gviewRight.OptionsView.ShowGroupExpandCollapseButtons = false; this.gviewRight.OptionsView.ShowGroupPanel = false; this.gviewRight.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] { new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.colSlotOld, DevExpress.Data.ColumnSortOrder.Ascending)}); @@ -627,10 +634,11 @@ resources.ApplyResources(this.colSlotOld, "colSlotOld"); this.colSlotOld.DisplayFormat.FormatString = "d"; this.colSlotOld.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; - this.colSlotOld.FieldName = "OldProgramNr"; + this.colSlotOld.FieldName = "OldPosition"; this.colSlotOld.Name = "colSlotOld"; this.colSlotOld.OptionsColumn.AllowEdit = false; this.colSlotOld.OptionsFilter.AllowAutoFilter = false; + this.colSlotOld.UnboundType = DevExpress.Data.UnboundColumnType.Integer; // // colSlotNew // @@ -641,6 +649,19 @@ this.colSlotNew.Name = "colSlotNew"; this.colSlotNew.UnboundType = DevExpress.Data.UnboundColumnType.Integer; // + // colSource + // + resources.ApplyResources(this.colSource, "colSource"); + this.colSource.FieldName = "Source"; + this.colSource.Name = "colSource"; + // + // colPrNr + // + resources.ApplyResources(this.colPrNr, "colPrNr"); + this.colPrNr.FieldName = "NewProgramNr"; + this.colPrNr.Name = "colPrNr"; + this.colPrNr.OptionsColumn.AllowEdit = false; + // // colName // resources.ApplyResources(this.colName, "colName"); @@ -2204,6 +2225,8 @@ private DevExpress.XtraSplashScreen.SplashScreenManager splashScreenManager1; private DevExpress.XtraEditors.LabelControl lblPredefinedList; private DevExpress.XtraBars.BarButtonItem miAllowEditPredefinedLists; + private DevExpress.XtraGrid.Columns.GridColumn colPrNr; + private DevExpress.XtraGrid.Columns.GridColumn colSource; } } diff --git a/source/ChanSort/MainForm.cs b/source/ChanSort/MainForm.cs index c87ac03..30b37f7 100644 --- a/source/ChanSort/MainForm.cs +++ b/source/ChanSort/MainForm.cs @@ -599,9 +599,13 @@ namespace ChanSort.Ui { if (this.currentChannelList != null) this.SaveInputGridLayout(this.currentChannelList.SignalSource); + + this.currentChannelList = channelList; + this.editor.ChannelList = channelList; + if (channelList != null) { - this.LoadInputGridLayout(channelList); + this.LoadInputGridLayout(); this.gridRight.DataSource = channelList.Channels; this.gridLeft.DataSource = channelList.Channels; @@ -614,7 +618,7 @@ namespace ChanSort.Ui if (this.dataRoot.MixedSourceFavorites) { - if (channelList.IsMixedSouceFavoritesList) + if (channelList.IsMixedSourceFavoritesList) { this.tabSubList.SelectedTabPageIndex = 1; this.pageProgNr.PageVisible = false; @@ -633,7 +637,7 @@ namespace ChanSort.Ui this.grpSubList.Visible = dataRoot.SortedFavorites; } - //this.tabSubList.TabPages[0].PageVisible = !channelList.IsMixedSouceFavoritesList; + //this.tabSubList.TabPages[0].PageVisible = !channelList.IsMixedSourceFavoritesList; //this.pageProgNr.Enabled = this.pageProgNr.Visible; } else @@ -642,8 +646,6 @@ namespace ChanSort.Ui this.gridLeft.DataSource = null; this.grpSubList.Visible = false; } - this.currentChannelList = channelList; - this.editor.ChannelList = channelList; if (gviewRight.IsValidRowHandle(0)) this.SelectFocusedRow(this.gviewRight, 0); @@ -867,6 +869,17 @@ namespace ChanSort.Ui File.Copy(currentTvFile, bakFile); } this.currentTvSerializer.Save(this.currentTvFile); + + // after saving old numbers match the new numbers + foreach (var list in this.dataRoot.ChannelLists) + { + foreach (var chan in list.Channels) + { + chan.OldProgramNr = chan.NewProgramNr; + chan.OldFavIndex.Clear(); + chan.OldFavIndex.AddRange(chan.FavIndex); + } + } } finally { @@ -1024,11 +1037,15 @@ namespace ChanSort.Ui int maxNr = this.currentChannelList.InsertProgramNumber; foreach (var channel in this.currentChannelList.Channels) maxNr = Math.Max(maxNr, channel.GetPosition(this.subListIndex)); - foreach (var channel in this.currentChannelList.Channels) + + var max = this.gviewRight.RowCount; + for (int handle = 0; handle-1"); + if (this.subListIndex > 0) + this.colPrNr.FilterInfo = new ColumnFilterInfo("[NewProgramNr]<>-1"); this.gviewRight.EndSort(); } #endregion #region LoadInputGridLayout() - private void LoadInputGridLayout(ChannelList list) + 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) @@ -1283,16 +1305,22 @@ namespace ChanSort.Ui newLayout = Settings.Default.InputGridLayoutDvbCT; if (!string.IsNullOrEmpty(newLayout)) this.SetGridLayout(this.gviewRight, newLayout); - - foreach (GridColumn col in this.gviewRight.Columns) - col.Visible = GetGridColumnVisibility(col, list); - foreach (GridColumn col in this.gviewLeft.Columns) - col.Visible = GetGridColumnVisibility(col, list); - +#endif + this.ShowGridColumns(this.gviewLeft); + this.ShowGridColumns(this.gviewRight); this.ClearRightFilter(); } #endregion + #region ShowGridColumns() + private void ShowGridColumns(GridView gview) + { + int visIndex = 0; + foreach (GridColumn col in gview.Columns) + col.VisibleIndex = GetGridColumnVisibility(col) ? visIndex++ : -1; + } + #endregion + #region SaveInputGridLayout() private void SaveInputGridLayout(SignalSource signalSource) { @@ -1308,13 +1336,16 @@ namespace ChanSort.Ui #region GetGridColumnVisibility() - private bool GetGridColumnVisibility(GridColumn col, ChannelList list) + private bool GetGridColumnVisibility(GridColumn col) { + var list = this.currentChannelList; var filter = list.VisibleColumnFieldNames; if (filter != null && !filter.Contains(col.FieldName)) return false; var source = list.SignalSource; + if (col == this.colSource) return list.IsMixedSourceFavoritesList; + if (col == this.colPrNr) return this.subListIndex > 0; if (col == this.colChannelOrTransponder) return (source & SignalSource.Sat) == 0; if (col == this.colShortName) return (source & SignalSource.Digital) != 0; if (col == this.colEncrypted) return (source & SignalSource.Digital) != 0; @@ -2020,14 +2051,16 @@ namespace ChanSort.Ui private void tabSubList_SelectedPageChanged(object sender, TabPageChangedEventArgs e) { this.subListIndex = this.tabSubList.SelectedTabPageIndex; + this.ShowGridColumns(this.gviewRight); + this.editor.SubListIndex = this.subListIndex; this.gviewLeft.BeginSort(); this.gviewLeft.EndSort(); this.gviewRight.BeginSort(); if (this.subListIndex > 0) - this.colSlotNew.FilterInfo = new ColumnFilterInfo("[NewProgramNr]<>-1"); + this.colPrNr.FilterInfo = new ColumnFilterInfo("[NewProgramNr]<>-1"); else - this.colSlotNew.ClearFilter(); + this.colPrNr.ClearFilter(); this.gviewRight.EndSort(); } #endregion @@ -2038,6 +2071,8 @@ namespace ChanSort.Ui var channel = (ChannelInfo) e.Row; if (e.Column.FieldName == "Position") e.Value = channel.GetPosition(this.subListIndex); + else if (e.Column.FieldName == "OldPosition") + e.Value = channel.GetOldPosition(this.subListIndex); } #endregion @@ -2407,7 +2442,7 @@ namespace ChanSort.Ui #region gviewRight_CustomColumnDisplayText private void gviewRight_CustomColumnDisplayText(object sender, CustomColumnDisplayTextEventArgs e) { - if (e.Column == this.colSlotNew) + if (e.Column == this.colSlotNew || e.Column == this.colSlotOld || e.Column == this.colPrNr) { if (!(e.Value is int)) return; if ((int) e.Value == -1) diff --git a/source/ChanSort/MainForm.de.resx b/source/ChanSort/MainForm.de.resx index 99e3bc7..a021328 100644 --- a/source/ChanSort/MainForm.de.resx +++ b/source/ChanSort/MainForm.de.resx @@ -124,154 +124,91 @@ Service Typ - Neue Pr# + Neue Pos - - TV Senderliste &öffnen... + + Neue Position - - &Drucken... + + Sendername - - &Favoriten hinzufügen + + Favoriten - - Program-/&Favoritenliste auswählen + + Ge- sperrt + + + Kindersicherung + + + Über- springen + + + Sender umbenennen + + + Nach unten + + + davor + + + Lücken beim Verschieben/Entfernen von Sendern schließen + + + Wenn aktiv, werden folgende Programmnummer automatisch vorgerückt + + + Einfügemodus: + + + Keine Senderlisten vorhanden + + + Setze Pr#: + + + Programplatz für Einfügen und Festlegen + + + ChanSort {0} - Editor für TV-Senderlisten + + + Kindersicherung bei markierten Sendern ein/ausschalten Alle Sender - - tauschen + + Markierte Sender in die sortierte liste übernehmen - - Favorit C umschalten + + Markierte Sender in die sortierte liste übernehmen - - Favorit B umschalten - - - Favorit A umschalten - - - Entfernt den Suchfilter von der sortierten Senderliste - - + Filter entfernen - - Markierte Sender fortlaufend nummerieren + + FIlter - - Markierte Sender fortlaufend nummerieren + + Entfernt den Suchfilter von der vollständigen Senderliste - - Markierte Sender nach unten verschieben + + Aller derzeit nicht sortierten Sender ans Ende der Liste anhängen - - Markierte Sender nach unten verschieben + + << Alle hinzufügen - - Markierte Sender nach oben verschieben + + Alle derzeit angezeigte, nicht sortierte Sender ans Ende der Liste anhängen - - Markierte Sender nach oben verschieben + + Sender aus sortierter Liste entfernen - - Markierte Sender aus sortierter Liste entfernen - - - Markierte Sender aus sortierter Liste entfernen - - - Sortierte Sender - - - Pr. Index - - - Alte Pr# - - - Alter Programmplatz - - - Neue Pr# - - - Neuer Programmplatz - - - Sendername - - - Kurzname - - - Favoriten - - - Ge- sperrt - - - Über- springen - - - Ver- steckt - - - Ver- schlüss - - - Verschlüsselt - - - Kanal/ Transp. - - - Kanal- bzw. Transpondernummer - - - Frequenz (MHz) - - - Service Typ ID - - - Service Typ - - - Satellit - - - Netzwerk (ONID) - - - Symbol- rate - - - Polarität - - - Netzwerk Name - - - Netzwerk Betreiber - - - Anbieter - - - Reihenfolge - - - Signal- quelle - - - F5: Filter | F6: Liste | Eingabe: übernehmen - - - Diese vorprogrammierte Liste kann nicht bearbeitet werden. + + Sender aus sortierter Liste entfernen Bei der Einrichtung ihres TVs wurde eine vordefinierte Senderliste gewählt. @@ -279,35 +216,296 @@ Das Ändern dieser Liste würde zu Fehlfunktionen des Geräts führen. Führen Sie bitte einen Sender-Vollsuchlauf aus und wählen Sie dabei keine speziellen Anbieter, Satelliten oder Länderlisten aus. - - Sender aus sortierter Liste entfernen + + Diese vorprogrammierte Liste kann nicht bearbeitet werden. - - Sender aus sortierter Liste entfernen + + F5: Filter | F6: Liste | Eingabe: übernehmen - - Aller derzeit nicht sortierten Sender ans Ende der Liste anhängen + + Signal- quelle - - << Alle hinzufügen + + Reihenfolge - - Aller derzeit nicht sortierten Sender ans Ende der Liste anhängen + + Anbieter - - Entfernt den Suchfilter von der vollständigen Senderliste + + Netzwerk Betreiber - - FIlter + + Netzwerk Name - + + Polarität + + + Symbol- rate + + + Netzwerk (ONID) + + + Satellit + + + Service Typ + + + Service Typ ID + + + Frequenz (MHz) + + + Kanal- bzw. Transpondernummer + + + Kanal/ Transp. + + + Verschlüsselt + + + Ver- schlüss + + + Ver- steckt + + + Über- springen + + + Ge- sperrt + + + Favoriten + + + Kurzname + + + Sendername + + + Neue Position + + + Neue Pos + + + Alte Position + + + Alte Pos + + + Pr. Index + + + Sortierte Sender + + + Markierte Sender aus sortierter Liste entfernen + + + Markierte Sender aus sortierter Liste entfernen + + + Markierte Sender nach oben verschieben + + + Markierte Sender nach oben verschieben + + + Markierte Sender nach unten verschieben + + + Markierte Sender nach unten verschieben + + + Markierte Sender fortlaufend nummerieren + + + Markierte Sender fortlaufend nummerieren + + Filter entfernen - - Markierte Sender in die sortierte liste übernehmen + + Entfernt den Suchfilter von der sortierten Senderliste - - Markierte Sender in die sortierte liste übernehmen + + Favorit A umschalten + + + Favorit B umschalten + + + Favorit C umschalten + + + Favorit D umschalten + + + Favorit E umschalten + + + Kindersicherung + + + dahinter + + + tauschen + + + Program-/&Favoritenliste auswählen + + + Öffnet ein Menü zur Auswahl der Programm- oder Favoritenliste. Dieses Menü kann auch direkt über die Umschalt+F1 Tastenkombination geöffnet werden. + + + &Eingangsquelle auswählen + + + Öffnet ein Menü zur Auswahl der Eingangsquelle. Dieses kann auch direkt mit der F1-Taste aufgerufen werden. + + + Einga&behilfe + + + Der Fernseher funktioniert dabei unter Umständen nicht mehr korrekt. + + + Bearbeiten vordefinierter Listen erlauben (GEFÄHRLICH) + + + Eventuelle Warnungen nach dem Laden einer TV-Datei automatisch anzeigen + + + Warnungen beim Laden anzeigen + + + ISO Zeichensätze + + + Alle Zeichensätze... + + + &Zeichensatz + + + &Sprache + + + &Einstellungen + + + Senderdatensätze neu organisieren und Duplikate entfernen + + + Senderliste bereinigen + + + Geräte&einstellungen... + + + TV-Gerät + + + Sender verstecken: aus + + + Sender &verstecken: ein + + + Sender überspringen: aus + + + Sender ü&berspringen: ein + + + Sender sperren: aus + + + Sender s&perren: ein + + + Favoriten entfernen + + + &Favoriten hinzufügen + + + Verwendet einheitlich die Pr# auch in allen Favoritenlisten + + + Favoriten nach Pr# nummerieren + + + Sender neu &nummerieren + + + Sender alphabetisch sortieren + + + Sender &entfernen + + + Sender &übernehmen + + + &Bearbeiten + + + Zuletzt verwendet + + + &Beenden + + + &Drucken... + + + Excel liste exportieren... + + + Referenzliste speichern... + + + Sender aus Referenzliste hinzufügen... + + + Referenzliste öffnen... + + + Speichern &unter... + + + &Speichern + + + Datei&information... + + + Sicherheitskopie wiederherstellen + + + &Erneut laden + + + TV Senderliste &öffnen... + + + &Datei + + + F3: Filter | F4: Liste | -: nach oben | +: nach unten | Entf: entfernen + + + Ver- steckt Programmliste @@ -354,204 +552,6 @@ speziellen Anbieter, Satelliten oder Länderlisten aus. Nach oben - - dahinter - - - Kindersicherung - - - Favorit E umschalten - - - Favorit D umschalten - - - Favoriten entfernen - - - Sender s&perren: ein - - - Sender sperren: aus - - - Sender ü&berspringen: ein - - - Sender überspringen: aus - - - Sender &verstecken: ein - - - Sender verstecken: aus - - - TV-Gerät - - - Geräte&einstellungen... - - - Senderliste bereinigen - - - Senderdatensätze neu organisieren und Duplikate entfernen - - - &Einstellungen - - - &Sprache - - - &Zeichensatz - - - Alle Zeichensätze... - - - ISO Zeichensätze - - - Warnungen beim Laden anzeigen - - - Eventuelle Warnungen nach dem Laden einer TV-Datei automatisch anzeigen - - - Bearbeiten vordefinierter Listen erlauben (GEFÄHRLICH) - - - Der Fernseher funktioniert dabei unter Umständen nicht mehr korrekt. - - - Einga&behilfe - - - Öffnet ein Menü zur Auswahl der Eingangsquelle. Dieses kann auch direkt mit der F1-Taste aufgerufen werden. - - - &Eingangsquelle auswählen - - - Öffnet ein Menü zur Auswahl der Programm- oder Favoritenliste. Dieses Menü kann auch direkt über die Umschalt+F1 Tastenkombination geöffnet werden. - - - &Beenden - - - Zuletzt verwendet - - - &Bearbeiten - - - Sender &übernehmen - - - Sender &entfernen - - - Sender alphabetisch sortieren - - - Sender neu &nummerieren - - - Favoriten nach Pr# nummerieren - - - Verwendet einheitlich die Pr# auch in allen Favoritenlisten - - - &Erneut laden - - - Sicherheitskopie wiederherstellen - - - Datei&information... - - - &Speichern - - - Speichern &unter... - - - Referenzliste öffnen... - - - Sender aus Referenzliste hinzufügen... - - - Referenzliste speichern... - - - Excel liste exportieren... - - - Neuer Programmplatz - - - Sendername - - - Favoriten - - - Ge- sperrt - - - Kindersicherung - - - Ver- steckt - - - F3: Filter | F4: Liste | -: nach oben | +: nach unten | Entf: entfernen - - - &Datei - - - Über- springen - - - Sender umbenennen - - - Nach unten - - - davor - - - Lücken beim Verschieben/Entfernen von Sendern schließen - - - Wenn aktiv, werden folgende Programmnummer automatisch vorgerückt - - - Einfügemodus: - - - Keine Senderlisten vorhanden - - - Setze Pr#: - - - Programplatz für Einfügen und Festlegen - - - ChanSort {0} - Editor für TV-Senderlisten - - - Kindersicherung bei markierten Sendern ein/ausschalten - 333, 17 @@ -625,4 +625,7 @@ speziellen Anbieter, Satelliten oder Länderlisten aus. 495, 19 + + Quelle + \ No newline at end of file diff --git a/source/ChanSort/MainForm.pt.resx b/source/ChanSort/MainForm.pt.resx index 5198625..0b7b92b 100644 --- a/source/ChanSort/MainForm.pt.resx +++ b/source/ChanSort/MainForm.pt.resx @@ -66,214 +66,7 @@ - Novo Pr# - - - Abrir &lista de canais... - - - &Acrescentar favoritos - - - Todos os canais - - - Comutar - - - Repor filtro - - - Renumerar canais seleccionados - - - Mover canais seleccionados para baixo - - - Mover canais seleccionados para cima - - - Remover canais seleccionados - - - Canais ordenados - - - Valor Pr# anterior - - - Posição de canal anterior Programmplatz - - - Novo Pr# - - - Posição de canal novo - - - Nome do canal - - - Abreviatura - - - Favoritos - - - Blo- queado - - - Sal- tar - - - Esc- onder - - - Cod- ificado - - - Codificado - - - Canal/ Transp. - - - Número de canal ou transponder - - - Frequência (MHz) - - - Sserviço ID - - - Tipo serviço ID - - - Tipo serviço - - - Sátelite - - - Taxa de- símbolo - - - Polaridade - - - Nome da rede - - - Operador - - - F5: Filtro | F6: Lista | Entrada: aceitar - - - Remover canais seleccionados - - - << Acrescentar todos - - - Repor filtro - - - Aceitar canais assinalados - - - &Ajuda - - - &Sobre ChanSort... - - - Para cima - - - Depois - - - Parental lock - - - Remover favoritos - - - Bloquear &canais: SIM - - - Bloquear canais: NÃO - - - Saltar &canais: SIM - - - Saltar canais: NÃO - - - Esconder &canais: SIM - - - Esconder canais: NÃO - - - Televisor - - - Configurações TV... - - - &Configurações - - - &Idioma - - - &Tabela de caracteres - - - &Terminar - - - &Editar - - - Aceitar &canal - - - Remover &canal - - - Ordenar canais alfabeticamente - - - Renumerar &canais de novo - - - &Recarregar - - - Repor cópia de segurança - - - Informações& do ficheiro... - - - &Gravar - - - Gravar &como... - - - Abrir lista de referência... - - - Gravar lista de referência... - - - Exportar lista de Excel... + Novo Pos Posição de canal novo @@ -290,15 +83,6 @@ Parental lock - - Esc- onder - - - F3: Filtro | F4: Lista | -: para cima | +: para baixo | DEL: remover - - - &Ficheiro - Sal- tar @@ -326,6 +110,222 @@ ChanSort {0} - Editor de listas de canais para televisores Samsung, LG, Panasonic e Toshiba + + Todos os canais + + + Aceitar canais assinalados + + + Repor filtro + + + << Acrescentar todos + + + Remover canais seleccionados + + + F5: Filtro | F6: Lista | Entrada: aceitar + + + Operador + + + Nome da rede + + + Polaridade + + + Taxa de- símbolo + + + Sátelite + + + Tipo serviço + + + Tipo serviço ID + + + Sserviço ID + + + Frequência (MHz) + + + Número de canal ou transponder + + + Canal/ Transp. + + + Codificado + + + Cod- ificado + + + Esc- onder + + + Sal- tar + + + Blo- queado + + + Favoritos + + + Abreviatura + + + Nome do canal + + + Posição de canal novo + + + Novo Pos + + + Posição de canal anterior Programmplatz + + + Valor Pr# anterior + + + Canais ordenados + + + Remover canais seleccionados + + + Mover canais seleccionados para cima + + + Mover canais seleccionados para baixo + + + Renumerar canais seleccionados + + + Repor filtro + + + Parental lock + + + Depois + + + Comutar + + + &Tabela de caracteres + + + &Idioma + + + &Configurações + + + Configurações TV... + + + Televisor + + + Esconder canais: NÃO + + + Esconder &canais: SIM + + + Saltar canais: NÃO + + + Saltar &canais: SIM + + + Bloquear canais: NÃO + + + Bloquear &canais: SIM + + + Remover favoritos + + + &Acrescentar favoritos + + + Renumerar &canais de novo + + + Ordenar canais alfabeticamente + + + Remover &canal + + + Aceitar &canal + + + &Editar + + + &Terminar + + + Exportar lista de Excel... + + + Gravar lista de referência... + + + Abrir lista de referência... + + + Gravar &como... + + + &Gravar + + + Informações& do ficheiro... + + + Repor cópia de segurança + + + &Recarregar + + + Abrir &lista de canais... + + + &Ficheiro + + + F3: Filtro | F4: Lista | -: para cima | +: para baixo | DEL: remover + + + Esc- onder + + + &Ajuda + + + &Sobre ChanSort... + + + Para cima + Tipo serviço diff --git a/source/ChanSort/MainForm.resx b/source/ChanSort/MainForm.resx index 67bacd3..542526a 100644 --- a/source/ChanSort/MainForm.resx +++ b/source/ChanSort/MainForm.resx @@ -143,6 +143,9 @@ Pr. index + + Service Type + True @@ -153,6 +156,12 @@ 45 + + New Pos + + + New program number + True @@ -162,6 +171,9 @@ 50 + + Channel name + True @@ -171,6 +183,9 @@ 158 + + Favorites + False @@ -194,6 +209,15 @@ 55 + + UID + + + Lock + + + Parental lock + True @@ -203,6 +227,9 @@ 35 + + Skip + True @@ -212,6 +239,9 @@ 35 + + Hide + True @@ -228,7 +258,7 @@ Numeric - 449, 398 + 449, 392 1 @@ -249,7 +279,7 @@ Bottom - 2, 452 + 2, 446 2, 2, 2, 2 @@ -260,6 +290,9 @@ 2 + + F3: Filter | F4: List | -: move up | +: move down | Del: remove + lblHotkeyLeft @@ -282,7 +315,7 @@ 6, 13 - 1456, 581 + 1450, 575 Bottom, Left, Right @@ -291,7 +324,10 @@ 0, 5 - 1445, 0 + 1439, 0 + + + Pr# pageProgNr @@ -306,7 +342,7 @@ 0 - 1451, 22 + 1445, 22 6 @@ -330,11 +366,14 @@ 0, 83 - 1456, 27 + 1450, 27 10 + + Sub List + False @@ -356,8 +395,242 @@ 475, 17 - - Service Type + + &File + + + &Open TV data file... + + + &Reload + + + Restore backup + + + File &information... + + + &Save + + + Save &as... + + + Load reference list... + + + Add channels from reference list... + + + Save reference list... + + + Export Excel list... + + + &Print... + + + &Quit + + + Recent files + + + &Edit + + + &Add channels + + + &Remove channels + + + Rename channel + + + Sor&t channels alphabetically + + + Re&number channels + + + Renumber favorites by Pr# + + + Uses the same Pr# in all channel and favorites lists + + + Add to &Favorites + + + &A + + + &B + + + &C + + + &D + + + &E + + + Remove from Favorites + + + &A + + + &B + + + &C + + + &D + + + &E + + + &Lock channel: on + + + Lock channel: off + + + &Skip channel: on + + + Skip channel: off + + + &Hide channel: on + + + Hide channel: off + + + TV-Set + + + Device setting... + + + Cleanup channel data + + + Reorganize channel records and remove duplicates + + + &Settings + + + &Language + + + &English + + + &Deutsch + + + Português + + + ру́сский + + + &Character set + + + All &character sets... + + + ISO character sets + + + Show warnings after loading file + + + Automatically show any warnings after opening a file + + + Allow editing predefined lists (DANGEROUS) + + + Your TV may malfunction when you edit a list with predefined channel numbers + + + &Accessibility + + + Opens a submenu for the input source selection. This menu can be directly activated with the F1 key + + + Select &input source + + + mnuInputSource + + + Opens a submenu for the program of favorite list selection. This menu can be directly activated with the Shift+F1 key + + + Select program/&favorite list + + + mnuFavList + + + Program list + + + Favorites A + + + Favorites B + + + Favorites C + + + Favorites D + + + Favorites E + + + &Left list filter + + + Left list + + + &Right list filter + + + Right list + + + &Help + + + Wiki + + + ChanSort website... + + + &About ChanSort... + + + Tools @@ -417,7 +690,7 @@ 0, 0 - 1456, 26 + 1450, 26 barDockControlTop @@ -435,10 +708,10 @@ Bottom - 0, 581 + 0, 575 - 1456, 0 + 1450, 0 barDockControlBottom @@ -459,7 +732,7 @@ 0, 26 - 0, 555 + 0, 549 barDockControlLeft @@ -477,10 +750,10 @@ Right - 1456, 26 + 1450, 26 - 0, 555 + 0, 549 barDockControlRight @@ -494,6 +767,15 @@ 4 + + Move up + + + Move down + + + swap + Default @@ -522,6 +804,9 @@ 185, 6 + + after + 46, 19 @@ -543,6 +828,9 @@ 107, 6 + + before + 54, 19 @@ -567,12 +855,18 @@ 543, 6 + + Close gap when moving/deleting a channel + 322, 19 7 + + When active, all channels after the current one will be automatically renumbered + cbCloseGap @@ -594,6 +888,9 @@ 2 + + Insert mode: + lblInsertMode @@ -610,7 +907,7 @@ Top, Right - 1278, 4 + 1272, 4 Transparent @@ -640,7 +937,10 @@ 0, 33 - 1266, 0 + 1260, 0 + + + No channel lists pageEmpty @@ -655,7 +955,7 @@ 0 - 1272, 22 + 1266, 22 5 @@ -684,6 +984,12 @@ 0 + + Set Pos: + + + Program number for insert and set operations + lblSetProgramNr @@ -702,6 +1008,9 @@ OK + + \d{1,4} + RegEx @@ -730,7 +1039,7 @@ 0, 26 - 1456, 57 + 1450, 57 0 @@ -750,6 +1059,9 @@ CenterScreen + + ChanSort {0} - TV Channel List Editor + dsChannels @@ -858,6 +1170,18 @@ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + colSource + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colPrNr + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + colName @@ -1519,7 +1843,7 @@ DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - 04/19/2016 13:27:29 + 04/27/2016 17:52:40 16, 16 @@ -1533,6 +1857,12 @@ 15 + + Toggle parental lock + + + Parental lock + btnToggleLock @@ -1545,6 +1875,9 @@ 0 + + Toggle Favorite E + 232, 5 @@ -1554,6 +1887,9 @@ 14 + + ±E + btnToggleFavE @@ -1566,6 +1902,9 @@ 1 + + Toggle Favorite D + 207, 5 @@ -1575,6 +1914,9 @@ 13 + + ±D + btnToggleFavD @@ -1587,6 +1929,9 @@ 2 + + Toggle Favorite C + 182, 5 @@ -1596,6 +1941,9 @@ 12 + + ±C + btnToggleFavC @@ -1608,543 +1956,9 @@ 3 - - New Pr# - - - &Open TV data file... - - - &Print... - - - Add to &Favorites - - - Select program/&favorite list - - - ±D - - - Original channels - - - Panel2 - - - splitContainerControl1 - - - swap - - - Toggle Favorite C - - - ±C - Toggle Favorite B - - ±B - - - Toggle Favorite A - - - ±A - - - Remove channel filter criteria from sorted channel list - - - Filter - - - Reset filter - - - Renumber selected channels sequentially - - - Renumber selected channels - - - Move selected channel down - - - Move selected channels down - - - Move selected channel up - - - Move selected channels up - - - Remove selected channels from sorted list - - - Remove selected channels - - - Sorted channels - - - Panel1 - - - Pr. index - - - Old Pr# - - - Old program number - - - New Pr# - - - New program number - - - Channel name - - - Short name - - - Favorites - - - Locked - - - Skip - - - Hide - - - Crypt - - - Encrypted - - - Chan/ Transp - - - Channel or transponder number - - - Freqency (MHz) - - - Service ID - - - Video PID - - - Audio PID - - - Service Type ID - - - Service Type - - - Satellite - - - Network (ONID) - - - TS ID - - - Transport Stream ID - - - Symbol rate - - - Polarity - - - Uid - - - Network Name - - - Network Operator - - - Provider - - - Order - - - Signal source - - - F5: Filter | F6: List | Enter: add - - - This is a predefined list and cannot be edited. - - - During the setup of your TV you selected a predefined channel list. -Modifying such a list would cause your TV to malfunction. -Please run a full channel scan on your TV and do not select any -specific provider, satellite or country lists. - - - Remove selected channels from sorted list - - - Remove selected channels from sorted list - - - Append all currently unsorted channels at the end of the list - - - << Add all - - - Append all currently unsorted channels at the end of the list - - - Remove channel filter criteria from complete channel list - - - Filter - - - Reset filter - - - Add selected channels to sorted list - - - Add selected channels to sorted list - - - mnuFavList - - - Program list - - - Favorites A - - - Favorites B - - - Favorites C - - - Favorites D - - - Favorites E - - - &Left list filter - - - Left list - - - &Right list filter - - - Right list - - - &Help - - - Wiki - - - ChanSort website... - - - &About ChanSort... - - - Tools - - - Move up - - - after - - - Parental lock - - - Toggle Favorite E - - - ±E - - - Toggle Favorite D - - - &A - - - &B - - - &C - - - &D - - - &E - - - Remove from Favorites - - - &A - - - &B - - - &C - - - &D - - - &E - - - &Lock channel: on - - - Lock channel: off - - - &Skip channel: on - - - Skip channel: off - - - &Hide channel: on - - - Hide channel: off - - - TV-Set - - - Device setting... - - - Cleanup channel data - - - Reorganize channel records and remove duplicates - - - &Settings - - - &Language - - - &English - - - &Deutsch - - - Português - - - ру́сский - - - &Character set - - - All &character sets... - - - ISO character sets - - - Show warnings after loading file - - - Automatically show any warnings after opening a file - - - Allow editing predefined lists (DANGEROUS) - - - Your TV may malfunction when you edit a list with predefined channel numbers - - - &Accessibility - - - Opens a submenu for the input source selection. This menu can be directly activated with the F1 key - - - Select &input source - - - mnuInputSource - - - Opens a submenu for the program of favorite list selection. This menu can be directly activated with the Shift+F1 key - - - &Quit - - - Recent files - - - &Edit - - - &Add channels - - - &Remove channels - - - Sor&t channels alphabetically - - - Re&number channels - - - Renumber favorites by Pr# - - - Uses the same Pr# in all channel and favorites lists - - - &Reload - - - Restore backup - - - File &information... - - - &Save - - - Save &as... - - - Load reference list... - - - Add channels from reference list... - - - Save reference list... - - - Export Excel list... - - - New program number - - - Channel name - - - Favorites - - - UID - - - Lock - - - Parental lock - - - Hide - - - F3: Filter | F4: List | -: move up | +: move down | Del: remove - - - Pr# - - - Sub List - - - &File - - - Skip - - - Rename channel - - - Move down - - - before - - - Close gap when moving/deleting a channel - - - When active, all channels after the current one will be automatically renumbered - - - Insert mode: - - - No channel lists - - - Set Pr#: - - - Program number for insert and set operations - - - \d{1,4} - - - ChanSort {0} - TV Channel List Editor - - - Toggle parental lock - 157, 5 @@ -2154,6 +1968,9 @@ specific provider, satellite or country lists. 11 + + ±B + btnToggleFavB @@ -2166,6 +1983,9 @@ specific provider, satellite or country lists. 4 + + Toggle Favorite A + 132, 5 @@ -2175,6 +1995,9 @@ specific provider, satellite or country lists. 10 + + ±A + btnToggleFavA @@ -2187,6 +2010,9 @@ specific provider, satellite or country lists. 5 + + Remove channel filter criteria from sorted channel list + Tahoma, 8.25pt, style=Strikeout @@ -2199,6 +2025,12 @@ specific provider, satellite or country lists. 9 + + Filter + + + Reset filter + btnClearLeftFilter @@ -2220,6 +2052,12 @@ specific provider, satellite or country lists. 8 + + Renumber selected channels sequentially + + + Renumber selected channels + btnRenum @@ -2241,6 +2079,12 @@ specific provider, satellite or country lists. 6 + + Move selected channel down + + + Move selected channels down + btnDown @@ -2262,6 +2106,12 @@ specific provider, satellite or country lists. 5 + + Move selected channel up + + + Move selected channels up + btnUp @@ -2283,6 +2133,12 @@ specific provider, satellite or country lists. 2 + + Remove selected channels from sorted list + + + Remove selected channels + btnRemoveLeft @@ -2326,11 +2182,14 @@ specific provider, satellite or country lists. 0, 0 - 453, 471 + 453, 465 0 + + Sorted channels + grpOutputList @@ -2343,6 +2202,9 @@ specific provider, satellite or country lists. 0 + + Panel1 + Fill @@ -2355,6 +2217,15 @@ specific provider, satellite or country lists. Tahoma, 8.25pt, style=Bold + + Pr. index + + + Old Pos + + + Old position + True @@ -2364,6 +2235,12 @@ specific provider, satellite or country lists. 50 + + New Pos + + + New position + True @@ -2373,6 +2250,21 @@ specific provider, satellite or country lists. 45 + + Source + + + 50 + + + Pr# + + + 30 + + + Channel name + True @@ -2382,12 +2274,18 @@ specific provider, satellite or country lists. 180 + + Short name + True 3 + + Favorites + False @@ -2409,6 +2307,9 @@ specific provider, satellite or country lists. 55 + + Locked + True @@ -2418,6 +2319,9 @@ specific provider, satellite or country lists. 40 + + Skip + True @@ -2427,6 +2331,9 @@ specific provider, satellite or country lists. 40 + + Hide + True @@ -2436,6 +2343,12 @@ specific provider, satellite or country lists. 40 + + Crypt + + + Encrypted + True @@ -2445,6 +2358,12 @@ specific provider, satellite or country lists. 40 + + Chan/ Transp + + + Channel or transponder number + True @@ -2454,6 +2373,9 @@ specific provider, satellite or country lists. 45 + + Freqency (MHz) + True @@ -2463,6 +2385,9 @@ specific provider, satellite or country lists. 57 + + Service ID + True @@ -2472,6 +2397,9 @@ specific provider, satellite or country lists. 45 + + Video PID + True @@ -2481,6 +2409,9 @@ specific provider, satellite or country lists. 40 + + Audio PID + True @@ -2490,6 +2421,9 @@ specific provider, satellite or country lists. 40 + + Service Type ID + True @@ -2499,6 +2433,9 @@ specific provider, satellite or country lists. 45 + + Service Type + True @@ -2508,6 +2445,9 @@ specific provider, satellite or country lists. 45 + + Satellite + True @@ -2517,6 +2457,9 @@ specific provider, satellite or country lists. 100 + + Network (ONID) + True @@ -2526,6 +2469,12 @@ specific provider, satellite or country lists. 45 + + TS ID + + + Transport Stream ID + True @@ -2535,6 +2484,9 @@ specific provider, satellite or country lists. 40 + + Symbol rate + True @@ -2544,32 +2496,53 @@ specific provider, satellite or country lists. 40 + + Polarity + 40 + + Uid + 120 + + Network Name + True 20 + + Network Operator + True 21 + + Provider + True 22 + + Order + + + Signal source + - 993, 398 + 987, 392 1 @@ -2590,7 +2563,7 @@ specific provider, satellite or country lists. Bottom - 2, 452 + 2, 446 2, 2, 2, 2 @@ -2601,6 +2574,9 @@ specific provider, satellite or country lists. 2 + + F5: Filter | F6: List | Enter: add + lblHotkeyRight @@ -2628,6 +2604,15 @@ specific provider, satellite or country lists. 8 + + This is a predefined list and cannot be edited. + + + During the setup of your TV you selected a predefined channel list. +Modifying such a list would cause your TV to malfunction. +Please run a full channel scan on your TV and do not select any +specific provider, satellite or country lists. + False @@ -2652,6 +2637,12 @@ specific provider, satellite or country lists. 6 + + Remove selected channels from sorted list + + + Remove selected channels from sorted list + btnRemoveRight @@ -2664,6 +2655,9 @@ specific provider, satellite or country lists. 1 + + Append all currently unsorted channels at the end of the list + 71, 5 @@ -2673,6 +2667,12 @@ specific provider, satellite or country lists. 5 + + << Add all + + + Append all currently unsorted channels at the end of the list + btnAddAll @@ -2685,6 +2685,9 @@ specific provider, satellite or country lists. 2 + + Remove channel filter criteria from complete channel list + Tahoma, 8.25pt, style=Strikeout @@ -2697,6 +2700,12 @@ specific provider, satellite or country lists. 2 + + Filter + + + Reset filter + btnClearRightFilter @@ -2718,6 +2727,12 @@ specific provider, satellite or country lists. 4 + + Add selected channels to sorted list + + + Add selected channels to sorted list + btnAdd @@ -2737,7 +2752,7 @@ specific provider, satellite or country lists. 2, 21 - 993, 33 + 987, 33 0 @@ -2761,11 +2776,14 @@ specific provider, satellite or country lists. 0, 0 - 997, 471 + 991, 465 0 + + Original channels + grpInputList @@ -2778,12 +2796,18 @@ specific provider, satellite or country lists. 0 + + Panel2 + - 1456, 471 + 1450, 465 5 + + splitContainerControl1 + splitContainerControl1 diff --git a/source/ChanSort/MainForm.ru.resx b/source/ChanSort/MainForm.ru.resx index 038e24c..3bdcc1d 100644 --- a/source/ChanSort/MainForm.ru.resx +++ b/source/ChanSort/MainForm.ru.resx @@ -120,288 +120,6 @@ Новый - - Открыть файл данных TV... - - - Добавить в Избранное - - - Все каналы - - - заменить - - - Фильтр - - - Сбросить фильтр - - - 1-999 - - - Изменить нумерацию выбранных каналов - - - v - - - Переместить выбранные каналы вниз - - - ^ - - - Переместить выбранные каналы вверх - - - X - - - Удалить выбранные каналы - - - Отсортированные каналы - - - Индекс пр. - - - Старый - - - Старый номер программы - - - Новый - - - Новый номер программы - - - Название канала - - - Краткое имя - - - Избранное - - - Заблокированный - - - Пропускать - - - Скрыть - - - Зашифрованный - - - Зашифрованный - - - Канал/Транспондер - - - Номер канала или транспондер - - - Частота (MHz) - - - ID сервиса - - - Видео PID - - - Аудио PID - - - ID Тип сервиса - - - Тип сервиса - - - Спутник - - - Сеть (ONID) - - - ID транспортного потока - - - Скорость передачи - - - Полярность - - - Сетевое имя - - - Оператор сети - - - Order - - - Источник сигнала - - - F5: Фильтр | F6: Список | Enter: Добавить - - - X - - - Удалить выбранные каналы из отсортированного списка - - - << Добавить все - - - Добавить все текущие несортированные каналы в конец списка - - - Фильтр - - - Сбросить фильтр - - - << - - - Добавить выбранные каналы в отсортированный список - - - Помощь - - - Вики ChanSort - - - Сайт ChanSort... - - - О ChanSort ... - - - Инструменты - - - Переместить вверх - - - после - - - Родительский контроль - - - Удалить из Избранного - - - Заблокировать канал - - - Разблокировать канал - - - Пропустить канал - - - Не пропускать канал - - - Скрыть канал - - - Показать канал - - - Телевизор - - - Настройка устройства... - - - Очистка данных канала - - - Перенастроить канал и удалить дубликаты - - - Настройки - - - Язык - - - Набор символов - - - Все наборы символов... - - - Показывать предупреждения после загрузки файла - - - Выход - - - Последние файлы - - - Правка - - - Добавить каналы - - - Удалить каналы - - - Сортировать каналы по алфавиту - - - Изменить нумерацию каналов - - - Перезагрузить - - - Восстановить из резервной копии - - - Файл и информация... - - - Сохранить - - - Сохранить как... - - - Загрузить список... - - - Добавить каналы из списка... - - - Сохранить список... - - - Экспорт в Excel... - Новый номер программы @@ -417,18 +135,6 @@ Родительский контроль - - Скрыть - - - F3: Фильтр | F4: Список | -: Вверх | +: Вниз | Del: Удалить - - - Pr# - - - Файл - Пропускать @@ -462,6 +168,300 @@ ChanSort {0} - редактор списка каналов для телевизоров Samsung, LG, Pansonic и Toshiba + + Все каналы + + + Добавить выбранные каналы в отсортированный список + + + << + + + Сбросить фильтр + + + Фильтр + + + Добавить все текущие несортированные каналы в конец списка + + + << Добавить все + + + Удалить выбранные каналы из отсортированного списка + + + X + + + F5: Фильтр | F6: Список | Enter: Добавить + + + Источник сигнала + + + Order + + + Оператор сети + + + Сетевое имя + + + Полярность + + + Скорость передачи + + + ID транспортного потока + + + Сеть (ONID) + + + Спутник + + + Тип сервиса + + + ID Тип сервиса + + + Аудио PID + + + Видео PID + + + ID сервиса + + + Частота (MHz) + + + Номер канала или транспондер + + + Канал/Транспондер + + + Зашифрованный + + + Зашифрованный + + + Скрыть + + + Пропускать + + + Заблокированный + + + Избранное + + + Краткое имя + + + Название канала + + + Новый номер программы + + + Новый + + + Старый номер программы + + + Старый + + + Индекс пр. + + + Отсортированные каналы + + + Удалить выбранные каналы + + + X + + + Переместить выбранные каналы вверх + + + ^ + + + Переместить выбранные каналы вниз + + + v + + + Изменить нумерацию выбранных каналов + + + 1-999 + + + Сбросить фильтр + + + Фильтр + + + Родительский контроль + + + после + + + заменить + + + Показывать предупреждения после загрузки файла + + + Все наборы символов... + + + Набор символов + + + Язык + + + Настройки + + + Перенастроить канал и удалить дубликаты + + + Очистка данных канала + + + Настройка устройства... + + + Телевизор + + + Показать канал + + + Скрыть канал + + + Не пропускать канал + + + Пропустить канал + + + Разблокировать канал + + + Заблокировать канал + + + Удалить из Избранного + + + Добавить в Избранное + + + Изменить нумерацию каналов + + + Сортировать каналы по алфавиту + + + Удалить каналы + + + Добавить каналы + + + Правка + + + Последние файлы + + + Выход + + + Экспорт в Excel... + + + Сохранить список... + + + Добавить каналы из списка... + + + Загрузить список... + + + Сохранить как... + + + Сохранить + + + Файл и информация... + + + Восстановить из резервной копии + + + Перезагрузить + + + Открыть файл данных TV... + + + Файл + + + Pr# + + + F3: Фильтр | F4: Список | -: Вверх | +: Вниз | Del: Удалить + + + Скрыть + + + Помощь + + + Вики ChanSort + + + Сайт ChanSort... + + + О ChanSort ... + + + Инструменты + + + Переместить вверх + Тип сервиса diff --git a/source/ChanSort/ReferenceListForm.cs b/source/ChanSort/ReferenceListForm.cs index adf0634..0cf694d 100644 --- a/source/ChanSort/ReferenceListForm.cs +++ b/source/ChanSort/ReferenceListForm.cs @@ -157,7 +157,7 @@ namespace ChanSort.Ui this.comboSource.Properties.Items.Clear(); foreach (var list in serializer.DataRoot.ChannelLists) { - if (!list.IsMixedSouceFavoritesList && list.Channels.Count > 0) + if (!list.IsMixedSourceFavoritesList && list.Channels.Count > 0) this.comboSource.Properties.Items.Add(list); } @@ -165,7 +165,7 @@ namespace ChanSort.Ui this.comboTarget.Properties.Items.Clear(); foreach (var list in main.DataRoot.ChannelLists) { - if (!list.IsMixedSouceFavoritesList && list.Channels.Count > 0) + if (!list.IsMixedSourceFavoritesList && list.Channels.Count > 0) { this.comboTarget.Properties.Items.Add(list); if (main.CurrentChannelList == list) diff --git a/source/changelog.md b/source/changelog.md index e3069b9..beb92e3 100644 --- a/source/changelog.md +++ b/source/changelog.md @@ -1,7 +1,7 @@ ChanSort Change Log =================== -2016-04-18 +2016-04-27 - added support for Hisense channel.db channel lists 2015-11-29 diff --git a/source/makeDistribZip.cmd b/source/makeDistribZip.cmd index 15583cd..dedaebf 100644 --- a/source/makeDistribZip.cmd +++ b/source/makeDistribZip.cmd @@ -2,7 +2,7 @@ cd /d %~dp0 set curdate=%date:~6,4%-%date:~3,2%-%date:~0,2% set target=%cd%\..\..\ChanSort_%curdate% -set DXversion=15.1 +set DXversion=15.2 mkdir "%target%" 2>nul del /s /q "%target%\*" copy debug\ChanSort.exe* "%target%"