summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.Designer.cs2
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.resx2
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs7
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs21
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs21
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs2
-rw-r--r--win/CS/HandBrakeWPF/Views/MainView.xaml15
-rw-r--r--win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml232
-rw-r--r--win/CS/HandBrakeWPF/Views/QueueView.xaml2
9 files changed, 136 insertions, 168 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 6206412ef..3431412ba 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -682,7 +682,7 @@ namespace HandBrakeWPF.Properties {
/// <summary>
/// Looks up a localized string similar to The preset you are trying to import is from a different version of HandBrake.
- ///Some values may be reset to default as a result.
+ /// It may not be possible to import or some values may be reset to default as a result.
///
///Do you wish to proceed?.
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 76ddea9ee..ee4f864f9 100644
--- 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>
<data name="Preset_OldVersion_Message" xml:space="preserve">
<value>The preset you are trying to import is from a different version of HandBrake.
-Some values may be reset to default as a result.
+ It may not be possible to import or some values may be reset to default as a result.
Do you wish to proceed?</value>
</data>
diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs
index a0374b5f1..a1d6b465c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs
@@ -9,8 +9,6 @@
namespace HandBrakeWPF.ViewModels.Interfaces
{
- using System.Windows.Media.Imaging;
-
using HandBrake.ApplicationServices.Model;
/// <summary>
@@ -21,12 +19,9 @@ namespace HandBrakeWPF.ViewModels.Interfaces
/// <summary>
/// The preview frame.
/// </summary>
- /// <param name="image">
- /// The image.
- /// </param>
/// <param name="task">
/// The task.
/// </param>
- void PreviewFrame(BitmapImage image, EncodeTask task);
+ void UpdatePreviewFrame(EncodeTask task);
}
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 9b95d0393..c051b0aad 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -823,12 +823,9 @@ namespace HandBrakeWPF.ViewModels
/// </summary>
public void PreviewImage()
{
- IScan scanService = IoC.Get<IScan>();
- BitmapImage image = scanService.GetPreview(this.Task, 1);
-
- if (image != null)
+ if (!string.IsNullOrEmpty(this.Task.Source))
{
- this.StaticPreviewViewModel.PreviewFrame(image, this.Task);
+ this.StaticPreviewViewModel.UpdatePreviewFrame(this.Task);
this.WindowManager.ShowWindow(this.StaticPreviewViewModel);
}
}
@@ -1200,19 +1197,9 @@ namespace HandBrakeWPF.ViewModels
/// </summary>
private void UpdatePreviewImage()
{
- return;
- if (delayedPreviewprocessor != null)
+ if (delayedPreviewprocessor != null && this.Task != null)
{
- delayedPreviewprocessor.PerformTask(() =>
- {
- IScan scanService = IoC.Get<IScan>();
- BitmapImage image = scanService.GetPreview(this.Task, 1);
-
- if (image != null)
- {
- this.StaticPreviewViewModel.PreviewFrame(image, this.Task);
- }
- }, 800);
+ delayedPreviewprocessor.PerformTask(() => this.StaticPreviewViewModel.UpdatePreviewFrame(this.Task), 800);
}
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index d836f6d49..fd683fc2a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -172,21 +172,11 @@ namespace HandBrakeWPF.ViewModels
#region Public Methods and Operators
- /// <summary>
- /// The preview frame.
- /// </summary>
- /// <param name="image">
- /// The image.
- /// </param>
- /// <param name="task">
- /// The task.
- /// </param>
- public void PreviewFrame(BitmapImage image, EncodeTask task)
+ public void UpdatePreviewFrame(EncodeTask task)
{
this.Task = task;
- this.Width = (int)Math.Ceiling(image.Width);
- this.Height = (int)Math.Ceiling(image.Height);
- this.PreviewImage = image;
+ this.UpdatePreviewFrame();
+ this.DisplayName = "Picture Preview";
}
/// <summary>
@@ -198,10 +188,11 @@ namespace HandBrakeWPF.ViewModels
if (image != null)
{
- this.PreviewFrame(image, this.Task);
+ this.Width = (int)Math.Ceiling(image.Width);
+ this.Height = (int)Math.Ceiling(image.Height);
+ this.PreviewImage = image;
}
}
-
#endregion
}
} \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs b/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs
index 301e161dd..1e6946b8a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs
@@ -11,8 +11,6 @@ namespace HandBrakeWPF.ViewModels
{
using Caliburn.Micro;
- using HandBrake.ApplicationServices.Services.Interfaces;
-
using HandBrakeWPF.Helpers;
using HandBrakeWPF.Services.Interfaces;
using HandBrakeWPF.ViewModels.Interfaces;
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 591d83227..2d8f613d9 100644
--- 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]" />
<MenuItem Header="_Reset Built-In Presets" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />
<Separator />
- <MenuItem IsCheckable="True" x:Name="showPresetPanelMenuItem" IsChecked="{Binding IsPresetPanelShowing}">
- <MenuItem.Style>
- <Style TargetType="MenuItem">
- <Style.Triggers>
- <DataTrigger Binding="{Binding IsChecked, ElementName=showPresetPanelMenuItem}" Value="True">
- <Setter Property="Header" Value="_Hide Preset Panel"/>
- </DataTrigger>
- <DataTrigger Binding="{Binding IsChecked, ElementName=showPresetPanelMenuItem}" Value="False">
- <Setter Property="Header" Value="S_how Preset Panel"/>
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </MenuItem.Style>
+ <MenuItem IsCheckable="True" x:Name="showPresetPanelMenuItem" IsChecked="{Binding IsPresetPanelShowing}"
+ Header="S_how Preset Panel">
</MenuItem>
</MenuItem>
diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 2a5d136bc..a39719959 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -14,142 +14,150 @@
</Style>
</UserControl.Resources>
- <StackPanel Orientation="Horizontal" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-
- <StackPanel.ContextMenu>
+ <Border Background="Transparent">
+ <Border.ContextMenu>
<ContextMenu>
<MenuItem Header="Show Still Preview (Experimental)" cal:Message.Attach="[Event Click] = [Action PreviewImage]" Visibility="Visible" />
</ContextMenu>
- </StackPanel.ContextMenu>
-
- <!-- Size Panel-->
- <StackPanel Name="SizePanel" Orientation="Vertical" >
- <Label Content="Size" FontWeight="Bold" />
-
- <!-- Row 1-->
- <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
- <Label Content="Source:" Grid.Row="0" Grid.Column="0" />
- <Label Content="{Binding SourceInfo}" Name="sourceResolution" Grid.Row="0" Grid.Column="1" />
- </StackPanel>
-
- <!-- Row 2-->
- <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
- <Label Content="Width:" Grid.Row="1" Grid.Column="0" />
- <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" IsEnabled="{Binding WidthControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}"
- Minimum="0" Grid.Row="1" Grid.Column="1" Width="60" />
- <Label Content="Height:" Grid.Row="1" Grid.Column="2" />
- <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}"
- Minimum="0" Grid.Row="1" Grid.Column="3" Width="60" />
- <CheckBox Content="Keep Aspect Ratio" IsChecked="{Binding MaintainAspectRatio}"
+ </Border.ContextMenu >
+
+ <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <!-- Size Panel-->
+ <StackPanel Name="SizePanel" Orientation="Vertical" VerticalAlignment="Top" Grid.Column="0" >
+ <Label Content="Size" FontWeight="Bold" />
+
+ <!-- Row 1-->
+ <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
+ <Label Content="Source:" />
+ <Label Content="{Binding SourceInfo}" Name="sourceResolution"/>
+ </StackPanel>
+
+ <!-- Row 2-->
+ <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
+ <Label Content="Width:" />
+ <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" IsEnabled="{Binding WidthControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}"
+ Minimum="0" Width="60" />
+ <Label Content="Height:" />
+ <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}"
+ Minimum="0" Width="60" />
+ <CheckBox Content="Keep Aspect Ratio" IsChecked="{Binding MaintainAspectRatio}"
Visibility="{Binding ShowKeepAR, Converter={StaticResource boolToVisHiddenConverter}}"
VerticalAlignment="Center" Margin="5,0,0,0" />
- </StackPanel>
-
- <!-- Row 3-->
- <Grid Margin="5,15,5,0">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- <Label Content="Anamorphic:" Grid.Row="0" Grid.Column="0" />
- <Label Content="Modulus:" Grid.Row="1" Grid.Column="0"
+ </StackPanel>
+
+ <!-- Row 3-->
+ <Grid Margin="5,15,5,0">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Label Content="Anamorphic:" Grid.Row="0" Grid.Column="0" />
+ <Label Content="Modulus:" Grid.Row="1" Grid.Column="0"
Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" />
- <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
- <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}"
+ <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
+ <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}"
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>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- <Label Content="Display Width:" Grid.Row="0" Grid.Column="0" />
- <Label Content="PAR Width:" Grid.Row="1" Grid.Column="0" />
- <Label Content="PAR Height:" Grid.Row="5" Grid.Column="0" />
-
- <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" 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>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Label Content="Display Width:" Grid.Row="0" Grid.Column="0" />
+ <Label Content="PAR Width:" Grid.Row="1" Grid.Column="0" />
+ <Label Content="PAR Height:" Grid.Row="2" Grid.Column="0" />
+
+ <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"
AllowEmpty="False" />
- <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"
+ <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"
IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />
- <controls:NumberBox Width="60" Number="{Binding ParHeight, Mode=TwoWay}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"
+ <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>
+ </Grid>
- <!-- Row 5-->
- <Grid Margin="5,15,5,0">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
+ <!-- Row 5-->
+ <Grid Margin="5,15,5,0">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
- <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"
+ <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"
Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />
- </Grid>
- </StackPanel>
-
- <!-- Crop Panel -->
- <StackPanel Name="CropPanel" Margin="50,0,0,0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
- <Label Content="Cropping" FontWeight="Bold" />
- <RadioButton Content="Automatic" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"/>
- <RadioButton Content="Custom" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0" />
-
- <Grid Margin="0,10,0,0">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- <Label Content="Top" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
- <Label Content="Bottom" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />
- <Label Content="Left" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
- <Label Content="Right" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
-
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"
+ </Grid>
+ </StackPanel>
+
+ <!-- Crop Panel -->
+ <StackPanel Name="CropPanel" Margin="50,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Column="1">
+ <Label Content="Cropping" FontWeight="Bold" />
+ <RadioButton Content="Automatic" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"/>
+ <RadioButton Content="Custom" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0" />
+
+ <Grid Margin="0,10,0,0">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Label Content="Top" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
+ <Label Content="Bottom" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />
+ <Label Content="Left" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
+ <Label Content="Right" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
+
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"
Minimum="0" Modulus="2" Number="{Binding CropTop, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"
Minimum="0" Modulus="2" Number="{Binding CropBottom, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"
Minimum="0" Modulus="2" Number="{Binding CropLeft, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"
Minimum="0" Modulus="2" Number="{Binding CropRight, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
- </Grid>
+ </Grid>
- </StackPanel>
- </StackPanel>
+ </StackPanel>
+ </Grid>
+ </Border>
</UserControl>
diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 62181977e..f1d8ccdf4 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -152,7 +152,7 @@
<MenuItem>
<MenuItem.Header>
<StackPanel Height="32" Orientation="Horizontal">
- <Image Source="Images\Advanced.png" Width="28" Height="28" VerticalAlignment="Center" />
+ <Image Source="Images\Advanced.png" Width="20" Height="20" VerticalAlignment="Center" />
<TextBlock VerticalAlignment="Center"
Text="Options " Margin="5,0,0,0" />
<Path Height="5"