WinGui: Update Caliburn Micro Framework to 1.3.1

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

3 files changed, 453 insertions, 74 deletions

diff --git a/win/CS/libraries/caliburn/Caliburn.Micro.dll b/win/CS/libraries/caliburn/Caliburn.Micro.dll
index d687bce4e..d6f507bef 100644
--- a/win/CS/libraries/caliburn/Caliburn.Micro.dll
+++ b/win/CS/libraries/caliburn/Caliburn.Micro.dll
diff --git a/win/CS/libraries/caliburn/Caliburn.Micro.pdb b/win/CS/libraries/caliburn/Caliburn.Micro.pdb
index c9004068c..266554152 100644
--- a/win/CS/libraries/caliburn/Caliburn.Micro.pdb
+++ b/win/CS/libraries/caliburn/Caliburn.Micro.pdb
diff --git a/win/CS/libraries/caliburn/Caliburn.Micro.xml b/win/CS/libraries/caliburn/Caliburn.Micro.xml
index 0b5612704..cf09ab6cc 100644
--- a/win/CS/libraries/caliburn/Caliburn.Micro.xml
+++ b/win/CS/libraries/caliburn/Caliburn.Micro.xml
@@ -168,6 +168,12 @@
               Resets the executor to use a non-dispatcher-based action executor.

             </summary>

         </member>

+        <member name="M:Caliburn.Micro.Execute.SetUIThreadMarshaller(System.Action{System.Action})">

+            <summary>

+            Sets a custom UI thread marshaller.

+            </summary>

+            <param name="marshaller">The marshaller.</param>

+        </member>

         <member name="M:Caliburn.Micro.Execute.OnUIThread(System.Action)">

             <summary>

               Executes the action on the UI thread.

@@ -229,6 +235,18 @@
             </summary>

             <param name = "propertyName">Name of the property.</param>

         </member>

+        <member name="M:Caliburn.Micro.PropertyChangedBase.OnDeserialized(System.Runtime.Serialization.StreamingContext)">

+            <summary>

+            Called when the object is deserialized.

+            </summary>

+            <param name="c">The streaming context.</param>

+        </member>

+        <member name="M:Caliburn.Micro.PropertyChangedBase.ShouldSerializeIsNotifying">

+            <summary>

+            Used to indicate whether or not the IsNotifying property is serialized to Xml.

+            </summary>

+            <returns>Whether or not to serialize the IsNotifying property. The default is false.</returns>

+        </member>

         <member name="P:Caliburn.Micro.PropertyChangedBase.IsNotifying">

             <summary>

               Enables/Disables property change notification.

@@ -384,11 +402,72 @@
             </summary>

             <param name = "items">The items.</param>

         </member>

+        <member name="M:Caliburn.Micro.BindableCollection`1.OnDeserialized(System.Runtime.Serialization.StreamingContext)">

+            <summary>

+            Called when the object is deserialized.

+            </summary>

+            <param name="c">The streaming context.</param>

+        </member>

+        <member name="M:Caliburn.Micro.BindableCollection`1.ShouldSerializeIsNotifying">

+            <summary>

+            Used to indicate whether or not the IsNotifying property is serialized to Xml.

+            </summary>

+            <returns>Whether or not to serialize the IsNotifying property. The default is false.</returns>

+        </member>

         <member name="P:Caliburn.Micro.BindableCollection`1.IsNotifying">

             <summary>

               Enables/Disables property change notification.

             </summary>

         </member>

+        <member name="T:Caliburn.Micro.RegExHelper">

+            <summary>

+             Helper class for encoding strings to regular expression patterns

+            </summary>

+        </member>

+        <member name="F:Caliburn.Micro.RegExHelper.NameRegEx">

+            <summary>

+            Regular expression pattern for valid name

+            </summary>

+        </member>

+        <member name="F:Caliburn.Micro.RegExHelper.SubNamespaceRegEx">

+            <summary>

+            Regular expression pattern for subnamespace (including dot)

+            </summary>

+        </member>

+        <member name="F:Caliburn.Micro.RegExHelper.NamespaceRegEx">

+            <summary>

+            Regular expression pattern for namespace or namespace fragment

+            </summary>

+        </member>

+        <member name="M:Caliburn.Micro.RegExHelper.GetCaptureGroup(System.String,System.String)">

+            <summary>

+            Creates a named capture group with the specified regular expression 

+            </summary>

+            <param name="groupName">Name of capture group to create</param>

+            <param name="regEx">Regular expression pattern to capture</param>

+            <returns>Regular expression capture group with the specified group name</returns>

+        </member>

+        <member name="M:Caliburn.Micro.RegExHelper.NamespaceToRegEx(System.String)">

+            <summary>

+            Converts a namespace (including wildcards) to a regular expression string

+            </summary>

+            <param name="srcNamespace">Source namespace to convert to regular expression</param>

+            <returns>Namespace converted to a regular expression</returns>

+        </member>

+        <member name="M:Caliburn.Micro.RegExHelper.GetNameCaptureGroup(System.String)">

+            <summary>

+            Creates a capture group for a valid name regular expression pattern

+            </summary>

+            <param name="groupName">Name of capture group to create</param>

+            <returns>Regular expression capture group with the specified group name</returns>

+        </member>

+        <member name="M:Caliburn.Micro.RegExHelper.GetNamespaceCaptureGroup(System.String)">

+            <summary>

+            Creates a capture group for a namespace regular expression pattern

+            </summary>

+            <param name="groupName">Name of capture group to create</param>

+            <returns>Regular expression capture group with the specified group name</returns>

+        </member>

         <member name="T:Caliburn.Micro.ILog">

             <summary>

             A logger.

@@ -1033,6 +1112,75 @@
              Used to transform names.

             </summary>

         </member>

+        <member name="F:Caliburn.Micro.ViewModelLocator.InterfaceCaptureGroupName">

+            <summary>

+            The name of the capture group used as a marker for rules that return interface types

+            </summary>

+        </member>

+        <member name="M:Caliburn.Micro.ViewModelLocator.ConfigureTypeMappings(Caliburn.Micro.TypeMappingConfiguration)">

+            <summary>

+            Specifies how type mappings are created, including default type mappings. Calling this method will

+            clear all existing name transformation rules and create new default type mappings according to the

+            configuration.

+            </summary>

+            <param name="config">An instance of TypeMappingConfiguration that provides the settings for configuration</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewModelLocator.AddDefaultTypeMapping(System.String)">

+            <summary>

+            Adds a default type mapping using the standard namespace mapping convention

+            </summary>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewModelLocator.AddTypeMapping(System.String,System.String,System.String[],System.String)">

+            <summary>

+            Adds a standard type mapping based on namespace RegEx replace and filter patterns

+            </summary>

+            <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>

+            <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>

+            <param name="nsTargetsRegEx">Array of RegEx replace values for target namespaces</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewModelLocator.AddTypeMapping(System.String,System.String,System.String,System.String)">

+            <summary>

+            Adds a standard type mapping based on namespace RegEx replace and filter patterns

+            </summary>

+            <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>

+            <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>

+            <param name="nsTargetRegEx">RegEx replace value for target namespace</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewModelLocator.AddNamespaceMapping(System.String,System.String[],System.String)">

+            <summary>

+            Adds a standard type mapping based on simple namespace mapping

+            </summary>

+            <param name="nsSource">Namespace of source type</param>

+            <param name="nsTargets">Namespaces of target type as an array</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewModelLocator.AddNamespaceMapping(System.String,System.String,System.String)">

+            <summary>

+            Adds a standard type mapping based on simple namespace mapping

+            </summary>

+            <param name="nsSource">Namespace of source type</param>

+            <param name="nsTarget">Namespace of target type</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewModelLocator.AddSubNamespaceMapping(System.String,System.String[],System.String)">

+            <summary>

+            Adds a standard type mapping by substituting one subnamespace for another

+            </summary>

+            <param name="nsSource">Subnamespace of source type</param>

+            <param name="nsTargets">Subnamespaces of target type as an array</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewModelLocator.AddSubNamespaceMapping(System.String,System.String,System.String)">

+            <summary>

+            Adds a standard type mapping by substituting one subnamespace for another

+            </summary>

+            <param name="nsSource">Subnamespace of source type</param>

+            <param name="nsTarget">Subnamespace of target type</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

         <member name="M:Caliburn.Micro.ViewModelLocator.MakeInterface(System.String)">

             <summary>

               Makes a type name into an interface name.

@@ -1040,6 +1188,17 @@
             <param name = "typeName">The part.</param>

             <returns></returns>

         </member>

+        <member name="F:Caliburn.Micro.ViewModelLocator.TransformName">

+            <summary>

+            Transforms a View type name into all of its possible ViewModel type names. Accepts a flag

+            to include or exclude interface types.

+            </summary>

+            <returns>Enumeration of transformed names</returns>

+            <remarks>Arguments:

+            typeName = The name of the View type being resolved to its companion ViewModel.

+            includeInterfaces = Flag to indicate if interface types are included

+            </remarks>

+        </member>

         <member name="F:Caliburn.Micro.ViewModelLocator.LocateTypeForViewType">

             <summary>

               Determines the view model type based on the specified view type.

@@ -1104,67 +1263,67 @@
         </member>

         <member name="T:Caliburn.Micro.Action">

             <summary>

-            A host for action related attached properties.

+              A host for action related attached properties.

             </summary>

         </member>

         <member name="F:Caliburn.Micro.Action.TargetProperty">

             <summary>

-            A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/>.  

-            The DataContext of the element will be set to this instance.

+              A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/> . The DataContext of the element will be set to this instance.

             </summary>

         </member>

         <member name="F:Caliburn.Micro.Action.TargetWithoutContextProperty">

             <summary>

-            A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/>.  

-            The DataContext of the element is not set to this instance.

+              A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/> . The DataContext of the element is not set to this instance.

             </summary>

         </member>

         <member name="M:Caliburn.Micro.Action.SetTarget(System.Windows.DependencyObject,System.Object)">

             <summary>

-            Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/>.

+              Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/> .

             </summary>

-            <param name="d">The element to attach the target to.</param>

-            <param name="target">The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/>.</param>

+            <param name="d"> The element to attach the target to. </param>

+            <param name="target"> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> . </param>

         </member>

         <member name="M:Caliburn.Micro.Action.GetTarget(System.Windows.DependencyObject)">

             <summary>

-            Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/>.

+              Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> .

             </summary>

-            <param name="d">The element to which the target is attached.</param>

-            <returns>The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/></returns>

+            <param name="d"> The element to which the target is attached. </param>

+            <returns> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> </returns>

         </member>

         <member name="M:Caliburn.Micro.Action.SetTargetWithoutContext(System.Windows.DependencyObject,System.Object)">

             <summary>

-            Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/>.

+              Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/> .

             </summary>

-            <param name="d">The element to attach the target to.</param>

-            <param name="target">The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/>.</param>

-            <remarks>The DataContext will not be set.</remarks>

+            <param name="d"> The element to attach the target to. </param>

+            <param name="target"> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> . </param>

+            <remarks>

+              The DataContext will not be set.

+            </remarks>

         </member>

         <member name="M:Caliburn.Micro.Action.GetTargetWithoutContext(System.Windows.DependencyObject)">

             <summary>

-            Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/>.

+              Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> .

             </summary>

-            <param name="d">The element to which the target is attached.</param>

-            <returns>The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/></returns>

+            <param name="d"> The element to which the target is attached. </param>

+            <returns> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> </returns>

         </member>

         <member name="M:Caliburn.Micro.Action.HasTargetSet(System.Windows.DependencyObject)">

             <summary>

-             Checks if the <see cref="T:Caliburn.Micro.ActionMessage"/>-Target was set.

+              Checks if the <see cref="T:Caliburn.Micro.ActionMessage"/> -Target was set.

             </summary>

-            <param name="element">DependencyObject to check</param>

-            <returns>True if Target or TargetWithoutContext was set on <paramref name="element"/></returns>

+            <param name="element"> DependencyObject to check </param>

+            <returns> True if Target or TargetWithoutContext was set on <paramref name="element"/> </returns>

         </member>

         <member name="M:Caliburn.Micro.Action.Invoke(System.Object,System.String,System.Windows.DependencyObject,System.Windows.FrameworkElement,System.Object,System.Object[])">

             <summary>

-             Uses the action pipeline to invoke the method.

+              Uses the action pipeline to invoke the method.

             </summary>

-            <param name="target">The object instance to invoke the method on.</param>

-            <param name="methodName">The name of the method to invoke.</param>

-            <param name="view">The view.</param>

-            <param name="source">The source of the invocation.</param>

-            <param name="eventArgs">The event args.</param>

-            <param name="parameters">The method parameters.</param>

+            <param name="target"> The object instance to invoke the method on. </param>

+            <param name="methodName"> The name of the method to invoke. </param>

+            <param name="view"> The view. </param>

+            <param name="source"> The source of the invocation. </param>

+            <param name="eventArgs"> The event args. </param>

+            <param name="parameters"> The method parameters. </param>

         </member>

         <member name="T:Caliburn.Micro.ScreenExtensions">

             <summary>

@@ -1224,6 +1383,13 @@
             Generic extension methods used by the framework.

             </summary>

         </member>

+        <member name="M:Caliburn.Micro.ExtensionMethods.GetAssemblyName(System.Reflection.Assembly)">

+            <summary>

+            Get's the name of the assembly.

+            </summary>

+            <param name="assembly">The assembly.</param>

+            <returns>The assembly's name.</returns>

+        </member>

         <member name="M:Caliburn.Micro.ExtensionMethods.GetAttributes``1(System.Reflection.MemberInfo,System.Boolean)">

             <summary>

             Gets all the attributes of a particular type.

@@ -1290,6 +1456,17 @@
             Derives the SelectedItem property name.

             </summary>

         </member>

+        <member name="F:Caliburn.Micro.ConventionManager.SetBinding">

+            <summary>

+            Creates a binding and sets it on the element, applying the appropriate conventions.

+            </summary>

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

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

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

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

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

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

+        </member>

         <member name="F:Caliburn.Micro.ConventionManager.ApplyBindingMode">

             <summary>

             Applies the appropriate binding mode to the binding.

@@ -1315,16 +1492,6 @@
             Determines whether a custom update source trigger should be applied to the binding.

             </summary>

         </member>

-        <member name="F:Caliburn.Micro.ConventionManager.HasBinding">

-            <summary>

-            Determines whether a particular dependency property already has a binding on the provided element.

-            </summary>

-        </member>

-        <member name="F:Caliburn.Micro.ConventionManager.SetBinding">

-            <summary>

-            Creates a binding and sets it on the element.

-            </summary>

-        </member>

         <member name="M:Caliburn.Micro.ConventionManager.AddElementConvention``1(System.Windows.DependencyProperty,System.String,System.String)">

             <summary>

             Adds an element convention.

@@ -1348,6 +1515,28 @@
             <returns>The convention if found, null otherwise.</returns>

             <remarks>Searches the class hierarchy for conventions.</remarks>

         </member>

+        <member name="M:Caliburn.Micro.ConventionManager.HasBinding(System.Windows.FrameworkElement,System.Windows.DependencyProperty)">

+            <summary>

+            Determines whether a particular dependency property already has a binding on the provided element.

+            </summary>

+        </member>

+        <member name="M:Caliburn.Micro.ConventionManager.SetBindingWithoutBindingOverwrite(System.Type,System.String,System.Reflection.PropertyInfo,System.Windows.FrameworkElement,Caliburn.Micro.ElementConvention,System.Windows.DependencyProperty)">

+            <summary>

+            Creates a binding and sets it on the element, guarding against pre-existing bindings.

+            </summary>

+        </member>

+        <member name="M:Caliburn.Micro.ConventionManager.SetBindingWithoutBindingOrValueOverwrite(System.Type,System.String,System.Reflection.PropertyInfo,System.Windows.FrameworkElement,Caliburn.Micro.ElementConvention,System.Windows.DependencyProperty)">

+            <summary>

+            Creates a binding and set it on the element, guarding against pre-existing bindings and pre-existing values.

+            </summary>

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

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

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

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

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

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

+            <returns></returns>

+        </member>

         <member name="M:Caliburn.Micro.ConventionManager.ApplyItemTemplate(System.Windows.Controls.ItemsControl,System.Reflection.PropertyInfo)">

             <summary>

             Attempts to apply the default item template to the items control.

@@ -1355,7 +1544,7 @@
             <param name="itemsControl">The items control.</param>

             <param name="property">The collection property.</param>

         </member>

-        <member name="M:Caliburn.Micro.ConventionManager.ConfigureSelectedItem(System.Windows.FrameworkElement,System.Windows.DependencyProperty,System.Type,System.String)">

+        <member name="F:Caliburn.Micro.ConventionManager.ConfigureSelectedItem">

             <summary>

             Configures the selected item convention.

             </summary>

@@ -1364,12 +1553,24 @@
             <param name="viewModelType">The view model type.</param>

             <param name="path">The property path.</param>

         </member>

-        <member name="M:Caliburn.Micro.ConventionManager.ApplyHeaderTemplate(System.Windows.FrameworkElement,System.Windows.DependencyProperty,System.Type)">

+        <member name="F:Caliburn.Micro.ConventionManager.ConfigureSelectedItemBinding">

+            <summary>

+            Configures the SelectedItem binding for matched selection path.

+            </summary>

+            <param name="selector">The element that has a SelectedItem property.</param>

+            <param name="selectedItemProperty">The SelectedItem property.</param>

+            <param name="viewModelType">The view model type.</param>

+            <param name="selectionPath">The property path.</param>

+            <param name="binding">The binding to configure.</param>

+            <returns>A bool indicating whether to apply binding</returns>

+        </member>

+        <member name="M:Caliburn.Micro.ConventionManager.ApplyHeaderTemplate(System.Windows.FrameworkElement,System.Windows.DependencyProperty,System.Windows.DependencyProperty,System.Type)">

             <summary>

             Applies a header template based on <see cref="T:Caliburn.Micro.IHaveDisplayName"/>

             </summary>

             <param name="element"></param>

             <param name="headerTemplateProperty"></param>

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

             <param name="viewModelType"></param>

         </member>

         <member name="M:Caliburn.Micro.ConventionManager.GetPropertyCaseInsensitive(System.Type,System.String)">

@@ -1392,41 +1593,41 @@
         </member>

         <member name="T:Caliburn.Micro.Message">

             <summary>

-            Host's attached properties related to routed UI messaging.

+              Host's attached properties related to routed UI messaging.

             </summary>

         </member>

         <member name="M:Caliburn.Micro.Message.SetHandler(System.Windows.DependencyObject,System.Object)">

             <summary>

-            Places a message handler on this element.

+              Places a message handler on this element.

             </summary>

-            <param name="d">The element.</param>

-            <param name="value">The message handler.</param>

+            <param name="d"> The element. </param>

+            <param name="value"> The message handler. </param>

         </member>

         <member name="M:Caliburn.Micro.Message.GetHandler(System.Windows.DependencyObject)">

             <summary>

-            Gets the message handler for this element.

+              Gets the message handler for this element.

             </summary>

-            <param name="d">The element.</param>

-            <returns>The message handler.</returns>

+            <param name="d"> The element. </param>

+            <returns> The message handler. </returns>

         </member>

         <member name="F:Caliburn.Micro.Message.AttachProperty">

             <summary>

-            A property definition representing attached triggers and messages.

+              A property definition representing attached triggers and messages.

             </summary>

         </member>

         <member name="M:Caliburn.Micro.Message.SetAttach(System.Windows.DependencyObject,System.String)">

             <summary>

-            Sets the attached triggers and messages.

+              Sets the attached triggers and messages.

             </summary>

-            <param name="d">The element to attach to.</param>

-            <param name="attachText">The parsable attachment text.</param>

+            <param name="d"> The element to attach to. </param>

+            <param name="attachText"> The parsable attachment text. </param>

         </member>

         <member name="M:Caliburn.Micro.Message.GetAttach(System.Windows.DependencyObject)">

             <summary>

-            Gets the attached triggers and messages.

+              Gets the attached triggers and messages.

             </summary>

-            <param name="d">The element that was attached to.</param>

-            <returns>The parsable attachment text.</returns>

+            <param name="d"> The element that was attached to. </param>

+            <returns> The parsable attachment text. </returns>

         </member>

         <member name="T:Caliburn.Micro.IHaveParameters">

             <summary>

@@ -1507,6 +1708,79 @@
               Separator used when resolving View names for context instances.

             </summary>

         </member>

+        <member name="M:Caliburn.Micro.ViewLocator.ConfigureTypeMappings(Caliburn.Micro.TypeMappingConfiguration)">

+            <summary>

+            Specifies how type mappings are created, including default type mappings. Calling this method will

+            clear all existing name transformation rules and create new default type mappings according to the

+            configuration.

+            </summary>

+            <param name="config">An instance of TypeMappingConfiguration that provides the settings for configuration</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewLocator.AddDefaultTypeMapping(System.String)">

+            <summary>

+            Adds a default type mapping using the standard namespace mapping convention

+            </summary>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewLocator.RegisterViewSuffix(System.String)">

+            <summary>

+            This method registers a View suffix or synonym so that View Context resolution works properly.

+            It is automatically called internally when calling AddNamespaceMapping(), AddDefaultTypeMapping(),

+            or AddTypeMapping(). It should not need to be called explicitly unless a rule that handles synonyms

+            is added directly through the NameTransformer.

+            </summary>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View".</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewLocator.AddTypeMapping(System.String,System.String,System.String[],System.String)">

+            <summary>

+            Adds a standard type mapping based on namespace RegEx replace and filter patterns

+            </summary>

+            <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>

+            <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>

+            <param name="nsTargetsRegEx">Array of RegEx replace values for target namespaces</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewLocator.AddTypeMapping(System.String,System.String,System.String,System.String)">

+            <summary>

+            Adds a standard type mapping based on namespace RegEx replace and filter patterns

+            </summary>

+            <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>

+            <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>

+            <param name="nsTargetRegEx">RegEx replace value for target namespace</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewLocator.AddNamespaceMapping(System.String,System.String[],System.String)">

+            <summary>

+            Adds a standard type mapping based on simple namespace mapping

+            </summary>

+            <param name="nsSource">Namespace of source type</param>

+            <param name="nsTargets">Namespaces of target type as an array</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewLocator.AddNamespaceMapping(System.String,System.String,System.String)">

+            <summary>

+            Adds a standard type mapping based on simple namespace mapping

+            </summary>

+            <param name="nsSource">Namespace of source type</param>

+            <param name="nsTarget">Namespace of target type</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewLocator.AddSubNamespaceMapping(System.String,System.String[],System.String)">

+            <summary>

+            Adds a standard type mapping by substituting one subnamespace for another

+            </summary>

+            <param name="nsSource">Subnamespace of source type</param>

+            <param name="nsTargets">Subnamespaces of target type as an array</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

+        <member name="M:Caliburn.Micro.ViewLocator.AddSubNamespaceMapping(System.String,System.String,System.String)">

+            <summary>

+            Adds a standard type mapping by substituting one subnamespace for another

+            </summary>

+            <param name="nsSource">Subnamespace of source type</param>

+            <param name="nsTarget">Subnamespace of target type</param>

+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>

+        </member>

         <member name="F:Caliburn.Micro.ViewLocator.GetOrCreateViewType">

             <summary>

               Retrieves the view from the IoC container or tries to create it if not found.

@@ -1515,6 +1789,22 @@
               Pass the type of view as a parameter and recieve an instance of the view.

             </remarks>

         </member>

+        <member name="F:Caliburn.Micro.ViewLocator.ModifyModelTypeAtDesignTime">

+            <summary>

+            Modifies the name of the type to be used at design time.

+            </summary>

+        </member>

+        <member name="F:Caliburn.Micro.ViewLocator.TransformName">

+            <summary>

+            Transforms a ViewModel type name into all of its possible View type names. Optionally accepts an instance

+            of context object

+            </summary>

+            <returns>Enumeration of transformed names</returns>

+            <remarks>Arguments:

+            typeName = The name of the ViewModel type being resolved to its companion View.

+            context = An instance of the context or null.

+            </remarks>

+        </member>

         <member name="F:Caliburn.Micro.ViewLocator.LocateTypeForModelType">

             <summary>

               Locates the view type based on the specified model type.

@@ -1542,6 +1832,11 @@
               Pass the model instance, display location (or null) and the context (or null) as parameters and receive a view instance.

             </remarks>

         </member>

+        <member name="F:Caliburn.Micro.ViewLocator.DeterminePackUriFromType">

+            <summary>

+            Transforms a view type into a pack uri.

+            </summary>

+        </member>

         <member name="M:Caliburn.Micro.ViewLocator.InitializeComponent(System.Object)">

             <summary>

               When a view does not contain a code-behind file, we need to automatically call InitializeCompoent.

@@ -1560,7 +1855,7 @@
         </member>

         <member name="F:Caliburn.Micro.MessageBinder.CustomConverters">

             <summary>

-            Custom converters used by the framework registered by detination type for which the will be selected.

+            Custom converters used by the framework registered by destination type for which they will be selected.

             The converter is passed the existing value to convert and a "context" object.

             </summary>

         </member>

@@ -1916,6 +2211,11 @@
             <param name = "getReplaceString">A function to do a transform on each item in the ReplaceValueList prior to applying the regular expression transform</param>

             <returns>The transformed names.</returns>

         </member>

+        <member name="P:Caliburn.Micro.NameTransformer.UseEagerRuleSelection">

+            <summary>

+            Flag to indicate if transformations from all matched rules are returned. Otherwise, transformations from only the first matched rule are returned.

+            </summary>

+        </member>

         <member name="T:Caliburn.Micro.NameTransformer.Rule">

             <summary>

              A rule that describes a name transform.

@@ -2072,20 +2372,22 @@
             A service that manages windows.

             </summary>

         </member>

-        <member name="M:Caliburn.Micro.IWindowManager.ShowDialog(System.Object,System.Object)">

+        <member name="M:Caliburn.Micro.IWindowManager.ShowDialog(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">

             <summary>

             Shows a modal dialog for the specified model.

             </summary>

             <param name="rootModel">The root model.</param>

             <param name="context">The context.</param>

+            <param name="settings">The optional dialog settings.</param>

             <returns>The dialog result.</returns>

         </member>

-        <member name="M:Caliburn.Micro.IWindowManager.ShowWindow(System.Object,System.Object)">

+        <member name="M:Caliburn.Micro.IWindowManager.ShowWindow(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">

             <summary>

             Shows a non-modal window for the specified model.

             </summary>

             <param name="rootModel">The root model.</param>

             <param name="context">The context.</param>

+            <param name="settings">The optional window settings.</param>

         </member>

         <member name="M:Caliburn.Micro.IWindowManager.ShowPopup(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">

             <summary>

@@ -2100,20 +2402,22 @@
             A service that manages windows.

             </summary>

         </member>

-        <member name="M:Caliburn.Micro.WindowManager.ShowDialog(System.Object,System.Object)">

+        <member name="M:Caliburn.Micro.WindowManager.ShowDialog(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">

             <summary>

             Shows a modal dialog for the specified model.

             </summary>

             <param name="rootModel">The root model.</param>

             <param name="context">The context.</param>

+            <param name="settings">The dialog popup settings.</param>

             <returns>The dialog result.</returns>

         </member>

-        <member name="M:Caliburn.Micro.WindowManager.ShowWindow(System.Object,System.Object)">

+        <member name="M:Caliburn.Micro.WindowManager.ShowWindow(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">

             <summary>

             Shows a window for the specified model.

             </summary>

             <param name="rootModel">The root model.</param>

             <param name="context">The context.</param>

+            <param name="settings">The optional window settings.</param>

         </member>

         <member name="M:Caliburn.Micro.WindowManager.ShowPopup(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">

             <summary>

@@ -2131,13 +2435,14 @@
             <param name="settings">The optional popup settings.</param>

             <returns>The popup.</returns>

         </member>

-        <member name="M:Caliburn.Micro.WindowManager.CreateWindow(System.Object,System.Boolean,System.Object)">

+        <member name="M:Caliburn.Micro.WindowManager.CreateWindow(System.Object,System.Boolean,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">

             <summary>

             Creates a window.

             </summary>

             <param name="rootModel">The view model.</param>

             <param name="isDialog">Whethor or not the window is being shown as a dialog.</param>

             <param name="context">The view context.</param>

+            <param name="settings">The optional popup settings.</param>

             <returns>The window.</returns>

         </member>

         <member name="M:Caliburn.Micro.WindowManager.EnsureWindow(System.Object,System.Object,System.Boolean)">

@@ -2156,13 +2461,14 @@
             <param name="window">The window to whose owner needs to be determined.</param>

             <returns>The owner.</returns>

         </member>

-        <member name="M:Caliburn.Micro.WindowManager.CreatePage(System.Object,System.Object)">

+        <member name="M:Caliburn.Micro.WindowManager.CreatePage(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">

             <summary>

             Creates the page.

             </summary>

             <param name="rootModel">The root model.</param>

             <param name="context">The context.</param>

-            <returns></returns>

+            <param name="settings">The optional popup settings.</param>

+            <returns>The page.</returns>

         </member>

         <member name="M:Caliburn.Micro.WindowManager.EnsurePage(System.Object,System.Object)">

             <summary>

@@ -2170,7 +2476,7 @@
             </summary>

             <param name="model">The model.</param>

             <param name="view">The view.</param>

-            <returns></returns>

+            <returns>The page.</returns>

         </member>

         <member name="T:Caliburn.Micro.SequentialResult">

             <summary>

@@ -2219,6 +2525,7 @@
             <summary>

             Creates an instance of the bootstrapper.

             </summary>

+            <param name="useApplication">Set this to false when hosting Caliburn.Micro inside and Office or WinForms application. The default is true.</param>

         </member>

         <member name="M:Caliburn.Micro.Bootstrapper.StartDesignTime">

             <summary>

@@ -2230,14 +2537,14 @@
             Called by the bootstrapper's constructor at runtime to start the framework.

             </summary>

         </member>

-        <member name="M:Caliburn.Micro.Bootstrapper.Configure">

+        <member name="M:Caliburn.Micro.Bootstrapper.PrepareApplication">

             <summary>

-            Override to configure the framework and setup your IoC container.

+            Provides an opportunity to hook into the application object.

             </summary>

         </member>

-        <member name="M:Caliburn.Micro.Bootstrapper.PrepareApplication">

+        <member name="M:Caliburn.Micro.Bootstrapper.Configure">

             <summary>

-            Provides an opportunity to hook into the application object.

+            Override to configure the framework and setup your IoC container.

             </summary>

         </member>

         <member name="M:Caliburn.Micro.Bootstrapper.SelectAssemblies">

@@ -2312,29 +2619,101 @@
             <param name="sender">The sender.</param>

             <param name="e">The args.</param>

         </member>

+        <member name="T:Caliburn.Micro.TypeMappingConfiguration">

+            <summary>

+            Class to specify settings for configuring type mappings by the ViewLocator or ViewModelLocator

+            </summary>

+        </member>

+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.DefaultSubNamespaceForViews">

+            <summary>

+            The default subnamespace for Views. Used for creating default subnamespace mappings. Defaults to "Views".

+            </summary>

+        </member>

+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.DefaultSubNamespaceForViewModels">

+            <summary>

+            The default subnamespace for ViewModels. Used for creating default subnamespace mappings. Defaults to "ViewModels".

+            </summary>

+        </member>

+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.UseNameSuffixesInMappings">

+            <summary>

+            Flag to indicate whether or not the name of the Type should be transformed when adding a type mapping. Defaults to true.

+            </summary>

+        </member>

+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.NameFormat">

+            <summary>

+            The format string used to compose the name of a type from base name and name suffix

+            </summary>

+        </member>

+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.IncludeViewSuffixInViewModelNames">

+            <summary>

+            Flag to indicate if ViewModel names should include View suffixes (i.e. CustomerPageViewModel vs. CustomerViewModel)

+            </summary>

+        </member>

+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.ViewSuffixList">

+            <summary>

+            List of View suffixes for which default type mappings should be created. Applies only when UseNameSuffixesInMappings = true.

+            Default values are "View", "Page"

+            </summary>

+        </member>

+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.ViewModelSuffix">

+            <summary>

+            The name suffix for ViewModels. Applies only when UseNameSuffixesInMappings = true. The default is "ViewModel".

+            </summary>

+        </member>

         <member name="T:Caliburn.Micro.Bind">

             <summary>

-            Hosts dependency properties for binding.

+              Hosts dependency properties for binding.

             </summary>

         </member>

         <member name="F:Caliburn.Micro.Bind.ModelProperty">

             <summary>

-            Allows binding on an existing view.

+              Allows binding on an existing view. Use this on root UserControls, Pages and Windows; not in a DataTemplate.

             </summary>

         </member>

+        <member name="F:Caliburn.Micro.Bind.ModelWithoutContextProperty">

+            <summary>

+              Allows binding on an existing view without setting the data context. Use this from within a DataTemplate.

+            </summary>

+        </member>

+        <member name="M:Caliburn.Micro.Bind.GetModelWithoutContext(System.Windows.DependencyObject)">

+            <summary>

+              Gets the model to bind to.

+            </summary>

+            <param name = "dependencyObject">The dependency object to bind to.</param>

+            <returns>The model.</returns>

+        </member>

+        <member name="M:Caliburn.Micro.Bind.SetModelWithoutContext(System.Windows.DependencyObject,System.Object)">

+            <summary>

+              Sets the model to bind to.

+            </summary>

+            <param name = "dependencyObject">The dependency object to bind to.</param>

+            <param name = "value">The model.</param>

+        </member>

         <member name="M:Caliburn.Micro.Bind.GetModel(System.Windows.DependencyObject)">

             <summary>

-            Gets the model to bind to.

+              Gets the model to bind to.

             </summary>

-            <param name="dependencyObject">The dependency object to bind to.</param>

+            <param name = "dependencyObject">The dependency object to bind to.</param>

             <returns>The model.</returns>

         </member>

         <member name="M:Caliburn.Micro.Bind.SetModel(System.Windows.DependencyObject,System.Object)">

             <summary>

-            Sets the model to bind to.

+              Sets the model to bind to.

             </summary>

-            <param name="dependencyObject">The dependency object to bind to.</param>

-            <param name="value">The model.</param>

+            <param name = "dependencyObject">The dependency object to bind to.</param>

+            <param name = "value">The model.</param>

+        </member>

+        <member name="F:Caliburn.Micro.Bind.AtDesignTimeProperty">

+            <summary>

+            Allows application of conventions at design-time.

+            </summary>

+        </member>

+        <member name="M:Caliburn.Micro.Bind.SetAtDesignTime(System.Windows.DependencyObject,System.Boolean)">

+            <summary>

+            Sets whether or not do bind conventions at design-time.

+            </summary>

+            <param name="dependencyObject">The ui to apply conventions to.</param>

+            <param name="value">Whether or not to apply conventions.</param>

         </member>

         <member name="T:Caliburn.Micro.AttachedCollection`1">

             <summary>