WinGui: Strip out more legacy code.

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

8 files changed, 29 insertions, 78 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs b/win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs
index e05e37aa9..f9200958d 100644
--- a/win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs
+++ b/win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs
@@ -1,7 +1,11 @@
-/*  UserSettingConstants.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="ASUserSettingConstants.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>

+//   The User Setting Constants

+// </summary>

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

 

 namespace HandBrake.ApplicationServices

 {

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
index ab716e5fd..d944dea97 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
@@ -7,12 +7,9 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-using System.IO;

-

 namespace HandBrake.ApplicationServices.Model.Encoding

 {

     using System;

-    using System.Windows.Forms;

 

     using Caliburn.Micro;

 

@@ -133,25 +130,6 @@ namespace HandBrake.ApplicationServices.Model.Encoding
         }

 

         /// <summary>

-        ///   Gets A ListViewItem Containing information about this subitlte

-        /// </summary>

-        [Obsolete("Used only for the old forms gui. Will be removed.")]

-        public ListViewItem ListView

-        {

-            get

-            {

-                var listTrack = new ListViewItem(this.Track);

-                listTrack.SubItems.Add(this.Forced ? "Yes" : "No");

-                listTrack.SubItems.Add(this.Burned ? "Yes" : "No");

-                listTrack.SubItems.Add(this.Default ? "Yes" : "No");

-                listTrack.SubItems.Add(this.SrtLang);

-                listTrack.SubItems.Add(this.SrtCharCode);

-                listTrack.SubItems.Add(this.SrtOffset.ToString());

-                return listTrack;

-            }

-        }

-

-        /// <summary>

         ///   Gets or sets SourceTrack.

         /// </summary>

         public Subtitle SourceTrack

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs b/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
index 177b3c267..5d165ae94 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
@@ -29,11 +29,6 @@ namespace HandBrake.ApplicationServices.Model
         /// </summary>

         public string Query { get; set; }

 

-        /// <summary>

-        /// Gets or sets a value indicating whether to use picture Settings in presets.

-        /// </summary>

-        [Obsolete("Don't use this!")]

-        public bool CropSettings { get; set; }

 

         /// <summary>

         /// Gets or sets The version number which associates this preset with a HB build

diff --git a/win/CS/HandBrake.ApplicationServices/ServiceManager.cs b/win/CS/HandBrake.ApplicationServices/ServiceManager.cs
index fba0e99b9..41775a287 100644
--- a/win/CS/HandBrake.ApplicationServices/ServiceManager.cs
+++ b/win/CS/HandBrake.ApplicationServices/ServiceManager.cs
@@ -1,10 +1,16 @@
-namespace HandBrake.ApplicationServices

-{

-    using System;

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

+// <copyright file="ServiceManager.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>

+//   Tempory Class which manages services until Windosor is added back into the project to handle it for us.

+// </summary>

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

 

+namespace HandBrake.ApplicationServices

+{

     using Caliburn.Micro;

 

-    using HandBrake.ApplicationServices.Services;

     using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.Interop;

 

@@ -14,11 +20,6 @@
     public class ServiceManager

     {

         /// <summary>

-        /// Backing Field for the User Setting Service.

-        /// </summary>

-        private static IUserSettingService userSettingService;

-

-        /// <summary>

         /// The Backing field for HandBrake Instance.

         /// </summary>

         private static HandBrakeInstance handBrakeInstance;

@@ -30,16 +31,7 @@
         {

             get

             {

-                try

-                {

-                    return IoC.Get<IUserSettingService>();

-                }

-                catch (NullReferenceException)

-                {

-                    // Hack until this legacy code for the forms gui is removed!

-                }

-

-                return userSettingService ?? (userSettingService = new UserSettingService());

+                return IoC.Get<IUserSettingService>();

             }

         }

 

diff --git a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
index 68bf80481..11df7ccb2 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
@@ -151,7 +151,6 @@ namespace HandBrake.ApplicationServices.Services
                 {

                     preset.Query = update.Query;

                     preset.Task = update.Task;

-                    preset.CropSettings = update.CropSettings;

                     preset.UsePictureFilters = update.UsePictureFilters;

 

                     // Update the presets file

@@ -297,15 +296,12 @@ namespace HandBrake.ApplicationServices.Services
                             Regex r = new Regex("(:  )"); // Split on hyphens. 

                             string[] presetName = r.Split(line);

 

-                            bool pic = presetName[2].Contains("crop");

-

                             Preset newPreset = new Preset

                                 {

                                     Category = category,

                                     Name = presetName[0].Replace("+", string.Empty).Trim(),

                                     Query = presetName[2],

                                     Version = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion),

-                                    CropSettings = pic,

                                     Description = string.Empty, // Maybe one day we will populate this.

                                     IsBuildIn = true,

                                     UsePictureFilters = true,

diff --git a/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs b/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs
index a250aa2fa..6d5b40ef6 100644
--- a/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs
+++ b/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs
@@ -1,4 +1,13 @@
-namespace HandBrake.ApplicationServices

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

+// <copyright file="ServicesWindsorInstaller.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>

+//   The Windsor Installer Interface Implementation

+// </summary>

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

+

+namespace HandBrake.ApplicationServices

 {

     using Castle.MicroKernel.Registration;

     using Castle.MicroKernel.SubSystems.Configuration;

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index d0a6450c8..ff5594975 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -14,7 +14,6 @@ namespace HandBrakeWPF.ViewModels
     using System.ComponentModel;

     using System.ComponentModel.Composition;

     using System.Diagnostics;

-    using System.Drawing;

     using System.IO;

     using System.Linq;

     using System.Windows;

@@ -24,7 +23,6 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;

 

     using HandBrake.ApplicationServices;

-    using HandBrake.ApplicationServices.Exceptions;

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Parsing;

@@ -34,7 +32,6 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Helpers;

     using HandBrakeWPF.Model;

     using HandBrakeWPF.ViewModels.Interfaces;

-    using HandBrakeWPF.Views;

 

     using Ookii.Dialogs.Wpf;

 

@@ -305,7 +302,6 @@ namespace HandBrakeWPF.ViewModels
                 fileMenuItem.Click += this.fileMenuItem_Click;

                 menuItems.Add(fileMenuItem);

 

-

                 // File Menu Item

                 MenuItem titleSpecific = new MenuItem { Header = new TextBlock { Text = "Title Specific Scan", Margin = new Thickness(8, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center } };

 

@@ -1286,16 +1282,6 @@ namespace HandBrakeWPF.ViewModels
             this.SelectedPreset = e.NewValue as Preset;

         }

 

-        /// <summary>

-        /// Show Release Notes

-        /// </summary>

-        public void ShowReleaseNotes()

-        {

-            string path =

-                Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);

-            Process.Start(path + "\\releasenotes.html");

-        }

-

         #endregion

 

         #region Private Methods

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 29565cf1c..9f3c65ee6 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -610,15 +610,6 @@
                    Padding="0,0,0,5"

                    />

 

-            <Button Content="BETA WPF UI RELEASE NOTES"

-                    FontSize="11"

-                    FontWeight="Bold"

-                    Foreground="Blue"

-                    Micro:Message.Attach="[Event Click] = [Action ShowReleaseNotes]"

-                    Padding="0,0,0,5"

-                    />

-

-

         </StatusBar>

     </Grid>

 </UserControl>