WinGui:

- Update Caliburn to 2.0RC, update the current source files to work with the new version. Introduces MEF to the project.

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

37 files changed, 124 insertions, 144 deletions

diff --git a/win/C#/HandBrakeWPF/App.xaml b/win/C#/HandBrakeWPF/App.xaml
index 903288b37..a00960ad3 100644
--- a/win/C#/HandBrakeWPF/App.xaml
+++ b/win/C#/HandBrakeWPF/App.xaml
@@ -1,8 +1,13 @@
-<ApplicationModel:CaliburnApplication x:Class="HandBrakeWPF.App"

+<Application x:Class="HandBrakeWPF.App"

              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 

-             xmlns:ApplicationModel="clr-namespace:Caliburn.PresentationFramework.ApplicationModel;assembly=Caliburn.PresentationFramework">

+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:HandBrakeWPF.Services">

     <Application.Resources>

-         

+        <ResourceDictionary>

+            <ResourceDictionary.MergedDictionaries>

+                <ResourceDictionary>

+                    <local:MefBootstrapper x:Key="bootstrapper" />

+                </ResourceDictionary>

+            </ResourceDictionary.MergedDictionaries>

+        </ResourceDictionary>

     </Application.Resources>

-</ApplicationModel:CaliburnApplication>

+</Application>

diff --git a/win/C#/HandBrakeWPF/App.xaml.cs b/win/C#/HandBrakeWPF/App.xaml.cs
index c0ed622a4..8b47a6291 100644
--- a/win/C#/HandBrakeWPF/App.xaml.cs
+++ b/win/C#/HandBrakeWPF/App.xaml.cs
@@ -5,16 +5,10 @@
 

 namespace HandBrakeWPF

 {

-    using Caliburn.PresentationFramework;

-    using Caliburn.PresentationFramework.ApplicationModel;

-

-    using HandBrakeWPF.Services;

-    using HandBrakeWPF.ViewModels;

-

     /// <summary>

     /// Interaction logic for App.xaml

     /// </summary>

-    public partial class App : CaliburnApplication

+    public partial class App 

     {

         /*

          * TODO:

@@ -23,34 +17,11 @@ namespace HandBrakeWPF
          * 

          */

 

-

         /// <summary>

         /// Initializes a new instance of the <see cref="App"/> class.

         /// </summary>

         public App()

         {

         }

-

-        /// <summary>

-        /// Create the Root View

-        /// </summary>

-        /// <returns>

-        /// A MainViewMOdel

-        /// </returns>

-        protected override object CreateRootModel()

-        {

-            var binder = (DefaultBinder)Container.GetInstance<DefaultBinder>();

-

-            binder.EnableBindingConventions();

-            binder.EnableMessageConventions();

-

-            return Container.GetInstance<MainViewModel>();

-        }

-

-

-        protected override void ConfigurePresentationFramework(PresentationFrameworkModule module)

-        {

-            module.UsingWindowManager<WindowManager>();

-        }

     }

 }

diff --git a/win/C#/HandBrakeWPF/HandBrakeWPF.csproj b/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
index 031f56ba7..0937aea29 100644
--- a/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
@@ -39,17 +39,54 @@
     <Reference Include="Caliburn.Core">

       <HintPath>..\libraries\caliburn\Caliburn.Core.dll</HintPath>

     </Reference>

-    <Reference Include="Caliburn.ModelFramework">

-      <HintPath>..\libraries\caliburn\Caliburn.ModelFramework.dll</HintPath>

+    <Reference Include="Caliburn.DynamicProxy">

+      <HintPath>..\libraries\caliburn\Caliburn.DynamicProxy.dll</HintPath>

+    </Reference>

+    <Reference Include="Caliburn.FluentValidation">

+      <HintPath>..\libraries\caliburn\Caliburn.FluentValidation.dll</HintPath>

+    </Reference>

+    <Reference Include="Caliburn.MEF">

+      <HintPath>..\libraries\caliburn\Caliburn.MEF.dll</HintPath>

     </Reference>

     <Reference Include="Caliburn.PresentationFramework">

       <HintPath>..\libraries\caliburn\Caliburn.PresentationFramework.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.Practices.ServiceLocation">

-      <HintPath>..\libraries\caliburn\Microsoft.Practices.ServiceLocation.dll</HintPath>

+    <Reference Include="Caliburn.ShellFramework">

+      <HintPath>..\libraries\caliburn\Caliburn.ShellFramework.dll</HintPath>

+    </Reference>

+    <Reference Include="Caliburn.Windsor">

+      <HintPath>..\libraries\caliburn\Caliburn.Windsor.dll</HintPath>

+    </Reference>

+    <Reference Include="Castle.Core">

+      <HintPath>..\libraries\caliburn\Castle.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="Castle.Windsor">

+      <HintPath>..\libraries\caliburn\Castle.Windsor.dll</HintPath>

+    </Reference>

+    <Reference Include="Common.Logging">

+      <HintPath>..\libraries\caliburn\Common.Logging.dll</HintPath>

+    </Reference>

+    <Reference Include="FluentValidation">

+      <HintPath>..\libraries\caliburn\FluentValidation.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Practices.Composite">

+      <HintPath>..\libraries\caliburn\Microsoft.Practices.Composite.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Practices.Composite.Presentation">

+      <HintPath>..\libraries\caliburn\Microsoft.Practices.Composite.Presentation.dll</HintPath>

     </Reference>

     <Reference Include="System" />

+    <Reference Include="System.ComponentModel.Composition" />

+    <Reference Include="System.CoreEx">

+      <HintPath>..\libraries\caliburn\System.CoreEx.dll</HintPath>

+    </Reference>

     <Reference Include="System.Data" />

+    <Reference Include="System.Interactive">

+      <HintPath>..\libraries\caliburn\System.Interactive.dll</HintPath>

+    </Reference>

+    <Reference Include="System.Reactive">

+      <HintPath>..\libraries\caliburn\System.Reactive.dll</HintPath>

+    </Reference>

     <Reference Include="System.Xml" />

     <Reference Include="Microsoft.CSharp" />

     <Reference Include="System.Core" />

@@ -70,9 +107,10 @@
       <Generator>MSBuild:Compile</Generator>

       <SubType>Designer</SubType>

     </ApplicationDefinition>

-    <Compile Include="Services\WindowManager.cs" />

+    <Compile Include="Services\MefBootstrapper.cs" />

     <Compile Include="ViewModels\AboutViewModel.cs" />

     <Compile Include="ViewModels\AddPresetViewModel.cs" />

+    <Compile Include="ViewModels\Interfaces\IMainViewModel.cs" />

     <Compile Include="ViewModels\PreviewViewModel.cs" />

     <Compile Include="ViewModels\QueueViewModel.cs" />

     <Compile Include="ViewModels\OptionsViewModel.cs" />

diff --git a/win/C#/HandBrakeWPF/Services/MefBootstrapper.cs b/win/C#/HandBrakeWPF/Services/MefBootstrapper.cs
new file mode 100644
index 000000000..bd05356c0
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Services/MefBootstrapper.cs
@@ -0,0 +1,21 @@
+namespace HandBrakeWPF.Services 

+{

+    using System.ComponentModel.Composition.Hosting;

+    using System.Linq;

+

+    using Caliburn.Core.InversionOfControl;

+    using Caliburn.MEF;

+    using Caliburn.PresentationFramework.ApplicationModel;

+

+    using HandBrakeWPF.ViewModels.Interfaces;

+

+    public class MefBootstrapper : Bootstrapper<IMainViewModel> 

+    {

+        protected override IServiceLocator CreateContainer() 

+        {

+            var container = new CompositionContainer(new AggregateCatalog(SelectAssemblies().Select(x => new AssemblyCatalog(x))));

+

+            return new MEFAdapter(container);

+        }

+    }

+}
\ No newline at end of file
diff --git a/win/C#/HandBrakeWPF/Services/WindowManager.cs b/win/C#/HandBrakeWPF/Services/WindowManager.cs
deleted file mode 100644
index 903597bd4..000000000
--- a/win/C#/HandBrakeWPF/Services/WindowManager.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-namespace HandBrakeWPF.Services

-{

-    using System;

-    using System.Windows;

-

-    using Caliburn.PresentationFramework.ApplicationModel;

-

-    public class WindowManager : DefaultWindowManager, IWindowManager

-    {

-

-        public WindowManager(IViewStrategy viewStrategy, IBinder binder)

-

-            : base(viewStrategy, binder)

-        {

-        }

-

-        //Display a view in a dialog (modal) window 

-        public new bool? ShowDialog(object rootModel, object context, Action<ISubordinate, Action> handleShutdownModel)

-        {

-            var window = base.CreateWindow(rootModel, true, context, handleShutdownModel);

-            window.WindowStartupLocation = WindowStartupLocation.CenterScreen;

-            window.WindowStyle = WindowStyle.ToolWindow;

-            window.ResizeMode = ResizeMode.NoResize;

-            window.Title = ((IPresenter)rootModel).DisplayName;

-            return window.ShowDialog();

-        }

-

-        //Display a view in a popup (non-modal) window 

-        public new void Show(object rootModel, object context, Action<ISubordinate, Action> handleShutdownModel)

-        {

-            var window = base.CreateWindow(rootModel, false, context, handleShutdownModel);

-            window.WindowStartupLocation = WindowStartupLocation.CenterScreen;

-            window.Title = ((IPresenter)rootModel).DisplayName;

-            window.ResizeMode = ResizeMode.NoResize;

-            window.Show();

-        }

-

-    }

-

-}

diff --git a/win/C#/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/AboutViewModel.cs
index b2e83cd84..aeb0ee822 100644
--- a/win/C#/HandBrakeWPF/ViewModels/AboutViewModel.cs
+++ b/win/C#/HandBrakeWPF/ViewModels/AboutViewModel.cs
@@ -5,15 +5,14 @@
 

 namespace HandBrakeWPF.ViewModels

 {

-    using Microsoft.Practices.ServiceLocation;

+    using Caliburn.PresentationFramework.ApplicationModel;

 

     /// <summary>

     /// The About View Model

     /// </summary>

     public class AboutViewModel : ViewModelBase

     {

-        public AboutViewModel(IServiceLocator locator)

-            : base(locator)

+        public AboutViewModel(IWindowManager windowManager) : base(windowManager)

         {

         }

 

diff --git a/win/C#/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index c744d0026..6a44bb1a5 100644
--- a/win/C#/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/C#/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -5,15 +5,14 @@
 

 namespace HandBrakeWPF.ViewModels

 {

-    using Microsoft.Practices.ServiceLocation;

+    using Caliburn.PresentationFramework.ApplicationModel;

 

     /// <summary>

     /// The Add Preset View Model

     /// </summary>

     public class AddPresetViewModel : ViewModelBase

     {

-        public AddPresetViewModel(IServiceLocator locator)

-            : base(locator)

+        public AddPresetViewModel(IWindowManager windowManager) : base(windowManager)

         {

         }

     }

diff --git a/win/C#/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
new file mode 100644
index 000000000..31ce54db0
--- /dev/null
+++ b/win/C#/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
@@ -0,0 +1,10 @@
+namespace HandBrakeWPF.ViewModels.Interfaces

+{

+    public interface IMainViewModel

+    {

+        /// <summary>

+        /// Shutdown the Application

+        /// </summary>

+        void ExitApplication();

+    }

+}
\ No newline at end of file
diff --git a/win/C#/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/MainViewModel.cs
index b39906df3..dc8a62a48 100644
--- a/win/C#/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/C#/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -7,21 +7,25 @@ namespace HandBrakeWPF.ViewModels
 {

     using System;

     using System.Collections.ObjectModel;

+    using System.ComponentModel.Composition;

     using System.Diagnostics;

     using System.IO;

     using System.Windows;

 

+    using Caliburn.PresentationFramework.ApplicationModel;

+

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Parsing;

     using HandBrake.ApplicationServices.Services;

     using HandBrake.ApplicationServices.Services.Interfaces;

 

-    using Microsoft.Practices.ServiceLocation;

+    using HandBrakeWPF.ViewModels.Interfaces;

 

     /// <summary>

     /// HandBrakes Main Window

     /// </summary>

-    public class MainViewModel : ViewModelBase

+    [Export(typeof(IMainViewModel))]

+    public class MainViewModel : ViewModelBase, IMainViewModel

     {

         #region Private Variables and Services

 

@@ -59,8 +63,8 @@ namespace HandBrakeWPF.ViewModels
 

         #region Properties

 

-        public MainViewModel(IServiceLocator locator)

-            : base(locator)

+        [ImportingConstructor]

+        public MainViewModel(IWindowManager windowManager) : base(windowManager) 

         {

             // Setup Services (TODO - Bring Castle back into the project to wire these up for us)

             this.scanService = File.Exists("hb.dll") ? (IScan)new LibScan() : new ScanService();

@@ -96,7 +100,6 @@ namespace HandBrakeWPF.ViewModels
                 if (!object.Equals(this.windowName, value))

                 {

                     this.windowName = value;

-                    this.NotifyOfPropertyChange("TestProperty");

                 }

             }

         }

@@ -139,7 +142,6 @@ namespace HandBrakeWPF.ViewModels
                 if (!object.Equals(this.sourceLabel, value))

                 {

                     this.sourceLabel = value;

-                    this.NotifyOfPropertyChange("SourceLabel");

                 }

             }

         }

@@ -160,7 +162,6 @@ namespace HandBrakeWPF.ViewModels
                 if (!object.Equals(this.programStatusLabel, value))

                 {

                     this.programStatusLabel = value;

-                    this.NotifyOfPropertyChange("ProgramStatusLabel");

                 }

             }

         }

@@ -170,7 +171,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>

         /// Shutdown this View

         /// </summary>

-        public override void Shutdown()

+        public void Shutdown()

         {

             // Unsubscribe from Events.

             this.scanService.ScanStared -= this.ScanStared;

@@ -181,9 +182,6 @@ namespace HandBrakeWPF.ViewModels
             this.queueProcessor.QueuePaused -= this.QueuePaused;

             this.queueProcessor.EncodeService.EncodeStarted -= this.EncodeStarted;

             this.queueProcessor.EncodeService.EncodeStatusChanged -= this.EncodeStatusChanged;

-

-            // Shutdown Normally

-            base.Shutdown();

         }

 

 

@@ -191,7 +189,6 @@ namespace HandBrakeWPF.ViewModels
         

         public void AboutApplication()

         {

-           this.ShowDialog<AboutViewModel>();

         }

         

         /// <summary>

diff --git a/win/C#/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index ab7749980..6d634bbbb 100644
--- a/win/C#/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/C#/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -5,15 +5,14 @@
 

 namespace HandBrakeWPF.ViewModels

 {

-    using Microsoft.Practices.ServiceLocation;

+    using Caliburn.PresentationFramework.ApplicationModel;

 

     /// <summary>

     /// The Options View Model

     /// </summary>

     public class OptionsViewModel : ViewModelBase

     {

-        public OptionsViewModel(IServiceLocator locator)

-            : base(locator)

+        public OptionsViewModel(IWindowManager windowManager) : base(windowManager)

         {

         }

     }

diff --git a/win/C#/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/PreviewViewModel.cs
index 2593fa51e..b41fd69f5 100644
--- a/win/C#/HandBrakeWPF/ViewModels/PreviewViewModel.cs
+++ b/win/C#/HandBrakeWPF/ViewModels/PreviewViewModel.cs
@@ -5,15 +5,14 @@
 

 namespace HandBrakeWPF.ViewModels

 {

-    using Microsoft.Practices.ServiceLocation;

+    using Caliburn.PresentationFramework.ApplicationModel;

 

     /// <summary>

     /// The About View Model

     /// </summary>

     public class PreviewViewModel : ViewModelBase

     {

-        public PreviewViewModel(IServiceLocator locator)

-            : base(locator)

+        public PreviewViewModel(IWindowManager windowManager) : base(windowManager)

         {

         }

     }

diff --git a/win/C#/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 5ebfd11f7..07f3f486f 100644
--- a/win/C#/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/C#/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -5,15 +5,14 @@
 

 namespace HandBrakeWPF.ViewModels

 {

-    using Microsoft.Practices.ServiceLocation;

+    using Caliburn.PresentationFramework.ApplicationModel;

 

     /// <summary>

     /// The Preview View Model

     /// </summary>

     public class QueueViewModel : ViewModelBase

     {

-        public QueueViewModel(IServiceLocator locator)

-            : base(locator)

+        public QueueViewModel(IWindowManager windowManager) : base(windowManager)

         {

         }

     }

diff --git a/win/C#/HandBrakeWPF/ViewModels/ViewModelBase.cs b/win/C#/HandBrakeWPF/ViewModels/ViewModelBase.cs
index c07593b7b..b946d7c7e 100644
--- a/win/C#/HandBrakeWPF/ViewModels/ViewModelBase.cs
+++ b/win/C#/HandBrakeWPF/ViewModels/ViewModelBase.cs
@@ -1,35 +1,18 @@
 namespace HandBrakeWPF.ViewModels

 {

     using Caliburn.PresentationFramework.ApplicationModel;

-

-    using Microsoft.Practices.ServiceLocation;

+    using Caliburn.PresentationFramework.Screens;

 

     /// <summary>

     /// A Base Class for the View Models which contains reusable code.

     /// </summary>

-    public class ViewModelBase : MultiPresenterManager

+    public class ViewModelBase : Screen

     {

-        protected IServiceLocator Locator { get; private set; }

-

-        public ViewModelBase(IServiceLocator locator)

-        {

-            this.Locator = locator;

-        }

-

-        public void Show<T>() where T : IPresenter

+        public ViewModelBase(IWindowManager windowManager)

         {

-            this.ShutdownCurrent();

-            this.Open(Locator.GetInstance<T>());

+            this.WindowManager = windowManager;

         }

 

-        public void ShowDialog<T>() where T : IPresenter

-        {

-            Locator.GetInstance<IWindowManager>().ShowDialog(Locator.GetInstance<T>());

-        }

-        

-        public void Popup<T>() where T : IPresenter

-        {

-            Locator.GetInstance<IWindowManager>().Show(Locator.GetInstance<T>());

-        }

+        public IWindowManager WindowManager { get; private set; }

     }

 }

diff --git a/win/C#/HandBrakeWPF/Views/AboutView.xaml b/win/C#/HandBrakeWPF/Views/AboutView.xaml
index 030623f9c..7316ab49a 100644
--- a/win/C#/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/C#/HandBrakeWPF/Views/AboutView.xaml
@@ -1,6 +1,6 @@
 <Window x:Class="HandBrakeWPF.Views.AboutView"

         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:PresentationFramework="clr-namespace:Caliburn.PresentationFramework;assembly=Caliburn.PresentationFramework" Title="AboutView" Height="268" Width="511">

+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:PresentationFramework="clr-namespace:Caliburn.PresentationFramework;assembly=Caliburn.PresentationFramework" xmlns:RoutedMessaging="clr-namespace:Caliburn.PresentationFramework.RoutedMessaging;assembly=Caliburn.PresentationFramework" Title="AboutView" Height="268" Width="511">

     

     <StackPanel Orientation="Horizontal">

         <Image Source="Images/logo64.png" Width="64" Height="64" SnapsToDevicePixels="True" Margin="10,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" />

@@ -18,7 +18,7 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

             </TextBox>

 

-            <Button Content="OK" PresentationFramework:Message.Attach="[Event Click] = [Action Close]"

+            <Button Content="OK" RoutedMessaging:Message.Attach="[Event Click] = [Action Close]"

                     HorizontalAlignment="Right" Padding="10,2" Margin="0,0,10,10" />

             

          </StackPanel>

diff --git a/win/C#/HandBrakeWPF/Views/MainView.xaml b/win/C#/HandBrakeWPF/Views/MainView.xaml
index 828a28cb9..496afc4ee 100644
--- a/win/C#/HandBrakeWPF/Views/MainView.xaml
+++ b/win/C#/HandBrakeWPF/Views/MainView.xaml
@@ -1,9 +1,9 @@
 <Window x:Class="HandBrakeWPF.Views.MainView"

         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 

-        xmlns:PresentationFramework="clr-namespace:Caliburn.PresentationFramework;assembly=Caliburn.PresentationFramework" 

         xmlns:Views="clr-namespace:HandBrakeWPF.Views"

         xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework" 

+        xmlns:RoutedMessaging="clr-namespace:Caliburn.PresentationFramework.RoutedMessaging;assembly=Caliburn.PresentationFramework" 

         Title="{Data:Binding Path=WindowTitle}" Height="655" Width="1015" FontSize="11">

 

     <Grid>

@@ -14,30 +14,30 @@
                 <Menu Height="23" VerticalAlignment="Top" HorizontalAlignment="Stretch">

                     <MenuItem Header="File">

                         <MenuItem Header="Cancel Scan" />

-                        <MenuItem Header="Exit" PresentationFramework:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="Exit" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />

                     </MenuItem>

 

                     <MenuItem Header="Tools">

-                        <MenuItem Header="Show Queue" PresentationFramework:Message.Attach="[Event Click] = [Action ExitApplication]" />

-                        <MenuItem Header="Activity Window" PresentationFramework:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="Show Queue" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="Activity Window" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />

                     </MenuItem>

 

                     <MenuItem Header="Presets">

-                        <MenuItem Header="Reset Built-in Presets" PresentationFramework:Message.Attach="[Event Click] = [Action ExitApplication]" />

-                        <MenuItem Header="Delete Built-in Presets" PresentationFramework:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="Reset Built-in Presets" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="Delete Built-in Presets" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />

                         <Separator />

-                        <MenuItem Header="Save As New Preset" PresentationFramework:Message.Attach="[Event Click] = [Action ExitApplication]" />

-                        <MenuItem Header="Import" PresentationFramework:Message.Attach="[Event Click] = [Action ExitApplication]" />

-                        <MenuItem Header="Export" PresentationFramework:Message.Attach="[Event Click] = [Action ExitApplication]" />

-                        <MenuItem Header="Set as Default" PresentationFramework:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="Save As New Preset" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="Import" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="Export" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="Set as Default" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />

                     </MenuItem>

 

                     <MenuItem Header="Help">

-                        <MenuItem Header="HandBrake User Guide" PresentationFramework:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="HandBrake User Guide" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />

                         <Separator />

-                        <MenuItem Header="Check for Updates" PresentationFramework:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="Check for Updates" RoutedMessaging:Message.Attach="[Event Click] = [Action ExitApplication]" />

                         <Separator />

-                        <MenuItem Header="About..." PresentationFramework:Message.Attach="[Event Click] = [Action AboutApplication]" />

+                        <MenuItem Header="About..." RoutedMessaging:Message.Attach="[Event Click] = [Action AboutApplication]" />

                     </MenuItem>

                 </Menu>

 

diff --git a/win/C#/libraries/caliburn/Caliburn 2.0 Documentation.chm b/win/C#/libraries/caliburn/Caliburn 2.0 Documentation.chm
new file mode 100644
index 000000000..75ffc2b63
--- /dev/null
+++ b/win/C#/libraries/caliburn/Caliburn 2.0 Documentation.chm
diff --git a/win/C#/libraries/caliburn/Caliburn.Castle.dll b/win/C#/libraries/caliburn/Caliburn.Castle.dll
deleted file mode 100644
index bc36c6478..000000000
--- a/win/C#/libraries/caliburn/Caliburn.Castle.dll
+++ /dev/null
diff --git a/win/C#/libraries/caliburn/Caliburn.Core.dll b/win/C#/libraries/caliburn/Caliburn.Core.dll
index bb4123077..7a59cd831 100644
--- a/win/C#/libraries/caliburn/Caliburn.Core.dll
+++ b/win/C#/libraries/caliburn/Caliburn.Core.dll
diff --git a/win/C#/libraries/caliburn/Caliburn.DynamicProxy.dll b/win/C#/libraries/caliburn/Caliburn.DynamicProxy.dll
new file mode 100644
index 000000000..d390f3b55
--- /dev/null
+++ b/win/C#/libraries/caliburn/Caliburn.DynamicProxy.dll
diff --git a/win/C#/libraries/caliburn/Caliburn.FluentValidation.dll b/win/C#/libraries/caliburn/Caliburn.FluentValidation.dll
new file mode 100644
index 000000000..37d3e6d4b
--- /dev/null
+++ b/win/C#/libraries/caliburn/Caliburn.FluentValidation.dll
diff --git a/win/C#/libraries/caliburn/Caliburn.MEF.dll b/win/C#/libraries/caliburn/Caliburn.MEF.dll
new file mode 100644
index 000000000..83f95f168
--- /dev/null
+++ b/win/C#/libraries/caliburn/Caliburn.MEF.dll
diff --git a/win/C#/libraries/caliburn/Caliburn.ModelFramework.dll b/win/C#/libraries/caliburn/Caliburn.ModelFramework.dll
deleted file mode 100644
index 795aac874..000000000
--- a/win/C#/libraries/caliburn/Caliburn.ModelFramework.dll
+++ /dev/null
diff --git a/win/C#/libraries/caliburn/Caliburn.PresentationFramework.dll b/win/C#/libraries/caliburn/Caliburn.PresentationFramework.dll
index 620498ca1..afd521992 100644
--- a/win/C#/libraries/caliburn/Caliburn.PresentationFramework.dll
+++ b/win/C#/libraries/caliburn/Caliburn.PresentationFramework.dll
diff --git a/win/C#/libraries/caliburn/Caliburn.ShellFramework.dll b/win/C#/libraries/caliburn/Caliburn.ShellFramework.dll
new file mode 100644
index 000000000..ccc8a8336
--- /dev/null
+++ b/win/C#/libraries/caliburn/Caliburn.ShellFramework.dll
diff --git a/win/C#/libraries/caliburn/Caliburn.Windsor.dll b/win/C#/libraries/caliburn/Caliburn.Windsor.dll
new file mode 100644
index 000000000..bdad565e2
--- /dev/null
+++ b/win/C#/libraries/caliburn/Caliburn.Windsor.dll
diff --git a/win/C#/libraries/caliburn/Castle.Core.dll b/win/C#/libraries/caliburn/Castle.Core.dll
index b4a80932c..3b22e09c6 100644
--- a/win/C#/libraries/caliburn/Castle.Core.dll
+++ b/win/C#/libraries/caliburn/Castle.Core.dll
diff --git a/win/C#/libraries/caliburn/Castle.DynamicProxy2.dll b/win/C#/libraries/caliburn/Castle.DynamicProxy2.dll
deleted file mode 100644
index 763a61721..000000000
--- a/win/C#/libraries/caliburn/Castle.DynamicProxy2.dll
+++ /dev/null
diff --git a/win/C#/libraries/caliburn/Castle.MicroKernel.dll b/win/C#/libraries/caliburn/Castle.MicroKernel.dll
deleted file mode 100644
index 35df07a3a..000000000
--- a/win/C#/libraries/caliburn/Castle.MicroKernel.dll
+++ /dev/null
diff --git a/win/C#/libraries/caliburn/Castle.Windsor.dll b/win/C#/libraries/caliburn/Castle.Windsor.dll
index 480a4b5ff..e35e112d3 100644
--- a/win/C#/libraries/caliburn/Castle.Windsor.dll
+++ b/win/C#/libraries/caliburn/Castle.Windsor.dll
diff --git a/win/C#/libraries/caliburn/FluentValidation.dll b/win/C#/libraries/caliburn/FluentValidation.dll
new file mode 100644
index 000000000..6112609c5
--- /dev/null
+++ b/win/C#/libraries/caliburn/FluentValidation.dll
diff --git a/win/C#/libraries/caliburn/Microsoft.Practices.Composite.Presentation.dll b/win/C#/libraries/caliburn/Microsoft.Practices.Composite.Presentation.dll
new file mode 100644
index 000000000..ab33ee5eb
--- /dev/null
+++ b/win/C#/libraries/caliburn/Microsoft.Practices.Composite.Presentation.dll
diff --git a/win/C#/libraries/caliburn/Microsoft.Practices.Composite.dll b/win/C#/libraries/caliburn/Microsoft.Practices.Composite.dll
new file mode 100644
index 000000000..5b19c9f18
--- /dev/null
+++ b/win/C#/libraries/caliburn/Microsoft.Practices.Composite.dll
diff --git a/win/C#/libraries/caliburn/Microsoft.Practices.ServiceLocation.dll b/win/C#/libraries/caliburn/Microsoft.Practices.ServiceLocation.dll
deleted file mode 100644
index 3f8895473..000000000
--- a/win/C#/libraries/caliburn/Microsoft.Practices.ServiceLocation.dll
+++ /dev/null
diff --git a/win/C#/libraries/caliburn/System.ComponentModel.Composition.dll b/win/C#/libraries/caliburn/System.ComponentModel.Composition.dll
deleted file mode 100644
index bbbae1e10..000000000
--- a/win/C#/libraries/caliburn/System.ComponentModel.Composition.dll
+++ /dev/null
diff --git a/win/C#/libraries/caliburn/System.CoreEx.dll b/win/C#/libraries/caliburn/System.CoreEx.dll
new file mode 100644
index 000000000..e648852a5
--- /dev/null
+++ b/win/C#/libraries/caliburn/System.CoreEx.dll
diff --git a/win/C#/libraries/caliburn/System.Interactive.dll b/win/C#/libraries/caliburn/System.Interactive.dll
new file mode 100644
index 000000000..cbbc484a9
--- /dev/null
+++ b/win/C#/libraries/caliburn/System.Interactive.dll
diff --git a/win/C#/libraries/caliburn/System.Reactive.dll b/win/C#/libraries/caliburn/System.Reactive.dll
new file mode 100644
index 000000000..c6645a05e
--- /dev/null
+++ b/win/C#/libraries/caliburn/System.Reactive.dll