From: sr55 <sr55.hb@outlook.com>
Date: Fri, 28 Sep 2018 20:59:37 +0000 (+0100)
Subject: WinGui: Improving Accessibility of the new Queue (and fixed a few other issues around... 
X-Git-Tag: 1.2.0~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77fa0c755330a25202203b3d4ad0974d141ce1cb;p=handbrake

WinGui: Improving Accessibility of the new Queue (and fixed a few other issues around the UI in this area too)
---

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index 43a64912a..e889002fc 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -456,6 +456,24 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Preset:.
+        /// </summary>
+        public static string FiltersView_DeinterlacePreset {
+            get {
+                return ResourceManager.GetString("FiltersView_DeinterlacePreset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Deinterlace Preset.
+        /// </summary>
+        public static string FiltersView_DeinterlacePresetAuto {
+            get {
+                return ResourceManager.GetString("FiltersView_DeinterlacePresetAuto", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Denoise:.
         /// </summary>
@@ -465,6 +483,24 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Denoise Preset.
+        /// </summary>
+        public static string FiltersView_DenoisePresetAuto {
+            get {
+                return ResourceManager.GetString("FiltersView_DenoisePresetAuto", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Denoise Tune.
+        /// </summary>
+        public static string FiltersView_DenoiseTuneAuto {
+            get {
+                return ResourceManager.GetString("FiltersView_DenoiseTuneAuto", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Detelecine:.
         /// </summary>
@@ -501,6 +537,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Interlace Detection:.
+        /// </summary>
+        public static string FiltersView_InterlaceDetection {
+            get {
+                return ResourceManager.GetString("FiltersView_InterlaceDetection", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Preset:.
         /// </summary>
@@ -528,6 +573,24 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Sharpen Preset.
+        /// </summary>
+        public static string FiltersView_SharpenPresetAuto {
+            get {
+                return ResourceManager.GetString("FiltersView_SharpenPresetAuto", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sharpen Tune.
+        /// </summary>
+        public static string FiltersView_SharpenTuneAuto {
+            get {
+                return ResourceManager.GetString("FiltersView_SharpenTuneAuto", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Tune:.
         /// </summary>
@@ -798,6 +861,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Format:.
+        /// </summary>
+        public static string MainView_Format {
+            get {
+                return ResourceManager.GetString("MainView_Format", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Help.
         /// </summary>
@@ -2105,6 +2177,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Delete.
+        /// </summary>
+        public static string QueueView_Delete {
+            get {
+                return ResourceManager.GetString("QueueView_Delete", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Destination: .
         /// </summary>
@@ -2132,6 +2213,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Edit.
+        /// </summary>
+        public static string QueueView_Edit {
+            get {
+                return ResourceManager.GetString("QueueView_Edit", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to End Time:.
         /// </summary>
@@ -2285,6 +2375,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Retry.
+        /// </summary>
+        public static string QueueView_Retry {
+            get {
+                return ResourceManager.GetString("QueueView_Retry", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Shutdown.
         /// </summary>
@@ -2601,7 +2700,16 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Use system default player.
+        ///   Looks up a localized string similar to Select a preview image.
+        /// </summary>
+        public static string StaticPreviewView_SelectPreviewImage {
+            get {
+                return ResourceManager.GetString("StaticPreviewView_SelectPreviewImage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Use system default video player.
         /// </summary>
         public static string StaticPreviewView_UseSystemDefault {
             get {
@@ -2871,7 +2979,7 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Encoder Level.
+        ///   Looks up a localized string similar to Encoder Level:.
         /// </summary>
         public static string VideoView_EncoderLevel {
             get {
diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 914d9525e..8dda5a635 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -556,7 +556,7 @@
     <value>Live Preview</value>
   </data>
   <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
-    <value>Use system default player</value>
+    <value>Use system default video player</value>
   </data>
   <data name="SubtitlesView_AddCC" xml:space="preserve">
     <value>Add Closed Captions when available</value>
@@ -595,7 +595,7 @@
     <value>Constant Quality:</value>
   </data>
   <data name="VideoView_EncoderLevel" xml:space="preserve">
-    <value>Encoder Level</value>
+    <value>Encoder Level:</value>
   </data>
   <data name="VideoView_EncoderPreset" xml:space="preserve">
     <value>Encoder Preset:</value>
@@ -1097,4 +1097,40 @@ This will not affect your current settings in the Subtitle tab.</value>
   <data name="QueueView_ResetFailed" xml:space="preserve">
     <value>Retry Failed</value>
   </data>
+  <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
+    <value>Preset:</value>
+  </data>
+  <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
+    <value>Deinterlace Preset</value>
+  </data>
+  <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
+    <value>Denoise Preset</value>
+  </data>
+  <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
+    <value>Denoise Tune</value>
+  </data>
+  <data name="FiltersView_InterlaceDetection" xml:space="preserve">
+    <value>Interlace Detection:</value>
+  </data>
+  <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
+    <value>Sharpen Preset</value>
+  </data>
+  <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
+    <value>Sharpen Tune</value>
+  </data>
+  <data name="MainView_Format" xml:space="preserve">
+    <value>Format:</value>
+  </data>
+  <data name="QueueView_Delete" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="QueueView_Edit" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="QueueView_Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
+  <data name="StaticPreviewView_SelectPreviewImage" xml:space="preserve">
+    <value>Select a preview image</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
index 96a531f34..393b5efc2 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
@@ -705,5 +705,10 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
         }
 
         #endregion
+
+        public override string ToString()
+        {
+            return string.Format("Audio Track: Title {0}", this.ScannedTrack.ToString());
+        }
     }
 }
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
index 9b195152b..3eef3bc4f 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
@@ -304,5 +304,10 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
                 return this.SrtFileName != "-" && this.SrtFileName != null;
             }
         }
+
+        public override string ToString()
+        {
+            return string.Format("Subtitle Track: Title {0}", this.SrtFileName ?? this.SourceTrack.ToString());
+        }
     }
 }
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs
index d8456519a..77c9b66ad 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs
@@ -9,6 +9,8 @@
 
 namespace HandBrakeWPF.Services.Queue.Model
 {
+    using System.Runtime.CompilerServices;
+
     using Caliburn.Micro;
 
     using HandBrake.Interop.Model;
@@ -138,5 +140,10 @@ namespace HandBrakeWPF.Services.Queue.Model
         {
             return this.Id.GetHashCode();
         }
+
+        public override string ToString()
+        {
+            return string.Format("Encode Task.  Title: {0}, Source: {1}, Destination: {2}", this.Task.Title, this.Task.Source, this.Task.Destination);
+        }
     }
 }
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Views/FiltersView.xaml b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
index 7c323869f..5ad267656 100644
--- a/win/CS/HandBrakeWPF/Views/FiltersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
@@ -54,16 +54,16 @@
                 <ComboBox Width="120" Grid.Row="0" ItemsSource="{Binding DetelecineOptions, Converter={StaticResource boolComboConverter}}" 
                           SelectedItem="{Binding SelectedDetelecine, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"
                           ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Detelecine}"
-                          HorizontalAlignment="Left"/>
+                          HorizontalAlignment="Left" AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Detelecine}" />
                 <TextBox Width="120" Grid.Row="0" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDetelecine, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left"
                          Visibility="{Binding ShowDetelecineCustom, Converter={StaticResource boolToVisConverter}}"/>
 
                 <!-- Interlace Detection -->
-                <TextBlock Text="Interlace Detection:" VerticalAlignment="Center" Margin="0,0,5,0" Grid.Row="1"  />
+                <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_InterlaceDetection}" VerticalAlignment="Center" Margin="0,0,5,0" Grid.Row="1"  />
 
                 <ComboBox Width="120" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding CombDetectPresets, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center"
                           SelectedItem="{Binding SelectedCombDetectPreset, Converter={StaticResource boolComboConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_InterlaceDetection}"
-                          VerticalContentAlignment="Center"/>
+                          VerticalContentAlignment="Center" AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_InterlaceDetection}"/>
 
                 <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="2">
                 <TextBlock Text="Custom:" VerticalAlignment="Center" Margin="0,0,5,0" Visibility="{Binding ShowCombDetectCustom, Converter={StaticResource boolToVisConverter}}" />
@@ -75,13 +75,15 @@
                 <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Deinterlace}" VerticalAlignment="Center" Grid.Row="2" Grid.Column="0" Margin="0,0,0,10" />
                 <StackPanel Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="0,0,0,10">
                     <ComboBox Width="120" ItemsSource="{Binding DeinterlaceFilterOptions, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left"
-                          SelectedItem="{Binding SelectedDeinterlaceFilter, Converter={StaticResource boolComboConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Deinterlace}"  />
+                              SelectedItem="{Binding SelectedDeinterlaceFilter, Converter={StaticResource boolComboConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Deinterlace}"
+                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Deinterlace}" />
                 </StackPanel>
 
                 <StackPanel Grid.Row="2" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,10">
-                    <TextBlock Text="Preset:" VerticalAlignment="Center" Margin="0,0,5,0" Visibility="{Binding IsDeinterlaceEnabled, Converter={StaticResource boolToVisConverter}}"  />
+                    <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_DeinterlacePreset}" VerticalAlignment="Center" Margin="0,0,5,0" Visibility="{Binding IsDeinterlaceEnabled, Converter={StaticResource boolToVisConverter}}"  />
                     <ComboBox Width="120" ItemsSource="{Binding DeinterlacePresets}" HorizontalAlignment="Left" VerticalAlignment="Center"
-                              SelectedItem="{Binding SelectedDeInterlacePreset}" DisplayMemberPath="Name" Visibility="{Binding IsDeinterlaceEnabled, Converter={StaticResource boolToVisConverter}}" />
+                              SelectedItem="{Binding SelectedDeInterlacePreset}" DisplayMemberPath="Name" Visibility="{Binding IsDeinterlaceEnabled, Converter={StaticResource boolToVisConverter}}"
+                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_DeinterlacePresetAuto}" />
 
                     <TextBlock Text="Custom:" VerticalAlignment="Center" Margin="5,0,5,0"  Visibility="{Binding ShowCustomDeinterlace, Converter={StaticResource boolToVisConverter}}" />
                     <TextBox Width="120" Text="{Binding CustomDeinterlaceSettings, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Left"
@@ -93,12 +95,14 @@
                 <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Denoise}" Grid.Row="3" Grid.Column="0" Margin="0,0,0,10"/>
                 <ComboBox Width="120" Grid.Row="3" ItemsSource="{Binding DenoiseOptions, Converter={StaticResource boolComboConverter}}" 
                           SelectedItem="{Binding SelectedDenoise, Converter={StaticResource boolComboConverter}}" Grid.Column="1"
-                          HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,10" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Denoise}" />
+                          HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,10" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Denoise}"
+                          AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Denoise}"/>
 
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="3" Grid.Column="2" Margin="0,0,0,10" 
                             Visibility="{Binding ShowDenoiseOptions, Converter={StaticResource boolToVisConverter}}">
                     <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Preset}" Margin="0,0,5,0" />
                     <ComboBox SelectedItem="{Binding SelectedDenoisePreset}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DenoisePreset}"
+                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_DenoisePresetAuto}"
                               MinWidth="100"  HorizontalAlignment="Center" VerticalAlignment="Center">
                         <ComboBox.ItemsSource>
                             <MultiBinding Converter="{StaticResource DenoisePresetConverter}">
@@ -111,6 +115,7 @@
                     <StackPanel Orientation="Horizontal" Visibility="{Binding ShowDenoiseTune, Converter={StaticResource boolToVisConverter}}">
                         <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Tune}" Margin="5,0,5,0" />
                         <ComboBox ItemsSource="{Binding DenoiseTunes}" SelectedItem="{Binding SelectedDenoiseTune}" MinWidth="100" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DenoiseTune}"
+                                  AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_DenoiseTuneAuto}"
                           Visibility="{Binding ShowDenoiseTune, Converter={StaticResource boolToVisConverter}}" VerticalAlignment="Center" />
                     </StackPanel>
 
@@ -126,6 +131,7 @@
                 <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Sharpen}" Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"/>
                 <ComboBox Width="120" Grid.Row="4" ItemsSource="{Binding SharpenOptions, Converter={StaticResource boolComboConverter}}" 
                           SelectedItem="{Binding SelectedSharpen, Converter={StaticResource boolComboConverter}}" Grid.Column="1"
+                          AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Sharpen}"
                           HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,10" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Sharpen}" />
                 
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="4" Grid.Column="2" Margin="0,0,0,10" 
@@ -133,7 +139,8 @@
                     
                     <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Preset}" Margin="0,0,5,0" />
                     <ComboBox SelectedItem="{Binding SelectedSharpenPreset}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_SharpenPreset}"
-                              MinWidth="100"  HorizontalAlignment="Center" VerticalAlignment="Center" DisplayMemberPath="DisplayName" >
+                              MinWidth="100"  HorizontalAlignment="Center" VerticalAlignment="Center" DisplayMemberPath="DisplayName"
+                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_SharpenPresetAuto}" >
                         <ComboBox.ItemsSource>
                             <MultiBinding Converter="{StaticResource SharpenPresetConverter}">
                                 <Binding Path="SharpenPresets" />
@@ -144,7 +151,8 @@
 
                     <StackPanel Orientation="Horizontal" Visibility="{Binding ShowSharpenTune, Converter={StaticResource boolToVisConverter}}">
                         <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Tune}" Margin="5,0,5,0" />
-                        <ComboBox SelectedItem="{Binding SelectedSharpenTune}" MinWidth="100" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_SharpenTune}" VerticalAlignment="Center" DisplayMemberPath="DisplayName" >
+                        <ComboBox SelectedItem="{Binding SelectedSharpenTune}" MinWidth="100" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_SharpenTune}" VerticalAlignment="Center" DisplayMemberPath="DisplayName" 
+                                  AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_SharpenTuneAuto}" >
                             <ComboBox.ItemsSource>
                                 <MultiBinding Converter="{StaticResource SharpenTuneConverter}">
                                     <Binding Path="SharpenTunes" />
@@ -165,7 +173,8 @@
                 <!-- Deblock -->
                 <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Deblock}" Grid.Row="5" Grid.Column="0" Margin="0,0,0,10"/>
                 <Slider Width="120" Value="{Binding DeblockValue}" TickPlacement="BottomRight" Minimum="4" Maximum="15" Grid.Row="5" Grid.Column="1" Margin="0,0,0,10"
-                        HorizontalAlignment="Left" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Deblock}" />
+                        HorizontalAlignment="Left" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Deblock}"
+                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Deblock}" />
                 <TextBlock Text="{Binding DeblockText}" Grid.Row="5" Grid.Column="2" Margin="0,0,0,10"/>
 
                 <CheckBox Content="{x:Static Properties:ResourcesUI.FiltersView_Grayscale}" IsChecked="{Binding Grayscale}" Grid.Row="6" Grid.Column="1" Margin="0,0,0,10"
@@ -175,6 +184,7 @@
                 <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Rotate}" Grid.Row="7" Grid.Column="0" Margin="0,0,0,0"/>
                 <ComboBox Width="120" ItemsSource="{Binding RotationOptions}" Grid.Row="7" Grid.Column="1"
                               SelectedItem="{Binding SelectedRotation}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Rotate}"
+                          AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Rotate}"
                               HorizontalAlignment="Left" VerticalAlignment="Center" />
 
                 <CheckBox Content="{x:Static Properties:ResourcesUI.FiltersView_FlipVideo}" Margin="5,0,0,0" VerticalAlignment="Center" Grid.Row="7" Grid.Column="2" IsChecked="{Binding FlipVideo, UpdateSourceTrigger=PropertyChanged}"
diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml
index 4745203ba..3c4eb57f4 100644
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml
+++ b/win/CS/HandBrakeWPF/Views/LogView.xaml
@@ -24,13 +24,15 @@
                      Loaded="ToolBarLoaded"
                      >
 
-                <Button cal:Message.Attach="[Event Click] = [Action CopyLog]" Margin="10,0,0,0">
+                <Button cal:Message.Attach="[Event Click] = [Action CopyLog]" Margin="10,0,0,0" 
+                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.LogView_CopyClipboard}" >
                     <StackPanel Orientation="Horizontal">
                         <Image Width="16" Source="Images/copy.png" />
                         <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:ResourcesUI.LogView_CopyClipboard}" />
                     </StackPanel>
                 </Button>
-                <Button Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">
+                <Button Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]"
+                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.LogView_OpenLogDir}" >
                     <StackPanel Orientation="Horizontal">
                         <Image Width="16" Source="Images/folder.png" />
                         <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:ResourcesUI.LogView_OpenLogDir}" />
diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 83540d253..b5bc6db28 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -43,11 +43,13 @@
                     <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Width}" />
                     <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" UpdateBindingOnTextChange="True" IsEnabled="{Binding WidthControlEnabled}" 
                                         Modulus="{Binding SelectedModulus, Mode=OneWay}"
-                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Width}"  Minimum="0" Width="60"  />
+                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Width}"  Minimum="0" Width="60"
+                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Width}" />
                     <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Height}" />
                     <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" UpdateBindingOnTextChange="True" 
                                         Modulus="{Binding SelectedModulus, Mode=OneWay}" 
-                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Height}" Minimum="0" Width="60"  />
+                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Height}" Minimum="0" Width="60"
+                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Height}" />
                     <CheckBox Content="{x:Static Properties:ResourcesUI.PictureSettingsView_KeepAR}" IsChecked="{Binding MaintainAspectRatio}"
                           Visibility="{Binding ShowKeepAR, Converter={StaticResource boolToVisHiddenConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_KeepAR}"
                           VerticalAlignment="Center" Margin="5,0,0,0" />
@@ -70,10 +72,12 @@
                        Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" />
 
                     <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"
-                              ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Anamorphic}" />
+                              ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Anamorphic}"
+                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Anamorphic}" />
                     <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}" 
-                          Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Modulus}"
-                          Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
+                              Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Modulus}"
+                              Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"
+                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Modulus}"/>
                 </Grid>
 
                 <!-- Custom Anamoprhic -->
@@ -93,7 +97,8 @@
                     <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_PAR}" Grid.Row="1" Grid.Column="0" />
 
                     <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" 
-                                    AllowEmpty="False" IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" />
+                                        AllowEmpty="False" IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}"
+                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_DisplayWitdh}" />
                     <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1">
                         <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" HorizontalAlignment="Left" AllowEmpty="False"
                                                  IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5"
@@ -139,19 +144,23 @@
 
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"
                                     Minimum="0" Modulus="2" Number="{Binding CropTop, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
-                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropTop}" />
+                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropTop}"
+                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Top}" />
 
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"
                                     Minimum="0" Modulus="2" Number="{Binding CropBottom, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
-                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropBottom}" />
+                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropBottom}"
+                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Bottom}" />
 
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"
                                     Minimum="0" Modulus="2" Number="{Binding CropLeft, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
-                                      ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropLeft}"  />
+                                      ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropLeft}"
+                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Left}"/>
 
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"
                                     Minimum="0" Modulus="2" Number="{Binding CropRight, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
-                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropRight}" />
+                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropRight}"
+                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Right}"/>
 
                 </Grid>
 
diff --git a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
index 2138bd180..4d001ae9a 100644
--- a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
+++ b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
@@ -53,7 +53,8 @@
 
             <TextBlock Text="{x:Static Properties:ResourcesUI.MainView_ShowQueue}" FontSize="28" VerticalAlignment="Center" FontFamily="Segoe UI Light" Margin="10,0,0,0"  />
 
-            <Menu HorizontalAlignment="Right" VerticalAlignment="Center" Background="Transparent" Grid.Column="2">
+            <Menu HorizontalAlignment="Right" VerticalAlignment="Center" Background="Transparent" Grid.Column="2" 
+                  AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_WhenDone}">
                 <MenuItem>
                     <MenuItem.Header>
                         <StackPanel Height="32" Orientation="Horizontal">
@@ -93,29 +94,6 @@
                                   Header="{x:Static Properties:ResourcesUI.QueueView_QuitHandBrake}"/>
                 </MenuItem>
             </Menu>
-
-            <!--<Menu HorizontalAlignment="Right" Background="Transparent" VerticalAlignment="Center" Grid.Column="3">
-                <MenuItem>
-                    <MenuItem.Header>
-                        <StackPanel Height="32" Orientation="Horizontal">
-                            <Image Source="..\Images\Advanced.png" Width="20" Height="20" VerticalAlignment="Center" />
-                            <TextBlock VerticalAlignment="Center"
-                                           Text="{x:Static Properties:ResourcesUI.QueueView_Options}" Margin="5,0,0,0" />
-                            <Path Height="5"
-                                      Margin="2,2,2,0"
-                                      Data="M 0 0 L 4 4 L 8 0 Z"
-                                      Fill="{DynamicResource GlyphBrush}" />
-                        </StackPanel>
-                    </MenuItem.Header>
-
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearCompleted}" />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearQueue}" />
-                    <Separator />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" />
-
-                </MenuItem>
-            </Menu>-->
-
         </Grid>
 
         <StackPanel Grid.Row="1" Margin="20,10,10,0" Visibility="{Binding IsNewQueueVisible, Converter={StaticResource boolToVisConverter}}">
@@ -281,13 +259,13 @@
                                     </Style>
                                 </StackPanel.Resources>
 
-                                <Button>
+                                <Button AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Retry}"  ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">
                                     <Button.Content>
                                         <StackPanel Orientation="Horizontal">
                                             <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0"
-                                               Source="../Images/Refresh.ico" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">
+                                               Source="../Images/Refresh.ico">
                                             </Image>
-                                            <TextBlock Text="Retry" />
+                                            <TextBlock Text="{x:Static Properties:ResourcesUI.QueueView_Retry}" />
                                         </StackPanel>
 
                                     </Button.Content>
@@ -300,13 +278,13 @@
                                     </i:Interaction.Triggers>
                                 </Button>
 
-                                <Button Margin="10,0,0,0">
+                                <Button Margin="10,0,0,0" AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Edit}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_SendJobBack}">
                                     <Button.Content>
                                         <StackPanel Orientation="Horizontal">
                                             <Image Width="20" Margin="0,0,5,0" Height="20" VerticalAlignment="Center"
-                                               Source="../Images/options24.png" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">
+                                               Source="../Images/options24.png">
                                             </Image>
-                                            <TextBlock Text="Edit" />
+                                            <TextBlock Text="{x:Static Properties:ResourcesUI.QueueView_Edit}" />
                                         </StackPanel>
                                     </Button.Content>
                                     <i:Interaction.Triggers>
@@ -318,13 +296,13 @@
                                     </i:Interaction.Triggers>
                                 </Button>
 
-                                <Button Margin="10,0,0,0">
+                                <Button Margin="10,0,0,0" AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Delete}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}">
                                     <Button.Content>
                                         <StackPanel Orientation="Horizontal">
                                             <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0" 
-                                               Source="../Images/delete.png" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">
+                                               Source="../Images/delete.png">
                                             </Image>
-                                            <TextBlock Text="Delete" />
+                                            <TextBlock Text="{x:Static Properties:ResourcesUI.QueueView_Delete}" />
                                         </StackPanel>
                                     </Button.Content>
                                     <i:Interaction.Triggers>
diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 0eddd5c0f..823d4b6d8 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -106,7 +106,8 @@
                     </Button>
 
                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" HorizontalAlignment="Right">
-                        <Menu HorizontalAlignment="Right" VerticalAlignment="Center" Background="Transparent">
+                        <Menu HorizontalAlignment="Right" VerticalAlignment="Center" Background="Transparent"
+                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_WhenDone}">
                             <MenuItem>
                                 <MenuItem.Header>
                                     <StackPanel Height="32" Orientation="Horizontal">
@@ -146,29 +147,6 @@
                                   Header="{x:Static Properties:ResourcesUI.QueueView_QuitHandBrake}"/>
                             </MenuItem>
                         </Menu>
-
-                        <!--<Menu HorizontalAlignment="Right" Background="Transparent" VerticalAlignment="Center">
-                            <MenuItem>
-                                <MenuItem.Header>
-                                    <StackPanel Height="32" Orientation="Horizontal">
-                                        <Image Source="Images\Advanced.png" Width="20" Height="20" VerticalAlignment="Center" />
-                                        <TextBlock VerticalAlignment="Center"
-                                           Text="{x:Static Properties:ResourcesUI.QueueView_Options}" Margin="5,0,0,0" />
-                                        <Path Height="5"
-                                      Margin="2,2,2,0"
-                                      Data="M 0 0 L 4 4 L 8 0 Z"
-                                      Fill="{DynamicResource GlyphBrush}" />
-                                    </StackPanel>
-                                </MenuItem.Header>
-
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearCompleted}" />
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearQueue}" />
-                                <Separator />
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" />
-
-                            </MenuItem>
-                        </Menu>-->
-
                     </StackPanel>
 
                 </DockPanel>
@@ -380,13 +358,13 @@
                                 </Grid.ColumnDefinitions>
 
                                 <Button Visibility="{Binding Status, Converter={StaticResource queueStatusVisConverter}}"
+                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Retry}"  ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}"
                                     Grid.Row="0" Grid.Column="0" Margin="0,5,0,0">
                                     <Button.Template>
                                         <ControlTemplate>
                                             <Image Width="20"  
                                                Height="20" VerticalAlignment="Center"
-                                               Source="Images/Refresh.ico"
-                                               ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">
+                                               Source="Images/Refresh.ico">
                                             </Image>
                                         </ControlTemplate>
                                     </Button.Template>
@@ -399,7 +377,8 @@
                                     </i:Interaction.Triggers>
                                 </Button>
 
-                                <Button Grid.Row="0" Grid.Column="1" Margin="10,5,0,0">
+                                <Button Grid.Row="0" Grid.Column="1" Margin="10,5,0,0"
+                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Edit}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_SendJobBack}" >
                                     <Button.Template>
                                         <ControlTemplate>
                                             <Image Width="20" 
@@ -418,7 +397,8 @@
                                     </i:Interaction.Triggers>
                                 </Button>
 
-                                <Button Grid.Row="0" Grid.Column="2" Margin="10,5,0,0">
+                                <Button Grid.Row="0" Grid.Column="2" Margin="10,5,0,0"
+                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Delete}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}">
                                     <Button.Template>
                                         <ControlTemplate>
                                             <Image Width="20" 
@@ -436,10 +416,7 @@
                                         </i:EventTrigger>
                                     </i:Interaction.Triggers>
                                 </Button>
-
-
                             </Grid>
-
                         </Grid>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
diff --git a/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
index 2ec3dcaa3..d17798a4b 100644
--- a/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
+++ b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
@@ -31,7 +31,7 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Slider Maximum="{Binding TotalPreviews}" Minimum="0" 
+                <Slider Maximum="{Binding TotalPreviews}" Minimum="0" AutomationProperties.Name="{x:Static Properties:ResourcesUI.StaticPreviewView_SelectPreviewImage}"
                 Value="{Binding SelectedPreviewImage}"
                 VerticalAlignment="Center"
                 HorizontalAlignment="Stretch"
diff --git a/win/CS/HandBrakeWPF/Views/SummaryView.xaml b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
index edfbd1fac..022c82d1a 100644
--- a/win/CS/HandBrakeWPF/Views/SummaryView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
@@ -55,11 +55,12 @@
             </Grid.Resources>
 
 
-            <TextBlock Text="Format:" FontWeight="Bold" Grid.Row="0" VerticalAlignment="Center" />
+            <TextBlock Text="{x:Static Properties:ResourcesUI.MainView_Format}" FontWeight="Bold" Grid.Row="0" VerticalAlignment="Center" />
             <ComboBox Name="Container" Width="100" HorizontalAlignment="Left"  Grid.Row="0" Grid.Column="1"
                               ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Mux}" VerticalAlignment="Center"
                               ItemsSource="{Binding OutputFormats, Converter={StaticResource enumComboConverter}}"
-                              SelectedItem="{Binding SelectedOutputFormat, Converter={StaticResource enumComboConverter}}" />
+                              SelectedItem="{Binding SelectedOutputFormat, Converter={StaticResource enumComboConverter}}" 
+                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_Format}" />
             <CheckBox Name="WebOptimized" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"
                               Content="{x:Static Properties:ResourcesUI.MainView_WebOptimized}"
                               IsChecked="{Binding Path=OptimizeMP4}"
diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 552a28128..c5e256fbc 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -42,7 +42,7 @@
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Codec}" Width="100" />
 
-                    <ComboBox Width="120" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Encoders}" >
+                    <ComboBox Width="120" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Encoders}" AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_Codec}" >
                         <ComboBox.SelectedItem>
                             <MultiBinding Converter="{StaticResource videoEncoderConverter}">
                                 <Binding Path="SelectedVideoEncoder" />
@@ -62,7 +62,8 @@
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Framerate}" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>
                     <StackPanel Orientation="Vertical">
-                        <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Framerate}"  />
+                        <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Framerate}"
+                                  AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_Framerate}" />
 
                         <StackPanel Orientation="Vertical" >
                             <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_ConstantFramerate}" IsChecked="{Binding IsConstantFramerate}" Margin="0,5,0,0"
@@ -107,7 +108,7 @@
                     <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_AverageBitrate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_AvgBitrate}" 
                                  IsChecked="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,10,0"/>
                     <TextBox Width="75" Text="{Binding VideoBitrate, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"
-                             ToolTip="{x:Static Properties:ResourcesTooltips.Video_AvgBitrate}" />
+                             ToolTip="{x:Static Properties:ResourcesTooltips.Video_AvgBitrate}" AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_AverageBitrate}"  />
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" Margin="30,0,0,0" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">
@@ -162,7 +163,7 @@
 
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncodeTune}" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,5,0,0"
                                Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"/>
-                    <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,5,5,0" Height="22"
+                    <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,5,5,0" Height="22" AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_EncodeTune}"
                               ItemsSource="{Binding VideoTunes}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoTune}"
                               ToolTip="{x:Static Properties:ResourcesTooltips.Video_EncoderTune}"  Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"
                               Style="{StaticResource LongToolTipHolder}" />
@@ -174,16 +175,19 @@
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderProfile}" Grid.Row="3" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"/>
                     <ComboBox Width="100" Grid.Row="3" Grid.Column="1" Margin="5,5,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"
                           ItemsSource="{Binding VideoProfiles}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoProfile}"
-                          Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Profile}"  />
+                          Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Profile}"
+                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_EncoderProfile}" />
 
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderLevel}" Grid.Row="3" Grid.Column="2" Margin="10,5,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}" />
                     <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,5,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}"
                           ItemsSource="{Binding VideoLevels}"  DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoLevel}"
-                          Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Level}" />
+                          Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Level}"
+                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_EncoderLevel}" />
 
                     <!-- Row 3 -->
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_ExtraOptions}" Grid.Row="4" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" />
                     <TextBox Text="{Binding ExtraArguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" TextWrapping="WrapWithOverflow"
+                             AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_ExtraOptions}" 
                              MaxLines="4" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="4" Margin="5,5,5,2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Stretch"
                              ToolTip="{Binding FullOptionsTooltip}" Style="{StaticResource LongToolTipHolder}" >
                         <TextBox.ContextMenu>