WinGui: Replace Castle Windsor with Caliburn Micros built-in SimpleContainer IoC. We don't need anything as powerful as castle. Also, since the license appears to now be Apache License 2 which is not compatible with GPLv2, we can't upgrade this library any more.

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

1 files changed, 8 insertions, 8 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index b233dc449..2082dbb9e 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -44,11 +44,6 @@ namespace HandBrakeWPF.ViewModels
         private readonly IUserSettingService userSettingService;

 

         /// <summary>

-        /// The Shell View Model

-        /// </summary>

-        private readonly IShellViewModel shellViewModel;

-

-        /// <summary>

         /// Backing field for the update service.

         /// </summary>

         private readonly IUpdateService updateService;

@@ -309,12 +304,15 @@ namespace HandBrakeWPF.ViewModels
         /// <param name="updateService">

         /// The update Service.

         /// </param>

-        public OptionsViewModel(IUserSettingService userSettingService, IShellViewModel shellViewModel, IUpdateService updateService)

+        /// <param name="aboutViewModel">

+        /// The about View Model.

+        /// </param>

+        public OptionsViewModel(IUserSettingService userSettingService, IUpdateService updateService, IAboutViewModel aboutViewModel)

         {

             this.Title = "Options";

             this.userSettingService = userSettingService;

-            this.shellViewModel = shellViewModel;

             this.updateService = updateService;

+            this.AboutViewModel = aboutViewModel;

             this.OnLoad();

 

             this.SelectedTab = OptionsTab.General;

@@ -1213,7 +1211,9 @@ namespace HandBrakeWPF.ViewModels
         public void Close()

         {

             this.Save();

-            this.shellViewModel.DisplayWindow(ShellWindow.MainWindow);

+

+            IShellViewModel shellViewModel = IoC.Get<IShellViewModel>();

+            shellViewModel.DisplayWindow(ShellWindow.MainWindow);

         }

 

         /// <summary>