WinGui: Add picture settings to the Queue Tooltip

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

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index 201ffc1e1ea6c0a378992ac621657838e83b156c..661ad12ebb054bf5209a0cb5759db5218c308e0e 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -9,6 +9,7 @@
 \r
 namespace HandBrake.ApplicationServices.Model\r
 {\r
+    using System;\r
     using System.Collections.ObjectModel;\r
     using System.Linq;\r
 \r
@@ -199,6 +200,7 @@ namespace HandBrake.ApplicationServices.Model
         #endregion\r
 \r
         #region Output Settings\r
+\r
         /// <summary>\r
         /// Gets or sets OutputFormat.\r
         /// </summary>\r
@@ -213,6 +215,7 @@ namespace HandBrake.ApplicationServices.Model
         /// Gets or sets a value indicating whether IPod5GSupport.\r
         /// </summary>\r
         public bool IPod5GSupport { get; set; }\r
+\r
         #endregion\r
 \r
         #region Picture\r
@@ -276,6 +279,7 @@ namespace HandBrake.ApplicationServices.Model
         /// Gets or sets Modulus.\r
         /// </summary>\r
         public int? Modulus { get; set; }\r
+\r
         #endregion\r
 \r
         #region Filters\r
@@ -339,6 +343,7 @@ namespace HandBrake.ApplicationServices.Model
         /// Gets or sets a value indicating whether Grayscale.\r
         /// </summary>\r
         public bool Grayscale { get; set; }\r
+\r
         #endregion\r
 \r
         #region Video\r
@@ -397,6 +402,7 @@ namespace HandBrake.ApplicationServices.Model
         /// Gets or sets AllowedPassthruOptions.\r
         /// </summary>\r
         public AllowedPassthru AllowedPassthruOptions { get; set; }\r
+\r
         #endregion\r
 \r
         #region Subtitles\r
@@ -405,6 +411,7 @@ namespace HandBrake.ApplicationServices.Model
         /// Gets or sets SubtitleTracks.\r
         /// </summary>\r
         public ObservableCollection<SubtitleTrack> SubtitleTracks { get; set; }\r
+\r
         #endregion\r
 \r
         #region Chapters\r
@@ -520,8 +527,11 @@ namespace HandBrake.ApplicationServices.Model
             {\r
                 if (this.OutputFormat == OutputFormat.Mp4)\r
                 {\r
-                    bool audio = this.AudioTracks.Any(item => item.Encoder == AudioEncoder.Ac3Passthrough ||\r
-                        item.Encoder == AudioEncoder.Ac3 || item.Encoder == AudioEncoder.DtsPassthrough || item.Encoder == AudioEncoder.Passthrough);\r
+                    bool audio =\r
+                        this.AudioTracks.Any(\r
+                            item =>\r
+                            item.Encoder == AudioEncoder.Ac3Passthrough || item.Encoder == AudioEncoder.Ac3\r
+                            || item.Encoder == AudioEncoder.DtsPassthrough || item.Encoder == AudioEncoder.Passthrough);\r
 \r
                     bool subtitles = this.SubtitleTracks.Any(track => track.SubtitleType != SubtitleType.VobSub);\r
 \r
@@ -565,6 +575,36 @@ namespace HandBrake.ApplicationServices.Model
                 }\r
             }\r
         }\r
+\r
+        /// <summary>\r
+        /// Gets the picture settings desc.\r
+        /// </summary>\r
+        public string PictureSettingsDesc\r
+        {\r
+            get\r
+            {\r
+                string resolution = string.Empty; \r
+                switch (this.Anamorphic)\r
+                {\r
+                    case Anamorphic.Strict:\r
+                        resolution = "Anamorphic: Strict";\r
+                        break;\r
+                    case Anamorphic.Loose:\r
+                        resolution = "Anamorphic: Loose, Width: " + this.Width;\r
+                        break;\r
+                    case Anamorphic.Custom:\r
+                        resolution = "Anamorphic: Custom, Resolution: " + this.Width + "x" + this.Height;\r
+                        break;\r
+                    case Anamorphic.None:\r
+                        resolution = "Resolution: " + this.Width + "x" + this.Height;\r
+                        break;\r
+                }\r
+\r
+                return resolution + Environment.NewLine + "Crop Top: " + this.Cropping.Top + ", Botton: " + this.Cropping.Bottom + ", Left: "\r
+                       + this.Cropping.Left + ", Right: " + this.Cropping.Right;\r
+            }\r
+        }\r
+\r
         #endregion\r
     }\r
 }\r

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 3b4af61cf1fb7b01b2784da21f8a75f5f356fce5..00f77f9853a76afdca1c4fc2c8450b0129a4a5d3 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -230,10 +230,11 @@
                                     <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="90" />\r
+                                    <ColumnDefinition Width="95" />\r
                                     <ColumnDefinition Width="*" />\r
                                 </Grid.ColumnDefinitions>\r
 \r
@@ -243,21 +244,23 @@
                                 <TextBlock FontWeight="Bold" Text="Destination:" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />\r
                                 <TextBlock Text="{Binding Task.Destination}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />\r
 \r
-                                <TextBlock FontWeight="Bold" Text="Video:" Grid.Row="2" Grid.Column="0" />\r
+                                <TextBlock FontWeight="Bold" Text="Picture Settings:" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />\r
+                                <TextBlock Text="{Binding Task.PictureSettingsDesc}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1"  />\r
+                                \r
+                                <TextBlock FontWeight="Bold" Text="Video:" Grid.Row="3" Grid.Column="0" />\r
                                 <TextBlock Text="{Binding Task.VideoEncoder, Converter={StaticResource enumComboConverter}}"\r
-                                           Grid.Row="2" Grid.Column="1" />\r
+                                           Grid.Row="3" Grid.Column="1" />\r
 \r
-                                <TextBlock FontWeight="Bold" Text="Audio: "  Grid.Row="3" Grid.Column="0"/>\r
+                                <TextBlock FontWeight="Bold" Text="Audio: "  Grid.Row="4" Grid.Column="0"/>\r
                                 <TextBlock Text="{Binding Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}"\r
-                                           Grid.Row="3" Grid.Column="1"/>\r
+                                           Grid.Row="4" Grid.Column="1"/>\r
 \r
-                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="Subtitles: " Grid.Row="4" Grid.Column="0"  />\r
+                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="Subtitles: " Grid.Row="5" Grid.Column="0"  />\r
                                 <TextBlock Text="{Binding Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}"\r
-                                           Grid.Row="4" Grid.Column="1" />\r
-\r
+                                           Grid.Row="5" Grid.Column="1" />\r
 \r
-                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="5" Grid.Column="0"  Text="Advanced: " />\r
-                                <TextBlock Text="{Binding Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="5" Grid.Column="1" TextWrapping="Wrap"  />\r
+                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="6" Grid.Column="0"  Text="Advanced: " />\r
+                                <TextBlock Text="{Binding Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="6" Grid.Column="1" TextWrapping="Wrap"  />\r
                             </Grid>\r
 \r
                         </Setter.Value>\r