WinGui: Dropping more legacy code and moving some more UI only code up to the UI level.

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

4 files changed, 2 insertions, 10 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index 65464f3f9..189472949 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -12,10 +12,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Collections.Generic;

     using System.Windows;

 

-    using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Services;

     using HandBrake.ApplicationServices.Services.Encode.Model;

-    using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.ApplicationServices.Interop.Model.Encoding;

@@ -23,7 +20,6 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Model.Audio;

     using HandBrakeWPF.Model.Subtitles;

     using HandBrakeWPF.Properties;

-    using HandBrakeWPF.Services;

     using HandBrakeWPF.Services.Interfaces;

     using HandBrakeWPF.Services.Presets;

     using HandBrakeWPF.Services.Presets.Interfaces;

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 08662882c..9c46008f8 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -26,7 +26,6 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.ApplicationServices.Services.Encode.Model.Models;

-    using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Services.Scan.EventArgs;

     using HandBrake.ApplicationServices.Services.Scan.Interfaces;

     using HandBrake.ApplicationServices.Services.Scan.Model;

@@ -499,7 +498,7 @@ namespace HandBrakeWPF.ViewModels
                 // Check if we have a Folder, if so, check if it's a DVD / Bluray drive and get the label.

                 if (ScannedSource.ScanPath.EndsWith("\\"))

                 {

-                    foreach (DriveInformation item in GeneralUtilities.GetDrives())

+                    foreach (DriveInformation item in DriveUtilities.GetDrives())

                     {

                         if (item.RootDirectory.Contains(this.ScannedSource.ScanPath.Replace("\\\\", "\\")))

                         {

@@ -1000,7 +999,7 @@ namespace HandBrakeWPF.ViewModels
                 if (this.showSourceSelection)

                 {

                     this.Drives.Clear();

-                    foreach (SourceMenuItem menuItem in from item in GeneralUtilities.GetDrives()

+                    foreach (SourceMenuItem menuItem in from item in DriveUtilities.GetDrives()

                                                         let driveInformation = item

                                                         select new SourceMenuItem

                                                         {

diff --git a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
index 6d4fcc84a..c85c707bd 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
@@ -13,8 +13,6 @@ namespace HandBrakeWPF.ViewModels
 

     using Caliburn.Micro;

 

-    using HandBrake.ApplicationServices.Services.Interfaces;

-

     using HandBrakeWPF.Model;

     using HandBrakeWPF.Properties;

     using HandBrakeWPF.Services.Interfaces;

diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index ff1b1a0c9..012a4c15b 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -24,7 +24,6 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.ApplicationServices.Services.Encode.Model.Models;

-    using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Services.Scan.Interfaces;

     using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Interop.Model.Encoding;