WinGui: Re-factoring the services library.

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

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 8d86c4e57a9c4a865fdafc9e5c165023f90f36c0..d3d229d67342b8ee99284d176af6c12c23c81a35 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -97,7 +97,6 @@
     <Reference Include="WindowsBase" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <Compile Include="Collections\SerializableDictionary.cs" />\r
     <Compile Include="Converters\EnumToDescConverter.cs" />\r
     <Compile Include="EventArgs\QueueCompletedEventArgs.cs" />\r
     <Compile Include="EventArgs\SettingChangedEventArgs.cs" />\r
@@ -125,11 +124,9 @@
     <Compile Include="Utilities\Converters.cs" />\r
     <Compile Include="Utilities\EnumHelper.cs" />\r
     <Compile Include="Utilities\InteropModelCreator.cs" />\r
-    <Compile Include="Utilities\PList.cs" />\r
     <Compile Include="Utilities\SystemInfo.cs" />\r
     <Compile Include="Utilities\VersionHelper.cs" />\r
     <Compile Include="Utilities\Win32.cs" />\r
-    <Compile Include="Utilities\Win7.cs" />\r
     <Compile Include="Model\DriveInformation.cs" />\r
     <Compile Include="Model\Encoding\AllowedPassthru.cs" />\r
     <Compile Include="Model\Encoding\AudioTrack.cs" />\r
@@ -162,7 +159,6 @@
     <Compile Include="Services\LibEncode.cs" />\r
     <Compile Include="Services\LibScan.cs" />\r
     <Compile Include="Services\QueueProcessor.cs" />\r
-    <Compile Include="Utilities\AppcastReader.cs" />\r
     <Compile Include="Utilities\CharCodesUtilities.cs" />\r
     <Compile Include="Utilities\GeneralUtilities.cs" />\r
     <Compile Include="Utilities\LanguageUtilities.cs" />\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs b/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs
index f7e0ae0ed06fbeea80e2e9a08ce4c6566ca5b8e8..df1211528e3dfa506861cbcc2bb63f73987a1405 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs
@@ -11,10 +11,8 @@ namespace HandBrake.ApplicationServices.Utilities
 {\r
     using System;\r
     using System.Collections.Generic;\r
-    using System.Globalization;\r
     using System.Management;\r
     using System.Text.RegularExpressions;\r
-    using System.Windows.Documents;\r
     using System.Windows.Forms;\r
 \r
     using HandBrake.Interop.HbLib;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Collections/SerializableDictionary.cs b/win/CS/HandBrakeWPF/Collections/SerializableDictionary.cs
similarity index 95%
rename from win/CS/HandBrake.ApplicationServices/Collections/SerializableDictionary.cs
rename to win/CS/HandBrakeWPF/Collections/SerializableDictionary.cs
index 15ac8a7c0f5c0c1167cedd6dcf36a89b3958c2fc..92ec90d1f9d97be3d7d338ef6a5cbedc457ce0ca 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Collections/SerializableDictionary.cs
+++ b/win/CS/HandBrakeWPF/Collections/SerializableDictionary.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Collections\r
+namespace HandBrakeWPF.Collections\r
 {\r
     using System.Collections.Generic;\r
     using System.Collections.Specialized;\r

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 3ca004790f5a494ba6dafc243869823bfd05ba2a..1e588f9840fa9ecbff1a5cc086f145aeb07eb836 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -132,6 +132,7 @@
     <Reference Include="System.Xaml">\r
       <RequiredTargetFramework>4.0</RequiredTargetFramework>\r
     </Reference>\r
+    <Reference Include="System.Xml.Linq" />\r
     <Reference Include="WindowsBase" />\r
     <Reference Include="PresentationCore" />\r
   </ItemGroup>\r
@@ -142,6 +143,7 @@
     </ApplicationDefinition>\r
     <Compile Include="AppArguments.cs" />\r
     <Compile Include="AttachedProperties\MenuItemExtensions.cs" />\r
+    <Compile Include="Collections\SerializableDictionary.cs" />\r
     <Compile Include="Commands\CancelScanCommand.cs" />\r
     <Compile Include="Commands\Interfaces\IAdvancedEncoderOptionsCommand.cs" />\r
     <Compile Include="Commands\OpenOptionsScreenCommand.cs" />\r
@@ -163,10 +165,13 @@
     <Compile Include="Services\Interfaces\IUserSettingService.cs" />\r
     <Compile Include="Services\Presets\PresetService.cs" />\r
     <Compile Include="Services\UserSettingService.cs" />\r
+    <Compile Include="Utilities\AppcastReader.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="Utilities\PList.cs" />\r
+    <Compile Include="Utilities\Win7.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/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
index b06df172834c4bf516bd71000fbab17efe01ceb0..7edf718367086686d98d16d6c1772379844ba278 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
@@ -26,6 +26,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
 \r
     using HandBrakeWPF.Services.Presets;\r
     using HandBrakeWPF.Services.Presets.Model;\r
+    using HandBrakeWPF.Utilities;\r
 \r
     /// <summary>\r
     /// A Factory to translate a Plist object into a Preset.\r

diff --git a/win/CS/HandBrakeWPF/Services/UpdateService.cs b/win/CS/HandBrakeWPF/Services/UpdateService.cs
index 67220c0e384c01bb2b260929a4ce363cfda529f2..2064e8e5cdd56059fc915100aaddb034b679b5e1 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/UpdateService.cs
+++ b/win/CS/HandBrakeWPF/Services/UpdateService.cs
@@ -20,6 +20,8 @@ namespace HandBrakeWPF.Services
     using HandBrakeWPF.Model;\r
     using HandBrakeWPF.Services.Interfaces;\r
 \r
+    using AppcastReader = HandBrakeWPF.Utilities.AppcastReader;\r
+\r
     /// <summary>\r
     /// The Update Service\r
     /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Services/UserSettingService.cs b/win/CS/HandBrakeWPF/Services/UserSettingService.cs
index d10ec84df1eb264917413af44e4ef0ce105f6dc8..6b7d87f1becdd3457ad0a5d42076acb52729f215 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/UserSettingService.cs
+++ b/win/CS/HandBrakeWPF/Services/UserSettingService.cs
@@ -16,7 +16,6 @@ namespace HandBrakeWPF.Services
     using System.Reflection;\r
     using System.Xml.Serialization;\r
 \r
-    using HandBrake.ApplicationServices.Collections;\r
     using HandBrake.ApplicationServices.EventArgs;\r
     using HandBrake.ApplicationServices.Exceptions;\r
 \r
@@ -35,12 +34,12 @@ namespace HandBrakeWPF.Services
         /// <summary>\r
         /// The XML Serializer \r
         /// </summary>\r
-        readonly XmlSerializer serializer = new XmlSerializer(typeof(SerializableDictionary<string, object>));\r
+        readonly XmlSerializer serializer = new XmlSerializer(typeof(Collections.SerializableDictionary<string, object>));\r
 \r
         /// <summary>\r
         /// The User Settings\r
         /// </summary>\r
-        private SerializableDictionary<string, object> userSettings;\r
+        private Collections.SerializableDictionary<string, object> userSettings;\r
 \r
         /// <summary>\r
         /// Initializes a new instance of the <see cref="UserSettingService"/> class.\r
@@ -162,17 +161,17 @@ namespace HandBrakeWPF.Services
                 {\r
                     using (StreamReader reader = new StreamReader(this.settingsFile))\r
                     {\r
-                        SerializableDictionary<string, object> data = (SerializableDictionary<string, object>)this.serializer.Deserialize(reader);\r
+                        Collections.SerializableDictionary<string, object> data = (Collections.SerializableDictionary<string, object>)this.serializer.Deserialize(reader);\r
                         this.userSettings = data;\r
                     }\r
                 }\r
                 else\r
                 {\r
-                    this.userSettings = new SerializableDictionary<string, object>();\r
+                    this.userSettings = new Collections.SerializableDictionary<string, object>();\r
                 }\r
 \r
                 // Add any missing / new settings\r
-                SerializableDictionary<string, object> defaults = this.GetDefaults();\r
+                Collections.SerializableDictionary<string, object> defaults = this.GetDefaults();\r
                 foreach (var item in defaults.Where(item => !this.userSettings.Keys.Contains(item.Key)))\r
                 {\r
                     this.userSettings.Add(item.Key, item.Value);\r
@@ -205,7 +204,7 @@ namespace HandBrakeWPF.Services
         /// <returns>\r
         /// The get defaults.\r
         /// </returns>\r
-        private SerializableDictionary<string, object> GetDefaults()\r
+        private Collections.SerializableDictionary<string, object> GetDefaults()\r
         {\r
             try\r
             {\r
@@ -213,15 +212,15 @@ namespace HandBrakeWPF.Services
                 Stream stream = assembly.GetManifestResourceStream("HandBrakeWPF.defaultsettings.xml");\r
                 if (stream != null)\r
                 {\r
-                    return (SerializableDictionary<string, object>)this.serializer.Deserialize(stream);\r
+                    return (Collections.SerializableDictionary<string, object>)this.serializer.Deserialize(stream);\r
                 }\r
             }\r
             catch (Exception)\r
             {\r
-                return new SerializableDictionary<string, object>();\r
+                return new Collections.SerializableDictionary<string, object>();\r
             }\r
 \r
-            return new SerializableDictionary<string, object>();\r
+            return new Collections.SerializableDictionary<string, object>();\r
         }\r
     }\r
 }\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/AppcastReader.cs b/win/CS/HandBrakeWPF/Utilities/AppcastReader.cs
similarity index 95%
rename from win/CS/HandBrake.ApplicationServices/Utilities/AppcastReader.cs
rename to win/CS/HandBrakeWPF/Utilities/AppcastReader.cs
index 0a3fac109d11ffd642c8282f8575436d704bdda5..49d7f4714f6e6333c55af3e9f827b9cdef243be2 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/AppcastReader.cs
+++ b/win/CS/HandBrakeWPF/Utilities/AppcastReader.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Utilities\r
+namespace HandBrakeWPF.Utilities\r
 {\r
     using System;\r
     using System.IO;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PList.cs b/win/CS/HandBrakeWPF/Utilities/PList.cs
similarity index 95%
rename from win/CS/HandBrake.ApplicationServices/Utilities/PList.cs
rename to win/CS/HandBrakeWPF/Utilities/PList.cs
index 78320f1feeb79f2024aa8391ad746f28760e648c..1e3c30e20ff06e5a76062bb66621a8ae869896c9 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PList.cs
+++ b/win/CS/HandBrakeWPF/Utilities/PList.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Utilities\r
+namespace HandBrakeWPF.Utilities\r
 {\r
     using System;\r
     using System.Collections.Generic;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Win7.cs b/win/CS/HandBrakeWPF/Utilities/Win7.cs
similarity index 95%
rename from win/CS/HandBrake.ApplicationServices/Utilities/Win7.cs
rename to win/CS/HandBrakeWPF/Utilities/Win7.cs
index 10ae1f29676b42b5d52d86bfe1f924499fb05d6d..0f6cb5680d98d1831f84f18893967481a29c91c1 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/Win7.cs
+++ b/win/CS/HandBrakeWPF/Utilities/Win7.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Utilities\r
+namespace HandBrakeWPF.Utilities\r
 {\r
     using System.Windows.Shell;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
index 1eddfd83e1177a2bd7ca4def43c1c3b446aeb855..3d4781276e89f1d4063f8e263f719e44316b3543 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
@@ -35,6 +35,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Services.Interfaces;\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
 \r

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs
index 35e1e0333eb2da722bf0a3db199ae7d92b36ddbf..bb757662c4332022bdc2b9e5314ce596c75c9f2e 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs
@@ -23,6 +23,7 @@ namespace HandBrakeWPF.Views
 \r
     using HandBrakeWPF.Commands;\r
     using HandBrakeWPF.Services.Interfaces;\r
+    using HandBrakeWPF.Utilities;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
     using Application = System.Windows.Application;\r