WinGui: Add "Delete" key shortcut to the queue to delete selected items.

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

2 files changed, 14 insertions, 5 deletions

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 8b86bd34f..e2eda58c9 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -11,6 +11,8 @@
         xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"

         xmlns:Subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"

         xmlns:video="clr-namespace:HandBrakeWPF.Converters.Video"

+        xmlns:commands="clr-namespace:HandBrakeWPF.Commands"

+        xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"

         Title="{Binding Title}"

         Width="700"

         Height="500"

@@ -190,8 +192,18 @@
                  dd:DragDrop.IsDragSource="True"

                  dd:DragDrop.IsDropTarget="True"

                  ItemsSource="{Binding QueueTasks, Mode=OneWay}"

+                 helpers:ListBoxHelper.SelectedItems="{Binding SelectedItems}" 

                  SelectionMode="Extended">

 

+            <i:Interaction.Triggers>

+                <commands:InputBindingTrigger>

+                    <commands:InputBindingTrigger.InputBinding>

+                        <KeyBinding Key="Delete"/>

+                    </commands:InputBindingTrigger.InputBinding>

+                    <cal:ActionMessage MethodName="RemoveSelectedJobs" />

+                </commands:InputBindingTrigger>

+            </i:Interaction.Triggers>

+

             <ListBox.Style>

                 <Style TargetType="ListBox">

                     <Style.Triggers>

@@ -205,7 +217,8 @@
             <ListBox.ContextMenu>

                 <ContextMenu>

                     <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="Clear Completed" />

-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="Clear" />

+                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="Clear All" />

+                    <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="Clear Selected" />                 

                     <Separator />

                     <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="Import Queue" />

                     <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="Export Queue" />

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml
index 9524199b9..cdfc8d588 100644
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml
@@ -38,10 +38,6 @@
 

         <DockPanel Background="Black" Opacity="0.60" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Panel.ZIndex="1"

                Visibility="{Binding ShowOverlayPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

-        

-        <!--<ContentControl x:Name="OverlayPanelViewModel"  Visibility="{Binding ShowOverlayPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" 

-                        VerticalAlignment="Center" HorizontalAlignment="Center" Panel.ZIndex="2" MinWidth="900" MinHeight="675"  />-->

-

 

     </Grid>

 </Window>