WinGui: Add an option to hide the Allowed Passthru checkboxes. (Hidden by default). Fixed an issue where the ScannedTrack was getting overwritten when switching between presets.

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

4 files changed, 39 insertions, 2 deletions

diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs
index 067a3e367..ae3e35245 100644
--- a/win/CS/HandBrakeWPF/UserSettingConstants.cs
+++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs
@@ -48,5 +48,6 @@ namespace HandBrakeWPF
         public const string DubModeSubtitle = "DubModeSubtitle";

         public const string AddOnlyOneAudioPerLanguage = "addOnlyOneAudioPerLanguage";

         public const string MinTitleLength = "MinTitleLength";

+        public const string ShowAdvancedAudioPassthruOpts = "ShowAdvancedAudioPassthruOpts";

     }

 }

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index dc536855e..4a9dd8aa4 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -304,6 +304,11 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         private BindingList<string> selectedLangauges = new BindingList<string>();

 

+        /// <summary>

+        /// The backing field for show advanced passthru options for Audio

+        /// </summary>

+        private bool showAdvancedPassthruOpts;

+

         #endregion

 

         #region Constructors and Destructors

@@ -875,6 +880,22 @@ namespace HandBrakeWPF.ViewModels
             }

         }

 

+        /// <summary>

+        /// Gets or sets a value indicating whether ShowAdvancedPassthruOpts.

+        /// </summary>

+        public bool ShowAdvancedPassthruOpts

+        {

+            get

+            {

+                return this.showAdvancedPassthruOpts;

+            }

+            set

+            {

+                this.showAdvancedPassthruOpts = value;

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

+            }

+        }

+

         #endregion

 

         #region System and Logging

@@ -1375,6 +1396,7 @@ namespace HandBrakeWPF.ViewModels
             this.addOnlyOneAudioTrackPerLanguage = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AddOnlyOneAudioPerLanguage);

 

             this.addClosedCaptions = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UseClosedCaption);

+            this.showAdvancedPassthruOpts = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedAudioPassthruOpts);

 

             // #############################

             // CLI

@@ -1640,6 +1662,7 @@ namespace HandBrakeWPF.ViewModels
             this.userSettingService.SetUserSetting(UserSettingConstants.UseClosedCaption, this.AddClosedCaptions);

             this.userSettingService.SetUserSetting(UserSettingConstants.DubModeAudio, this.SelectedAddAudioMode);

             this.userSettingService.SetUserSetting(UserSettingConstants.DubModeSubtitle, this.SelectedAddSubtitleMode);

+            this.userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedAudioPassthruOpts, this.ShowAdvancedPassthruOpts);

 

             /* System and Logging */

             userSettingService.SetUserSetting(ASUserSettingConstants.ProcessPriority, this.SelectedPriority);

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 5b19d1c0e..006b6e1ab 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="HandBrakeWPF.Views.OptionsView"

         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"

-        xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers" Title="{Binding Title}" MinWidth="620" MinHeight="550" Width="620" Height="550">

+        xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers" Title="{Binding Title}" MinWidth="620" MinHeight="600" Width="620" Height="600">

 

     <Window.Resources>

         <Style TargetType="Button">

@@ -35,7 +35,7 @@
         </StackPanel>

 

         <!-- Options Panel-->

-        <TabControl Margin="10,10,10,10" Height="410">

+        <TabControl Margin="10,10,10,10" Height="460">

             <TabItem Header="General">

                 <StackPanel Orientation="Vertical">

                     <Grid Margin="10,10,0,10">

@@ -242,6 +242,11 @@
                         </StackPanel>

                     </GroupBox>

 

+                    <StackPanel Orientation="Vertical">

+                        <Label Content="Audio Tab Options" FontWeight="Bold" />

+                        <CheckBox IsChecked="{Binding ShowAdvancedPassthruOpts}" Content="Show advanced audio passthru options. (Requires Restart)"

+                                  Margin="5,0,0,0" />

+                    </StackPanel>

 

                 </StackPanel>

             </TabItem>

diff --git a/win/CS/HandBrakeWPF/defaultsettings.xml b/win/CS/HandBrakeWPF/defaultsettings.xml
index bff3307a4..eeaa60865 100644
--- a/win/CS/HandBrakeWPF/defaultsettings.xml
+++ b/win/CS/HandBrakeWPF/defaultsettings.xml
@@ -416,4 +416,12 @@
       <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">RQuM6TVXbXkdih1PmGTf+h178Ho=</anyType>

     </value>

   </item>

+  <item>

+    <key>

+      <string>ShowAdvancedAudioPassthruOpts</string>

+    </key>

+    <value>

+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>

+    </value>

+  </item>

 </dictionary>
\ No newline at end of file