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

11 files changed, 216 insertions, 23 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 6ba1e302d..39596c222 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -44,6 +44,20 @@
     <DebugType>pdbonly</DebugType>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x86' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\x86\Debug31\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <PlatformTarget>x86</PlatformTarget>

+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x64' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\x64\Debug31\</OutputPath>

+    <DefineConstants>TRACE;DEBUG</DefineConstants>

+    <PlatformTarget>x64</PlatformTarget>

+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

   <ItemGroup>

     <Reference Include="Caliburn.Micro, Version=1.3.1.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
index d86da1833..720f64395 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
@@ -100,6 +100,28 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>

     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>

   </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x64' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\x64\Debug31\</OutputPath>

+    <DefineConstants>TRACE;DEBUG;X64</DefineConstants>

+    <DebugType>full</DebugType>

+    <PlatformTarget>x64</PlatformTarget>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>

+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x86' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\x86\Debug31\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <DebugType>full</DebugType>

+    <PlatformTarget>x86</PlatformTarget>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>

+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>

+  </PropertyGroup>

   <ItemGroup>

     <Reference Include="PresentationCore">

       <RequiredTargetFramework>3.0</RequiredTargetFramework>

diff --git a/win/CS/HandBrake.Server/HandBrake.Server.csproj b/win/CS/HandBrake.Server/HandBrake.Server.csproj
index b27f798d6..7e202d4c2 100644
--- a/win/CS/HandBrake.Server/HandBrake.Server.csproj
+++ b/win/CS/HandBrake.Server/HandBrake.Server.csproj
@@ -41,6 +41,21 @@
     <PlatformTarget>x64</PlatformTarget>

     <OutputPath>bin\Release\</OutputPath>

   </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x86' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\x86\Debug31\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <DebugType>full</DebugType>

+    <PlatformTarget>x86</PlatformTarget>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x64' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\x64\Debug31\</OutputPath>

+    <PlatformTarget>x64</PlatformTarget>

+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

   <ItemGroup>

     <Reference Include="System" />

     <Reference Include="System.Core" />

diff --git a/win/CS/HandBrake10.sln b/win/CS/HandBrake10.sln
index 4878465ae..4af3e5007 100644
--- a/win/CS/HandBrake10.sln
+++ b/win/CS/HandBrake10.sln
@@ -1,6 +1,8 @@
 

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

+Microsoft Visual Studio Solution File, Format Version 12.00

+# Visual Studio 2013

+VisualStudioVersion = 12.0.30110.0

+MinimumVisualStudioVersion = 10.0.40219.1

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServices", "HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeWPF", "HandBrakeWPF\HandBrakeWPF.csproj", "{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}"

@@ -20,6 +22,10 @@ Global
 		Debug|Mixed Platforms = Debug|Mixed Platforms

 		Debug|x64 = Debug|x64

 		Debug|x86 = Debug|x86

+		Debug32|Any CPU = Debug32|Any CPU

+		Debug32|Mixed Platforms = Debug32|Mixed Platforms

+		Debug32|x64 = Debug32|x64

+		Debug32|x86 = Debug32|x86

 		Release|Any CPU = Release|Any CPU

 		Release|Mixed Platforms = Release|Mixed Platforms

 		Release|x64 = Release|x64

@@ -33,6 +39,13 @@ Global
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x64.Build.0 = Debug|x64

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.ActiveCfg = Debug|x86

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.Build.0 = Debug|x86

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|Any CPU.ActiveCfg = Debug32|x86

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|Mixed Platforms.ActiveCfg = Debug32|x86

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|Mixed Platforms.Build.0 = Debug32|x86

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|x64.ActiveCfg = Debug32|x86

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|x64.Build.0 = Debug32|x86

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|x86.ActiveCfg = Debug32|x86

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|x86.Build.0 = Debug32|x86

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Any CPU.ActiveCfg = Release|x86

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Mixed Platforms.ActiveCfg = Release|x86

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Mixed Platforms.Build.0 = Release|x86

@@ -47,6 +60,13 @@ Global
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.Build.0 = Debug|x64

 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x86.ActiveCfg = Debug|x86

 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x86.Build.0 = Debug|x86

+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|Any CPU.ActiveCfg = Debug32|x86

+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|Mixed Platforms.ActiveCfg = Debug32|x86

+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|Mixed Platforms.Build.0 = Debug32|x86

+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|x64.ActiveCfg = Debug32|x86

+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|x64.Build.0 = Debug32|x86

+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|x86.ActiveCfg = Debug32|x86

+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|x86.Build.0 = Debug32|x86

 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Any CPU.ActiveCfg = Release|x86

 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Mixed Platforms.ActiveCfg = Release|x86

 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Mixed Platforms.Build.0 = Release|x86

@@ -61,6 +81,13 @@ Global
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x64.Build.0 = Debug|x64

 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.ActiveCfg = Debug|x86

 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.Build.0 = Debug|x86

+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|Any CPU.ActiveCfg = Debug32|x86

+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|Mixed Platforms.ActiveCfg = Debug32|x86

+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|Mixed Platforms.Build.0 = Debug32|x86

+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|x64.ActiveCfg = Debug32|x86

+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|x64.Build.0 = Debug32|x86

+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|x86.ActiveCfg = Debug32|x86

+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|x86.Build.0 = Debug32|x86

 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Any CPU.ActiveCfg = Release|x86

 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.ActiveCfg = Release|x86

 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.Build.0 = Release|x86

@@ -75,6 +102,13 @@ Global
 		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|x64.Build.0 = Debug|x64

 		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|x86.ActiveCfg = Debug|x86

 		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|x86.Build.0 = Debug|x86

+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug32|Any CPU.ActiveCfg = Debug32|x86

+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug32|Mixed Platforms.ActiveCfg = Debug32|x86

+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug32|Mixed Platforms.Build.0 = Debug32|x86

+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug32|x64.ActiveCfg = Debug32|x86

+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug32|x64.Build.0 = Debug32|x86

+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug32|x86.ActiveCfg = Debug32|x86

+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug32|x86.Build.0 = Debug32|x86

 		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|Any CPU.ActiveCfg = Release|x86

 		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|Mixed Platforms.ActiveCfg = Release|x86

 		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|Mixed Platforms.Build.0 = Release|x86

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index adad1827a..2250b4fc5 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -71,6 +71,24 @@
     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x86' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\x86\Debug31\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <DebugType>full</DebugType>

+    <PlatformTarget>x86</PlatformTarget>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x64' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\x64\Debug31\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <DebugType>full</DebugType>

+    <PlatformTarget>x64</PlatformTarget>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

   <ItemGroup>

     <Reference Include="Caliburn.Micro">

       <HintPath>..\libraries\caliburn\Caliburn.Micro.dll</HintPath>

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 384cfbc01..adb1478dd 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -690,6 +690,15 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to Output: {0}.

+        /// </summary>

+        public static string PictureSettings_OutputResolution {

+            get {

+                return ResourceManager.GetString("PictureSettings_OutputResolution", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Preset Version.

         /// </summary>

         public static string Preset_OldVersion_Header {

@@ -747,6 +756,24 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to Still Preview.

+        /// </summary>

+        public static string Preview {

+            get {

+                return ResourceManager.GetString("Preview", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to Still Preview (Scaled).

+        /// </summary>

+        public static string Preview_Scaled {

+            get {

+                return ResourceManager.GetString("Preview_Scaled", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Question.

         /// </summary>

         public static string Question {

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index ec7809d9e..2d7dbc438 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -507,4 +507,13 @@ Do you wish to proceed?</value>
   <data name="Main_InvalidDestination" xml:space="preserve">

     <value>The entered destination contained illegal characters. You must fix the path and filename before continuing.</value>

   </data>

+  <data name="Preview" xml:space="preserve">

+    <value>Still Preview</value>

+  </data>

+  <data name="Preview_Scaled" xml:space="preserve">

+    <value>Still Preview (Scaled)</value>

+  </data>

+  <data name="PictureSettings_OutputResolution" xml:space="preserve">

+    <value>Output: {0}</value>

+  </data>

 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index c051b0aad..b10c0f292 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -1049,7 +1049,7 @@ namespace HandBrakeWPF.ViewModels
                 double dispWidth = Math.Round((result.OutputWidth * result.OutputParWidth / result.OutputParHeight), 0);

 

                 this.DisplaySize = this.sourceResolution.IsEmpty

-                                     ? string.Empty

+                                     ? string.Format(Properties.Resources.PictureSettings_OutputResolution, "None")

                                      : string.Format("Output: {0}x{1}, Anamorphic: {2}x{3}", result.OutputWidth, result.OutputHeight, dispWidth, result.OutputHeight);

             }

             else

diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index fd683fc2a..279cc6fc8 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -10,6 +10,7 @@
 namespace HandBrakeWPF.ViewModels

 {

     using System;

+    using System.Windows;

     using System.Windows.Media.Imaging;

 

     using HandBrake.ApplicationServices.Model;

@@ -22,6 +23,12 @@ namespace HandBrakeWPF.ViewModels
     /// </summary>

     public class StaticPreviewViewModel : ViewModelBase, IStaticPreviewViewModel

     {

+        /*

+         * TODO

+         * - Screen needs to be made DPI Aware

+         * - Integrate Video Preview panel.

+         */

+

         #region Fields

 

         /// <summary>

@@ -63,6 +70,7 @@ namespace HandBrakeWPF.ViewModels
         {

             this.scanService = scanService;

             this.selectedPreviewImage = 1;

+            this.Title = Properties.Resources.Preview;

         }

 

         #endregion

@@ -172,11 +180,18 @@ namespace HandBrakeWPF.ViewModels
 

         #region Public Methods and Operators

 

+        /// <summary>

+        /// The update preview frame.

+        /// </summary>

+        /// <param name="task">

+        /// The task.

+        /// </param>

         public void UpdatePreviewFrame(EncodeTask task)

         {

             this.Task = task;

             this.UpdatePreviewFrame();

             this.DisplayName = "Picture Preview";

+            this.Title = Properties.Resources.Preview;

         }

 

         /// <summary>

@@ -193,6 +208,28 @@ namespace HandBrakeWPF.ViewModels
                 this.PreviewImage = image;

             }

         }

+

+        /// <summary>

+        /// The preview size changed.

+        /// </summary>

+        /// <param name="ea">

+        /// The ea.

+        /// </param>

+        public void PreviewSizeChanged(SizeChangedEventArgs ea)

+        {

+            Rect workArea = SystemParameters.WorkArea;

+            if (ea.NewSize.Width > workArea.Width)

+            {

+                this.Width = (int)Math.Round(workArea.Width, 0) - 20;

+                this.Title = Properties.Resources.Preview_Scaled;

+            }

+

+            if (ea.NewSize.Height > workArea.Height)

+            {

+                this.Height = (int)Math.Round(workArea.Height, 0) - 20;

+                this.Title = Properties.Resources.Preview_Scaled;

+            }

+        }

         #endregion

     }

 }
\ No newline at end of file
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>