WinGui: Fix a styling issue on the preview window. Disable libhb encode for the upcoming release so that users don't inadvertently turn it on. Made the new preview window an optional setting, off by default as it's a Alpha feature. (See Preferences)

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

3 files changed, 20 insertions, 20 deletions

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 69f57ab74..b36557a32 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -326,15 +326,16 @@
                     </StackPanel>

 

 

-                    <StackPanel Orientation="Vertical" Margin="0,10,0,20">

-

-                        <TextBlock Text="Beta Features" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>

+                    <StackPanel Orientation="Vertical" Margin="0,10,0,20" Visibility="Visible">

 

-                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">

+                        <TextBlock Text="Alpha Features" FontSize="14" Margin="0,0,0,10"/>

 

-                            <CheckBox Content="Use LibHB for Encoding (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" />

-                            <CheckBox Content="Enable Process Isolation (Run Encodes via an intermediate service)" Margin="20,10,0,0" IsChecked="{Binding EnableProcessIsolation}" />

-                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Grid.Column="1">

+                        <StackPanel Orientation="Vertical"  Margin="20,0,0,0">

+                            <CheckBox Content="Enable Static Preview" Margin="0,5,0,0" IsChecked="{Binding EnableStaticPreview}" />

+                                    

+                            <CheckBox Content="Use LibHB for Encoding (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" Visibility="Collapsed" />

+                            <CheckBox Content="Enable Process Isolation (Run Encodes via an intermediate service)" Margin="20,10,0,0" IsChecked="{Binding EnableProcessIsolation}" Visibility="Collapsed" />

+                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Visibility="Collapsed">

                                 <TextBlock Text="Server Port:" VerticalAlignment="Center" />

                                 <TextBox Width="50" MaxLength="5" Text="{Binding ServerPort}" />

                             </StackPanel>

diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 53aae130a..93e630381 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -151,7 +151,8 @@
             </StackPanel>

 

             <!-- Preview Panel -->

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

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

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

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

 

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

diff --git a/win/CS/HandBrakeWPF/Views/PreviewView.xaml b/win/CS/HandBrakeWPF/Views/PreviewView.xaml
index bb15e7ce4..c38a5dc2c 100644
--- a/win/CS/HandBrakeWPF/Views/PreviewView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PreviewView.xaml
@@ -5,7 +5,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

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

         Title="{Binding Title}"

-        Width="380"

+        Width="390"

         Style="{StaticResource windowStyle}"

         ResizeMode="NoResize"

         SizeToContent="Height"

@@ -64,18 +64,16 @@
                       SelectedItem="{Binding Duration}" />

         </StackPanel>

 

-        <StackPanel Margin="10,10,0,0" Orientation="Horizontal">

-            <ProgressBar Width="310"

-                         Height="22"

-                         Maximum="100"

-                         Minimum="0"

-                         Value="{Binding PercentageValue}" />

-            <TextBlock Margin="5,0,0,0" Text="{Binding Percentage}" />

-        </StackPanel>

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

+            <Grid.ColumnDefinitions>

+                <ColumnDefinition Width="*" />

+                <ColumnDefinition Width="Auto" MinWidth="50" />

+            </Grid.ColumnDefinitions>

+            <ProgressBar MinHeight="22" Maximum="100" Minimum="0" Value="{Binding PercentageValue}" Grid.Column="0" />

+            <TextBlock Margin="5,0,0,0" Text="{Binding Percentage}" Grid.Column="1" />

+        </Grid>

 

-        <StackPanel Width="360"

-                    Margin="10,10,0,10"

-                    Orientation="Horizontal">

+        <StackPanel Margin="10,10,0,10" Orientation="Horizontal">

             <CheckBox VerticalAlignment="Center"

                       Content="Use system default player"

                       IsChecked="{Binding UseSystemDefaultPlayer}" />