WinGui: Fix an issue with the json preset factory not correctly setting the auto...

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

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index 580e275ce85b8c4b525a4352f64aee28b3fb4baf..89fd9392181ade52692e9359b9d0e6ef5385365a 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -61,7 +61,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
             preset.Task.MaxWidth = importedPreset.PictureWidth.HasValue && importedPreset.PictureWidth.Value > 0 ? importedPreset.PictureWidth.Value : (int?)null;\r
             preset.Task.MaxHeight = importedPreset.PictureHeight.HasValue && importedPreset.PictureHeight.Value > 0 ? importedPreset.PictureHeight.Value : (int?)null;\r
             preset.Task.Cropping = new Cropping(importedPreset.PictureTopCrop, importedPreset.PictureBottomCrop, importedPreset.PictureLeftCrop, importedPreset.PictureRightCrop);\r
-            preset.Task.HasCropping = importedPreset.PictureAutoCrop;\r
+            preset.Task.HasCropping = !importedPreset.PictureAutoCrop;\r
 \r
             preset.Task.Modulus = importedPreset.PictureModulus;\r
             preset.Task.KeepDisplayAspect = importedPreset.PictureKeepRatio;\r

diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 62eeabb10a97ec125d1352255a5139e0437a34f4..eabefdf9d3fd09860e5a1f39b52844c67f13584e 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -3,8 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
              xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"\r
              xmlns:controls="clr-namespace:HandBrakeWPF.Controls"\r
-             xmlns:cal="http://www.caliburnproject.org"\r
-             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties">\r
+              xmlns:Properties="clr-namespace:HandBrakeWPF.Properties">\r
 \r
     <UserControl.Resources>\r
         <Converters:BooleanConverter x:Key="boolConverter" />\r
@@ -30,17 +29,17 @@
             </Grid.RowDefinitions>\r
 \r
             <!-- Size Panel-->\r
-            <StackPanel Name="SizePanel" Orientation="Vertical" VerticalAlignment="Top" Grid.Column="0" Grid.Row="0" Grid.RowSpan="1" >\r
-                <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Size}" FontWeight="Bold" />\r
+            <StackPanel Name="SizePanel" Orientation="Vertical" VerticalAlignment="Top" Margin="5,0,0,0"  Grid.Column="0" Grid.Row="0">\r
+                <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Size}"  FontWeight="Bold" />\r
 \r
                 <!-- Row 1-->\r
-                <StackPanel Orientation="Horizontal" Margin="5,0,5,0">\r
+                <StackPanel Orientation="Horizontal" Margin="0,0,5,0">\r
                     <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Source}" />\r
                     <Label Content="{Binding SourceInfo}" Name="sourceResolution"/>\r
                 </StackPanel>\r
 \r
                 <!-- Row 2-->\r
-                <StackPanel Orientation="Horizontal" Margin="5,0,5,0">\r
+                <StackPanel Orientation="Horizontal" Margin="0,0,5,0">\r
                     <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Width}" />\r
                     <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" UpdateBindingOnTextChange="True" IsEnabled="{Binding WidthControlEnabled}" \r
                                         Modulus="{Binding SelectedModulus, Mode=OneWay}"\r
@@ -55,7 +54,7 @@
                 </StackPanel>\r
 \r
                 <!-- Row 3-->\r
-                <Grid Margin="5,15,5,0">\r
+                <Grid Margin="0,15,5,0">\r
                     <Grid.RowDefinitions>\r
                         <RowDefinition Height="Auto" />\r
                         <RowDefinition Height="Auto" />\r
@@ -77,7 +76,7 @@
                 </Grid>\r
 \r
                 <!-- Custom Anamoprhic -->\r
-                <Grid Margin="5,15,5,0" Visibility="{Binding ShowCustomAnamorphicControls, Converter={StaticResource boolToVisConverter}}">\r
+                <Grid Margin="0,15,5,0" Visibility="{Binding ShowCustomAnamorphicControls, Converter={StaticResource boolToVisConverter}}">\r
                     <Grid.RowDefinitions>\r
                         <RowDefinition Height="Auto" />\r
                         <RowDefinition Height="Auto" />\r
@@ -148,10 +147,10 @@
             </StackPanel>\r
 \r
             <!-- Preview Panel -->\r
-            <StackPanel Name="PreviewPanel" Margin="0,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1"  Grid.Column="0">\r
+            <StackPanel Name="PreviewPanel" Margin="10,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1"  Grid.Column="0">\r
                 <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Output}" FontWeight="Bold" />\r
 \r
-                <Grid Margin="5,0,0,0">\r
+                <Grid Margin="10,0,0,0">\r
                     <Grid.RowDefinitions>\r
                         <RowDefinition Height="Auto" />\r
                         <RowDefinition Height="Auto" />\r