WinGui: Some Model Re-factoring by RandomEngy

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

3 files changed, 35 insertions, 35 deletions

diff --git a/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs b/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs
index adc18ff2d..4bf88f35a 100644
--- a/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs
+++ b/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs
@@ -31,13 +31,13 @@ namespace HandBrakeWPF.Commands
         /// <param name="ssw">

         /// The scan service wrapper.

         /// </param>

-        public CancelScanCommand(IScan ssw)

-        {

-            this.scanServiceWrapper = ssw;

-            this.scanServiceWrapper.ScanStared += this.ScanServiceWrapperScanStared;

-            this.scanServiceWrapper.ScanCompleted += this.ScanServiceWrapperScanCompleted;

-        }

-

+        public CancelScanCommand(IScan ssw)
+        {
+            this.scanServiceWrapper = ssw;
+            this.scanServiceWrapper.ScanStarted += this.ScanServiceWrapperScanStared;
+            this.scanServiceWrapper.ScanCompleted += this.ScanServiceWrapperScanCompleted;
+        }
+
         /// <summary>

         /// The scan service Scan Completed Event Handler.

         /// Fires CanExecuteChanged

diff --git a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
index 008d70dcb..d369728a7 100644
--- a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
@@ -129,13 +129,13 @@ namespace HandBrakeWPF.ViewModels
         protected override void OnActivate()

         {

             this.scanService.ScanCompleted += ScanServiceScanCompleted;

-            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.encodeService.EncodeCompleted += EncodeServiceEncodeCompleted;
+            this.encodeService.EncodeStatusChanged += this.EncodeServiceEncodeStatusChanged;
+            this.scanService.ScanStatusChanged += this.ScanServiceScanStatusChanged;
+            this.scanService.ScanStarted += this.scanService_ScanStared;
+            this.encodeService.EncodeStarted += this.encodeService_EncodeStarted;
+            base.OnActivate();
+
             this.NotifyOfPropertyChange(() => this.ScanLog);

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

         }

@@ -182,13 +182,13 @@ namespace HandBrakeWPF.ViewModels
         protected override void OnDeactivate(bool close)

         {

             this.scanService.ScanCompleted -= ScanServiceScanCompleted;

-            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);

+            this.encodeService.EncodeCompleted -= EncodeServiceEncodeCompleted;
+            this.encodeService.EncodeStatusChanged -= this.EncodeServiceEncodeStatusChanged;
+            this.scanService.ScanStatusChanged -= this.ScanServiceScanStatusChanged;
+            this.scanService.ScanStarted -= this.scanService_ScanStared;
+            this.encodeService.EncodeStarted -= this.encodeService_EncodeStarted;
+
+            base.OnDeactivate(close);
         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 2dc706409..e4d20d053 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -260,13 +260,13 @@ namespace HandBrakeWPF.ViewModels
             this.CurrentTask = new EncodeTask();

             this.CurrentTask.PropertyChanged += this.CurrentTask_PropertyChanged;

             this.ScannedSource = new Source();

-            this.HasSource = false;

-

-            // Setup Events

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

-            this.scanService.ScanCompleted += this.ScanCompleted;

-            this.scanService.ScanStatusChanged += this.ScanStatusChanged;

-            this.queueProcessor.JobProcessingStarted += this.QueueProcessorJobProcessingStarted;

+            this.HasSource = false;
+
+            // Setup Events
+            this.scanService.ScanStarted += this.ScanStared;
+            this.scanService.ScanCompleted += this.ScanCompleted;
+            this.scanService.ScanStatusChanged += this.ScanStatusChanged;
+            this.queueProcessor.JobProcessingStarted += this.QueueProcessorJobProcessingStarted;
             this.queueProcessor.QueueCompleted += this.QueueCompleted;

             this.queueProcessor.QueueChanged += this.QueueChanged;

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

@@ -1220,13 +1220,13 @@ namespace HandBrakeWPF.ViewModels
         public void Shutdown()

         {

             // Shutdown Service

-            this.encodeService.Stop();

-

-            // Unsubscribe from Events.

-            this.scanService.ScanStared -= this.ScanStared;

-            this.scanService.ScanCompleted -= this.ScanCompleted;

-            this.scanService.ScanStatusChanged -= this.ScanStatusChanged;

-

+            this.encodeService.Stop();
+
+            // Unsubscribe from Events.
+            this.scanService.ScanStarted -= this.ScanStared;
+            this.scanService.ScanCompleted -= this.ScanCompleted;
+            this.scanService.ScanStatusChanged -= this.ScanStatusChanged;
+
             this.queueProcessor.QueueCompleted -= this.QueueCompleted;

             this.queueProcessor.QueueChanged -= this.QueueChanged;

             this.queueProcessor.JobProcessingStarted -= this.QueueProcessorJobProcessingStarted;