WinGui: UI Tweaks and further fixes to Custom Anamorphic.

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

3 files changed, 25 insertions, 7 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 471c49de5..064342560 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -953,6 +953,12 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         private void CustomAnamorphicAdjust()

         {

+            if (this.MaintainAspectRatio && this.DisplayWidth != 0)

+            {

+                this.ParWidth = this.DisplayWidth;

+                this.ParHeight = this.Width;

+            }

+

             this.SetDisplaySize();

         }

 

@@ -1094,6 +1100,12 @@ namespace HandBrakeWPF.ViewModels
                     this.SetDisplaySize();

                     break;

                 case Anamorphic.Custom:

+                    if (this.MaintainAspectRatio)

+                    {

+                        this.ParWidth = this.DisplayWidth;

+                        this.ParHeight = this.Width;

+                    }

+

                     this.SetDisplaySize();

                     break;

             }

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index c7d2dc02d..2f3213a7f 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -8,7 +8,7 @@
     <UserControl.Resources>

         <Style TargetType="Button">

             <Setter Property="FontWeight" Value="Bold" />

-            <Setter Property="Padding" Value="5,0.5" />

+            <Setter Property="Padding" Value="5,1" />

             <Setter Property="FontSize" Value="11.5" />

             <Setter Property="VerticalAlignment" Value="Center" />

         </Style>

@@ -17,6 +17,10 @@
             <Setter Property="Margin" Value="0,0,5,0" />

         </Style>

 

+        <Style TargetType="TextBox">

+            <Setter Property="Padding" Value="5,2" />

+        </Style>

+

         <Style TargetType="CheckBox">

             <Setter Property="Margin" Value="0,0,0,5" />

         </Style>

@@ -88,7 +92,7 @@
                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">

                                 <CheckBox Content="Send file to:" VerticalAlignment="Center" IsChecked="{Binding SendFileAfterEncode}" />

                                 <TextBlock Margin="5,0,5,5" VerticalAlignment="Center" Text="{Binding SendFileTo}" />

-                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseSendFileTo]" Width="55"/>

+                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseSendFileTo]" />

                             </StackPanel>

 

                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">

@@ -108,7 +112,7 @@
                             <StackPanel Orientation="Horizontal">

                                 <TextBlock VerticalAlignment="Center" Text="Path:" />

                                 <TextBox Name="vlcPath" Text="{Binding VLCPath}"  Width="250" />

-                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseVlcPath]" Margin="5,0,0,0" Width="55"/>

+                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseVlcPath]" Margin="5,0,0,0" />

                             </StackPanel>

                             <TextBlock Margin="30,0,0,0" Text="This path is used for the video preview feature only." />

 

@@ -133,7 +137,7 @@
                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">

                                 <TextBlock VerticalAlignment="Center" Text="Default Path: " />

                                 <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="180" />

-                                <Button Content="Browse" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" Width="55"/>

+                                <Button Content="Browse" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" />

                             </StackPanel>

                             <TextBlock Text="Available Options: {source_path} or {source_folder_name} (Not Both)" />

 

diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index fa537e178..f8a09cf44 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -54,7 +54,7 @@
                           Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />

             </Grid>

             

-            <!-- Row 4-->

+            <!-- Custom Anamoprhic -->

             <Grid Margin="5,15,5,0" Visibility="{Binding ShowCustomAnamorphicControls, Converter={StaticResource boolToVisConverter}}">

                 <Grid.RowDefinitions>

                     <RowDefinition Height="Auto" />

@@ -72,8 +72,10 @@
                 <Label Content="PAR Height:" Grid.Row="5" Grid.Column="0" />

 

                 <NumericUpDown:NumericUpDown Width="60" Value="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />

-                <NumericUpDown:NumericUpDown Width="60" Value="{Binding ParWidth, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />

-                <NumericUpDown:NumericUpDown Width="60" Value="{Binding ParHeight, Mode=TwoWay}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />

+                <NumericUpDown:NumericUpDown Width="60" Value="{Binding ParWidth, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left"

+                                             IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />

+                <NumericUpDown:NumericUpDown Width="60" Value="{Binding ParHeight, Mode=TwoWay}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" 

+                                             IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />

             </Grid>

             

             <!-- Row 5-->