- Sony Android (E-Format) now supports independent favorite list ordering

- fixed issue when saving Sony Android list with high program numbers (causing negative int32 values due to bit shift)
- for unknown DVB service types the UI now shows the number instead of an empty string
- loaders are now setting the OldFavIndex (to be consistent with the use OldProgramNr)
- Form shows full file path in title bar
- no longer defaulting to "swap" mode when opening a file and using "current order"
- show "Source" column in the left list when editing a mixed source favorite list
This commit is contained in:
hbeham
2019-11-10 20:09:27 +01:00
parent 449dea8195
commit 5cdf9d0995
15 changed files with 151 additions and 71 deletions

View File

@@ -71,6 +71,8 @@ namespace ChanSort.Ui
foreach (GridColumn col in this.gviewRight.Columns)
col.Tag = col.Visible;
this.colOutSource.Caption = this.colSource.Caption; // copy translated caption
if (!Config.Default.WindowSize.IsEmpty)
this.Size = Config.Default.WindowSize;
this.title = string.Format(base.Text, AppVersion);
@@ -255,7 +257,7 @@ namespace ChanSort.Ui
this.currentRefFile = Path.Combine(Path.GetDirectoryName(this.currentTvFile) ?? "",
Path.GetFileNameWithoutExtension(this.currentTvFile) + ".txt");
}
this.Text = this.title + " - " + Path.GetFileName(this.currentTvFile);
this.Text = this.title + " - " + this.currentTvFile;
}
#endregion
@@ -631,7 +633,7 @@ namespace ChanSort.Ui
//this.currentTvSerializer.ApplyCurrentProgramNumbers();
this.DataRoot.ApplyCurrentProgramNumbers();
this.RefreshGrid(this.gviewLeft, this.gviewRight);
this.rbInsertSwap.Checked = true;
//this.rbInsertSwap.Checked = true;
}
}
@@ -1460,6 +1462,12 @@ namespace ChanSort.Ui
if (list == null)
return false;
if (list.IsMixedSourceFavoritesList)
{
if (col == this.colSource || col == this.colOutSource) return true;
if (col == this.colOutHide || col == this.colOutLock || col == this.colOutSkip) return false;
}
var filter = list.VisibleColumnFieldNames;
if (filter != null)
{
@@ -1472,7 +1480,6 @@ namespace ChanSort.Ui
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;