WinGui: API Tidyup Part 3 of many.

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

4 files changed, 25 insertions, 26 deletions

diff --git a/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs b/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs
index 32e999e7b..f37fae656 100644
--- a/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs
@@ -115,7 +115,7 @@ namespace HandBrakeWPF.Helpers
             {

                 foreach (string file in queueFiles)

                 {

-                    encodeQueue.QueueManager.RestoreQueue(appDataPath + file); // Start Recovery

+                    encodeQueue.RestoreQueue(appDataPath + file); // Start Recovery

                 }

             }

             else

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index e7c737b09..70f62c435 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -207,7 +207,7 @@ namespace HandBrakeWPF.ViewModels
             this.driveDetectService = driveDetectService;

             this.userSettingService = userSettingService;

             this.queueProcessor = IoC.Get<IQueueProcessor>();

-            this.queueProcessor.QueueManager.ResetInstanceId();

+            this.queueProcessor.ResetInstanceId();

 

             // Setup Properties

             this.WindowTitle = "HandBrake";

@@ -960,9 +960,9 @@ namespace HandBrakeWPF.ViewModels
             }

 

             QueueTask task = new QueueTask { Task = new EncodeTask(this.CurrentTask) };

-            if (!this.queueProcessor.QueueManager.CheckForDestinationPathDuplicates(task.Task.Destination))

+            if (!this.queueProcessor.CheckForDestinationPathDuplicates(task.Task.Destination))

             {

-                this.queueProcessor.QueueManager.Add(task);

+                this.queueProcessor.Add(task);

             }

             else

             {

@@ -971,7 +971,7 @@ namespace HandBrakeWPF.ViewModels
 

             if (!this.IsEncoding)

             {

-                this.ProgramStatusLabel = string.Format("{0} Encodes Pending", this.queueProcessor.QueueManager.Count);

+                this.ProgramStatusLabel = string.Format("{0} Encodes Pending", this.queueProcessor.Count);

             }

         }

 

@@ -1083,7 +1083,7 @@ namespace HandBrakeWPF.ViewModels
             }

 

             // Check if we already have jobs, and if we do, just start the queue.

-            if (this.queueProcessor.QueueManager.Count != 0)

+            if (this.queueProcessor.Count != 0)

             {

                 this.queueProcessor.Start();

                 return;

@@ -1117,7 +1117,7 @@ namespace HandBrakeWPF.ViewModels
                     Task = new EncodeTask(this.CurrentTask),

                     CustomQuery = false

                 };

-            this.queueProcessor.QueueManager.Add(task);

+            this.queueProcessor.Add(task);

             this.queueProcessor.Start();

             this.IsEncoding = true;

         }

@@ -1700,7 +1700,7 @@ namespace HandBrakeWPF.ViewModels
                                 e.AverageFrameRate,

                                 e.EstimatedTimeLeft,

                                 e.ElapsedTime,

-                                this.queueProcessor.QueueManager.Count);

+                                this.queueProcessor.Count);

                     }

                 });

         }

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 82f3b30f4..80fe4372a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -158,7 +158,7 @@ namespace HandBrakeWPF.ViewModels
         {

             get

             {

-                return this.queueProcessor.QueueManager.Queue;

+                return this.queueProcessor.Queue;

             }

         }

 

@@ -203,7 +203,7 @@ namespace HandBrakeWPF.ViewModels
                 "Are you sure you wish to clear the queue?", "Confirm", MessageBoxButton.YesNo, MessageBoxImage.Warning);

             if (result == MessageBoxResult.Yes)

             {

-                this.queueProcessor.QueueManager.Clear();

+                this.queueProcessor.Clear();

             }

         }

 

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

         public void ClearCompleted()

         {

-            this.queueProcessor.QueueManager.ClearCompleted();

+            this.queueProcessor.ClearCompleted();

         }

 

         /// <summary>

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

             // Setup the window to the correct state.

             this.IsEncoding = this.queueProcessor.EncodeService.IsEncoding;

-            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);

+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);

 

             base.OnLoad();

         }

@@ -263,15 +263,15 @@ namespace HandBrakeWPF.ViewModels
                 if (result == MessageBoxResult.Yes)

                 {

                     this.queueProcessor.EncodeService.Stop();

-                    this.queueProcessor.QueueManager.Remove(task);

+                    this.queueProcessor.Remove(task);

                 }

             }

             else

             {

-                this.queueProcessor.QueueManager.Remove(task);

+                this.queueProcessor.Remove(task);

             }

 

-            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);

+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);

         }

 

         /// <summary>

@@ -283,7 +283,7 @@ namespace HandBrakeWPF.ViewModels
         public void RetryJob(QueueTask task)

         {

             task.Status = QueueItemStatus.Waiting;

-            this.queueProcessor.QueueManager.BackupQueue(null);

+            this.queueProcessor.BackupQueue(null);

         }

 

         /// <summary>

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

         public void StartEncode()

         {

-            if (this.queueProcessor.QueueManager.Count == 0)

+            if (this.queueProcessor.Count == 0)

             {

                 this.errorService.ShowMessageBox(

                     "There are no pending jobs.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);

@@ -315,7 +315,7 @@ namespace HandBrakeWPF.ViewModels
                 };

             dialog.ShowDialog();

 

-            this.queueProcessor.QueueManager.BackupQueue(dialog.FileName);

+            this.queueProcessor.BackupQueue(dialog.FileName);

         }

 

         /// <summary>

@@ -326,7 +326,7 @@ namespace HandBrakeWPF.ViewModels
             VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "HandBrake Queue Files (*.hbq)|*.hbq", CheckFileExists = true  };

             dialog.ShowDialog();

 

-            this.queueProcessor.QueueManager.RestoreQueue(dialog.FileName);

+            this.queueProcessor.RestoreQueue(dialog.FileName);

         }

 

         /// <summary>

@@ -372,7 +372,7 @@ namespace HandBrakeWPF.ViewModels
             this.queueProcessor.JobProcessingStarted += this.queueProcessor_JobProcessingStarted;

             this.queueProcessor.QueueCompleted += this.queueProcessor_QueueCompleted;

             this.queueProcessor.QueuePaused += this.queueProcessor_QueuePaused;

-            this.queueProcessor.QueueManager.QueueChanged += this.QueueManager_QueueChanged;

+            this.queueProcessor.QueueChanged += this.QueueManager_QueueChanged;

             this.queueProcessor.EncodeService.EncodeStatusChanged += this.EncodeService_EncodeStatusChanged;

 

             base.OnActivate();

@@ -389,7 +389,7 @@ namespace HandBrakeWPF.ViewModels
             this.queueProcessor.JobProcessingStarted -= this.queueProcessor_JobProcessingStarted;

             this.queueProcessor.QueueCompleted -= this.queueProcessor_QueueCompleted;

             this.queueProcessor.QueuePaused -= this.queueProcessor_QueuePaused;

-            this.queueProcessor.QueueManager.QueueChanged -= this.QueueManager_QueueChanged;

+            this.queueProcessor.QueueChanged -= this.QueueManager_QueueChanged;

             this.queueProcessor.EncodeService.EncodeStatusChanged -= this.EncodeService_EncodeStatusChanged;

 

             base.OnDeactivate(close);

@@ -430,7 +430,7 @@ namespace HandBrakeWPF.ViewModels
         /// </param>

         private void QueueManager_QueueChanged(object sender, EventArgs e)

         {

-            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);

+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);

         }

 

         /// <summary>

@@ -446,7 +446,7 @@ namespace HandBrakeWPF.ViewModels
             object sender, QueueProgressEventArgs e)

         {

             this.JobStatus = "Queue Started";

-            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);

+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);

             this.IsEncoding = true;

         }

 

@@ -462,7 +462,7 @@ namespace HandBrakeWPF.ViewModels
         private void queueProcessor_QueueCompleted(object sender, EventArgs e)

         {

             this.JobStatus = "Queue Completed";

-            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);

+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);

             this.IsEncoding = false;

         }

 

@@ -478,7 +478,7 @@ namespace HandBrakeWPF.ViewModels
         private void queueProcessor_QueuePaused(object sender, EventArgs e)

         {

             this.JobStatus = "Queue Paused";

-            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);

+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);

             this.IsEncoding = false;

         }

 

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index ac4085146..c051786af 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -134,7 +134,6 @@
                 <MenuItem Header="Debug" Visibility="{Binding ShowDebugMenu, Converter={StaticResource boolToVisConverter}}" >

                     <MenuItem Header="Show CLI Equiv" Micro:Message.Attach="[Event Click] = [Action ShowCliQuery]" />

                     <MenuItem Header="Debug Scan Log" Micro:Message.Attach="[Event Click] = [Action DebugScanLog]" />

-                    <MenuItem Header="Test Isolation Service" Micro:Message.Attach="[Event Click] = [Action EnableIsolationServices]" />

                 </MenuItem>

             </Menu>