WinGui: General tidy up and remove the custom styling for the app. The app will now always honour the system defaults.

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

2 files changed, 7 insertions, 14 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstanceManager.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstanceManager.cs
index aee941447..a84f5f657 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstanceManager.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstanceManager.cs
@@ -17,7 +17,7 @@ namespace HandBrake.ApplicationServices.Interop
     /// The HandBrake Instance manager.

     /// Only supports scanning right now.

     /// </summary>

-    internal static class HandBrakeInstanceManager

+    public static class HandBrakeInstanceManager

     {

         private static HandBrakeInstance scanInstance;

         private static HandBrakeInstance encodeInstance;

@@ -49,7 +49,7 @@ namespace HandBrake.ApplicationServices.Interop
         /// <returns>

         /// The <see cref="IHandBrakeInstance"/>.

         /// </returns>

-        public static IHandBrakeInstance GetScanInstance(int verbosity)

+        internal static IHandBrakeInstance GetScanInstance(int verbosity)

         {

             if (scanInstance != null)

             {

@@ -73,7 +73,7 @@ namespace HandBrake.ApplicationServices.Interop
         /// <returns>

         /// The <see cref="IHandBrakeInstance"/>.

         /// </returns>

-        public static IHandBrakeInstance GetEncodeInstance(int verbosity)

+        internal static IHandBrakeInstance GetEncodeInstance(int verbosity)

         {

             if (encodeInstance != null)

             {

@@ -91,7 +91,7 @@ namespace HandBrake.ApplicationServices.Interop
         /// <summary>

         /// Gets the master instance.

         /// </summary>

-        public static IHandBrakeInstance MasterInstance

+        internal static IHandBrakeInstance MasterInstance

         {

             get

             {

@@ -102,7 +102,7 @@ namespace HandBrake.ApplicationServices.Interop
         /// <summary>

         /// Gets the last scan scan instance.

         /// </summary>

-        public static IHandBrakeInstance LastScanScanInstance

+        internal static IHandBrakeInstance LastScanScanInstance

         {

             get

             {

@@ -124,7 +124,7 @@ namespace HandBrake.ApplicationServices.Interop
         /// <summary>

         /// Gets the last encode scan instance.

         /// </summary>

-        public static IHandBrakeInstance LastEncodeScanInstance

+        internal static IHandBrakeInstance LastEncodeScanInstance

         {

             get

             {

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs
index 0fdf95211..e2610905d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs
@@ -26,15 +26,8 @@ namespace HandBrake.ApplicationServices.Interop
     public class HandBrakePresetService

     {

         /// <summary>

-        /// Initializes static members of the <see cref="HandBrakePresetService"/> class.

-        /// </summary>

-        static HandBrakePresetService()

-        {

-            HandBrakeInstanceManager.Init();

-        }

-

-        /// <summary>

         /// The get built in presets.

+        /// Requires an hb_init to have been invoked.

         /// </summary>

         /// <returns>

         /// The <see cref="string"/>.