diff options
Diffstat (limited to 'win/CS/HandBrakeWPF/Views/QueueView.xaml')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/QueueView.xaml | 81 |
1 files changed, 57 insertions, 24 deletions
diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml index 8b3b31f03..6c64557b1 100644 --- a/win/CS/HandBrakeWPF/Views/QueueView.xaml +++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml @@ -8,7 +8,8 @@ xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:YourNamespace="clr-namespace:HandBrakeWPF.AttachedProperties"
- xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio" Title="{Binding Title}"
+ xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"
+ xmlns:Subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles" Title="{Binding Title}"
Width="600"
Height="400"
MinWidth="600"
@@ -24,6 +25,7 @@ <Converters:EnumComboConverter x:Key="enumComboConverter" />
<Converters:QueueStatusToVisibilityConverter x:Key="queueStatusVisConverter" />
<Audio:AudioQueueDisplayConverter x:Key="audioTrackDisplayConverter" />
+ <Subtitles:SubtitlesQueueDisplayConverter x:Key="subtitleTrackDisplayConverter" />
</Window.Resources>
<Grid>
@@ -142,6 +144,7 @@ dd:DragDrop.IsDragSource="True"
dd:DragDrop.IsDropTarget="True"
ItemsSource="{Binding QueueJobs}"
+ SelectedItem="{Binding SelectedJob}"
SelectionMode="Extended">
<ListBox.ContextMenu>
@@ -171,7 +174,12 @@ <TextBlock Margin="10,0,0,0" FontWeight="Bold" Text="Audio: " />
<TextBlock Text="{Binding Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}" />
</StackPanel>
-
+
+ <StackPanel Orientation="Horizontal">
+ <TextBlock FontWeight="Bold" Text="Subtitles: " />
+ <TextBlock Text="{Binding Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}" />
+ </StackPanel>
+
<StackPanel Orientation="Horizontal">
<TextBlock FontWeight="Bold" Text="Advanced: " />
<TextBlock Text="{Binding Task.AdvancedEncoderOptions}" />
@@ -251,36 +259,61 @@ <Grid Grid.Column="2"
Margin="10,0,10,0"
VerticalAlignment="Center">
- <StackPanel Orientation="Vertical">
- <Image Width="20"
- Height="20"
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Image Width="20" Grid.Row="0" Grid.Column="0" Grid.RowSpan="2"
+ Height="20" VerticalAlignment="Center" Margin="0,0,5,0"
Source="Images/Refresh.ico"
ToolTip="Reset job status to Waiting."
Visibility="{Binding Status,
Converter={StaticResource queueStatusVisConverter}}">
- <i:Interaction.Triggers>
- <i:EventTrigger EventName="MouseDown">
- <cal:ActionMessage MethodName="RetryJob">
- <cal:Parameter Value="{Binding}" />
- </cal:ActionMessage>
- </i:EventTrigger>
- </i:Interaction.Triggers>
- </Image>
-
- <Image Width="20"
+ <i:Interaction.Triggers>
+ <i:EventTrigger EventName="MouseDown">
+ <cal:ActionMessage MethodName="RetryJob">
+ <cal:Parameter Value="{Binding}" />
+ </cal:ActionMessage>
+ </i:EventTrigger>
+ </i:Interaction.Triggers>
+ </Image>
+
+ <Image Width="20" Grid.Row="0" Grid.Column="1"
+ Height="20"
+ Margin="0,5,0,0"
+ Source="Images/Options24.png"
+ ToolTip="Edit this Job">
+ <i:Interaction.Triggers>
+ <i:EventTrigger EventName="MouseDown">
+ <cal:ActionMessage MethodName="EditJob">
+ <cal:Parameter Value="{Binding}" />
+ </cal:ActionMessage>
+ </i:EventTrigger>
+ </i:Interaction.Triggers>
+ </Image>
+
+ <Image Width="20" Grid.Row="1" Grid.Column="1"
Height="20"
Margin="0,5,0,0"
Source="Images/delete.png"
ToolTip="Remove this Job">
- <i:Interaction.Triggers>
- <i:EventTrigger EventName="MouseDown">
- <cal:ActionMessage MethodName="RemoveJob">
- <cal:Parameter Value="{Binding}" />
- </cal:ActionMessage>
- </i:EventTrigger>
- </i:Interaction.Triggers>
- </Image>
- </StackPanel>
+ <i:Interaction.Triggers>
+ <i:EventTrigger EventName="MouseDown">
+ <cal:ActionMessage MethodName="RemoveJob">
+ <cal:Parameter Value="{Binding}" />
+ </cal:ActionMessage>
+ </i:EventTrigger>
+ </i:Interaction.Triggers>
+ </Image>
+
+
</Grid>
|