diff options
| author | sr55 <[email protected]> | 2011-09-17 20:49:08 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-09-17 20:49:08 +0000 |
| commit | d145ee9d9ed7be65b83124afbf0cc71b60adddc6 (patch) | |
| tree | 8a7a47aa0bbeab6b18d6859bc457a215c5cbe61d /win/CS/HandBrakeWPF/ViewModels | |
| parent | ac48779d6481154c16419d3c758af39ddcba4d86 (diff) | |
HandBrakeWPF: Switch from Caliburn to Caliburn Micro and Add a CastleWindsor Bootstrapper.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4230 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
7 files changed, 7 insertions, 9 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs index aeb0ee822..aff760ad7 100644 --- a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs @@ -5,7 +5,7 @@ namespace HandBrakeWPF.ViewModels
{
- using Caliburn.PresentationFramework.ApplicationModel;
+ using Caliburn.Micro;
/// <summary>
/// The About View Model
@@ -15,6 +15,5 @@ namespace HandBrakeWPF.ViewModels public AboutViewModel(IWindowManager windowManager) : base(windowManager)
{
}
-
}
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs index 6a44bb1a5..0c9373b57 100644 --- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs @@ -5,7 +5,7 @@ namespace HandBrakeWPF.ViewModels
{
- using Caliburn.PresentationFramework.ApplicationModel;
+ using Caliburn.Micro;
/// <summary>
/// The Add Preset View Model
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index dc8a62a48..f833695c6 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -12,7 +12,7 @@ namespace HandBrakeWPF.ViewModels using System.IO;
using System.Windows;
- using Caliburn.PresentationFramework.ApplicationModel;
+ using Caliburn.Micro;
using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Parsing;
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs index 6d634bbbb..5979cdf60 100644 --- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs @@ -5,7 +5,7 @@ namespace HandBrakeWPF.ViewModels
{
- using Caliburn.PresentationFramework.ApplicationModel;
+ using Caliburn.Micro;
/// <summary>
/// The Options View Model
diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs index b41fd69f5..a72d0d665 100644 --- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs @@ -5,7 +5,7 @@ namespace HandBrakeWPF.ViewModels
{
- using Caliburn.PresentationFramework.ApplicationModel;
+ using Caliburn.Micro;
/// <summary>
/// The About View Model
diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs index 07f3f486f..e74722792 100644 --- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs @@ -5,7 +5,7 @@ namespace HandBrakeWPF.ViewModels
{
- using Caliburn.PresentationFramework.ApplicationModel;
+ using Caliburn.Micro;
/// <summary>
/// The Preview View Model
diff --git a/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs b/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs index b946d7c7e..29379938a 100644 --- a/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs +++ b/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs @@ -1,7 +1,6 @@ namespace HandBrakeWPF.ViewModels
{
- using Caliburn.PresentationFramework.ApplicationModel;
- using Caliburn.PresentationFramework.Screens;
+ using Caliburn.Micro;
/// <summary>
/// A Base Class for the View Models which contains reusable code.
|