Initial commit to allow the Queue Window to be embedded in the main window. Still some UX/UI stuff to tidy up later.

1 files changed, 7 insertions, 12 deletions

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 9a7460015..13df0e626 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="HandBrakeWPF.Views.QueueView"

+<UserControl x:Class="HandBrakeWPF.Views.QueueView"

         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

         xmlns:cal="http://www.caliburnproject.org"

@@ -14,16 +14,13 @@
         xmlns:commands="clr-namespace:HandBrakeWPF.Commands"

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

         xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"

-        Title="{Binding Title}"

-        Width="700"

-        Height="500"

+

         MinWidth="350"

         MinHeight="250"

-        WindowStartupLocation="CenterScreen"

         TextOptions.TextFormattingMode="Display"

         mc:Ignorable="d">

 

-    <Window.Resources>

+    <UserControl.Resources>

         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />

         <Converters:FullPathToFileNameConverter x:Key="filePathToFilenameConverter" />

         <Converters:EnumComboConverter x:Key="enumComboConverter" />

@@ -33,13 +30,11 @@
         <video:EncoderOptionsTooltipConverter x:Key="encoderOptionsTooltipConverter" />

         <video:VideoOptionsTooltipConverter x:Key="videoOptionsTooltipConverter" />

         

-

-

         <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">

             <Setter Property="ToolTipService.ShowDuration" Value="10000" />

         </Style>

 

-    </Window.Resources>

+    </UserControl.Resources>

 

     <Grid>

 

@@ -181,13 +176,13 @@
             </DockPanel>

         </ToolBar>

 

-        <StackPanel Grid.Row="1" Margin="10,20,10,20">

+        <StackPanel Grid.Row="1" Margin="10,20,10,0" Visibility="{Binding DisplayJobStatusInfo,  Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">

             <TextBlock Text="{Binding JobsPending}" />

             <TextBlock Text="{Binding JobStatus}" />

         </StackPanel>

 

         <ListBox Grid.Row="2"

-                 Margin="10,0,10,10"

+                 Margin="10,20,10,10"

                  dd:DragDrop.DropHandler="{Binding}"

                  dd:DragDrop.IsDragSource="True"

                  dd:DragDrop.IsDropTarget="True"

@@ -420,4 +415,4 @@
 

 

     </Grid>

-</Window>

+</UserControl>