WinGui: (WPF) Fixes to the Audio and Subtitle panels. Add pdb's to installer.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4532 b64f7644-9d1e-0410-96f1-a4d463321fa5

6 files changed, 65 insertions, 6 deletions

diff --git a/win/CS/HandBrakeWPF/Installer/MakeAlpha.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeAlpha.nsi.tmpl
index 53ac01d52..2be087486 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeAlpha.nsi.tmpl
+++ b/win/CS/HandBrakeWPF/Installer/MakeAlpha.nsi.tmpl
@@ -106,6 +106,7 @@ Section "Handbrake" SEC01
   File "*.dll"

   File "*.config"

   File "*.xml"

+  File "*.pdb"

 

   ; Copy the standard doc set into the doc folder

   SetOutPath "$INSTDIR\doc"

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index dbe32a813..b8485be40 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -134,6 +134,9 @@ namespace HandBrakeWPF.ViewModels
             {

                 this.AddTracksFromPreset(preset);

             }

+

+            this.Task.AllowedPassthruOptions.IsEnabled =

+                 this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedAudioPassthruOpts);

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 2c7b47c95..e3fddb827 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -477,8 +477,7 @@ namespace HandBrakeWPF.ViewModels
         public void SetPreset(Preset preset, EncodeTask task)

         {

             this.Task = task;

-

-

+ 

             // TODO: These all need to be handled correctly.

             this.SelectedAnamorphicMode = preset.Task.Anamorphic;

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 9595855bc..3be51ec05 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -177,6 +177,39 @@ namespace HandBrakeWPF.ViewModels
             this.Task.SubtitleTracks.Remove(track);

         }

 

+        /// <summary>

+        /// Select the default subtitle track.

+        /// </summary>

+        /// <param name="subtitle">

+        /// The subtitle.

+        /// </param>

+        public void SelectDefaultTrack(SubtitleTrack subtitle)

+        {

+            foreach (SubtitleTrack track in this.Task.SubtitleTracks)

+            {

+                track.Default = false;

+            }

+            subtitle.Default = true;

+

+            this.NotifyOfPropertyChange(() => this.Task);

+        }

+

+        /// <summary>

+        /// Select the burned in track.

+        /// </summary>

+        /// <param name="subtitle">

+        /// The subtitle.

+        /// </param>

+        public void SelectBurnedInTrack(SubtitleTrack subtitle)

+        {

+            foreach (SubtitleTrack track in this.Task.SubtitleTracks)

+            {

+                track.Burned = false;

+            }

+            subtitle.Burned = true;

+            this.NotifyOfPropertyChange(() => this.Task);

+        }

+

         #endregion

 

         #region Implemented Interfaces

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index d94f25738..a27c02085 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -81,14 +81,17 @@
                             <ComboBox Width="100" Grid.Column="1" Margin="5,0,5,0" Height="22"

                                       ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" 

                                       SelectedItem="{Binding ScannedTrack}"/>

+                            

                             <TextBlock Text="Codec" FontWeight="Bold" Grid.Column="2" VerticalAlignment="Center" />

                             <ComboBox Width="100" Grid.Column="3" Margin="5,0,5,0" Height="22"

                                       ItemsSource="{Binding DataContext.AudioEncoders, Converter={StaticResource enumComboConverter},  RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" 

                                       SelectedItem="{Binding Encoder, Converter={StaticResource enumComboConverter}}"/>

+                            

                             <TextBlock Text="Bitrate" FontWeight="Bold" Grid.Column="4" VerticalAlignment="Center" />

                             <ComboBox Width="70" Grid.Column="5" Margin="5,0,5,0" Height="22" 

                                       ItemsSource="{Binding DataContext.AudioBitrates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"

                                       SelectedItem="{Binding Bitrate}"/>

+                            

                             <TextBlock Text="Samplerate" FontWeight="Bold" Grid.Column="6" VerticalAlignment="Center" />

                             <ComboBox Width="70" Grid.Column="7" Margin="5,0,5,0" Height="22" 

                                       ItemsSource="{Binding DataContext.SampleRates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"

@@ -99,10 +102,14 @@
                             <ComboBox Width="100" Grid.Column="1" Margin="5,0,5,0" Grid.Row="1" Height="22"

                                       ItemsSource="{Binding DataContext.AudioMixdowns, Converter={StaticResource enumComboConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"

                                       SelectedItem="{Binding MixDown, Converter={StaticResource enumComboConverter}}"/>

+                            

                             <TextBlock Text="DRC" FontWeight="Bold" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center"/>

-                            <NumericUpDown:NumericUpDown Width="45" Value="{Binding DRC}" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Left"  Margin="5,0,5,0" />

+                            <NumericUpDown:NumericUpDown Width="45" Value="{Binding DRC, Mode=TwoWay}" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Left" Margin="5,0,5,0"

+                                                         Minimum="0" Maximum="4" DecimalPlace="1" LargeChange="0.1" SmallChange="0.1"/>

+                            

                             <TextBlock Text="Gain" FontWeight="Bold" Grid.Column="4" Grid.Row="1" VerticalAlignment="Center"/>

-                            <NumericUpDown:NumericUpDown Width="45" Value="{Binding Gain}" Grid.Row="1" Grid.Column="5" HorizontalAlignment="Left"  Margin="5,0,5,0" />

+                            <NumericUpDown:NumericUpDown Width="45" Value="{Binding Gain, Mode=TwoWay}" Grid.Row="1" Grid.Column="5" HorizontalAlignment="Left" Margin="5,0,5,0"

+                                                         Minimum="-20" Maximum="20" DecimalPlace="0" SmallChange="1" LargeChange="1" />

                             

                         </Grid>

 

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 71e48a7ba..0611bba0b 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -79,9 +79,25 @@
                             <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"/>

+                            <CheckBox Grid.Column="5" IsChecked="{Binding Burned}" VerticalAlignment="Center" Margin="5,0,5,0">

+                                <i:Interaction.Triggers>

+                                    <i:EventTrigger EventName="Click">

+                                        <cal:ActionMessage MethodName="SelectBurnedInTrack">

+                                            <cal:Parameter Value="{Binding}" />

+                                        </cal:ActionMessage>

+                                    </i:EventTrigger>

+                                </i:Interaction.Triggers>

+                            </CheckBox>

                             <TextBlock Text="Default" FontWeight="Bold" Grid.Column="6" VerticalAlignment="Center" />

-                            <CheckBox Grid.Column="7" IsChecked="{Binding Default}" VerticalAlignment="Center" Margin="5,0,5,0"/>

+                            <CheckBox Grid.Column="7" IsChecked="{Binding Default}" VerticalAlignment="Center" Margin="5,0,5,0">

+                                <i:Interaction.Triggers>

+                                    <i:EventTrigger EventName="Click">

+                                        <cal:ActionMessage MethodName="SelectDefaultTrack">

+                                            <cal:Parameter Value="{Binding}" />

+                                        </cal:ActionMessage>

+                                    </i:EventTrigger>

+                                </i:Interaction.Triggers>

+                            </CheckBox>

 

                             <!-- Row 2-->

                             <TextBlock Text="Language" FontWeight="Bold" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center"/>