WinGui: Tidy up a few cosmetic issues and enable the picture preview code in the...

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

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 6206412ef86afe2b74df5b1cd83204597a3d9144..3431412ba5586b6623c5afcb6659eef004723dcf 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -682,7 +682,7 @@ namespace HandBrakeWPF.Properties {
         \r
         /// <summary>\r
         ///   Looks up a localized string similar to The preset you are trying to import is from a different version of HandBrake. \r
-        ///Some values may be reset to default as a result. \r
+        /// It may not be possible to import or some values may be reset to default as a result. \r
         ///\r
         ///Do you wish to proceed?.\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 76ddea9ee747a3c626ad6dc7255074f5eb620b1a..ee4f864f9ea4a74afe1ee1762b8734289ae1c064 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -491,7 +491,7 @@ Your custom presets have not been updated so you may have to re-create these by
   </data>\r
   <data name="Preset_OldVersion_Message" xml:space="preserve">\r
     <value>The preset you are trying to import is from a different version of HandBrake. \r
-Some values may be reset to default as a result. \r
+ It may not be possible to import or some values may be reset to default as a result. \r
 \r
 Do you wish to proceed?</value>\r
   </data>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs
index a0374b5f1226c9bada490aa6dc81d5ec466d8cb1..a1d6b465c52fc734920c6db53fb69ab4e849778f 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs
@@ -9,8 +9,6 @@
 \r
 namespace HandBrakeWPF.ViewModels.Interfaces\r
 {\r
-    using System.Windows.Media.Imaging;\r
-\r
     using HandBrake.ApplicationServices.Model;\r
 \r
     /// <summary>\r
@@ -21,12 +19,9 @@ namespace HandBrakeWPF.ViewModels.Interfaces
         /// <summary>\r
         /// The preview frame.\r
         /// </summary>\r
-        /// <param name="image">\r
-        /// The image.\r
-        /// </param>\r
         /// <param name="task">\r
         /// The task.\r
         /// </param>\r
-        void PreviewFrame(BitmapImage image, EncodeTask task);\r
+        void UpdatePreviewFrame(EncodeTask task);\r
     }\r
 }\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 9b95d0393f08ec4bfd4e7549bf8db82ee00d75c8..c051b0aad2c10183683852f70571920c0cdfb1fa 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -823,12 +823,9 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         public void PreviewImage()\r
         {\r
-            IScan scanService = IoC.Get<IScan>();\r
-            BitmapImage image = scanService.GetPreview(this.Task, 1);\r
-\r
-            if (image != null)\r
+            if (!string.IsNullOrEmpty(this.Task.Source))\r
             {\r
-                this.StaticPreviewViewModel.PreviewFrame(image, this.Task);\r
+                this.StaticPreviewViewModel.UpdatePreviewFrame(this.Task);\r
                 this.WindowManager.ShowWindow(this.StaticPreviewViewModel);\r
             }\r
         }\r
@@ -1200,19 +1197,9 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         private void UpdatePreviewImage()\r
         {\r
-            return;\r
-            if (delayedPreviewprocessor != null)\r
+            if (delayedPreviewprocessor != null && this.Task != null)\r
             {\r
-                delayedPreviewprocessor.PerformTask(() =>\r
-                {\r
-                    IScan scanService = IoC.Get<IScan>();\r
-                    BitmapImage image = scanService.GetPreview(this.Task, 1);\r
-\r
-                    if (image != null)\r
-                    {\r
-                        this.StaticPreviewViewModel.PreviewFrame(image, this.Task);\r
-                    }\r
-                }, 800);\r
+                delayedPreviewprocessor.PerformTask(() => this.StaticPreviewViewModel.UpdatePreviewFrame(this.Task), 800);\r
             }\r
         }\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index d836f6d49800be2c5ea0ae52ed48420353ecdf4a..fd683fc2a617051a7976593296c43fde2638d765 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -172,21 +172,11 @@ namespace HandBrakeWPF.ViewModels
 \r
         #region Public Methods and Operators\r
 \r
-        /// <summary>\r
-        /// The preview frame.\r
-        /// </summary>\r
-        /// <param name="image">\r
-        /// The image.\r
-        /// </param>\r
-        /// <param name="task">\r
-        /// The task.\r
-        /// </param>\r
-        public void PreviewFrame(BitmapImage image, EncodeTask task)\r
+        public void UpdatePreviewFrame(EncodeTask task)\r
         {\r
             this.Task = task;\r
-            this.Width = (int)Math.Ceiling(image.Width);\r
-            this.Height = (int)Math.Ceiling(image.Height);\r
-            this.PreviewImage = image;\r
+            this.UpdatePreviewFrame();\r
+            this.DisplayName = "Picture Preview";\r
         }\r
 \r
         /// <summary>\r
@@ -198,10 +188,11 @@ namespace HandBrakeWPF.ViewModels
 \r
             if (image != null)\r
             {\r
-                this.PreviewFrame(image, this.Task);\r
+                this.Width = (int)Math.Ceiling(image.Width);\r
+                this.Height = (int)Math.Ceiling(image.Height);\r
+                this.PreviewImage = image;\r
             }\r
         }\r
-\r
         #endregion\r
     }\r
 }
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs b/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs
index 301e161ddf689a18b7417846310dbde5c771ad95..1e6946b8ad9431afae7810172c08062aef74f563 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs
@@ -11,8 +11,6 @@ namespace HandBrakeWPF.ViewModels
 {\r
     using Caliburn.Micro;\r
 \r
-    using HandBrake.ApplicationServices.Services.Interfaces;\r
-\r
     using HandBrakeWPF.Helpers;\r
     using HandBrakeWPF.Services.Interfaces;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 591d83227c97a7ec6653b21b31da62a9a84a3ad8..2d8f613d9534e6dc3d6df59d8de1043ffb4809b4 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -149,19 +149,8 @@
                     <MenuItem Header="_Set Current as Default" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />\r
                     <MenuItem Header="_Reset Built-In Presets" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />\r
                     <Separator />\r
-                    <MenuItem IsCheckable="True" x:Name="showPresetPanelMenuItem" IsChecked="{Binding IsPresetPanelShowing}">\r
-                        <MenuItem.Style>\r
-                            <Style TargetType="MenuItem">\r
-                                <Style.Triggers>\r
-                                    <DataTrigger Binding="{Binding IsChecked, ElementName=showPresetPanelMenuItem}" Value="True">\r
-                                        <Setter Property="Header" Value="_Hide Preset Panel"/>\r
-                                    </DataTrigger>\r
-                                    <DataTrigger Binding="{Binding IsChecked, ElementName=showPresetPanelMenuItem}" Value="False">\r
-                                        <Setter Property="Header" Value="S_how Preset Panel"/>\r
-                                    </DataTrigger>\r
-                                </Style.Triggers>\r
-                            </Style>\r
-                        </MenuItem.Style>\r
+                    <MenuItem IsCheckable="True" x:Name="showPresetPanelMenuItem" IsChecked="{Binding IsPresetPanelShowing}"\r
+                              Header="S_how Preset Panel">\r
                     </MenuItem>\r
                 </MenuItem>\r
 \r

diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 2a5d136bc39054d629183ae4895ed8f615248ca3..a3971995936d03b11843e42e4d122cd7fe563292 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -14,142 +14,150 @@
         </Style>\r
     </UserControl.Resources>\r
 \r
-    <StackPanel Orientation="Horizontal" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">\r
-\r
-        <StackPanel.ContextMenu>\r
+    <Border Background="Transparent">\r
+        <Border.ContextMenu>\r
             <ContextMenu>\r
                 <MenuItem Header="Show Still Preview (Experimental)" cal:Message.Attach="[Event Click] = [Action PreviewImage]" Visibility="Visible" />\r
             </ContextMenu>\r
-        </StackPanel.ContextMenu>\r
-        \r
-        <!-- Size Panel-->\r
-        <StackPanel Name="SizePanel" Orientation="Vertical" >\r
-            <Label Content="Size" FontWeight="Bold" />\r
-\r
-            <!-- Row 1-->\r
-            <StackPanel Orientation="Horizontal" Margin="5,0,5,0">\r
-                <Label Content="Source:" Grid.Row="0" Grid.Column="0" />\r
-                <Label Content="{Binding SourceInfo}" Name="sourceResolution" Grid.Row="0" Grid.Column="1" />\r
-            </StackPanel>\r
-\r
-            <!-- Row 2-->\r
-            <StackPanel Orientation="Horizontal" Margin="5,0,5,0">\r
-                <Label Content="Width:" Grid.Row="1" Grid.Column="0" />\r
-                <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" IsEnabled="{Binding WidthControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}"\r
-                                             Minimum="0" Grid.Row="1" Grid.Column="1" Width="60"  />\r
-                <Label Content="Height:" Grid.Row="1" Grid.Column="2" />\r
-                <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}" \r
-                                             Minimum="0" Grid.Row="1" Grid.Column="3" Width="60"  />\r
-                <CheckBox Content="Keep Aspect Ratio" IsChecked="{Binding MaintainAspectRatio}"\r
+        </Border.ContextMenu  >\r
+\r
+        <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">\r
+\r
+            <Grid.ColumnDefinitions>\r
+                <ColumnDefinition Width="Auto" />\r
+                <ColumnDefinition Width="Auto" />\r
+                <ColumnDefinition Width="*" />\r
+            </Grid.ColumnDefinitions>\r
+\r
+            <!-- Size Panel-->\r
+            <StackPanel Name="SizePanel" Orientation="Vertical" VerticalAlignment="Top" Grid.Column="0" >\r
+                <Label Content="Size" FontWeight="Bold" />\r
+\r
+                <!-- Row 1-->\r
+                <StackPanel Orientation="Horizontal" Margin="5,0,5,0">\r
+                    <Label Content="Source:" />\r
+                    <Label Content="{Binding SourceInfo}" Name="sourceResolution"/>\r
+                </StackPanel>\r
+\r
+                <!-- Row 2-->\r
+                <StackPanel Orientation="Horizontal" Margin="5,0,5,0">\r
+                    <Label Content="Width:" />\r
+                    <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" IsEnabled="{Binding WidthControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}"\r
+                                             Minimum="0" Width="60"  />\r
+                    <Label Content="Height:" />\r
+                    <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}" \r
+                                             Minimum="0" Width="60"  />\r
+                    <CheckBox Content="Keep Aspect Ratio" IsChecked="{Binding MaintainAspectRatio}"\r
                           Visibility="{Binding ShowKeepAR, Converter={StaticResource boolToVisHiddenConverter}}" \r
                           VerticalAlignment="Center" Margin="5,0,0,0" />\r
-            </StackPanel>\r
-\r
-            <!-- Row 3-->\r
-            <Grid Margin="5,15,5,0">\r
-                <Grid.RowDefinitions>\r
-                    <RowDefinition Height="Auto" />\r
-                    <RowDefinition Height="Auto" />\r
-                </Grid.RowDefinitions>\r
-\r
-                <Grid.ColumnDefinitions>\r
-                    <ColumnDefinition Width="Auto" />\r
-                    <ColumnDefinition Width="Auto" />\r
-                </Grid.ColumnDefinitions>\r
-\r
-                <Label Content="Anamorphic:" Grid.Row="0" Grid.Column="0" />\r
-                <Label Content="Modulus:" Grid.Row="1" Grid.Column="0" \r
+                </StackPanel>\r
+\r
+                <!-- Row 3-->\r
+                <Grid Margin="5,15,5,0">\r
+                    <Grid.RowDefinitions>\r
+                        <RowDefinition Height="Auto" />\r
+                        <RowDefinition Height="Auto" />\r
+                    </Grid.RowDefinitions>\r
+\r
+                    <Grid.ColumnDefinitions>\r
+                        <ColumnDefinition Width="Auto" />\r
+                        <ColumnDefinition Width="Auto" />\r
+                    </Grid.ColumnDefinitions>\r
+\r
+                    <Label Content="Anamorphic:" Grid.Row="0" Grid.Column="0" />\r
+                    <Label Content="Modulus:" Grid.Row="1" Grid.Column="0" \r
                        Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" />\r
 \r
-                <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />\r
-                <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}" \r
+                    <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />\r
+                    <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}" \r
                           Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}"\r
                           Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />\r
-            </Grid>\r
-\r
-            <!-- Custom Anamoprhic -->\r
-            <Grid Margin="5,15,5,0" Visibility="{Binding ShowCustomAnamorphicControls, Converter={StaticResource boolToVisConverter}}">\r
-                <Grid.RowDefinitions>\r
-                    <RowDefinition Height="Auto" />\r
-                    <RowDefinition Height="Auto" />\r
-                    <RowDefinition Height="Auto" />\r
-                </Grid.RowDefinitions>\r
-\r
-                <Grid.ColumnDefinitions>\r
-                    <ColumnDefinition Width="Auto" />\r
-                    <ColumnDefinition Width="Auto" />\r
-                </Grid.ColumnDefinitions>\r
-\r
-                <Label Content="Display Width:" Grid.Row="0" Grid.Column="0" />\r
-                <Label Content="PAR Width:" Grid.Row="1" Grid.Column="0" />\r
-                <Label Content="PAR Height:" Grid.Row="5" Grid.Column="0" />\r
-\r
-                <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" \r
+                </Grid>\r
+\r
+                <!-- Custom Anamoprhic -->\r
+                <Grid Margin="5,15,5,0" Visibility="{Binding ShowCustomAnamorphicControls, Converter={StaticResource boolToVisConverter}}">\r
+                    <Grid.RowDefinitions>\r
+                        <RowDefinition Height="Auto" />\r
+                        <RowDefinition Height="Auto" />\r
+                        <RowDefinition Height="Auto" />\r
+                    </Grid.RowDefinitions>\r
+\r
+                    <Grid.ColumnDefinitions>\r
+                        <ColumnDefinition Width="Auto" />\r
+                        <ColumnDefinition Width="Auto" />\r
+                    </Grid.ColumnDefinitions>\r
+\r
+                    <Label Content="Display Width:" Grid.Row="0" Grid.Column="0" />\r
+                    <Label Content="PAR Width:" Grid.Row="1" Grid.Column="0" />\r
+                    <Label Content="PAR Height:" Grid.Row="2" Grid.Column="0" />\r
+\r
+                    <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" \r
                                     AllowEmpty="False" />\r
-                <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"\r
+                    <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"\r
                                              IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />\r
-                <controls:NumberBox Width="60" Number="{Binding ParHeight, Mode=TwoWay}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"\r
+                    <controls:NumberBox Width="60" Number="{Binding ParHeight, Mode=TwoWay}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"\r
                                              IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />\r
-            </Grid>\r
+                </Grid>\r
 \r
-            <!-- Row 5-->\r
-            <Grid Margin="5,15,5,0">\r
-                <Grid.RowDefinitions>\r
-                    <RowDefinition Height="Auto" />\r
-                </Grid.RowDefinitions>\r
+                <!-- Row 5-->\r
+                <Grid Margin="5,15,5,0">\r
+                    <Grid.RowDefinitions>\r
+                        <RowDefinition Height="Auto" />\r
+                    </Grid.RowDefinitions>\r
 \r
-                <Grid.ColumnDefinitions>\r
-                    <ColumnDefinition Width="Auto" />\r
-                </Grid.ColumnDefinitions>\r
+                    <Grid.ColumnDefinitions>\r
+                        <ColumnDefinition Width="Auto" />\r
+                    </Grid.ColumnDefinitions>\r
 \r
 \r
-                <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"\r
+                    <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"\r
                        Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />\r
-            </Grid>\r
-        </StackPanel>\r
-\r
-        <!-- Crop Panel -->\r
-        <StackPanel Name="CropPanel" Margin="50,0,0,0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">\r
-            <Label Content="Cropping" FontWeight="Bold" />\r
-            <RadioButton Content="Automatic" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"/>\r
-            <RadioButton Content="Custom" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0" />\r
-\r
-            <Grid Margin="0,10,0,0">\r
-                <Grid.RowDefinitions>\r
-                    <RowDefinition Height="Auto" />\r
-                    <RowDefinition Height="Auto" />\r
-                    <RowDefinition Height="Auto" />\r
-                    <RowDefinition Height="Auto" />\r
-                    <RowDefinition Height="Auto" />\r
-                </Grid.RowDefinitions>\r
-\r
-                <Grid.ColumnDefinitions>\r
-                    <ColumnDefinition Width="Auto" />\r
-                    <ColumnDefinition Width="Auto" />\r
-                    <ColumnDefinition Width="Auto" />\r
-                    <ColumnDefinition Width="Auto" />\r
-                    <ColumnDefinition Width="Auto" />\r
-                </Grid.ColumnDefinitions>\r
-\r
-                <Label Content="Top" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />\r
-                <Label Content="Bottom" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />\r
-                <Label Content="Left" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />\r
-                <Label Content="Right" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />\r
-\r
-                <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"\r
+                </Grid>\r
+            </StackPanel>\r
+\r
+            <!-- Crop Panel -->\r
+            <StackPanel Name="CropPanel" Margin="50,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Column="1">\r
+                <Label Content="Cropping" FontWeight="Bold" />\r
+                <RadioButton Content="Automatic" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"/>\r
+                <RadioButton Content="Custom" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0" />\r
+\r
+                <Grid Margin="0,10,0,0">\r
+                    <Grid.RowDefinitions>\r
+                        <RowDefinition Height="Auto" />\r
+                        <RowDefinition Height="Auto" />\r
+                        <RowDefinition Height="Auto" />\r
+                        <RowDefinition Height="Auto" />\r
+                        <RowDefinition Height="Auto" />\r
+                    </Grid.RowDefinitions>\r
+\r
+                    <Grid.ColumnDefinitions>\r
+                        <ColumnDefinition Width="Auto" />\r
+                        <ColumnDefinition Width="Auto" />\r
+                        <ColumnDefinition Width="Auto" />\r
+                        <ColumnDefinition Width="Auto" />\r
+                        <ColumnDefinition Width="Auto" />\r
+                    </Grid.ColumnDefinitions>\r
+\r
+                    <Label Content="Top" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />\r
+                    <Label Content="Bottom" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />\r
+                    <Label Content="Left" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />\r
+                    <Label Content="Right" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />\r
+\r
+                    <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"\r
                                     Minimum="0" Modulus="2" Number="{Binding CropTop, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />\r
 \r
-                <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"\r
+                    <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"\r
                                     Minimum="0" Modulus="2" Number="{Binding CropBottom, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />\r
 \r
-                <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"\r
+                    <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"\r
                                     Minimum="0" Modulus="2" Number="{Binding CropLeft, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />\r
 \r
-                <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"\r
+                    <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"\r
                                     Minimum="0" Modulus="2" Number="{Binding CropRight, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />\r
 \r
-            </Grid>\r
+                </Grid>\r
 \r
-        </StackPanel>\r
-    </StackPanel>\r
+            </StackPanel>\r
+        </Grid>\r
+    </Border>\r
 </UserControl>\r

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 62181977e55bc56b56f9d2fc8b87078c97462fda..f1d8ccdf4c6e9b5740919749fe915afc3a3a680c 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -152,7 +152,7 @@
                         <MenuItem>\r
                             <MenuItem.Header>\r
                                 <StackPanel Height="32" Orientation="Horizontal">\r
-                                    <Image Source="Images\Advanced.png" Width="28" Height="28" VerticalAlignment="Center" />\r
+                                    <Image Source="Images\Advanced.png" Width="20" Height="20" VerticalAlignment="Center" />\r
                                     <TextBlock VerticalAlignment="Center"\r
                                            Text="Options " Margin="5,0,0,0" />\r
                                     <Path Height="5"\r