From: sr55 <sr55.hb@outlook.com>
Date: Sat, 23 Feb 2019 21:16:17 +0000 (+0000)
Subject: WinGui: Further evolving the new queue design.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21c68f4f5bf42b20f5a544b149d224156118cbf9;p=handbrake

WinGui: Further evolving the new queue design.
---

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index f096724a5..ead05b8b7 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -3729,6 +3729,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Actions.
+        /// </summary>
+        public static string QueueView_Actions {
+            get {
+                return ResourceManager.GetString("QueueView_Actions", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Advanced:.
         /// </summary>
@@ -3864,6 +3873,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Import.
+        /// </summary>
+        public static string QueueView_Import {
+            get {
+                return ResourceManager.GetString("QueueView_Import", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Lock System.
         /// </summary>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 15388e182..7cc191852 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -1912,4 +1912,10 @@ This will not impact any of the software encoders.</value>
   <data name="Main_ResumeEncode" xml:space="preserve">
     <value>Resume Encode</value>
   </data>
+  <data name="QueueView_Actions" xml:space="preserve">
+    <value>Actions</value>
+  </data>
+  <data name="QueueView_Import" xml:space="preserve">
+    <value>Import</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
index 66e8d3ab4..d97c85deb 100644
--- a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
+++ b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
@@ -46,49 +46,92 @@
         <Grid HorizontalAlignment="Stretch" Grid.Row="0" Visibility="{Binding IsNewQueueVisible, Converter={StaticResource boolToVisConverter}}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
-            <TextBlock Text="{x:Static Properties:Resources.MainView_ShowQueue}" FontSize="28" VerticalAlignment="Center" FontFamily="Segoe UI Light" Margin="10,0,0,0"  />
+            <TextBlock Text="{x:Static Properties:Resources.MainView_ShowQueue}" FontSize="28" VerticalAlignment="Center" FontFamily="Segoe UI Light" Margin="10,0,0,0" />
+            <TextBlock Text="{Binding JobsPending}"  Grid.Column="1" Margin="15,0,0,5 " VerticalAlignment="Bottom" TextWrapping="WrapWithOverflow" TextTrimming="CharacterEllipsis" />
+
+            <Menu HorizontalAlignment="Right" Background="Transparent" VerticalAlignment="Bottom" Grid.Column="3" Margin="0,0,10,0" >
+                <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:Resources.QueueView_Options}" Margin="5,0,0,0" />
+                            <Path Height="5"
+                                  Margin="2,2,0,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 ResetFailed]" Header="{x:Static Properties:Resources.QueueView_ResetFailed}" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action ResetSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ResetSelectedJobs}" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action ResetAllJobs]" Header="{x:Static Properties:Resources.QueueView_ResetAllJobs}" />
+                    <Separator />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:Resources.QueueView_ClearAll}" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ClearSelected}" />
+                    <Separator />
+                    <!--<MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="{x:Static Properties:Resources.QueueView_Import}" />-->
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:Resources.QueueView_Export}" />
+                </MenuItem>
+            </Menu>
+
         </Grid>
 
-        <Grid Grid.Row="2" Margin="0,0,0,0">
+        <Grid Grid.Row="2" Margin="0,15,0,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="3*" MaxWidth="600" x:Name="leftTabPanel" />
                 <ColumnDefinition Width="5*" x:Name="rightTabPanel"  />
             </Grid.ColumnDefinitions>
 
-            <Border>
-                <Grid>
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Grid Grid.Row="0"  HorizontalAlignment="Stretch" Margin="10,0,5,5">
+
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
 
-                    <Grid Grid.Row="0"  HorizontalAlignment="Stretch" Margin="15,0,5,5">
-
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <TextBlock Text="{Binding JobsPending}" Grid.Row="1" Grid.Column="0" TextWrapping="WrapWithOverflow" TextTrimming="CharacterEllipsis"/>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <Button Name="Start" AutomationProperties.Name="Start Queue" cal:Message.Attach="[Event Click] = [Action StartQueue]" Grid.Column="0"
+                                IsEnabled="{Binding IsQueueRunning, Converter={StaticResource notBooleanConverter}}"
+                                Visibility="{Binding IsQueueRunning, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
+                        <StackPanel Orientation="Horizontal">
+                            <Image Width="16" Height="16" Margin="2,0,0,0" Source="../Images/Play.png"  />
+                            <Label Margin="5,0,5,0" VerticalAlignment="Center" Content="{x:Static Properties:Resources.QueueView_Start}" />
+                        </StackPanel>
+                    </Button>
 
-                        <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
-                            <Button Content="^" Width="20" Height="20" Margin="0" cal:Message.Attach="[Event Click] = [Action MoveUp]" />
-                            <Button Content="v" Width="20" Height="20" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action MoveDown]" />
+                    <Button Name="Pause" AutomationProperties.Name="Pause Queue" cal:Message.Attach="[Event Click] = [Action PauseQueueToolbar]" Grid.Column="1"
+                                Visibility="{Binding IsQueueRunning, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
+                        <StackPanel Orientation="Horizontal">
+                            <Image Width="16" Height="16" Margin="2,0,0,0" Source="../Images/Pause.png" />
+                            <Label Margin="5,0,0,0" VerticalAlignment="Center" Content="{x:Static Properties:Resources.QueueView_Pause}" />
                         </StackPanel>
-                    </Grid>
+                    </Button>
 
-                    <ListBox Tag="{Binding}" x:Name="queueJobs" Grid.Row="1" Margin="10,0,5,0"
+                    <StackPanel Grid.Row="0" Grid.Column="3" Orientation="Horizontal">
+                        <Button Content="^" Width="20" Height="20" Margin="0" cal:Message.Attach="[Event Click] = [Action MoveUp]" />
+                        <Button Content="v" Width="20" Height="20" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action MoveDown]" />
+                    </StackPanel>
+                </Grid>
+
+                <ListBox Tag="{Binding}" x:Name="queueJobs" Grid.Row="1" Margin="10,0,5,0"
                              
                              dd:DragDrop.DropHandler="{Binding}"
                              dd:DragDrop.IsDragSource="True"
@@ -100,178 +143,177 @@
                              BorderThickness="1"
                              ScrollViewer.HorizontalScrollBarVisibility="Disabled" >
 
-                        <i:Interaction.Triggers>
-                            <commands:InputBindingTrigger>
-                                <commands:InputBindingTrigger.InputBinding>
-                                    <KeyBinding Key="Delete"/>
-                                </commands:InputBindingTrigger.InputBinding>
-                                <cal:ActionMessage MethodName="RemoveSelectedJobs" />
-                            </commands:InputBindingTrigger>
-                        </i:Interaction.Triggers>
-
-                        <ListBox.ContextMenu>
-                            <ContextMenu cal:Action.TargetWithoutContext="{Binding Path=PlacementTarget.Tag, RelativeSource={RelativeSource Self}}" Opened="ContextMenu_OnOpened">
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action StartQueue]" Header="{x:Static Properties:Resources.QueueView_Start}" />
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action PauseQueue]" Header="{x:Static Properties:Resources.QueueView_Pause}" />
-                                <Separator />
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action ResetFailed]" Header="{x:Static Properties:Resources.QueueView_ResetFailed}" />
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action ResetSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ResetSelectedJobs}" />
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action ResetAllJobs]" Header="{x:Static Properties:Resources.QueueView_ResetAllJobs}" />
-                                <Separator />
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" />
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:Resources.QueueView_ClearAll}" />
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ClearSelected}" />
-                                <Separator />
-                                <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenSourceDir}" x:Name="openSourceDir" Click="OpenSourceDir_OnClick" />
-                                <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenDestDir}" x:Name="openDestDir" Click="OpenDestDir_OnClick" />
-                                <Separator />
-                                <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:Resources.QueueView_Export}" />
-                            </ContextMenu>
-                        </ListBox.ContextMenu>
-
-                        <ListBox.ItemContainerStyle>
-                            <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                                <Setter Property="Margin" Value="0,0,0,1" />
-                            </Style>
-                        </ListBox.ItemContainerStyle>
+                    <i:Interaction.Triggers>
+                        <commands:InputBindingTrigger>
+                            <commands:InputBindingTrigger.InputBinding>
+                                <KeyBinding Key="Delete"/>
+                            </commands:InputBindingTrigger.InputBinding>
+                            <cal:ActionMessage MethodName="RemoveSelectedJobs" />
+                        </commands:InputBindingTrigger>
+                    </i:Interaction.Triggers>
+
+                    <ListBox.ContextMenu>
+                        <ContextMenu cal:Action.TargetWithoutContext="{Binding Path=PlacementTarget.Tag, RelativeSource={RelativeSource Self}}" Opened="ContextMenu_OnOpened">
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action StartQueue]" Header="{x:Static Properties:Resources.QueueView_Start}" />
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action PauseQueue]" Header="{x:Static Properties:Resources.QueueView_Pause}" />
+                            <Separator />
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action ResetFailed]" Header="{x:Static Properties:Resources.QueueView_ResetFailed}" />
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action ResetSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ResetSelectedJobs}" />
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action ResetAllJobs]" Header="{x:Static Properties:Resources.QueueView_ResetAllJobs}" />
+                            <Separator />
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" />
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:Resources.QueueView_ClearAll}" />
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ClearSelected}" />
+                            <Separator />
+                            <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenSourceDir}" x:Name="openSourceDir" Click="OpenSourceDir_OnClick" />
+                            <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenDestDir}" x:Name="openDestDir" Click="OpenDestDir_OnClick" />
+                            <Separator />
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:Resources.QueueView_Export}" />
+                        </ContextMenu>
+                    </ListBox.ContextMenu>
+
+                    <ListBox.ItemContainerStyle>
+                        <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                            <Setter Property="Margin" Value="0,0,0,1" />
+                        </Style>
+                    </ListBox.ItemContainerStyle>
+
+                    <ListBox.ItemTemplate>
+                        <DataTemplate x:Name="QueueItemTemplate">
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="40" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
 
-                        <ListBox.ItemTemplate>
-                            <DataTemplate x:Name="QueueItemTemplate">
+                                <!--  Marker  -->
+                                <Image Grid.Column="0" Width="16" Height="16" SnapsToDevicePixels="True">
+
+                                    <Image.LayoutTransform>
+                                        <RotateTransform CenterX="8" CenterY="8" Angle="0"/>
+                                    </Image.LayoutTransform>
+
+                                    <Image.Style>
+                                        <Style TargetType="{x:Type Image}">
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">
+                                                    <Setter Property="Source" Value="..\Images\Movies.png" />
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="In Progress">
+                                                    <Setter Property="Source" Value="..\Images\Working0.png" />
+                                                    <DataTrigger.EnterActions>
+                                                        <BeginStoryboard>
+                                                            <Storyboard>
+                                                                <DoubleAnimation Duration="0:0:2" To="180" Storyboard.TargetProperty="(Image.LayoutTransform).(RotateTransform.Angle)" RepeatBehavior="Forever" />
+                                                            </Storyboard>
+                                                        </BeginStoryboard>
+                                                    </DataTrigger.EnterActions>
+                                                    <DataTrigger.ExitActions>
+                                                        <BeginStoryboard>
+                                                            <Storyboard>
+                                                                <DoubleAnimation Duration="0:0:0" To="0" Storyboard.TargetProperty="(Image.LayoutTransform).(RotateTransform.Angle)"/>
+                                                            </Storyboard>
+                                                        </BeginStoryboard>
+                                                    </DataTrigger.ExitActions>
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Completed">
+                                                    <Setter Property="Source" Value="..\Images\Complete.png" />
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Error">
+                                                    <Setter Property="Source" Value="..\Images\WarningSmall.png" />
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Image.Style>
+                                </Image>
+
+                                <!--  Settings  -->
+                                <Grid Grid.Column="1" Margin="0,3,15,3">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
 
-                                <Grid>
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="40" />
-                                        <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
                                     </Grid.ColumnDefinitions>
 
-                                    <!--  Marker  -->
-                                    <Image Grid.Column="0" Width="16" Height="16" SnapsToDevicePixels="True">
-
-                                        <Image.LayoutTransform>
-                                            <RotateTransform CenterX="8" CenterY="8" Angle="0"/>
-                                        </Image.LayoutTransform>
-
-                                        <Image.Style>
-                                            <Style TargetType="{x:Type Image}">
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">
-                                                        <Setter Property="Source" Value="..\Images\Movies.png" />
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="In Progress">
-                                                        <Setter Property="Source" Value="..\Images\Working0.png" />
-                                                        <DataTrigger.EnterActions>
-                                                            <BeginStoryboard>
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Duration="0:0:2" To="180" Storyboard.TargetProperty="(Image.LayoutTransform).(RotateTransform.Angle)" RepeatBehavior="Forever" />
-                                                                </Storyboard>
-                                                            </BeginStoryboard>
-                                                        </DataTrigger.EnterActions>
-                                                        <DataTrigger.ExitActions>
-                                                            <BeginStoryboard>
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Duration="0:0:0" To="0" Storyboard.TargetProperty="(Image.LayoutTransform).(RotateTransform.Angle)"/>
-                                                                </Storyboard>
-                                                            </BeginStoryboard>
-                                                        </DataTrigger.ExitActions>
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Completed">
-                                                        <Setter Property="Source" Value="..\Images\Complete.png" />
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Error">
-                                                        <Setter Property="Source" Value="..\Images\WarningSmall.png" />
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Image.Style>
-                                    </Image>
-
-                                    <!--  Settings  -->
-                                    <Grid Grid.Column="1" Margin="0,3,15,3">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                        </Grid.RowDefinitions>
-
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="*" />
-                                        </Grid.ColumnDefinitions>
-
-                                        <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.ColumnSpan="2">
-                                            <TextBlock FontWeight="Bold" Text="Title: " />
-                                            <TextBlock Text="{Binding Task.Title}" />
-
-                                            <TextBlock Text="{Binding Task.PointToPointMode}" Margin="10,0,0,0" FontWeight="Bold" />
-                                            <TextBlock Text=": " />
-                                            <TextBlock Text="{Binding Task.StartPoint}" />
-                                            <TextBlock Margin="5,0,5,0" Text="to" />
-                                            <TextBlock Text="{Binding Task.EndPoint}" />
-                                        </StackPanel>
+                                    <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.ColumnSpan="2">
+                                        <TextBlock FontWeight="Bold" Text="Title: " />
+                                        <TextBlock Text="{Binding Task.Title}" />
+
+                                        <TextBlock Text="{Binding Task.PointToPointMode}" Margin="10,0,0,0" FontWeight="Bold" />
+                                        <TextBlock Text=": " />
+                                        <TextBlock Text="{Binding Task.StartPoint}" />
+                                        <TextBlock Margin="5,0,5,0" Text="to" />
+                                        <TextBlock Text="{Binding Task.EndPoint}" />
+                                    </StackPanel>
 
 
-                                        <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" Grid.Row="1" />
-                                        <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}"  Margin="2,0,0,0" Grid.Row="1" Grid.Column="1"/>
-                                        <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" Grid.Row="2" />
-                                        <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" Margin="2,0,0,0" TextTrimming="CharacterEllipsis" Grid.Row="2" Grid.Column="1" />
+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" Grid.Row="1" />
+                                    <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}"  Margin="2,0,0,0" Grid.Row="1" Grid.Column="1"/>
+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" Grid.Row="2" />
+                                    <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" Margin="2,0,0,0" TextTrimming="CharacterEllipsis" Grid.Row="2" Grid.Column="1" />
 
-                                        <ProgressBar Minimum="0" Height="4" Maximum="100" Name="pbStatus" Margin="0,2,5,0" Grid.Row="3" Grid.ColumnSpan="2"
+                                    <ProgressBar Minimum="0" Height="4" Maximum="100" Name="pbStatus" Margin="0,2,5,0" Grid.Row="3" Grid.ColumnSpan="2"
                                              Value="{Binding DataContext.ProgressValue, ElementName=queueJobs}" IsIndeterminate="{Binding DataContext.IntermediateProgress, ElementName=queueJobs}"
                                              Visibility="{Binding ShowEncodeProgress, Converter={StaticResource boolToVisConverter}}" />
-                                    </Grid>
                                 </Grid>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
+                            </Grid>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
 
-                    <Border BorderThickness="1,0,1,1" BorderBrush="DarkGray" Grid.Row="2" Margin="10,0,5,10" SnapsToDevicePixels="True" >
-                        <Menu HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent"   
+                <Border BorderThickness="1,0,1,1" BorderBrush="DarkGray" Grid.Row="2" Margin="10,0,5,10" SnapsToDevicePixels="True" >
+                    <Menu HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent"   
                               AutomationProperties.Name="{x:Static Properties:Resources.QueueView_WhenDone}">
-                            <MenuItem>
-                                <MenuItem.Header>
-                                    <StackPanel Height="32" Orientation="Horizontal">
-                                        <TextBlock VerticalAlignment="Center"
+                        <MenuItem>
+                            <MenuItem.Header>
+                                <StackPanel Height="32" Orientation="Horizontal">
+                                    <TextBlock VerticalAlignment="Center"
                                                FontWeight="Bold"
                                                Text="{x:Static Properties:Resources.QueueView_WhenDone}" />
-                                        <Label Margin="8,0,0,0"
+                                    <Label Margin="8,0,0,0"
                                            VerticalAlignment="Center"
                                            Content="{Binding WhenDoneAction}" />
-                                        <Path Height="5"
+                                    <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>
+                                </StackPanel>
+                            </MenuItem.Header>
 
-                                <MenuItem x:Name="doNothing"
+                            <MenuItem x:Name="doNothing"
                                       cal:Message.Attach="[Event Click] = [Action WhenDone(doNothing.Header)]"
                                       Header="{x:Static Properties:Resources.QueueView_DoNothing}" />
-                                <MenuItem x:Name="shutdown"
+                            <MenuItem x:Name="shutdown"
                                       cal:Message.Attach="[Event Click] = [Action WhenDone(shutdown.Header)]"
                                       Header="{x:Static Properties:Resources.QueueView_Shutdown}" />
-                                <MenuItem x:Name="suspend"
+                            <MenuItem x:Name="suspend"
                                       cal:Message.Attach="[Event Click] = [Action WhenDone(suspend.Header)]"
                                       Header="{x:Static Properties:Resources.QueueView_Suspend}" />
-                                <MenuItem x:Name="hibernate"
+                            <MenuItem x:Name="hibernate"
                                       cal:Message.Attach="[Event Click] = [Action WhenDone(hibernate.Header)]"
                                       Header="{x:Static Properties:Resources.QueueView_Hibernate}"/>
-                                <MenuItem x:Name="lock"
+                            <MenuItem x:Name="lock"
                                       cal:Message.Attach="[Event Click] = [Action WhenDone(lock.Header)]"
                                       Header="{x:Static Properties:Resources.QueueView_LockSystem}" />
-                                <MenuItem x:Name="logoff"
+                            <MenuItem x:Name="logoff"
                                       cal:Message.Attach="[Event Click] = [Action WhenDone(logoff.Header)]"
                                       Header="{x:Static Properties:Resources.QueueView_Logoff}"/>
-                                <MenuItem x:Name="quit"
+                            <MenuItem x:Name="quit"
                                       cal:Message.Attach="[Event Click] = [Action WhenDone(quit.Header)]"
                                       Header="{x:Static Properties:Resources.QueueView_QuitHandBrake}"/>
-                            </MenuItem>
-                        </Menu>
-                    </Border>
-                </Grid>
-            </Border>
+                        </MenuItem>
+                    </Menu>
+                </Border>
+            </Grid>
 
             <TabControl x:Name="summaryTabControl"  Grid.Column="1"  Margin="5,0,10,10" >
                 <TabItem Header="{x:Static Properties:Resources.QueueView_Summary}" >
@@ -344,7 +386,7 @@
 
 
                                 <Button x:Name="queueOptionsDropButton" Margin="10,0,0,0" Click="QueueOptionsDropButton_OnClick"
-                                        AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Options}" IsEnabled="{Binding CanPerformActionOnSource}">
+                                        AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Actions}" IsEnabled="{Binding CanPerformActionOnSource}">
                                     <Button.Content>
                                         <StackPanel Orientation="Horizontal">
                                             <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0" 
@@ -353,7 +395,7 @@
 
                                             <TextBlock Margin="0,0,5,0" Padding="0"
                                                        VerticalAlignment="Center"
-                                                       Text="{x:Static Properties:Resources.QueueView_Options}" />
+                                                       Text="{x:Static Properties:Resources.QueueView_Actions}" />
 
                                             <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"
                                                   Data="M 0 0 L 4 4 L 8 0 Z"