diff options
| author | sr55 <[email protected]> | 2012-11-25 12:40:23 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-11-25 12:40:23 +0000 |
| commit | 0eb819027c9a774adea751e28569e8849b6aeb0d (patch) | |
| tree | 3326bb99cc4457005b5166253110a12a9cf5c595 /win/CS/HandBrakeWPF | |
| parent | 1c82ce41279bb0a2bb1efef73814b1e1099379cb (diff) | |
WinGui: Tweak the advanced panel design so it is less likely to go off screen.
Fix a framework selection but on non gb/us cultures.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5081 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/AdvancedView.xaml | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs index 9dabbd323..888afb132 100644 --- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs @@ -301,7 +301,7 @@ namespace HandBrakeWPF.ViewModels return "Same as source";
}
- return this.Task.Framerate.ToString();
+ return this.Task.Framerate.Value.ToString(CultureInfo.InvariantCulture);
}
set
{
diff --git a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml index f1a48b91f..196c4e3d6 100644 --- a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml +++ b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml @@ -205,6 +205,7 @@ <ComboBox Grid.Row="7"
Grid.Column="1"
Height="22"
+ MaxWidth="100"
DisplayMemberPath="Label"
ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.PyramidalBFrames}"
SelectedItem="{Binding PyramidalBFrames}"
@@ -318,7 +319,7 @@ <Label Grid.Row="2"
Grid.Column="0"
- Content="Motion Estimation Method:"
+ Content="Motion Est Method:"
Style="{StaticResource AdvancedLabel}"
/>
<ComboBox Grid.Row="2"
@@ -338,7 +339,7 @@ <Label Grid.Row="3"
Grid.Column="0"
- Content="Subpixel Motion Estimation:"
+ Content="Subpixel Motion Est:"
Style="{StaticResource AdvancedLabel}"
/>
<ComboBox Grid.Row="3"
@@ -358,7 +359,7 @@ <Label Grid.Row="4"
Grid.Column="0"
- Content="Motion Estimation Range:"
+ Content="Motion Est Range:"
Style="{StaticResource AdvancedLabel}"
Visibility="{Binding MotionEstimationRangeVisible,
Converter={StaticResource VisibilityConverter}}"
@@ -397,7 +398,7 @@ <Label Grid.Row="0"
Grid.Column="0"
- Content="Adaptive Quantization Strength:"
+ Content="Adaptive Quant Strength:"
Style="{StaticResource AdvancedLabel}"
/>
<Slider Grid.Row="0"
|