WinGui: Code Cleanup

- New file headers for App Services
- Update Interop to include an IWindsorInstaller implementation
- Update Interop Converter (new framerates and fflac)
- Many stylecop warnings fixed.

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

6 files changed, 54 insertions, 29 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/AppcastReader.cs b/win/CS/HandBrake.ApplicationServices/Utilities/AppcastReader.cs
index 8b0053a86..0a3fac109 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/AppcastReader.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/AppcastReader.cs
@@ -1,7 +1,11 @@
-/*  AppcastReader.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="AppcastReader.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Appcast Reader - Used for parsing HandBrakes update file

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

 

 namespace HandBrake.ApplicationServices.Utilities

 {

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/CharCodesUtilities.cs b/win/CS/HandBrake.ApplicationServices/Utilities/CharCodesUtilities.cs
index 9c9801015..8470927f6 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/CharCodesUtilities.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/CharCodesUtilities.cs
@@ -1,7 +1,11 @@
-/*  AppcastReader.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="CharCodesUtilities.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Char Codes

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

 

 namespace HandBrake.ApplicationServices.Utilities

 {

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs b/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
index 99ecd5cd6..34a078a7c 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
@@ -1,7 +1,11 @@
-/*  UtilityService.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="GeneralUtilities.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   A Set of Static Utilites

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

 

 namespace HandBrake.ApplicationServices.Utilities

 {

@@ -12,9 +16,10 @@ namespace HandBrake.ApplicationServices.Utilities
     using System.Text;

     using System.Windows.Forms;

 

+    using Caliburn.Micro;

+

     using HandBrake.ApplicationServices.Functions;

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Services;

     using HandBrake.ApplicationServices.Services.Interfaces;

 

     /// <summary>

@@ -25,7 +30,7 @@ namespace HandBrake.ApplicationServices.Utilities
         /// <summary>

         /// The User Setting Service

         /// </summary>

-        private static IUserSettingService userSettingService = ServiceManager.UserSettingService;

+        private static readonly IUserSettingService UserSettingService = IoC.Get<IUserSettingService>();

 

         /// <summary>

         /// The Default Log Directory

@@ -113,7 +118,7 @@ namespace HandBrake.ApplicationServices.Utilities
         {

             StringBuilder logHeader = new StringBuilder();

 

-            logHeader.AppendLine(String.Format("HandBrake {0} {1}", userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion), userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild)));

+            logHeader.AppendLine(String.Format("HandBrake {0} {1}", UserSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion), UserSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild)));

             logHeader.AppendLine(String.Format("OS: {0}", Environment.OSVersion));

             logHeader.AppendLine(String.Format("CPU: {0}", SystemInfo.GetCpuCount));

             logHeader.Append(String.Format("Ram: {0} MB, ", SystemInfo.TotalPhysicalMemory));

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index b35a360a2..9f2c70bcf 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -1,7 +1,11 @@
-/*  PlistUtility.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr/>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="PlistUtility.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Plist Preset Converter

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

 

 namespace HandBrake.ApplicationServices.Utilities

 {

@@ -22,7 +26,7 @@ namespace HandBrake.ApplicationServices.Utilities
     /// <summary>

     /// Plist Preset Converter

     /// </summary>

-    public class PlistPresetHandler

+    public class PlistUtility

     {

         /// <summary>

         /// The User Setting Service

@@ -38,6 +42,7 @@ namespace HandBrake.ApplicationServices.Utilities
         /// The filename.

         /// </param>

         /// <returns>

+        /// A Preset Object

         /// </returns>

         public static Preset Import(string filename)

         {

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index a5df48e2a..ec6f74562 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -1,7 +1,11 @@
-/*  QueryGeneratorUtility.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr/>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="QueryGeneratorUtility.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Generate a CLI Query for HandBrakeCLI

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

 

 namespace HandBrake.ApplicationServices.Utilities

 {

@@ -10,7 +14,6 @@ namespace HandBrake.ApplicationServices.Utilities
     using System.Collections.ObjectModel;

     using System.Globalization;

     using System.IO;

-    using System.Text.RegularExpressions;

 

     using HandBrake.ApplicationServices.Functions;

     using HandBrake.ApplicationServices.Model;

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index 5be0b0c83..9824ec44f 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -1,7 +1,11 @@
-/*  QueryParser.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="QueryParserUtility.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Parse a CLI Query

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

 

 namespace HandBrake.ApplicationServices.Utilities

 {