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

16 files changed, 32 insertions, 128 deletions

diff --git a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml
index 3adb82821..9b2010852 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml
+++ b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandBrakeWPF.Views.AdvancedView"

+<UserControl x:Class="HandBrakeWPF.Views.Controls.AdvancedView"

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

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

              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

diff --git a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs
index b7ad6ef86..247100750 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs
@@ -1,19 +1,7 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Navigation;

-using System.Windows.Shapes;

-

-namespace HandBrakeWPF.Views

+namespace HandBrakeWPF.Views.Controls

 {

+    using System.Windows.Controls;

+

     /// <summary>

     /// Interaction logic for AdvancedView.xaml

     /// </summary>

diff --git a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml
index 6087c7d07..0ec8c866c 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandBrakeWPF.Views.AudioView"

+<UserControl x:Class="HandBrakeWPF.Views.Controls.AudioView"

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

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

              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

diff --git a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs
index 3518eea56..ad4bb96c8 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs
@@ -1,19 +1,7 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Navigation;

-using System.Windows.Shapes;

-

-namespace HandBrakeWPF.Views

+namespace HandBrakeWPF.Views.Controls

 {

+    using System.Windows.Controls;

+

     /// <summary>

     /// Interaction logic for AudioView.xaml

     /// </summary>

diff --git a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml
index ac39a7062..982142385 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandBrakeWPF.Views.ChaptersView"

+<UserControl x:Class="HandBrakeWPF.Views.Controls.ChaptersView"

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

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

              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

diff --git a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs
index f61b201c9..4bb0e2d1f 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs
@@ -1,19 +1,7 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Navigation;

-using System.Windows.Shapes;

-

-namespace HandBrakeWPF.Views

+namespace HandBrakeWPF.Views.Controls

 {

+    using System.Windows.Controls;

+

     /// <summary>

     /// Interaction logic for ChaptersView.xaml

     /// </summary>

diff --git a/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml b/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml
index 6ac8f5a10..7729dc553 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandBrakeWPF.Views.FiltersView"

+<UserControl x:Class="HandBrakeWPF.Views.Controls.FiltersView"

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

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

              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

diff --git a/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs
index 27f38be95..a8b26716a 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs
@@ -1,19 +1,7 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Navigation;

-using System.Windows.Shapes;

-

-namespace HandBrakeWPF.Views

+namespace HandBrakeWPF.Views.Controls

 {

+    using System.Windows.Controls;

+

     /// <summary>

     /// Interaction logic for VideoFilters.xaml

     /// </summary>

diff --git a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml
index 80b82c52f..f39f61528 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"

+<UserControl x:Class="HandBrakeWPF.Views.Controls.PictureSettingsView"

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

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

              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

diff --git a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs
index 9401168dc..c86e0f8e0 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs
@@ -1,19 +1,7 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Navigation;

-using System.Windows.Shapes;

-

-namespace HandBrakeWPF.Views

+namespace HandBrakeWPF.Views.Controls

 {

+    using System.Windows.Controls;

+

     /// <summary>

     /// Interaction logic for PictureSettingsView.xaml

     /// </summary>

diff --git a/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml b/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml
index 694dcd8df..86d19f5ff 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml
+++ b/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandBrakeWPF.Views.QueryEditorView"

+<UserControl x:Class="HandBrakeWPF.Views.Controls.QueryEditorView"

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

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

              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

diff --git a/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs
index d67b7eb5c..6b1735815 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs
@@ -1,19 +1,7 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Navigation;

-using System.Windows.Shapes;

-

-namespace HandBrakeWPF.Views

+namespace HandBrakeWPF.Views.Controls

 {

+    using System.Windows.Controls;

+

     /// <summary>

     /// Interaction logic for QueryEditorView.xaml

     /// </summary>

diff --git a/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml
index 4594f62b5..842807931 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandBrakeWPF.Views.SubtitlesView"

+<UserControl x:Class="HandBrakeWPF.Views.Controls.SubtitlesView"

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

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

              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

diff --git a/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs
index 589462c40..539ae5793 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs
@@ -1,19 +1,7 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Navigation;

-using System.Windows.Shapes;

-

-namespace HandBrakeWPF.Views

+namespace HandBrakeWPF.Views.Controls

 {

+    using System.Windows.Controls;

+

     /// <summary>

     /// Interaction logic for SubtitlesView.xaml

     /// </summary>

diff --git a/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml b/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml
index 72ab1f67c..d1b22c15b 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandBrakeWPF.Views.VideoView"

+<UserControl x:Class="HandBrakeWPF.Views.Controls.VideoView"

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

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

              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

diff --git a/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml.cs
index f59435f02..12f96979d 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml.cs
@@ -1,19 +1,7 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Navigation;

-using System.Windows.Shapes;

-

-namespace HandBrakeWPF.Views

+namespace HandBrakeWPF.Views.Controls

 {

+    using System.Windows.Controls;

+

     /// <summary>

     /// Interaction logic for VideoView.xaml

     /// </summary>