WinGui: Some Threading, Performance and Log window fixes.

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

11 files changed, 199 insertions, 126 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Isolation/IsolatedEncodeService.cs b/win/CS/HandBrake.ApplicationServices/Isolation/IsolatedEncodeService.cs
index 3ddae9b1f..31c1d8cec 100644
--- a/win/CS/HandBrake.ApplicationServices/Isolation/IsolatedEncodeService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Isolation/IsolatedEncodeService.cs
@@ -82,6 +82,17 @@ namespace HandBrake.ApplicationServices.Isolation
         }

 

         /// <summary>

+        /// Gets the log index.

+        /// </summary>

+        public int LogIndex

+        {

+            get

+            {

+                return -1;

+            }

+        }

+

+        /// <summary>

         /// Gets a value indicating whether IsEncoding.

         /// </summary>

         public bool IsEncoding

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs b/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs
index 866edb794..555b004f2 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs
@@ -15,8 +15,6 @@ namespace HandBrake.ApplicationServices.Services.Base
     using System.Text;

     using System.Text.RegularExpressions;

 

-    using Caliburn.Micro;

-

     using HandBrake.ApplicationServices.EventArgs;

     using HandBrake.ApplicationServices.Exceptions;

     using HandBrake.ApplicationServices.Model;

@@ -41,11 +39,6 @@ namespace HandBrake.ApplicationServices.Services.Base
         private readonly IUserSettingService userSettingService;

 

         /// <summary>

-        /// Windows 7 API Pack wrapper

-        /// </summary>

-        private readonly Win7 windowsSeven = new Win7();

-

-        /// <summary>

         /// The Log File Header

         /// </summary>

         private readonly StringBuilder header;

@@ -76,6 +69,8 @@ namespace HandBrake.ApplicationServices.Services.Base
                 GeneralUtilities.CreateCliLogHeader(

                     userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion),

                     userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild));

+

+            this.LogIndex = 0;

         }

 

         #region Events

@@ -119,24 +114,18 @@ namespace HandBrake.ApplicationServices.Services.Base
         }

 

         /// <summary>

-        /// Gets LogBuffer.

+        /// Gets the log index.

         /// </summary>

-        public StringBuilder LogBuffer

-        {

-            get

-            {

-                return this.logBuffer;

-            }

-        }

+        public int LogIndex { get; private set; }

 

         /// <summary>

-        /// Gets WindowsSeven.

+        /// Gets LogBuffer.

         /// </summary>

-        public Win7 WindowsSeven

+        public StringBuilder LogBuffer

         {

             get

             {

-                return this.windowsSeven;

+                return this.logBuffer;

             }

         }

 

@@ -152,15 +141,11 @@ namespace HandBrake.ApplicationServices.Services.Base
         /// </param>

         public void InvokeEncodeStatusChanged(EncodeProgressEventArgs e)

         {

-            Execute.OnUIThread(

-                () =>

-                {

-                    EncodeProgessStatus handler = this.EncodeStatusChanged;

-                    if (handler != null)

-                    {

-                        handler(this, e);

-                    }

-                });

+            EncodeProgessStatus handler = this.EncodeStatusChanged;

+            if (handler != null)

+            {

+                handler(this, e);

+            }

         }

 

         /// <summary>

@@ -171,15 +156,13 @@ namespace HandBrake.ApplicationServices.Services.Base
         /// </param>

         public void InvokeEncodeCompleted(EncodeCompletedEventArgs e)

         {

-            Execute.OnUIThread(

-                () =>

-                {

-                    EncodeCompletedStatus handler = this.EncodeCompleted;

-                    if (handler != null)

-                    {

-                        handler(this, e);

-                    }

-                });

+            EncodeCompletedStatus handler = this.EncodeCompleted;

+            if (handler != null)

+            {

+                handler(this, e);

+            }

+

+            this.LogIndex = 0; // Reset

         }

 

         /// <summary>

@@ -190,14 +173,11 @@ namespace HandBrake.ApplicationServices.Services.Base
         /// </param>

         public void InvokeEncodeStarted(EventArgs e)

         {

-            Execute.OnUIThread(() =>

-                {

-                    EventHandler handler = this.EncodeStarted;

-                    if (handler != null)

-                    {

-                        handler(this, e);

-                    }

-                });

+            EventHandler handler = this.EncodeStarted;

+            if (handler != null)

+            {

+                handler(this, e);

+            }

         }

 

         #endregion

@@ -261,7 +241,6 @@ namespace HandBrake.ApplicationServices.Services.Base
             }

         }

 

-

         /// <summary>

         /// Pase the CLI status output (from standard output)

         /// </summary>

@@ -393,6 +372,8 @@ namespace HandBrake.ApplicationServices.Services.Base
             {

                 try

                 {

+                    this.LogIndex = this.LogIndex + 1;

+

                     lock (this.LogBuffer)

                     {

                         this.LogBuffer.AppendLine(message);

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode.cs
index 577067050..b4f572521 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode.cs
@@ -11,7 +11,6 @@ namespace HandBrake.ApplicationServices.Services
 {

     using System;

     using System.Diagnostics;

-    using System.Globalization;

     using System.IO;

     using System.Windows.Forms;

 

@@ -66,7 +65,7 @@ namespace HandBrake.ApplicationServices.Services
         public Encode(IUserSettingService userSettingService)

             : base(userSettingService)

         {

-            this.userSettingService = userSettingService;  

+            this.userSettingService = userSettingService;

         }

 

         #region Properties

@@ -135,7 +134,7 @@ namespace HandBrake.ApplicationServices.Services
                                        userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),

                                        userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),

                                        userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))

-                                   : QueryGeneratorUtility.GenerateQuery(new EncodeTask(this.currentTask.Task), 

+                                   : QueryGeneratorUtility.GenerateQuery(new EncodeTask(this.currentTask.Task),

                                    userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),

                                    userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),

                                    userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav));

@@ -263,21 +262,16 @@ namespace HandBrake.ApplicationServices.Services
             }

 

             Execute.OnUIThread(() =>

+            {

+                if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep))

                 {

-                    if (this.WindowsSeven.IsWindowsSeven)

-                    {

-                        this.WindowsSeven.SetTaskBarProgressToNoProgress();

-                    }

-

-                    if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep))

-                    {

-                        Win32.AllowSleep();

-                    }

+                    Win32.AllowSleep();

+                }

+            });

 

-                    this.currentTask.Status = QueueItemStatus.Completed;

-                    this.IsEncoding = false;

-                    this.InvokeEncodeCompleted(new EncodeCompletedEventArgs(true, null, string.Empty));

-                });

+            this.currentTask.Status = QueueItemStatus.Completed;

+            this.IsEncoding = false;

+            this.InvokeEncodeCompleted(new EncodeCompletedEventArgs(true, null, string.Empty));

         }

 

         /// <summary>

@@ -296,14 +290,14 @@ namespace HandBrake.ApplicationServices.Services
         {

             if (!String.IsNullOrEmpty(e.Data))

             {

-                if (initShutdown && this.LogBuffer.Length < 25000000) 

+                if (initShutdown && this.LogBuffer.Length < 25000000)

                 {

                     initShutdown = false; // Reset this flag.

                 }

 

                 if (this.LogBuffer.Length > 25000000 && !initShutdown) // Approx 23.8MB and make sure it's only printed once

                 {

-                    this.ProcessLogMessage("ERROR: Initiating automatic shutdown of encode process. The size of the log file inidcates that there is an error! ");

+                    this.ProcessLogMessage("ERROR: Initiating automatic shutdown of encode process. The size of the log file indicates that there is an error! ");

                     initShutdown = true;

                     this.Stop();

                 }

@@ -328,28 +322,14 @@ namespace HandBrake.ApplicationServices.Services
                 EncodeProgressEventArgs eventArgs = this.ReadEncodeStatus(e.Data, this.startTime);

                 if (eventArgs != null)

                 {

-                    Execute.OnUIThread(

-                        () =>

-                            {

-                                if (!this.IsEncoding)

-                                {

-                                    // We can get events out of order since the CLI progress is monitored on a background thread.

-                                    // So make sure we don't send a status update after an encode complete event.

-                                    return;

-                                }

-

-                                this.InvokeEncodeStatusChanged(eventArgs);

-

-                                if (this.WindowsSeven.IsWindowsSeven)

-                                {

-                                    int percent;

-                                    int.TryParse(

-                                        Math.Round(eventArgs.PercentComplete).ToString(CultureInfo.InvariantCulture),

-                                        out percent);

-

-                                    this.WindowsSeven.SetTaskBarProgress(percent);

-                                }

-                            });

+                    if (!this.IsEncoding)

+                    {

+                        // We can get events out of order since the CLI progress is monitored on a background thread.

+                        // So make sure we don't send a status update after an encode complete event.

+                        return;

+                    }

+

+                    this.InvokeEncodeStatusChanged(eventArgs);

                 }

             }

         }

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs
index 915d66788..fbb59ec2b 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs
@@ -67,6 +67,11 @@ namespace HandBrake.ApplicationServices.Services.Interfaces
         string ActivityLog { get; }

 

         /// <summary>

+        /// Gets the log index. The current log row counter.

+        /// </summary>

+        int LogIndex { get; }

+

+        /// <summary>

         /// Start with a LibHb EncodeJob Object

         /// </summary>

         /// <param name="job">

diff --git a/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs b/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs
index 0d1998a59..33453dad8 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs
@@ -254,14 +254,6 @@ namespace HandBrake.ApplicationServices.Services
             };

 

             this.InvokeEncodeStatusChanged(args);

-

-            if (this.WindowsSeven.IsWindowsSeven)

-            {

-                int percent;

-                int.TryParse(Math.Round(e.FractionComplete).ToString(CultureInfo.InvariantCulture), out percent);

-

-                this.WindowsSeven.SetTaskBarProgress(percent);

-            }

         }

 

         /// <summary>

@@ -282,11 +274,6 @@ namespace HandBrake.ApplicationServices.Services
                     ? new EncodeCompletedEventArgs(false, null, string.Empty)

                     : new EncodeCompletedEventArgs(true, null, string.Empty));

 

-            if (this.WindowsSeven.IsWindowsSeven)

-            {

-                this.WindowsSeven.SetTaskBarProgressToNoProgress();

-            }

-

             if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep))

             {

                 Win32.AllowSleep();

diff --git a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
index 8f424b65a..2dd1814ee 100644
--- a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
+++ b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
@@ -127,6 +127,17 @@ namespace HandBrakeWPF.Services
         }

 

         /// <summary>

+        /// Gets the log index.

+        /// </summary>

+        public int LogIndex

+        {

+            get

+            {

+                return this.encodeService.LogIndex;

+            }

+        }

+

+        /// <summary>

         /// Gets a value indicating whether IsEncoding.

         /// </summary>

         public bool IsEncoding

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ILogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ILogViewModel.cs
index 6aa1020d4..6c7a7a2c8 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ILogViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ILogViewModel.cs
@@ -14,5 +14,9 @@ namespace HandBrakeWPF.ViewModels.Interfaces
     /// </summary>

     public interface ILogViewModel

     {

+        /// <summary>

+        /// Gets or sets the selected tab.

+        /// </summary>

+        int SelectedTab { get; set; }

     }

 }
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
index 5bf95d22f..ad76a56b2 100644
--- a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
@@ -10,7 +10,6 @@
 namespace HandBrakeWPF.ViewModels

 {

     using System;

-    using System.Collections.Generic;

     using System.Diagnostics;

     using System.Windows;

 

@@ -36,6 +35,16 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         private readonly IScanServiceWrapper scanService;

 

+        /// <summary>

+        /// The selected tab.

+        /// </summary>

+        private int selectedTab;

+

+        /// <summary>

+        /// The encode log index.

+        /// </summary>

+        private int encodeLogIndex;

+

         #endregion

 

         /// <summary>

@@ -52,12 +61,24 @@ namespace HandBrakeWPF.ViewModels
             this.encodeService = encodeService;

             this.scanService = scanService;

             this.Title = "Log Viewer";

+            this.encodeLogIndex = 0;

         }

 

         /// <summary>

         /// Gets or sets the selected tab.

         /// </summary>

-        public int SelectedTab { get; set; }

+        public int SelectedTab

+        {

+            get

+            {

+                return this.selectedTab;

+            }

+            set

+            {

+                this.selectedTab = value;

+                this.NotifyOfPropertyChange(() => this.SelectedTab);

+            }

+        }

 

         /// <summary>

         /// Gets Log.

@@ -97,7 +118,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public void CopyLog()

         {

-            Clipboard.SetDataObject(this.SelectedTab == 0 ? this.ScanLog : this.EncodeLog, true);

+            Clipboard.SetDataObject(this.SelectedTab == 1 ? this.ScanLog : this.EncodeLog, true);

         }

 

         /// <summary>

@@ -109,6 +130,8 @@ namespace HandBrakeWPF.ViewModels
             this.encodeService.EncodeCompleted += EncodeServiceEncodeCompleted;

             this.encodeService.EncodeStatusChanged += this.EncodeServiceEncodeStatusChanged;

             this.scanService.ScanStatusChanged += this.ScanServiceScanStatusChanged;

+            this.scanService.ScanStared += this.scanService_ScanStared;

+            this.encodeService.EncodeStarted += this.encodeService_EncodeStarted;

             base.OnActivate();

 

             this.NotifyOfPropertyChange(() => this.ScanLog);

@@ -140,7 +163,12 @@ namespace HandBrakeWPF.ViewModels
         /// </param>

         private void EncodeServiceEncodeStatusChanged(object sender, EncodeProgressEventArgs e)

         {

-            this.NotifyOfPropertyChange(() => this.EncodeLog);

+            if (encodeLogIndex != this.encodeService.LogIndex || this.encodeService.LogIndex == -1)

+            {

+                this.NotifyOfPropertyChange(() => this.EncodeLog);

+            }

+

+            encodeLogIndex = this.encodeService.LogIndex;

         }

 

         /// <summary>

@@ -155,6 +183,8 @@ namespace HandBrakeWPF.ViewModels
             this.encodeService.EncodeCompleted -= EncodeServiceEncodeCompleted;

             this.encodeService.EncodeStatusChanged -= this.EncodeServiceEncodeStatusChanged;

             this.scanService.ScanStatusChanged -= this.ScanServiceScanStatusChanged;

+            this.scanService.ScanStared -= this.scanService_ScanStared;

+            this.encodeService.EncodeStarted -= this.encodeService_EncodeStarted;

 

             base.OnDeactivate(close);

         }

@@ -186,5 +216,33 @@ namespace HandBrakeWPF.ViewModels
         {

             this.NotifyOfPropertyChange(() => this.EncodeLog);

         }

+

+        /// <summary>

+        /// The encode service encode started.

+        /// </summary>

+        /// <param name="sender">

+        /// The sender.

+        /// </param>

+        /// <param name="e">

+        /// The e.

+        /// </param>

+        private void encodeService_EncodeStarted(object sender, EventArgs e)

+        {

+            this.SelectedTab = 0;

+        }

+

+        /// <summary>

+        /// The scan service scan stared.

+        /// </summary>

+        /// <param name="sender">

+        /// The sender.

+        /// </param>

+        /// <param name="e">

+        /// The e.

+        /// </param>

+        private void scanService_ScanStared(object sender, EventArgs e)

+        {

+            this.SelectedTab = 1;

+        }

     }

 }
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index c837627c4..8f643a74b 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -95,6 +95,11 @@ namespace HandBrakeWPF.ViewModels
         private readonly IEncodeServiceWrapper encodeService;

 

         /// <summary>

+        /// Windows 7 API Pack wrapper

+        /// </summary>

+        private readonly Win7 windowsSeven = new Win7();

+

+        /// <summary>

         /// HandBrakes Main Window Title

         /// </summary>

         private string windowName;

@@ -163,6 +168,11 @@ namespace HandBrakeWPF.ViewModels
         /// The Source Menu Backing Field

         /// </summary>

         private IEnumerable<SourceMenuItem> sourceMenu;

+

+        /// <summary>

+        /// The last percentage complete value.

+        /// </summary>

+        private int lastEncodePercentage;

         #endregion

 

         /// <summary>

@@ -956,11 +966,15 @@ namespace HandBrakeWPF.ViewModels
 

             if (window != null)

             {

+                ILogViewModel logvm = (ILogViewModel)window.DataContext;

+                logvm.SelectedTab = this.IsEncoding ? 0 : 1;

                 window.Activate();

             }

             else

             {

-                this.WindowManager.ShowWindow(IoC.Get<ILogViewModel>());

+                ILogViewModel logvm = IoC.Get<ILogViewModel>();

+                logvm.SelectedTab = this.IsEncoding ? 0 : 1;

+                this.WindowManager.ShowWindow(logvm);

             }

         }

 

@@ -1782,6 +1796,12 @@ namespace HandBrakeWPF.ViewModels
         /// </param>

         private void EncodeStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs e)

         {

+            int percent;

+            int.TryParse(

+                Math.Round(e.PercentComplete).ToString(CultureInfo.InvariantCulture),

+                out percent);

+

+

             Execute.OnUIThread(

                 () =>

                 {

@@ -1796,6 +1816,13 @@ namespace HandBrakeWPF.ViewModels
                                 e.EstimatedTimeLeft,

                                 e.ElapsedTime,

                                 this.queueProcessor.Count);

+

+                        if (lastEncodePercentage != percent && this.windowsSeven.IsWindowsSeven)

+                        {

+                            this.windowsSeven.SetTaskBarProgress(percent);

+                        }

+

+                        lastEncodePercentage = percent;

                     }

                 });

         }

@@ -1837,6 +1864,11 @@ namespace HandBrakeWPF.ViewModels
                 {

                     this.ProgramStatusLabel = "Queue Finished";

                     this.IsEncoding = false;

+

+                    if (this.windowsSeven.IsWindowsSeven)

+                    {

+                        this.windowsSeven.SetTaskBarProgressToNoProgress();

+                    }

                 });

         }

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 4f344db08..79532b9ee 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -101,7 +101,7 @@ namespace HandBrakeWPF.ViewModels
             this.errorService = errorService;

             this.Title = "Queue";

             this.JobsPending = "No encodes pending";

-            this.JobStatus = "There are no jobs currently encoding";  

+            this.JobStatus = "There are no jobs currently encoding";

         }

 

         #endregion

@@ -263,9 +263,9 @@ namespace HandBrakeWPF.ViewModels
             {

                 MessageBoxResult result =

                     this.errorService.ShowMessageBox(

-                        "This encode is currently in progress. If you delete it, the encode will be stoped. Are you sure you wish to proceed?", 

-                        "Warning", 

-                        MessageBoxButton.YesNo, 

+                        "This encode is currently in progress. If you delete it, the encode will be stoped. Are you sure you wish to proceed?",

+                        "Warning",

+                        MessageBoxButton.YesNo,

                         MessageBoxImage.Question);

 

                 if (result == MessageBoxResult.Yes)

@@ -330,7 +330,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public void Import()

         {

-            VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "HandBrake Queue Files (*.hbq)|*.hbq", CheckFileExists = true  };

+            VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "HandBrake Queue Files (*.hbq)|*.hbq", CheckFileExists = true };

             dialog.ShowDialog();

 

             this.queueProcessor.RestoreQueue(dialog.FileName);

@@ -374,7 +374,7 @@ namespace HandBrakeWPF.ViewModels
         {

             this.Load();

 

-            this.WhenDoneAction = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.WhenCompleteAction);    

+            this.WhenDoneAction = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.WhenCompleteAction);

 

             this.queueProcessor.JobProcessingStarted += this.queueProcessor_JobProcessingStarted;

             this.queueProcessor.QueueCompleted += this.queueProcessor_QueueCompleted;

@@ -414,19 +414,23 @@ namespace HandBrakeWPF.ViewModels
         private void EncodeService_EncodeStatusChanged(

             object sender, EncodeProgressEventArgs e)

         {

-            if (this.IsEncoding)

+            Caliburn.Micro.Execute.OnUIThread(() =>

             {

-                this.JobStatus =

-                    string.Format(

-                        "Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0},  Time Remaining: {5},  Elapsed: {6:hh\\:mm\\:ss}",

-                        e.Task,

-                        e.TaskCount,

-                        e.PercentComplete,

-                        e.CurrentFrameRate,

-                        e.AverageFrameRate,

-                        e.EstimatedTimeLeft,

-                        e.ElapsedTime);

-            }

+                if (this.IsEncoding)

+                {

+                    this.JobStatus =

+                        string.Format(

+                            "Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0},  Time Remaining: {5},  Elapsed: {6:hh\\:mm\\:ss}",

+                            e.Task,

+                            e.TaskCount,

+                            e.PercentComplete,

+                            e.CurrentFrameRate,

+                            e.AverageFrameRate,

+                            e.EstimatedTimeLeft,

+                            e.ElapsedTime);

+                }

+

+            });

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml
index 94e5989ba..f8b2c9327 100644
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml
+++ b/win/CS/HandBrakeWPF/Views/LogView.xaml
@@ -37,21 +37,21 @@
             </ToolBar>

 

             <TabControl Grid.Row="1" SelectedIndex="{Binding SelectedTab}">

-                <TabItem Header="Scan Log">

+                <TabItem Header="Encode Log">

                     <TextBox Grid.Row="1"

                      AcceptsReturn="True"

                      IsReadOnly="True"

                      ScrollViewer.VerticalScrollBarVisibility="Visible"

-                     Text="{Binding ScanLog, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"

+                     Text="{Binding EncodeLog, Mode=OneWay,  UpdateSourceTrigger=PropertyChanged}"

                      TextWrapping="Wrap" />

                 </TabItem>

-

-                <TabItem Header="Encode Log">

+                

+                <TabItem Header="Scan Log">

                     <TextBox Grid.Row="1"

                      AcceptsReturn="True"

                      IsReadOnly="True"

                      ScrollViewer.VerticalScrollBarVisibility="Visible"

-                     Text="{Binding EncodeLog, Mode=OneWay,  UpdateSourceTrigger=PropertyChanged}"

+                     Text="{Binding ScanLog, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"

                      TextWrapping="Wrap" />

                 </TabItem>