allow block items to disable watermarks (#2139)

* allow block items to disable watermarks

* fix test
This commit is contained in:
Jason Dove
2025-07-12 03:55:18 +00:00
committed by GitHub
parent e16cb30ab1
commit 451c534062
18 changed files with 11775 additions and 8 deletions
+12 -3
View File
@@ -77,6 +77,7 @@
<MudTh>Collection</MudTh>
<MudTh>Playback Order</MudTh>
<MudTh>Show In EPG</MudTh>
<MudTh>Disable Watermarks</MudTh>
<MudTh/>
<MudTh/>
<MudTh/>
@@ -96,6 +97,9 @@
<MudTd>
<MudCheckBox T="bool" Value="@context.IncludeInProgramGuide" ValueChanged="@(e => UpdateEPG(context, e))"/>
</MudTd>
<MudTd>
<MudCheckBox T="bool" Value="@context.DisableWatermarks" ValueChanged="@(e => UpdateWatermark(context, e))"/>
</MudTd>
<MudTd>
<MudIconButton Icon="@Icons.Material.Filled.ContentCopy"
OnClick="@(_ => CopyItem(context))">
@@ -406,7 +410,8 @@
SmartCollection = item.SmartCollection,
MediaItem = item.MediaItem,
PlaybackOrder = item.PlaybackOrder,
IncludeInProgramGuide = item.IncludeInProgramGuide
IncludeInProgramGuide = item.IncludeInProgramGuide,
DisableWatermarks = item.DisableWatermarks
};
private void AddBlockItem()
@@ -433,7 +438,8 @@
MultiCollection = item.MultiCollection,
SmartCollection = item.SmartCollection,
MediaItem = item.MediaItem,
IncludeInProgramGuide = item.IncludeInProgramGuide
IncludeInProgramGuide = item.IncludeInProgramGuide,
DisableWatermarks = item.DisableWatermarks
};
foreach (BlockItemEditViewModel i in _block.Items.Filter(bi => bi.Index >= newItem.Index))
@@ -490,7 +496,8 @@
item.SmartCollection?.Id,
item.MediaItem?.MediaItemId,
item.PlaybackOrder,
item.IncludeInProgramGuide)).ToList();
item.IncludeInProgramGuide,
item.DisableWatermarks)).ToList();
_block.Minutes = _durationHours * 60 + _durationMinutes;
@@ -505,4 +512,6 @@
private static void UpdateEPG(BlockItemEditViewModel context, bool includeInProgramGuide) => context.IncludeInProgramGuide = includeInProgramGuide;
private static void UpdateWatermark(BlockItemEditViewModel context, bool disableWatermarks) => context.DisableWatermarks = disableWatermarks;
}
@@ -60,6 +60,8 @@ public class BlockItemEditViewModel : INotifyPropertyChanged
public bool IncludeInProgramGuide { get; set; }
public bool DisableWatermarks { get; set; }
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null) =>