WinGui: Move the preset system out of the services package.

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

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index c55cd035cd455aed063a3093c15723cfc7e3fc07..dde908f5291b1d0c9277cd6f6ac2fb2f4c6ac8fc 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -108,7 +108,6 @@
     <Compile Include="EventArgs\ScanCompletedEventArgs.cs" />\r
     <Compile Include="EventArgs\ScanProgressEventArgs.cs" />\r
     <Compile Include="Extensions\StringExtensions.cs" />\r
-    <Compile Include="Factories\PlistPresetFactory.cs" />\r
     <Compile Include="Isolation\BackgroundServiceConnector.cs" />\r
     <Compile Include="Isolation\IsolatedEncodeService.cs" />\r
     <Compile Include="Model\Audio\AudioBehaviourModes.cs" />\r
@@ -127,7 +126,6 @@
     <Compile Include="Utilities\EnumHelper.cs" />\r
     <Compile Include="Utilities\InteropModelCreator.cs" />\r
     <Compile Include="Utilities\PList.cs" />\r
-    <Compile Include="Utilities\PlistUtility.cs" />\r
     <Compile Include="Utilities\SystemInfo.cs" />\r
     <Compile Include="Utilities\VersionHelper.cs" />\r
     <Compile Include="Utilities\Win32.cs" />\r
@@ -141,7 +139,6 @@
     <Compile Include="Model\EncodeTask.cs" />\r
     <Compile Include="Model\Encoding\OutputFormat.cs" />\r
     <Compile Include="Model\Encoding\SubtitleTrack.cs" />\r
-    <Compile Include="Model\Preset.cs" />\r
     <Compile Include="Model\PresetPictureSettingsMode.cs" />\r
     <Compile Include="Model\QueueItemStatus.cs" />\r
     <Compile Include="Model\QueueTask.cs" />\r
@@ -162,10 +159,8 @@
     <Compile Include="Services\Interfaces\IEncode.cs" />\r
     <Compile Include="Services\Interfaces\IQueueProcessor.cs" />\r
     <Compile Include="Services\Interfaces\IScan.cs" />\r
-    <Compile Include="Services\Interfaces\IPresetService.cs" />\r
     <Compile Include="Services\LibEncode.cs" />\r
     <Compile Include="Services\LibScan.cs" />\r
-    <Compile Include="Services\PresetService.cs" />\r
     <Compile Include="Services\QueueProcessor.cs" />\r
     <Compile Include="Utilities\AppcastReader.cs" />\r
     <Compile Include="Utilities\CharCodesUtilities.cs" />\r
@@ -197,6 +192,7 @@
       <Name>HandBrakeInterop</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
+  <ItemGroup />\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.*\StyleCop.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r

diff --git a/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs b/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs
index 2ffd290466df65c1539e78ade71964e31a394998..72b32ef7f37b274ee106198addec07cca81ce146 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs
+++ b/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs
@@ -29,7 +29,6 @@ namespace HandBrake.ApplicationServices
         /// <param name="container">The container.</param><param name="store">The configuration store.</param>\r
         public void Install(IWindsorContainer container, IConfigurationStore store)\r
         {\r
-            container.Register(Component.For<IPresetService>().ImplementedBy<PresetService>());\r
             container.Register(Component.For<IQueueProcessor>().ImplementedBy<QueueProcessor>());\r
         }\r
 \r

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 0d85fb289cb7a7a1bd994c4d5e3a26941357a260..a1dcac7208a305efaea6b6c47018e0640555105b 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -110,6 +110,7 @@
     <Reference Include="LumenWorks.Framework.IO">\r
       <HintPath>..\libraries\CsvReader\LumenWorks.Framework.IO.dll</HintPath>\r
     </Reference>\r
+    <Reference Include="Microsoft.CSharp" />\r
     <Reference Include="Ookii.Dialogs.Wpf">\r
       <HintPath>..\libraries\OokiiDialogs\Ookii.Dialogs.Wpf.dll</HintPath>\r
     </Reference>\r
@@ -153,14 +154,19 @@
     <Compile Include="Converters\Filters\DenoisePresetConverter.cs" />\r
     <Compile Include="Converters\Subtitles\SubtitleBehaviourConverter.cs" />\r
     <Compile Include="Converters\Video\ScalingConverter.cs" />\r
+    <Compile Include="Services\Presets\Factories\PlistPresetFactory.cs" />\r
     <Compile Include="Helpers\FileHelper.cs" />\r
+    <Compile Include="Model\Preset\Preset.cs" />\r
     <Compile Include="Model\ScanMode.cs" />\r
     <Compile Include="Factories\HBConfigurationFactory.cs" />\r
+    <Compile Include="Services\Presets\Interfaces\IPresetService.cs" />\r
     <Compile Include="Services\Interfaces\IUserSettingService.cs" />\r
+    <Compile Include="Services\Presets\PresetService.cs" />\r
     <Compile Include="Services\UserSettingService.cs" />\r
     <Compile Include="Utilities\DelayedActionProcessor.cs" />\r
     <Compile Include="Utilities\DPIAwareness.cs" />\r
     <Compile Include="Utilities\HandBrakeApp.cs" />\r
+    <Compile Include="Services\Presets\Factories\PlistFactory.cs" />\r
     <Compile Include="ViewModels\CountdownAlertViewModel.cs" />\r
     <Compile Include="ViewModels\Interfaces\ICountdownAlertViewModel.cs" />\r
     <Compile Include="Controls\SourceSelection.xaml.cs">\r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs b/win/CS/HandBrakeWPF/Model/Preset/Preset.cs
similarity index 95%
rename from win/CS/HandBrake.ApplicationServices/Model/Preset.cs
rename to win/CS/HandBrakeWPF/Model/Preset/Preset.cs
index 2bddd75aa35d982962f33d703455e20983d44ea2..d7c93838b77a769204d159ae66dfa2e13690f31e 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
+++ b/win/CS/HandBrakeWPF/Model/Preset/Preset.cs
@@ -7,10 +7,11 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model\r
+namespace HandBrakeWPF.Model.Preset\r
 {\r
     using Caliburn.Micro;\r
 \r
+    using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Audio;\r
     using HandBrake.ApplicationServices.Model.Subtitle;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
similarity index 96%
rename from win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
rename to win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
index 9f3ba99916408ae75ce63c60e3b71f13db3e10d2..1efc290e7ec97c13a65844f4677363dea62ad9a2 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
@@ -7,15 +7,18 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Utilities\r
+namespace HandBrakeWPF.Services.Presets.Factories\r
 {\r
     using System.Text;\r
     using System.Xml;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
+\r
     /// <summary>\r
     /// Plist Preset Converter\r
     /// </summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
similarity index 97%
rename from win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs
rename to win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
index 780dc9825e80000cf59afeadc739bee1e10b9080..fc098d9724285da3a4c289a4abec57d65739ca19 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Factories\r
+namespace HandBrakeWPF.Services.Presets.Factories\r
 {\r
     using System.Collections.Generic;\r
     using System.Collections.ObjectModel;\r
@@ -19,12 +19,14 @@ namespace HandBrake.ApplicationServices.Factories
     using HandBrake.ApplicationServices.Model.Audio;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Model.Subtitle;\r
-    using HandBrake.ApplicationServices.Services;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r
     using HandBrake.Interop.Model.Encoding.x265;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
+    using HandBrakeWPF.Services.Presets;\r
+\r
     /// <summary>\r
     /// A Factory to translate a Plist object into a Preset.\r
     /// </summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
similarity index 94%
rename from win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs
rename to win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
index 83e1206b298a0f3deaeda88429cd7964649d46af..90dd855fbb30db83f0c4adddc59ff9a5fb4ddd3d 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
@@ -7,11 +7,11 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Services.Interfaces\r
+namespace HandBrakeWPF.Services.Presets.Interfaces\r
 {\r
     using System.Collections.ObjectModel;\r
 \r
-    using HandBrake.ApplicationServices.Model;\r
+    using HandBrakeWPF.Model.Preset;\r
 \r
     /// <summary>\r
     /// The Preset Service Interface\r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
similarity index 96%
rename from win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
rename to win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index 8de36ca7fba06cf9f496df76da0bb3cbc6899f72..5afb3cf234319fd451fbdd7928785344b66773ba 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Services\r
+namespace HandBrakeWPF.Services.Presets\r
 {\r
     using System;\r
     using System.Collections.Generic;\r
@@ -20,11 +20,12 @@ namespace HandBrake.ApplicationServices.Services
     using System.Xml.Serialization;\r
 \r
     using HandBrake.ApplicationServices.Exceptions;\r
-    using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Services.Interfaces;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
+    using HandBrakeWPF.Services.Presets.Interfaces;\r
+\r
     /// <summary>\r
     /// The preset service manages HandBrake's presets\r
     /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
index 379fcec91d455371b627f07703f0bd766feec55a..c22d881cba2d0de9d91c52540b40a85e9b331150 100644 (file)
--- a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
+++ b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
@@ -26,6 +26,8 @@ namespace HandBrakeWPF.Startup
 \r
     using HandBrakeWPF.Commands;\r
     using HandBrakeWPF.Commands.Interfaces;\r
+    using HandBrakeWPF.Services.Presets;\r
+    using HandBrakeWPF.Services.Presets.Interfaces;\r
 \r
     using ViewModels;\r
     using ViewModels.Interfaces;\r
@@ -63,6 +65,7 @@ namespace HandBrakeWPF.Startup
             this.windsorContainer.Register(Component.For<INotificationService>().ImplementedBy<NotificationService>().LifeStyle.Is(LifestyleType.Singleton));\r
             this.windsorContainer.Register(Component.For<IPrePostActionService>().ImplementedBy<PrePostActionService>().LifeStyle.Is(LifestyleType.Singleton));\r
             this.windsorContainer.Register(Component.For<IUserSettingService>().ImplementedBy<UserSettingService>());\r
+            this.windsorContainer.Register(Component.For<IPresetService>().ImplementedBy<PresetService>());\r
 \r
             // Commands\r
             this.windsorContainer.Register(Component.For<IAdvancedEncoderOptionsCommand>().ImplementedBy<AdvancedEncoderOptionsCommand>().LifeStyle.Is(LifestyleType.Singleton));\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index 16b26bb83d1e105ab132be11ac5fb03e5880a8a4..4c2eccf4165ed4d80c79a8d071be2405509139e4 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -21,8 +21,12 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.Properties;\r
+    using HandBrakeWPF.Services;\r
     using HandBrakeWPF.Services.Interfaces;\r
+    using HandBrakeWPF.Services.Presets;\r
+    using HandBrakeWPF.Services.Presets.Interfaces;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
index 470a27be22cd5236b9b25ec50bce4a6a39830cbc..bfc445c7409f6ee007f24004c77e1f7c6775e042 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
@@ -13,6 +13,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Parsing;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index b297782f236afb8fbcafceaa50434fe5958501fb..faba373d7bc59f1282f7062c9472a695502277f9 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -23,6 +23,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.Services.Interfaces;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
index c1bc619a5520c30e80643c54342829269757cbab..7768cda9b8d1e6e89d10bd545147e5333902264b 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
@@ -21,6 +21,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Parsing;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.Services.Interfaces;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
index 42407aadf3b54e2ef52fc45d34aef2a535d4ed20..9da0b7361f5b8976c5f078f9e7ece0d86a4e6ca6 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
@@ -15,6 +15,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Parsing;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index 019bf04186d255f1ea8b8b0e31ca43ea52754df9..8ed024a098321f9e759baafd54cea69c4532e34c 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -20,6 +20,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.Services.Interfaces;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
index dcaf1a7f4a989cfaaf9af49d2bb2dacf8492b7c4..f31a633e29c163d878b9f8e156ea5889dffb828f 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
@@ -32,7 +32,9 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Factories;\r
     using HandBrakeWPF.Helpers;\r
     using HandBrakeWPF.Model;\r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.Services.Interfaces;\r
+    using HandBrakeWPF.Services.Presets.Interfaces;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
     using HandBrakeWPF.Views;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
index e08d2d9ffadf69eb0402b283d60919d2a2c615da..ac7bf01065b814a8a5ace8ba82419e1f2e8535da 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
@@ -11,6 +11,8 @@ namespace HandBrakeWPF.ViewModels.Interfaces
 {\r
     using HandBrake.ApplicationServices.Model;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
+\r
     /// <summary>\r
     /// The Main Window View Model\r
     /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs
index 42ca560f4a4806a2284b9da033fe3d6ff7419857..1cdc634a90e2b79d776decb1f4cd9e3410afeb41 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs
@@ -12,6 +12,8 @@ namespace HandBrakeWPF.ViewModels.Interfaces
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Parsing;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
+\r
     /// <summary>\r
     /// Common interface for all the main tab panels\r
     /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 3665c7acf6f306210ece872b09c1425ab8c442a8..0252a1945cd10f7feaeacdf116ef81505d4993da 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -21,7 +21,6 @@ namespace HandBrakeWPF.ViewModels
 \r
     using Caliburn.Micro;\r
 \r
-    using HandBrake.ApplicationServices.Factories;\r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Audio;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
@@ -34,8 +33,12 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Factories;\r
     using HandBrakeWPF.Helpers;\r
     using HandBrakeWPF.Model;\r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.Properties;\r
     using HandBrakeWPF.Services.Interfaces;\r
+    using HandBrakeWPF.Services.Presets.Factories;\r
+    using HandBrakeWPF.Services.Presets.Interfaces;\r
+    using HandBrakeWPF.Utilities;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
     using HandBrakeWPF.Views;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index d569b7824ceea549fadacad7a161f27d5f490391..3d08327d6d055fca899d0ee5e8216ba367ac2daf 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -19,6 +19,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.Interop.Model.Encoding;\r
 \r
     using HandBrakeWPF.Helpers;\r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.Utilities;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 0161c562bbac05f4ca6c4ab7883e15219b3c8999..ce0c6f7641a52e3a65d1e082fa1d85944c20288d 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -20,6 +20,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Parsing;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
     using Ookii.Dialogs.Wpf;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index ccb5cd73a14724aaaff1283824af3565246779cb..3e62828e04c22e4348480e6bce8a402b9118c969 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -28,6 +28,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.Interop.Model.Encoding.x265;\r
 \r
     using HandBrakeWPF.Commands.Interfaces;\r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.Properties;\r
     using HandBrakeWPF.Services.Interfaces;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
index 94d425c7e7eceb4b82152803de26194532a033f5..39db9776a6b684347968038842c0264fe6311710 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
@@ -21,6 +21,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Commands.Interfaces;\r
     using HandBrakeWPF.Helpers;\r
     using HandBrakeWPF.Model;\r
+    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
     /// <summary>\r