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

4 files changed, 24 insertions, 14 deletions

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index da7c7d0cc..9cdbfb626 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -484,11 +484,12 @@
 

             <!--  Tab Control  -->

             <TabControl Name="tabControl"

-                        Grid.Row="3"

+                        Grid.Row="4"

                         Margin="10,10,5,5"

                         HorizontalAlignment="Stretch"

                         VerticalAlignment="Stretch"

                         MinHeight="350" MinWidth="720"

+                        Visibility="{Binding IsQueueShowingInLine,  Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"

                         >

                 <TabItem Name="pictureTab" Header="{x:Static Properties:ResourcesUI.MainView_PictureTab}">

                     <ContentControl x:Name="PictureSettingsViewModel" />

@@ -513,6 +514,18 @@
                 </TabItem>

             </TabControl>

 

+            <!-- Queue in-line display if enabled -->

+            <Grid  Grid.Row="3" Margin="10,10,5,5"  Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}"

+                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch">

+                <Grid.RowDefinitions>

+                    <RowDefinition Height="Auto" />

+                    <RowDefinition Height="*" />

+                </Grid.RowDefinitions>

+                <Label Content="Queue" FontWeight="Bold" Grid.Row="0"/>

+                <ContentControl x:Name="QueueViewModel"  Grid.Row="1" />

+            </Grid>

+

+

             <!--  Presets  -->

             <GroupBox Grid.RowSpan="4"

                       Grid.Column="1"

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index d8c6ee802..1cde94b01 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -148,6 +148,7 @@
                             <CheckBox Content="{x:Static Properties:ResourcesUI.Options_MinimiseTray}" IsChecked="{Binding MinimiseToTray}" />

                             <CheckBox Content="{x:Static Properties:ResourcesUI.Options_ClearCompleted}" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />

                             <CheckBox Content="{x:Static Properties:ResourcesUI.Options_AdvancedTab}" IsChecked="{Binding ShowAdvancedTab}" />

+                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_ShowQueueInline}" IsChecked="{Binding ShowQueueInline}" />

                         </StackPanel>

                     </StackPanel>

                 </StackPanel>

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>

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs b/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs
index ea01a20fb..e69dabe77 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs
@@ -10,11 +10,12 @@
 namespace HandBrakeWPF.Views

 {

     using System.Windows;

+    using System.Windows.Controls;

 

     /// <summary>

     /// Interaction logic for VideoView

     /// </summary>

-    public partial class QueueView : Window

+    public partial class QueueView : UserControl

     {

         /// <summary>

         /// Initializes a new instance of the <see cref="QueueView"/> class.