WinGui: Update the Queue Summary display to render more information on the audio/subtitles. #2723

2 files changed, 25 insertions, 1 deletions

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
index 400f17ce4..a9bf90360 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
@@ -11,12 +11,15 @@ namespace HandBrakeWPF.Converters.Audio
 {

     using System;

     using System.Collections.ObjectModel;

+    using System.Drawing.Drawing2D;

     using System.Globalization;

     using System.Text;

     using System.Windows.Data;

 

     using HandBrake.Interop.Utilities;

 

+    using HandBrakeWPF.Properties;

+    using HandBrakeWPF.Services.Encode.Model.Models;

     using HandBrakeWPF.Utilities;

 

     using AudioEncoder = HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder;

@@ -47,7 +50,15 @@ namespace HandBrakeWPF.Converters.Audio
                         track.ScannedTrack.TrackNumber,

                         track.ScannedTrack.Language);

 

-                    audioTracks.Append(string.Format("{0} - {1} To {2}{3}", trackName, track.TrackName, EnumHelper<AudioEncoder>.GetDisplay(track.Encoder), Environment.NewLine)); 

+                    string quality = string.Empty;

+                    if (!track.IsPassthru)

+                    {

+                        quality = track.EncoderRateType == AudioEncoderRateType.Quality

+                                      ? string.Format("{0} {1}", Resources.VideoView_Quality, track.Quality)

+                                      : track.Bitrate + " kbps";

+                    }

+

+                    audioTracks.Append(string.Format("{0} - {1} To {2} {3}{4}", trackName, track.TrackName, quality, EnumHelper<AudioEncoder>.GetDisplay(track.Encoder), Environment.NewLine)); 

                 }

             }

 

diff --git a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs
index f96983347..42f336273 100644
--- a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs
@@ -12,9 +12,12 @@ namespace HandBrakeWPF.Converters.Subtitles
     using System;

     using System.Collections.ObjectModel;

     using System.Globalization;

+    using System.Linq;

     using System.Text;

     using System.Windows.Data;

 

+    using HandBrakeWPF.Properties;

+

     using SubtitleTrack = HandBrakeWPF.Services.Encode.Model.Models.SubtitleTrack;

 

     /// <summary>

@@ -41,6 +44,16 @@ namespace HandBrakeWPF.Converters.Subtitles
                                       ? track.SourceTrack.ToString()

                                       : (track.SrtFileName + ".srt");

 

+                    if (!string.IsNullOrEmpty(track.SrtFileName))

+                    {

+                        text += string.Format(", {0}", track.SrtCharCode);

+                    }

+

+                    if (track.Burned)

+                    {

+                        text = text + string.Format(", {0}", Resources.SummaryView_Burned);

+                    }

+                    

                     sutitleTracks.AppendLine(text);

                 }

             }