diff options
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.Designer.cs | 9 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.resx | 3 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs | 12 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/SummaryView.xaml | 2 |
4 files changed, 23 insertions, 3 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index 8dfcbb1e4..062b3868f 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs @@ -6425,6 +6425,15 @@ namespace HandBrakeWPF.Properties { } /// <summary> + /// Looks up a localized string similar to (padded). + /// </summary> + public static string SummaryView_Padded { + get { + return ResourceManager.GetString("SummaryView_Padded", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to Preview {0} of {1}. /// </summary> public static string SummaryView_PreviewInfo { diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx index 47de39e99..943cd4d64 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.resx +++ b/win/CS/HandBrakeWPF/Properties/Resources.resx @@ -2481,4 +2481,7 @@ This warning will display only twice.</value> <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
<value>RGB Value:</value>
</data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>(padded)</value>
+ </data>
</root>
\ No newline at end of file diff --git a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs index d9eb2f88f..3e0655ed3 100644 --- a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs @@ -549,7 +549,17 @@ namespace HandBrakeWPF.ViewModels this.NotifyOfPropertyChange(() => this.FiltersInfo); // Picture Section - this.DimensionInfo = string.Format("{0}x{1} {2}, {3}x{4} {5}", this.Task.Width, this.Task.Height, Resources.SummaryView_storage, this.Task.DisplayWidth, this.Task.Height, Resources.SummaryView_display); + string storageDesc = Resources.SummaryView_storage; + int? width = this.task.Width; + int? height = this.task.Height; + if (this.task.Padding.Enabled) + { + storageDesc = string.Format("{0} {1}", Resources.SummaryView_storage, Resources.SummaryView_Padded); + width = this.task.Width + this.task.Padding.W; + height = this.task.Height + this.task.Padding.H; + } + + this.DimensionInfo = string.Format("{0}x{1} {2}, {3}x{4} {5}", width, height, storageDesc, this.Task.DisplayWidth, this.Task.Height, Resources.SummaryView_display); this.NotifyOfPropertyChange(() => this.DimensionInfo); this.AspectInfo = string.Empty; diff --git a/win/CS/HandBrakeWPF/Views/SummaryView.xaml b/win/CS/HandBrakeWPF/Views/SummaryView.xaml index ac6baffda..64754da05 100644 --- a/win/CS/HandBrakeWPF/Views/SummaryView.xaml +++ b/win/CS/HandBrakeWPF/Views/SummaryView.xaml @@ -86,8 +86,6 @@ <TextBlock Text="{x:Static Properties:Resources.MainView_Filters}" FontSize="12" FontWeight="Bold" Grid.Row="10" Grid.Column="0" VerticalAlignment="Center" /> <TextBlock Text="{Binding FiltersInfo}" Grid.Row="10" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="Wrap" /> - - <TextBlock Text="{x:Static Properties:Resources.MainView_Size}" FontSize="12" FontWeight="Bold" Grid.Row="12" Grid.Column="0" VerticalAlignment="Center" /> <TextBlock Text="{Binding DimensionInfo}" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Row="12" Grid.Column="1" /> |