WinGui: Give the preview window a presence on the picture settings tab. Added some initial code to manage the window size. (Note, this is not complete or DPI aware yet)

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

2 files changed, 37 insertions, 20 deletions

diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index a39719959..1458d1dea 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -29,8 +29,13 @@
                 <ColumnDefinition Width="*" />

             </Grid.ColumnDefinitions>

 

+            <Grid.RowDefinitions>

+                <RowDefinition Height="Auto" />

+                <RowDefinition Height="*" />

+            </Grid.RowDefinitions>

+

             <!-- Size Panel-->

-            <StackPanel Name="SizePanel" Orientation="Vertical" VerticalAlignment="Top" Grid.Column="0" >

+            <StackPanel Name="SizePanel" Orientation="Vertical" VerticalAlignment="Top" Grid.Column="0" Grid.Row="0" Grid.RowSpan="1" >

                 <Label Content="Size" FontWeight="Bold" />

 

                 <!-- Row 1-->

@@ -99,24 +104,10 @@
                                              IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />

                 </Grid>

 

-                <!-- Row 5-->

-                <Grid Margin="5,15,5,0">

-                    <Grid.RowDefinitions>

-                        <RowDefinition Height="Auto" />

-                    </Grid.RowDefinitions>

-

-                    <Grid.ColumnDefinitions>

-                        <ColumnDefinition Width="Auto" />

-                    </Grid.ColumnDefinitions>

-

-

-                    <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"

-                       Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />

-                </Grid>

             </StackPanel>

 

             <!-- Crop Panel -->

-            <StackPanel Name="CropPanel" Margin="50,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Column="1">

+            <StackPanel Name="CropPanel" Margin="15,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="0" Grid.RowSpan="2" Grid.Column="1">

                 <Label Content="Cropping" FontWeight="Bold" />

                 <RadioButton Content="Automatic" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"/>

                 <RadioButton Content="Custom" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0" />

@@ -158,6 +149,29 @@
                 </Grid>

 

             </StackPanel>

+

+            <!-- Preview Panel -->

+            <StackPanel Name="PreviewPanel" Margin="0,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1"  Grid.Column="0">

+                <Label Content="Output" FontWeight="Bold" />

+

+                <Grid Margin="5,0,0,0">

+                    <Grid.RowDefinitions>

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                    </Grid.RowDefinitions>

+

+                    <Grid.ColumnDefinitions>

+                        <ColumnDefinition Width="Auto" />

+                    </Grid.ColumnDefinitions>

+

+                    <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" Margin="0,0,0,5"

+                       Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />

+

+                    <Button Content="Preview" Grid.Row="1" Margin="5,0,0,0"

+                            cal:Message.Attach="[Event Click] = [Action PreviewImage]" HorizontalAlignment="Left" />

+                </Grid>

+                

+            </StackPanel>

         </Grid>

     </Border>

 </UserControl>

diff --git a/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
index 080d10ea8..ae044945c 100644
--- a/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
+++ b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
@@ -2,12 +2,15 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

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

              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 

+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

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

              mc:Ignorable="d" SizeToContent="WidthAndHeight"

              TextOptions.TextFormattingMode="Display"

-             Title="Still Preview">

+             WindowStartupLocation="CenterScreen"

+             cal:Message.Attach="[Event SizeChanged] = [Action PreviewSizeChanged($eventArgs)]"       

+             Title="{Binding Title}">

     <Grid>

-        

+

         <Image Source="{Binding PreviewImage}" MaxWidth="{Binding Width}" MaxHeight="{Binding Height}" />

         <Slider Maximum="{Binding TotalPreviews}" Minimum="0" 

                 Value="{Binding SelectedPreviewImage}"

@@ -15,6 +18,6 @@
                 HorizontalAlignment="Center"

                 Margin="0,0,0,20" Width="150" 

                 Background="Transparent" 

-                /> 

+                />

     </Grid>

 </Window>