WinGui: Move the preset model object into the presets package.

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

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index a1dcac7208a305efaea6b6c47018e0640555105b..3eb9c9faa2c5c9c1214bd691969ce5bea27092bb 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -156,7 +156,7 @@
     <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="Services\Presets\Model\Preset.cs" />\r
     <Compile Include="Model\ScanMode.cs" />\r
     <Compile Include="Factories\HBConfigurationFactory.cs" />\r
     <Compile Include="Services\Presets\Interfaces\IPresetService.cs" />\r
@@ -513,7 +513,6 @@
     <Resource Include="Views\Images\remove.png" />\r
     <Resource Include="Views\Images\information.png" />\r
     <Resource Include="Views\Images\picture_small.png" />\r
-    <None Include="Resources\logo64.png" />\r
     <Resource Include="Views\Images\warningsmall.png" />\r
     <Resource Include="Views\Images\Refresh.ico" />\r
     <Resource Include="Views\Images\Complete.png" />\r

diff --git a/win/CS/HandBrakeWPF/Resources/logo64.png b/win/CS/HandBrakeWPF/Resources/logo64.png
deleted file mode 100644 (file)
index 12808f6..0000000
Binary files a/win/CS/HandBrakeWPF/Resources/logo64.png and /dev/null differ

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
index 1efc290e7ec97c13a65844f4677363dea62ad9a2..7c2a76d603b7b7aff063192a9836c3621fc9fe96 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
-    using HandBrakeWPF.Model.Preset;\r
+    using HandBrakeWPF.Services.Presets.Model;\r
 \r
     /// <summary>\r
     /// Plist Preset Converter\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
index fc098d9724285da3a4c289a4abec57d65739ca19..b06df172834c4bf516bd71000fbab17efe01ceb0 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
@@ -24,8 +24,8 @@ namespace HandBrakeWPF.Services.Presets.Factories
     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
+    using HandBrakeWPF.Services.Presets.Model;\r
 \r
     /// <summary>\r
     /// A Factory to translate a Plist object into a Preset.\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
index 90dd855fbb30db83f0c4adddc59ff9a5fb4ddd3d..9035eae70616606bdb5143175d989fdc8e750879 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.Services.Presets.Interfaces
 {\r
     using System.Collections.ObjectModel;\r
 \r
-    using HandBrakeWPF.Model.Preset;\r
+    using HandBrakeWPF.Services.Presets.Model;\r
 \r
     /// <summary>\r
     /// The Preset Service Interface\r

diff --git a/win/CS/HandBrakeWPF/Model/Preset/Preset.cs b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
similarity index 95%
rename from win/CS/HandBrakeWPF/Model/Preset/Preset.cs
rename to win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
index d7c93838b77a769204d159ae66dfa2e13690f31e..aa50ec7de2188540b360ad64278d7471e398c3f1 100644 (file)
--- a/win/CS/HandBrakeWPF/Model/Preset/Preset.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrakeWPF.Model.Preset\r
+namespace HandBrakeWPF.Services.Presets.Model\r
 {\r
     using Caliburn.Micro;\r
 \r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index 5afb3cf234319fd451fbdd7928785344b66773ba..e7a2b8afb7d4857e20ee66734821d9f215e929a0 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -23,8 +23,8 @@ namespace HandBrakeWPF.Services.Presets
     using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
-    using HandBrakeWPF.Model.Preset;\r
     using HandBrakeWPF.Services.Presets.Interfaces;\r
+    using HandBrakeWPF.Services.Presets.Model;\r
 \r
     /// <summary>\r
     /// The preset service manages HandBrake's presets\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index 4c2eccf4165ed4d80c79a8d071be2405509139e4..94ce1c8513d15ba55f881de75133241508ae9127 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -21,12 +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.Services.Presets.Model;\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 bfc445c7409f6ee007f24004c77e1f7c6775e042..e8f48e8254f84e844f1ec7f5b526c5e844301ce3 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
@@ -13,7 +13,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Parsing;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
-    using HandBrakeWPF.Model.Preset;\r
+    using HandBrakeWPF.Services.Presets.Model;\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 faba373d7bc59f1282f7062c9472a695502277f9..f2642431533bad029f8ee9bdf5d50507c3f54d73 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -23,8 +23,8 @@ 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.Services.Presets.Model;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
index 7768cda9b8d1e6e89d10bd545147e5333902264b..e877c04794ecfb2b48ec0090bcf042823f42202b 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
@@ -21,8 +21,8 @@ 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.Services.Presets.Model;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
     using LumenWorks.Framework.IO.Csv;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
index 9da0b7361f5b8976c5f078f9e7ece0d86a4e6ca6..014885606c80a20e8b00205eec9b9c20b1b4a77b 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Parsing;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
-    using HandBrakeWPF.Model.Preset;\r
+    using HandBrakeWPF.Services.Presets.Model;\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 8ed024a098321f9e759baafd54cea69c4532e34c..16e6c177c110be90ddf9498927bcb3ba4271bdc2 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -20,8 +20,8 @@ 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.Services.Presets.Model;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
index f31a633e29c163d878b9f8e156ea5889dffb828f..6e0d5e8eb3cb80e7726e4ebaad756fd030f4fafc 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
@@ -32,9 +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.Services.Presets.Model;\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 ac7bf01065b814a8a5ace8ba82419e1f2e8535da..283b828c9fd085918e3eb13cb6e32cb2d67ed07e 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.ViewModels.Interfaces
 {\r
     using HandBrake.ApplicationServices.Model;\r
 \r
-    using HandBrakeWPF.Model.Preset;\r
+    using HandBrakeWPF.Services.Presets.Model;\r
 \r
     /// <summary>\r
     /// The Main Window View Model\r

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

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 0252a1945cd10f7feaeacdf116ef81505d4993da..c6f44e4c634b0c942b2eb4aa3d08f4cfb44de77d 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -33,11 +33,11 @@ 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.Services.Presets.Model;\r
     using HandBrakeWPF.Utilities;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
     using HandBrakeWPF.Views;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 3d08327d6d055fca899d0ee5e8216ba367ac2daf..cc6421d28b4bc04f09efb1f457642bfd5a4a93d6 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -19,7 +19,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.Interop.Model.Encoding;\r
 \r
     using HandBrakeWPF.Helpers;\r
-    using HandBrakeWPF.Model.Preset;\r
+    using HandBrakeWPF.Services.Presets.Model;\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 ce0c6f7641a52e3a65d1e082fa1d85944c20288d..661b8f679f0ab6865b1408ea12ff6b208d299a2e 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -20,7 +20,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Parsing;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
-    using HandBrakeWPF.Model.Preset;\r
+    using HandBrakeWPF.Services.Presets.Model;\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 3e62828e04c22e4348480e6bce8a402b9118c969..a1fb19c9f6bb8b8db2ca3582d1a50d8c675f8e62 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -28,9 +28,9 @@ 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.Services.Presets.Model;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
index 39db9776a6b684347968038842c0264fe6311710..846cc58c1d0586771b122ec808f661c512ceae9b 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
@@ -21,7 +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.Services.Presets.Model;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
     /// <summary>\r