From 0ee7c489ca5c0408877d304b65cb1d92160af807 Mon Sep 17 00:00:00 2001 From: sr55 Date: Mon, 25 Dec 2017 16:06:19 +0000 Subject: [PATCH] WinGui: Disable Subtitle Burn In Checkbox for PGS + MP4 #1077 --- win/CS/HandBrakeWPF/HandBrakeWPF.csproj | 1 + .../Services/Encode/Model/Models/SubtitleTrack.cs | 4 +++- .../HandBrakeWPF/ViewModels/SubtitlesViewModel.cs | 2 +- win/CS/HandBrakeWPF/Views/SubtitlesView.xaml | 13 +++++++++++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index dea2d44d0..0e2d5c5ea 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -162,6 +162,7 @@ + diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs index d29709310..e481907bb 100644 --- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs +++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs @@ -171,8 +171,10 @@ namespace HandBrakeWPF.Services.Encode.Model.Models if (this.sourceTrack != null) { this.Track = this.sourceTrack.ToString(); + this.SubtitleType = this.sourceTrack.SubtitleType; } - + + this.NotifyOfPropertyChange(() => this.SubtitleType); this.NotifyOfPropertyChange(() => this.CanBeBurned); this.NotifyOfPropertyChange(() => this.CanBeForced); diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs index c05fda5e5..bc8ba1ce2 100644 --- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs @@ -576,7 +576,7 @@ namespace HandBrakeWPF.ViewModels SubtitleTrack track = new SubtitleTrack { - SubtitleType = SubtitleType.VobSub, + SubtitleType = source.SubtitleType, SourceTrack = source, }; diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml index 2268d5aaa..2d4d7492d 100644 --- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml +++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml @@ -10,12 +10,14 @@ xmlns:controls="clr-namespace:HandBrakeWPF.Controls" xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton" xmlns:Properties="clr-namespace:HandBrakeWPF.Properties" + xmlns:subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles" d:DesignHeight="350" d:DesignWidth="500" mc:Ignorable="d" x:Name="subTab"> +