diff --git a/ChanSort.Api/Controller/Editor.cs b/ChanSort.Api/Controller/Editor.cs index ddb23d4..5100618 100644 --- a/ChanSort.Api/Controller/Editor.cs +++ b/ChanSort.Api/Controller/Editor.cs @@ -219,7 +219,7 @@ namespace ChanSort.Api if (tvChannel != null) { tvChannel.SetPosition(this.SubListIndex, refChannel.OldProgramNr); - tvChannel.Favorites = refChannel.Favorites; + tvChannel.Favorites = refChannel.Favorites & DataRoot.SupportedFavorites; tvChannel.Skip = refChannel.Skip; tvChannel.Lock = refChannel.Lock; tvChannel.Hidden = refChannel.Hidden; @@ -229,6 +229,19 @@ namespace ChanSort.Api tvChannel.Name = refChannel.Name; tvChannel.IsNameModified = true; } + if (this.DataRoot.SortedFavorites) + { + if (refDataRoot.SortedFavorites) + { + var c = Math.Min(refChannel.FavIndex.Count, tvChannel.FavIndex.Count); + for (int i = 0; i < c; i++) + tvChannel.FavIndex[i] = refChannel.FavIndex[i]; + } + else + { + this.ApplyPrNrToFavLists(tvChannel); + } + } } else { @@ -240,6 +253,7 @@ namespace ChanSort.Api } } + #endregion #region AutoNumberingForUnassignedChannels() @@ -352,5 +366,36 @@ namespace ChanSort.Api } } #endregion + + #region ApplyPrNrToFavLists() + public void ApplyPrNrToFavLists() + { + if (!this.DataRoot.SortedFavorites) + return; + + foreach (var list in this.DataRoot.ChannelLists) + { + foreach(var channel in list.Channels) + this.ApplyPrNrToFavLists(channel); + } + } + + /// + /// Set the number inside the favorites list to the same number as Pr# + /// + /// + private void ApplyPrNrToFavLists(ChannelInfo tvChannel) + { + var supMask = (int)this.DataRoot.SupportedFavorites; + var refMask = (int)tvChannel.Favorites; + for (int i = 0; supMask != 0; i++) + { + tvChannel.FavIndex[i] = (refMask & 0x01) == 0 ? -1 : tvChannel.OldProgramNr; + supMask >>= 1; + refMask >>= 1; + } + } + + #endregion } } diff --git a/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj b/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj index fc1235e..0b02bae 100644 --- a/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj +++ b/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj @@ -70,6 +70,7 @@ + diff --git a/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.ini b/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.ini index 81a03d0..f5f4fc3 100644 --- a/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.ini +++ b/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.ini @@ -56,6 +56,18 @@ Favorites = 5 SortedFavorites = 1 +[Series:H] + SatDataBase.dat = 145 + TransponderDataBase.dat = 45 + PTC = 12 + map-AirA = 64 + map-AirD = 320 + map-CableD = 320 + map-SateD = 168 + map-AstraHDPlusD = 212 + Favorites = 5 + SortedFavorites = 1 + [Analog:28] ; map-AirA and map-CableA for B series offInUse = 0 diff --git a/ChanSort.Loader.Samsung/FavMode.cs b/ChanSort.Loader.Samsung/FavMode.cs new file mode 100644 index 0000000..fa50551 --- /dev/null +++ b/ChanSort.Loader.Samsung/FavMode.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace ChanSort.Loader.Samsung +{ + class FavMode + { + } +} diff --git a/ChanSort/MainForm.Designer.cs b/ChanSort/MainForm.Designer.cs index 1235f52..5175b63 100644 --- a/ChanSort/MainForm.Designer.cs +++ b/ChanSort/MainForm.Designer.cs @@ -121,6 +121,7 @@ this.miRenameChannel = new DevExpress.XtraBars.BarButtonItem(); this.miSort = new DevExpress.XtraBars.BarButtonItem(); this.miRenum = new DevExpress.XtraBars.BarButtonItem(); + this.miRenumFavByPrNr = new DevExpress.XtraBars.BarButtonItem(); this.mnuFavSet = new DevExpress.XtraBars.BarSubItem(); this.miFavSet = new DevExpress.XtraBars.BarListItem(); this.mnuFavUnset = new DevExpress.XtraBars.BarSubItem(); @@ -917,9 +918,10 @@ this.miExcelExport, this.miPortuguese, this.miAddFromRefList, - this.miPrint}); + this.miPrint, + this.miRenumFavByPrNr}); this.barManager1.MainMenu = this.bar1; - this.barManager1.MaxItemId = 63; + this.barManager1.MaxItemId = 64; this.barManager1.ShowFullMenus = true; // // bar1 @@ -1115,6 +1117,7 @@ new DevExpress.XtraBars.LinkPersistInfo(this.miRenameChannel), new DevExpress.XtraBars.LinkPersistInfo(this.miSort), new DevExpress.XtraBars.LinkPersistInfo(this.miRenum), + new DevExpress.XtraBars.LinkPersistInfo(this.miRenumFavByPrNr), new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.mnuFavSet, "", true, true, true, 0, null, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph), new DevExpress.XtraBars.LinkPersistInfo(this.mnuFavUnset), new DevExpress.XtraBars.LinkPersistInfo(this.miLockOn, true), @@ -1172,6 +1175,13 @@ this.miRenum.Name = "miRenum"; this.miRenum.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miRenum_ItemClick); // + // miRenumFavByPrNr + // + resources.ApplyResources(this.miRenumFavByPrNr, "miRenumFavByPrNr"); + this.miRenumFavByPrNr.Id = 63; + this.miRenumFavByPrNr.Name = "miRenumFavByPrNr"; + this.miRenumFavByPrNr.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miRenumFavByPrNr_ItemClick); + // // mnuFavSet // resources.ApplyResources(this.mnuFavSet, "mnuFavSet"); @@ -1824,6 +1834,7 @@ private DevExpress.XtraGrid.Columns.GridColumn colOutHide; private DevExpress.XtraBars.BarButtonItem miPrint; private DevExpress.XtraGrid.Columns.GridColumn colProvider; + private DevExpress.XtraBars.BarButtonItem miRenumFavByPrNr; private DevExpress.XtraSplashScreen.SplashScreenManager splashScreenManager1; } } diff --git a/ChanSort/MainForm.cs b/ChanSort/MainForm.cs index 8e2724f..bdac902 100644 --- a/ChanSort/MainForm.cs +++ b/ChanSort/MainForm.cs @@ -25,7 +25,7 @@ namespace ChanSort.Ui { public partial class MainForm : XtraForm { - public const string AppVersion = "v2014-06-08.3"; + public const string AppVersion = "v2014-06-10"; private const int MaxMruEntries = 10; @@ -2404,7 +2404,12 @@ namespace ChanSort.Ui } #endregion - - + #region miRenumFavByPrNr_ItemClick + private void miRenumFavByPrNr_ItemClick(object sender, ItemClickEventArgs e) + { + TryExecute(this.editor.ApplyPrNrToFavLists); + this.RefreshGrid(this.gviewLeft, this.gviewRight); + } + #endregion } } diff --git a/ChanSort/MainForm.de.resx b/ChanSort/MainForm.de.resx index 0859b99..2030c71 100644 --- a/ChanSort/MainForm.de.resx +++ b/ChanSort/MainForm.de.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Neue Pr# @@ -135,7 +135,13 @@ Kindersicherung - + + Über- springen + + + Ver- steckt + + 333, 17 @@ -172,6 +178,9 @@ Excel liste exportieren... + + &Drucken... + &Beenden @@ -193,6 +202,12 @@ Sender neu &nummerieren + + Favoriten nach Pr# nummerieren + + + Verwendet einheitlich die Pr# auch in allen Favoritenlisten + &Favoriten hinzufügen @@ -256,8 +271,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy - LjIuOC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMy4yLCBWZXJzaW9uPTEz + LjIuOS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEZpbGUE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICKaPJ5gsBeU2NTSFe @@ -266,8 +281,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy - LjIuOC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMy4yLCBWZXJzaW9uPTEz + LjIuOS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEhlbHAE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICdEVVDegwMU2acNpw @@ -276,8 +291,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy - LjIuOC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMy4yLCBWZXJzaW9uPTEz + LjIuOS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEVkaXQE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICZMTu18lZRU+IqmAu @@ -286,8 +301,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy - LjIuOC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMy4yLCBWZXJzaW9uPTEz + LjIuOS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAAB09wdGlvbnME/P///wtTeXN0ZW0uR3VpZAsAAAACX2EC X2ICX2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICXJMOh9nzAkKc @@ -303,18 +318,30 @@ tauschen + + 66, 19 + dahinter + + 62, 19 + davor + + 50, 19 + Lücken beim Verschieben/Entfernen von Sendern schließen Wenn aktiv, werden folgende Programmnummer automatisch vorgerückt + + 71, 13 + Einfügemodus: @@ -432,13 +459,4 @@ Alle Sender - - Über- springen - - - Ver- steckt - - - &Drucken... - \ No newline at end of file diff --git a/ChanSort/MainForm.resx b/ChanSort/MainForm.resx index 9ae5cd0..598b100 100644 --- a/ChanSort/MainForm.resx +++ b/ChanSort/MainForm.resx @@ -455,6 +455,12 @@ Re&number channels + + Renumber favorites by Pr# + + + Uses the same Pr# in all channel and favorites lists + Add to &Favorites @@ -543,7 +549,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMy4yLCBWZXJzaW9uPTEz - LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + LjIuOS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEZpbGUE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICKaPJ5gsBeU2NTSFe @@ -553,7 +559,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMy4yLCBWZXJzaW9uPTEz - LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + LjIuOS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEhlbHAE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICdEVVDegwMU2acNpw @@ -563,7 +569,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMy4yLCBWZXJzaW9uPTEz - LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + LjIuOS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEVkaXQE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICZMTu18lZRU+IqmAu @@ -573,7 +579,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMy4yLCBWZXJzaW9uPTEz - LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + LjIuOS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAAB09wdGlvbnME/P///wtTeXN0ZW0uR3VpZAsAAAACX2EC X2ICX2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICXJMOh9nzAkKc @@ -1364,6 +1370,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + miRenumFavByPrNr + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + mnuFavSet @@ -1563,7 +1575,7 @@ DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - 01/19/2014 15:33:34 + 06/10/2014 17:55:01 16, 16 diff --git a/ChanSort/Properties/licenses.licx b/ChanSort/Properties/licenses.licx index e69de29..bd37187 100644 --- a/ChanSort/Properties/licenses.licx +++ b/ChanSort/Properties/licenses.licx @@ -0,0 +1,6 @@ +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/readme.txt b/readme.txt index e5726cd..698b337 100644 --- a/readme.txt +++ b/readme.txt @@ -1,7 +1,9 @@ -Version v2014-06-08.3 ===================================================== +Version v2014-06-10 ======================================================= Changes: -- fixed problem with Toshiba lists that refer to invalid satellites +- fixed problem with incorrect favorites when applying a reference list +- added function "Edit / Renumber Favorites by Pr#" to use the same numbers + in all lists The complete change log can be found at the end of this document @@ -115,6 +117,11 @@ OTHER DEALINGS IN THE SOFTWARE. Change log ================================================================ +2015-06-10 +- fixed problem with incorrect favorites when applying a reference list +- added function "Edit / Renumber Favorites by Pr#" to use the same numbers + in all lists + 2014-06-08.3 - fixed problem with Toshiba lists that refer to invalid satellites