summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Views
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
-rw-r--r--win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml11
-rw-r--r--win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml10
-rw-r--r--win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml.cs27
3 files changed, 45 insertions, 3 deletions
diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index a808c76b4..12d75bf44 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -2,7 +2,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
- xmlns:controls="clr-namespace:HandBrakeWPF.Controls">
+ xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:cal="http://www.caliburnproject.org">
<UserControl.Resources>
<Converters:BooleanConverter x:Key="boolConverter" />
@@ -59,7 +60,7 @@
Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}"
Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
</Grid>
-
+
<!-- Custom Anamoprhic -->
<Grid Margin="5,15,5,0" Visibility="{Binding ShowCustomAnamorphicControls, Converter={StaticResource boolToVisConverter}}">
<Grid.RowDefinitions>
@@ -84,7 +85,7 @@
<controls:NumberBox Width="60" Number="{Binding ParHeight, Mode=TwoWay}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"
IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />
</Grid>
-
+
<!-- Row 5-->
<Grid Margin="5,15,5,0">
<Grid.RowDefinitions>
@@ -143,6 +144,10 @@
</Grid>
+
+ <Label Content="Preview" FontWeight="Bold" Margin="15,0,0,0" Visibility="Collapsed" />
+ <Button Content="Show Preview" cal:Message.Attach="[Event Click] = [Action PreviewImage]" Visibility="Collapsed" />
+
</StackPanel>
</StackPanel>
</UserControl>
diff --git a/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
new file mode 100644
index 000000000..133ce551e
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
@@ -0,0 +1,10 @@
+<Window x:Class="HandBrakeWPF.Views.StaticPreviewView"
+ 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"
+ mc:Ignorable="d">
+ <Grid>
+ <Image Source="{Binding PreviewImage}" />
+ </Grid>
+</Window>
diff --git a/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml.cs b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml.cs
new file mode 100644
index 000000000..8c2c55991
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml.cs
@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="StaticPreviewView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Interaction logic for StaticPreviewView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views
+{
+ using System.Windows;
+
+ /// <summary>
+ /// Interaction logic for StaticPreviewView.xaml
+ /// </summary>
+ public partial class StaticPreviewView : Window
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="StaticPreviewView"/> class.
+ /// </summary>
+ public StaticPreviewView()
+ {
+ InitializeComponent();
+ }
+ }
+}