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, 12 insertions, 1 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
index f21345f97..f516b156c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
@@ -46,6 +46,8 @@ namespace HandBrakeWPF.ViewModels
 

         private bool isMainPanelEnabled;

 

+        private IMainViewModel mainViewModel;

+

         #endregion

 

         /// <summary>

@@ -54,12 +56,21 @@ namespace HandBrakeWPF.ViewModels
         /// <param name="errorService">

         /// The error Service.

         /// </param>

-        public ShellViewModel(IErrorService errorService)

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

+        /// The main View Model.

+        /// </param>

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

+        /// The options View Model.

+        /// </param>

+        public ShellViewModel(IErrorService errorService, IMainViewModel mainViewModel, IOptionsViewModel optionsViewModel)

         {

             this.errorService = errorService;

             this.showMainWindow = true;

             this.showOptions = false;

             this.IsMainPanelEnabled = true;

+            this.MainViewModel = mainViewModel;

+            this.OptionsViewModel = optionsViewModel;

+            //this.OverlayPanelViewModel = overlayPanel;

         }

 

         /// <summary>