WinGui: Adding Queue Start/Pause Context Menu options to the In-line queue and queue window. #489

1 files changed, 9 insertions, 6 deletions

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index c1c00bb39..414c29e30 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -66,8 +66,8 @@
             <DockPanel Background="Transparent" HorizontalAlignment="Stretch">

 

                 <Button Name="Start" DockPanel.Dock="Left" AutomationProperties.Name="Start Queue"

-                        cal:Message.Attach="[Event Click] = [Action StartEncode]"

-                        Visibility="{Binding IsEncoding,

+                        cal:Message.Attach="[Event Click] = [Action StartQueue]"

+                        Visibility="{Binding IsQueueRunning,

                                              Converter={StaticResource boolToVisConverter},

                                              ConverterParameter=true}">

                     <StackPanel Orientation="Horizontal">

@@ -81,8 +81,8 @@
                 </Button>

 

                 <Button Name="Pause" DockPanel.Dock="Left" AutomationProperties.Name="Pause Queue"

-                        cal:Message.Attach="[Event Click] = [Action PauseEncode]"

-                        Visibility="{Binding IsEncoding,

+                        cal:Message.Attach="[Event Click] = [Action PauseQueueToolbar]"

+                        Visibility="{Binding IsQueueRunning,

                                              Converter={StaticResource boolToVisConverter},

                                              ConverterParameter=false}">

                     <StackPanel Orientation="Horizontal">

@@ -184,7 +184,7 @@
             <TextBlock Text="{Binding JobStatus}" TextWrapping="WrapWithOverflow" TextTrimming="CharacterEllipsis"/>

         </StackPanel>

 

-        <ListBox Grid.Row="2"

+        <ListBox Grid.Row="2" Tag="{Binding}"

                  Margin="10,20,10,10"

                  dd:DragDrop.DropHandler="{Binding}"

                  dd:DragDrop.IsDragSource="True"

@@ -203,7 +203,10 @@
             </i:Interaction.Triggers>

 

             <ListBox.ContextMenu>

-                <ContextMenu>

+                <ContextMenu cal:Action.TargetWithoutContext="{Binding Path=PlacementTarget.Tag, RelativeSource={RelativeSource Self}}">

+                    <MenuItem cal:Message.Attach="[Event Click] = [Action StartQueue]" Header="{x:Static Properties:ResourcesUI.QueueView_Start}" />

+                    <MenuItem cal:Message.Attach="[Event Click] = [Action PauseQueue]" Header="{x:Static Properties:ResourcesUI.QueueView_Pause}" />

+                    <Separator />

                     <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_ClearAll}" />

                     <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearSelected}" />