WinGui: Archive Queue Recovery files for 7 days. Add an option on the Source Selection Panel to recover archived queue files. Option will disappear automatically after 7 days.

1 files changed, 26 insertions, 9 deletions

diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
index 84c8c6ee9..90eec104b 100644
--- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
+++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
@@ -1,11 +1,17 @@
 <UserControl x:Class="HandBrakeWPF.Controls.SourceSelection"

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

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

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

-        xmlns:controls="clr-namespace:HandBrakeWPF.Controls"

-        xmlns:Properties="clr-namespace:HandBrakeWPF.Properties" x:Name="sourcePanel"

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

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

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

+             xmlns:controls="clr-namespace:HandBrakeWPF.Controls"

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

+             xmlns:converters="clr-namespace:HandBrakeWPF.Converters"

+             x:Name="sourcePanel"

        >

 

+    <UserControl.Resources>

+        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />

+    </UserControl.Resources>

+

     <Grid Height="{Binding ElementName=sourcePanel, Path=ActualHeight}">

 

         <Grid.ColumnDefinitions>

@@ -19,9 +25,10 @@
                 <RowDefinition Height="Auto" />

                 <RowDefinition Height="Auto" />

                 <RowDefinition Height="Auto" />

-                <RowDefinition Height="*" />

                 <RowDefinition Height="Auto" />

                 <RowDefinition Height="Auto" />

+                <RowDefinition Height="*" />

+                <RowDefinition Height="Auto" />

                 <RowDefinition Height="Auto" />

             </Grid.RowDefinitions>

 

@@ -91,16 +98,26 @@
                         </Button>

                     </DataTemplate>

                 </ListBox.ItemTemplate>

-

             </ListBox>

 

+            <Button Grid.Row="5"  AutomationProperties.Name="{x:Static Properties:ResourcesUI.SourceSelection_QueueArchiveRecovery}" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" 

+                    cal:Message.Attach="[Event Click] = [Action RecoverQueue]" Visibility="{Binding QueueRecoveryArchivesExist, Converter={StaticResource BooleanToVisibilityConverter}}"

+                    Margin="20,15,0,0" Padding="8" HorizontalAlignment="Left" BorderBrush="DarkGray" BorderThickness="0,1,0,0">

+                <StackPanel Orientation="Horizontal" MinWidth="100">

+                    <Image Source="../Views/Images/Queue.png" Width="32" />

+                    <StackPanel Orientation="Vertical">

+                        <TextBlock Text="{x:Static Properties:ResourcesUI.SourceSelection_QueueArchiveRecovery}" VerticalAlignment="Center" Margin="5,0,0,0" />

+                        <TextBlock Text="{x:Static Properties:ResourcesUI.SourceSelection_QueueArchiveRecoveryDesc}" VerticalAlignment="Center" Margin="5,0,0,0" />

+                    </StackPanel>

+                </StackPanel>

+            </Button>

 

             <!-- Cancel Window -->

-            <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">

+            <StackPanel Grid.Row="7" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">

                 <Button cal:Message.Attach="[Event Click] = [Action CloseSourceSelection]" Content="Cancel" Padding="8,2" />

             </StackPanel>

 

-            <StackPanel Grid.Row="7" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">

+            <StackPanel Grid.Row="8" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">

                 <TextBlock>           

                     <Hyperlink x:Name="Preferences" NavigateUri="/"  RequestNavigate="OpenOptions_OnRequestNavigate" >Preferences</Hyperlink>

                 </TextBlock>