From 84c35378ff15d56f4dec5ca961514072e628c798 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Mon, 21 May 2012 00:02:21 +0000
Subject: [PATCH] WinGui: Bug fixes on the subtitles panel.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4694 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs | 10 ++++++++--
 win/CS/HandBrakeWPF/Views/SubtitlesView.xaml         | 12 ++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index b4d8d65ab..515b25eb9 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -190,9 +190,12 @@ namespace HandBrakeWPF.ViewModels
         {
             foreach (SubtitleTrack track in this.Task.SubtitleTracks)
             {
+                if (track == subtitle)
+                {
+                    continue; // Skip the track the user selected.
+                }
                 track.Default = false;
             }
-            subtitle.Default = true;
 
             this.NotifyOfPropertyChange(() => this.Task);
         }
@@ -207,9 +210,12 @@ namespace HandBrakeWPF.ViewModels
         {
             foreach (SubtitleTrack track in this.Task.SubtitleTracks)
             {
+                if (track == subtitle)
+                {
+                    continue; // Skip the track the user selected.
+                }
                 track.Burned = false;
             }
-            subtitle.Burned = true;
             this.NotifyOfPropertyChange(() => this.Task);
         }
 
diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index ae87c95b1..a1b32527d 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -85,10 +85,14 @@
                             <TextBlock Text="{Binding SrtFileName}" Grid.Column="1" VerticalAlignment="Center"
                                        Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=false}" />
                             
-                            <TextBlock Text="Forced Only" FontWeight="Bold" Grid.Column="2" VerticalAlignment="Center" />
-                            <CheckBox Grid.Column="3" IsChecked="{Binding Forced}" VerticalAlignment="Center" Margin="5,0,5,0"/>
-                            <TextBlock Text="Burn In" FontWeight="Bold" Grid.Column="4" VerticalAlignment="Center" />
-                            <CheckBox Grid.Column="5" IsChecked="{Binding Burned}" VerticalAlignment="Center" Margin="5,0,5,0">
+                            <TextBlock Text="Forced Only" FontWeight="Bold" Grid.Column="2" VerticalAlignment="Center"
+                                       Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}" />
+                            <CheckBox Grid.Column="3" IsChecked="{Binding Forced}" VerticalAlignment="Center" Margin="5,0,5,0"
+                                      Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}" />
+                            <TextBlock Text="Burn In" FontWeight="Bold" Grid.Column="4" VerticalAlignment="Center"
+                                       Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}"/>
+                            <CheckBox Grid.Column="5" IsChecked="{Binding Burned}" VerticalAlignment="Center" Margin="5,0,5,0"
+                                      Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="Click">
                                         <cal:ActionMessage MethodName="SelectBurnedInTrack">
-- 
2.40.0