[Editor] Make Stride.Core.Presentation.Quantum cross-platform

2024-03-01 15:55:08 +01:00 · 2024-03-01 15:55:08 +01:00 · b389a6f53c
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/AnimationFrameBoxTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/AnimationFrameBoxTemplateProvider.cs
@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.

-using Stride.Core.Presentation.Quantum.View;
-using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Assets.Models;
+using Stride.Core.Assets.Editor.View;
+using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Assets.Presentation.TemplateProviders
 {
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/AnimationFrameTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/AnimationFrameTemplateProvider.cs
@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.

-using Stride.Core.Presentation.Quantum.View;
-using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Assets.Models;
+using Stride.Core.Assets.Editor.View;
+using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Assets.Presentation.TemplateProviders
 {
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/ComputeCurveTemplateProviders.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/ComputeCurveTemplateProviders.cs
@ -1,11 +1,10 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
-using Stride.Core.Mathematics;
-using Stride.Core.Presentation.Quantum;
-using Stride.Core.Presentation.Quantum.View;
-using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Animations;
+using Stride.Core.Assets.Editor.View;
+using Stride.Core.Mathematics;
+using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Assets.Presentation.TemplateProviders
 {
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/EntityComponentCollectionTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/EntityComponentCollectionTemplateProvider.cs
@ -1,10 +1,8 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using Stride.Engine;
-using Stride.Core.Presentation.Quantum;
-using Stride.Core.Presentation.Quantum.View;
+using Stride.Core.Assets.Editor.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
+using Stride.Engine;

 namespace Stride.Assets.Presentation.TemplateProviders
 {
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/EntityComponentReferenceTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/EntityComponentReferenceTemplateProvider.cs
@ -1,11 +1,10 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.

+using Stride.Core.Assets.Editor.View;
 using Stride.Core.Extensions;
-using Stride.Engine;
-using Stride.Core.Presentation.Quantum;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
+using Stride.Engine;

 namespace Stride.Assets.Presentation.TemplateProviders
 {
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/EntityReferenceTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/EntityReferenceTemplateProvider.cs
@ -1,9 +1,8 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Stride.Engine;
-using Stride.Core.Presentation.Quantum;
-using Stride.Core.Presentation.Quantum.View;
+using Stride.Core.Assets.Editor.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
+using Stride.Engine;

 namespace Stride.Assets.Presentation.TemplateProviders
 {
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/GameSettingAddConfigurationTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/GameSettingAddConfigurationTemplateProvider.cs
@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Stride.Data;
-using Stride.Core.Presentation.Quantum.View;
+using Stride.Core.Assets.Editor.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
+using Stride.Data;

 namespace Stride.Assets.Presentation.TemplateProviders
 {
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/GameSettingsFiltersTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/GameSettingsFiltersTemplateProvider.cs
@ -1,9 +1,7 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Stride.Core.Presentation.Quantum;
-using Stride.Core.Presentation.Quantum.View;
+using Stride.Core.Assets.Editor.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
-using Stride.Assets.Presentation.ViewModel;

 namespace Stride.Assets.Presentation.TemplateProviders
 {
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/ModelNodeLinkNameTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/ModelNodeLinkNameTemplateProvider.cs
@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.

-using Stride.Core.Presentation.Quantum.View;
-using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Assets.Presentation.NodePresenters.Keys;
+using Stride.Core.Assets.Editor.View;
+using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Engine;

 namespace Stride.Assets.Presentation.TemplateProviders
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/RenderStageReferenceTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/RenderStageReferenceTemplateProvider.cs
@ -1,11 +1,9 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.

-using System.Reflection;
-using Stride.Core.Presentation.Quantum;
-using Stride.Core.Presentation.Quantum.View;
-using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Assets.Rendering;
+using Stride.Core.Assets.Editor.View;
+using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Rendering;

 namespace Stride.Assets.Presentation.TemplateProviders
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/ScriptTextEditorTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/ScriptTextEditorTemplateProvider.cs
@ -1,12 +1,9 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
 using System.Reflection;
-using Stride.Engine;
-using Stride.Core.Presentation.Quantum;
-using Stride.Core.Presentation.Quantum.View;
-using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Assets.Scripts;
+using Stride.Core.Assets.Editor.View;
+using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Assets.Presentation.TemplateProviders
 {
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/ScriptVariableReferenceTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/ScriptVariableReferenceTemplateProvider.cs
@ -2,12 +2,10 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.

 using System.Reflection;
-using Stride.Core.Presentation.Quantum;
-using Stride.Core.Presentation.Quantum.View;
-using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Assets.Presentation.NodePresenters.Keys;
-using Stride.Assets.Presentation.NodePresenters.Updaters;
 using Stride.Assets.Scripts;
+using Stride.Core.Assets.Editor.View;
+using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Assets.Presentation.TemplateProviders
 {
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/ShaderClassNodeMixinReferenceTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/ShaderClassNodeMixinReferenceTemplateProvider.cs
@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Stride.Core.Presentation.Quantum;
-using Stride.Core.Presentation.Quantum.View;
+using Stride.Core.Assets.Editor.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Rendering.Materials.ComputeColors;

--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/SkeletonModelPropertyTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/SkeletonModelPropertyTemplateProvider.cs
@ -2,10 +2,8 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Collections.Generic;
-
 using Stride.Assets.Models;
-using Stride.Core.Presentation.Quantum;
-using Stride.Core.Presentation.Quantum.View;
+using Stride.Core.Assets.Editor.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Assets.Presentation.TemplateProviders
--- a/sources/editor/Stride.Assets.Presentation/TemplateProviders/SpriteFontFontNamePropertyTemplateProvider.cs
+++ b/sources/editor/Stride.Assets.Presentation/TemplateProviders/SpriteFontFontNamePropertyTemplateProvider.cs
@ -1,10 +1,8 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;

 using Stride.Assets.SpriteFont;
-using Stride.Core.Presentation.Quantum;
-using Stride.Core.Presentation.Quantum.View;
+using Stride.Core.Assets.Editor.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Assets.Presentation.TemplateProviders
--- a/sources/editor/Stride.Assets.Presentation/View/EntityPropertyTemplates.xaml
+++ b/sources/editor/Stride.Assets.Presentation/View/EntityPropertyTemplates.xaml
@ -2,7 +2,6 @@
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:tp="clr-namespace:Stride.Assets.Presentation.TemplateProviders"
                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-                    xmlns:view="clr-namespace:Stride.Core.Presentation.Quantum.View;assembly=Stride.Core.Presentation.Quantum"
                    xmlns:system="clr-namespace:System;assembly=mscorlib"
                    xmlns:behaviors="clr-namespace:Stride.Core.Assets.Editor.View.Behaviors;assembly=Stride.Core.Assets.Editor"
                    xmlns:valueConverters="clr-namespace:Stride.Core.Assets.Editor.View.ValueConverters;assembly=Stride.Core.Assets.Editor"
@ -20,7 +19,7 @@
    <ResourceDictionary Source="/Stride.Assets.Presentation;component/View/ImageDictionary.xaml"/>
  </ResourceDictionary.MergedDictionaries>

-  <view:TypeMatchTemplateProvider x:Key="EntityComponentTemplateProvider" Type="engine:EntityComponent"
+  <sd:TypeMatchTemplateProvider x:Key="EntityComponentTemplateProvider" Type="engine:EntityComponent"
                                  Template="{StaticResource HeaderReadOnlyProperty}" OverrideRule="Most"
                                  sd:PropertyViewHelper.TemplateCategory="PropertyHeader"/>

@ -141,7 +140,7 @@
    <Setter Property="Visibility" Value="Visible"/>
  </Style>

-  <view:TypeMatchTemplateProvider x:Key="SceneCameraSlotIndexTemplateProvider" sd:PropertyViewHelper.TemplateCategory="PropertyEditor"
+  <sd:TypeMatchTemplateProvider x:Key="SceneCameraSlotIndexTemplateProvider" sd:PropertyViewHelper.TemplateCategory="PropertyEditor"
                                  OverrideRule="Some" Type="composers:SceneCameraSlotId">
    <DataTemplate>
      <DockPanel>
@ -157,7 +156,7 @@
                    Margin="5,0" IsHitTestVisible="False" VerticalAlignment="Center"/>
      </DockPanel>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </sd:TypeMatchTemplateProvider>

  <tp:ModelComponentMaterialTemplateProvider x:Key="ModelComponentMaterialPropertyTemplateProvider" DynamicThumbnail="True" sd:PropertyViewHelper.TemplateCategory="PropertyEditor"
                                             OverrideRule="Most">
--- a/sources/editor/Stride.Assets.Presentation/View/GraphicsCompositorTemplates.xaml
+++ b/sources/editor/Stride.Assets.Presentation/View/GraphicsCompositorTemplates.xaml
@ -1,7 +1,6 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-                    xmlns:view="clr-namespace:Stride.Core.Presentation.Quantum.View;assembly=Stride.Core.Presentation.Quantum"
                    xmlns:rendering="clr-namespace:Stride.Rendering;assembly=Stride.Engine"
                    xmlns:sd="http://schemas.stride3d.net/xaml/presentation">

--- a/sources/editor/Stride.Assets.Presentation/View/SkeletonPropertyTemplates.xaml
+++ b/sources/editor/Stride.Assets.Presentation/View/SkeletonPropertyTemplates.xaml
@ -3,8 +3,7 @@
                    xmlns:templateProviders="clr-namespace:Stride.Assets.Presentation.TemplateProviders"
                    xmlns:sd="http://schemas.stride3d.net/xaml/presentation"
                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-                    xmlns:qvm="clr-namespace:Stride.Core.Presentation.Quantum.ViewModels;assembly=Stride.Core.Presentation.Quantum"
-                    xmlns:view="clr-namespace:Stride.Core.Presentation.Quantum.View;assembly=Stride.Core.Presentation.Quantum">
+                    xmlns:qvm="clr-namespace:Stride.Core.Presentation.Quantum.ViewModels;assembly=Stride.Core.Presentation.Quantum">

  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/Stride.Core.Assets.Editor;component/View/DefaultPropertyTemplateProviders.xaml"/>
@ -34,7 +33,7 @@
          <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
            <CheckBox Margin="4,0" VerticalAlignment="Center"
                      IsThreeState="{Binding Enabled.NodeValue, Converter={sd:IsEqualToParam}, ConverterParameter={x:Static qvm:NodeViewModel.DifferentValues}}"
-                      IsChecked="{Binding Enabled.NodeValue, Converter={view:DifferentValueToParam}, ConverterParameter={x:Null}}"
+                      IsChecked="{Binding Enabled.NodeValue, Converter={sd:DifferentValueToParam}, ConverterParameter={x:Null}}"
                      Visibility="{Binding HasChild_Enabled, Converter={sd:VisibleOrCollapsed}}"/>
            <Image Source="{Binding NodeValue, Converter={sd:Chained {sd:ObjectToType}, {sd:TypeToResource}}}" MaxWidth="16" MaxHeight="16"
                   RenderOptions.BitmapScalingMode="NearestNeighbor" Margin="0,0,4,0"/>
--- a/sources/editor/Stride.Assets.Presentation/View/UIPropertyTemplates.xaml
+++ b/sources/editor/Stride.Assets.Presentation/View/UIPropertyTemplates.xaml
@ -1,6 +1,5 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:view="clr-namespace:Stride.Core.Presentation.Quantum.View;assembly=Stride.Core.Presentation.Quantum"
                    xmlns:ui="clr-namespace:Stride.UI;assembly=Stride.UI"
                    xmlns:views="clr-namespace:Stride.Assets.Presentation.AssetEditors.UIEditor.Views"
                    xmlns:sd="http://schemas.stride3d.net/xaml/presentation">
@ -9,16 +8,16 @@
    <ResourceDictionary Source="ImageDictionary.xaml"/>
  </ResourceDictionary.MergedDictionaries>

-  <view:TypeMatchTemplateProvider x:Key="StripDefinitionTemplateProvider" Type="{x:Type ui:StripDefinition}" sd:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <sd:TypeMatchTemplateProvider x:Key="StripDefinitionTemplateProvider" Type="{x:Type ui:StripDefinition}" sd:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate>
      <UniformGrid Rows="1">
        <ContentPresenter Content="{Binding SizeValue}" ContentTemplateSelector="{x:Static sd:PropertyViewHelper.EditorProviders}" />
        <ContentPresenter Content="{Binding Type_}" ContentTemplateSelector="{x:Static sd:PropertyViewHelper.EditorProviders}" />
      </UniformGrid>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </sd:TypeMatchTemplateProvider>

-  <view:TypeMatchTemplateProvider x:Key="ThicknessTemplateProvider" Type="{x:Type ui:Thickness}" sd:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <sd:TypeMatchTemplateProvider x:Key="ThicknessTemplateProvider" Type="{x:Type ui:Thickness}" sd:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate>
      <DataTemplate.Resources>
        <Style TargetType="views:ThicknessEditor">
@ -83,7 +82,7 @@
      </DataTemplate.Resources>
      <views:ThicknessEditor Value="{Binding NodeValue}" DecimalPlaces="3" />
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </sd:TypeMatchTemplateProvider>

 </ResourceDictionary>

--- a/sources/editor/Stride.Core.Assets.Editor/View/DefaultPropertyTemplateProviders.xaml
+++ b/sources/editor/Stride.Core.Assets.Editor/View/DefaultPropertyTemplateProviders.xaml
@ -2,7 +2,6 @@
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:sd="http://schemas.stride3d.net/xaml/presentation"
-                    xmlns:view="clr-namespace:Stride.Core.Presentation.Quantum.View;assembly=Stride.Core.Presentation.Quantum"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                    xmlns:s="clr-namespace:System;assembly=mscorlib"
                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
@ -225,7 +224,7 @@
          </sd:TextBox>
          <CheckBox Grid.Column="3" Margin="2,0" VerticalAlignment="Center" HorizontalAlignment="Left"
                    IsThreeState="{Binding Enabled.NodeValue, Converter={sd:IsEqualToParam}, ConverterParameter={x:Static qvm:NodeViewModel.DifferentValues}}"
-                    IsChecked="{Binding Enabled.NodeValue, Converter={view:DifferentValueToParam}, ConverterParameter={x:Null}}"
+                    IsChecked="{Binding Enabled.NodeValue, Converter={cvt:DifferentValueToParam}, ConverterParameter={x:Null}}"
                    Visibility="{Binding HasChild_Enabled, Converter={sd:VisibleOrCollapsed}}"/>
        </Grid>
      </Border>
@ -276,7 +275,7 @@
        <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
          <CheckBox Margin="4,0" VerticalAlignment="Center"
                    IsThreeState="{Binding Enabled.NodeValue, Converter={sd:IsEqualToParam}, ConverterParameter={x:Static qvm:NodeViewModel.DifferentValues}}"
-                    IsChecked="{Binding Enabled.NodeValue, Converter={view:DifferentValueToParam}, ConverterParameter={x:Null}}"
+                    IsChecked="{Binding Enabled.NodeValue, Converter={cvt:DifferentValueToParam}, ConverterParameter={x:Null}}"
                    Visibility="{Binding HasChild_Enabled, Converter={sd:VisibleOrCollapsed}}"/>
          <Image Source="{Binding NodeValue, Converter={sd:Chained {sd:ObjectToType}, {cvt:TypeToResource}}}" MaxWidth="16" MaxHeight="16"
                            RenderOptions.BitmapScalingMode="NearestNeighbor" Margin="0,0,4,0"/>
@ -762,16 +761,16 @@
  </pvdr:DictionaryEnumKeyTemplateProvider>

  <!-- Provider for boolean editor -->
-  <view:TypeMatchTemplateProvider x:Key="BoolPropertyTemplateProvider" Type="{x:Type s:Boolean}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="BoolPropertyTemplateProvider" Type="{x:Type s:Boolean}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <CheckBox x:Name="CheckBox" Margin="2" HorizontalAlignment="Left"
                IsThreeState="{Binding NodeValue, Converter={sd:IsEqualToParam}, ConverterParameter={x:Static qvm:NodeViewModel.DifferentValues}}"
-                IsChecked="{Binding NodeValue, Converter={view:DifferentValueToParam}, ConverterParameter={x:Null}}"/>
+                IsChecked="{Binding NodeValue, Converter={cvt:DifferentValueToParam}, ConverterParameter={x:Null}}"/>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for char editor -->
-  <view:TypeMatchTemplateProvider x:Key="CharPropertyTemplateProvider" Type="{x:Type s:Char}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="CharPropertyTemplateProvider" Type="{x:Type s:Char}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <Grid>
        <Grid.ColumnDefinitions>
@ -802,7 +801,7 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Providers for color editors -->
  <DataTemplate x:Key="ColorEditorTemplate" DataType="qvm:NodeViewModel">
@ -860,9 +859,9 @@
      </DataTrigger>
    </DataTemplate.Triggers>
  </DataTemplate>
-  <view:TypeMatchTemplateProvider x:Key="ColorPropertyTemplateProvider" Type="{x:Type math:Color}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource ColorEditorTemplate}"/>
-  <view:TypeMatchTemplateProvider x:Key="Color3PropertyTemplateProvider" Type="{x:Type math:Color3}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource ColorEditorTemplate}"/>
-  <view:TypeMatchTemplateProvider x:Key="Color4PropertyTemplateProvider" Type="{x:Type math:Color4}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource ColorEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="ColorPropertyTemplateProvider" Type="{x:Type math:Color}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource ColorEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="Color3PropertyTemplateProvider" Type="{x:Type math:Color3}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource ColorEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="Color4PropertyTemplateProvider" Type="{x:Type math:Color4}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource ColorEditorTemplate}"/>

  <!-- Providers for number with a range editors -->
  <pvdr:RangedValueTemplateProvider x:Key="RangedValueTemplateProvider" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" OverrideRule="Most">
@ -929,8 +928,8 @@
      </DataTrigger>
    </DataTemplate.Triggers>
  </DataTemplate>
-  <view:TypeMatchTemplateProvider x:Key="FloatPropertyTemplateProvider" Type="{x:Type s:Single}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource FloatEditorTemplate}"/>
-  <view:TypeMatchTemplateProvider x:Key="DoublePropertyTemplateProvider" Type="{x:Type s:Double}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource FloatEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="FloatPropertyTemplateProvider" Type="{x:Type s:Single}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource FloatEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="DoublePropertyTemplateProvider" Type="{x:Type s:Double}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource FloatEditorTemplate}"/>

  <!-- Providers for fixed-point number editors -->
  <DataTemplate x:Key="IntEditorTemplate" DataType="qvm:NodeViewModel">
@ -955,17 +954,17 @@
    </DataTemplate.Triggers>
  </DataTemplate>

-  <view:TypeMatchTemplateProvider x:Key="Int8PropertyTemplateProvider" Type="{x:Type s:SByte}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
-  <view:TypeMatchTemplateProvider x:Key="UInt8PropertyTemplateProvider" Type="{x:Type s:Byte}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
-  <view:TypeMatchTemplateProvider x:Key="Int16PropertyTemplateProvider" Type="{x:Type s:Int16}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
-  <view:TypeMatchTemplateProvider x:Key="UInt16PropertyTemplateProvider" Type="{x:Type s:UInt16}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
-  <view:TypeMatchTemplateProvider x:Key="Int32PropertyTemplateProvider" Type="{x:Type s:Int32}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
-  <view:TypeMatchTemplateProvider x:Key="UInt32PropertyTemplateProvider" Type="{x:Type s:UInt32}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
-  <view:TypeMatchTemplateProvider x:Key="Int64PropertyTemplateProvider" Type="{x:Type s:Int64}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
-  <view:TypeMatchTemplateProvider x:Key="UInt64PropertyTemplateProvider" Type="{x:Type s:UInt64}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="Int8PropertyTemplateProvider" Type="{x:Type s:SByte}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="UInt8PropertyTemplateProvider" Type="{x:Type s:Byte}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="Int16PropertyTemplateProvider" Type="{x:Type s:Int16}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="UInt16PropertyTemplateProvider" Type="{x:Type s:UInt16}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="Int32PropertyTemplateProvider" Type="{x:Type s:Int32}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="UInt32PropertyTemplateProvider" Type="{x:Type s:UInt32}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="Int64PropertyTemplateProvider" Type="{x:Type s:Int64}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>
+  <edvw:TypeMatchTemplateProvider x:Key="UInt64PropertyTemplateProvider" Type="{x:Type s:UInt64}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor" Template="{StaticResource IntEditorTemplate}"/>

  <!-- Provider for time span editor -->
-  <view:TypeMatchTemplateProvider x:Key="TimeSpanPropertyTemplateProvider" Type="{x:Type s:TimeSpan}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="TimeSpanPropertyTemplateProvider" Type="{x:Type s:TimeSpan}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:TimeSpanEditor x:Name="TimeSpanEditor" Margin="2"
                         Value="{Binding NodeValue, Converter={cvt:DifferentValuesToNull}}"
@ -978,10 +977,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for date time editor -->
-  <view:TypeMatchTemplateProvider x:Key="DateTimePropertyTemplateProvider" Type="{x:Type s:DateTime}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="DateTimePropertyTemplateProvider" Type="{x:Type s:DateTime}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:DateTimeEditor x:Name="DateTimeEditor" Margin="2"
                         Value="{Binding NodeValue, Converter={cvt:DifferentValuesToNull}}"
@ -994,10 +993,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>
  
  <!-- Provider for string editor -->
-  <view:TypeMatchTemplateProvider x:Key="StringPropertyTemplateProvider" Type="{x:Type s:String}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="StringPropertyTemplateProvider" Type="{x:Type s:String}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:TextBox x:Name="TextBox" Margin="2" SelectAllOnFocus="True"
                    Text="{Binding NodeValue, Converter={cvt:DifferentValuesToString}}"
@ -1008,10 +1007,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for vector2 editor -->
-  <view:TypeMatchTemplateProvider x:Key="Vector2PropertyTemplateProvider" Type="{x:Type math:Vector2}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="Vector2PropertyTemplateProvider" Type="{x:Type math:Vector2}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:Vector2Editor X="{Binding X.NodeValue, Converter={cvt:DifferentValuesToNull}}"
                          Y="{Binding Y.NodeValue, Converter={cvt:DifferentValuesToNull}}"
@ -1026,10 +1025,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for vector3 editor -->
-  <view:TypeMatchTemplateProvider x:Key="Vector3PropertyTemplateProvider" Type="{x:Type math:Vector3}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="Vector3PropertyTemplateProvider" Type="{x:Type math:Vector3}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:Vector3Editor X="{Binding X.NodeValue, Converter={cvt:DifferentValuesToNull}}"
                          Y="{Binding Y.NodeValue, Converter={cvt:DifferentValuesToNull}}"
@ -1045,10 +1044,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for vector4 editor -->
-  <view:TypeMatchTemplateProvider x:Key="Vector4PropertyTemplateProvider" Type="{x:Type math:Vector4}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="Vector4PropertyTemplateProvider" Type="{x:Type math:Vector4}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:Vector4Editor X="{Binding X.NodeValue, Converter={cvt:DifferentValuesToNull}}"
                          Y="{Binding Y.NodeValue, Converter={cvt:DifferentValuesToNull}}"
@ -1065,10 +1064,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for int2 editor -->
-  <view:TypeMatchTemplateProvider x:Key="Int2PropertyTemplateProvider" Type="{x:Type math:Int2}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="Int2PropertyTemplateProvider" Type="{x:Type math:Int2}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:Int2Editor X="{Binding X.NodeValue, Converter={cvt:DifferentValuesToNull}}"
                       Y="{Binding Y.NodeValue, Converter={cvt:DifferentValuesToNull}}"
@ -1083,10 +1082,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for int3 editor -->
-  <view:TypeMatchTemplateProvider x:Key="Int3PropertyTemplateProvider" Type="{x:Type math:Int3}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="Int3PropertyTemplateProvider" Type="{x:Type math:Int3}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:Int3Editor X="{Binding X.NodeValue, Converter={cvt:DifferentValuesToNull}}"
                       Y="{Binding Y.NodeValue, Converter={cvt:DifferentValuesToNull}}"
@ -1102,10 +1101,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for int4 editor -->
-  <view:TypeMatchTemplateProvider x:Key="Int4PropertyTemplateProvider" Type="{x:Type math:Int4}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="Int4PropertyTemplateProvider" Type="{x:Type math:Int4}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:Int4Editor X="{Binding X.NodeValue, Converter={cvt:DifferentValuesToNull}}"
                       Y="{Binding Y.NodeValue, Converter={cvt:DifferentValuesToNull}}"
@ -1122,10 +1121,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for rectangleF editor -->
-  <view:TypeMatchTemplateProvider x:Key="RectangleFPropertyTemplateProvider" Type="{x:Type math:RectangleF}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="RectangleFPropertyTemplateProvider" Type="{x:Type math:RectangleF}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:RectangleFEditor RectX="{Binding X.NodeValue, Converter={cvt:DifferentValuesToNull}}"
                             RectY="{Binding Y.NodeValue, Converter={cvt:DifferentValuesToNull}}"
@ -1138,10 +1137,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for rectangle editor -->
-  <view:TypeMatchTemplateProvider x:Key="RectanglePropertyTemplateProvider" Type="{x:Type math:Rectangle}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="RectanglePropertyTemplateProvider" Type="{x:Type math:Rectangle}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:RectangleEditor RectX="{Binding X.NodeValue, Converter={cvt:DifferentValuesToNull}}"
                            RectY="{Binding Y.NodeValue, Converter={cvt:DifferentValuesToNull}}"
@ -1154,10 +1153,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for rotation editor -->
-  <view:TypeMatchTemplateProvider x:Key="RotationPropertyTemplateProvider" Type="{x:Type math:Quaternion}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="RotationPropertyTemplateProvider" Type="{x:Type math:Quaternion}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:RotationEditor Value="{Binding NodeValue, Converter={cvt:DifferentValuesToNull}}"
                           WatermarkContentTemplate="{StaticResource DifferentValuesWatermarkTemplate}" DecimalPlaces="3" x:Name="VectorEditor"/>
@ -1167,10 +1166,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for matrix editor -->
-  <view:TypeMatchTemplateProvider x:Key="MatrixPropertyTemplateProvider" Type="{x:Type math:Matrix}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="MatrixPropertyTemplateProvider" Type="{x:Type math:Matrix}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:MatrixEditor M11="{Binding M11.NodeValue, Converter={cvt:DifferentValuesToNull}}"
                         M12="{Binding M12.NodeValue, Converter={cvt:DifferentValuesToNull}}"
@ -1195,10 +1194,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for angleSingle editor -->
-  <view:TypeMatchTemplateProvider x:Key="AnglePropertyTemplateProvider" Type="{x:Type math:AngleSingle}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="AnglePropertyTemplateProvider" Type="{x:Type math:AngleSingle}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <sd:NumericTextBox x:Name="TextBox" DecimalPlaces="3"
                           Value="{Binding NodeValue, Converter={sd:Chained {cvt:DifferentValuesToNull}, {sd:AngleSingleToDegrees}}}"
@ -1216,10 +1215,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for UDirectory editor -->
-  <view:TypeMatchTemplateProvider x:Key="UDirectoryPropertyTemplateProvider" Type="{x:Type io:UDirectory}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="UDirectoryPropertyTemplateProvider" Type="{x:Type io:UDirectory}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <DockPanel>
        <Button Style="{StaticResource ImageButtonStyle}" DockPanel.Dock="Right" Command="{Binding BrowseDirectory}"
@ -1242,10 +1241,10 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for UFile editor -->
-  <view:TypeMatchTemplateProvider x:Key="UFilePropertyTemplateProvider" Type="{x:Type io:UFile}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+  <edvw:TypeMatchTemplateProvider x:Key="UFilePropertyTemplateProvider" Type="{x:Type io:UFile}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
    <DataTemplate DataType="qvm:NodeViewModel">
      <DockPanel>
        <Button Style="{StaticResource ImageButtonStyle}" DockPanel.Dock="Right" Command="{Binding BrowseFile}"
@ -1269,7 +1268,7 @@
        </DataTrigger>
      </DataTemplate.Triggers>
    </DataTemplate>
-  </view:TypeMatchTemplateProvider>
+  </edvw:TypeMatchTemplateProvider>

  <!-- Provider for simple enum editor: A ComboBox to select a single value -->
  <pvdr:EnumTemplateProvider x:Key="EnumPropertyTemplateProvider" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
--- a/sources/presentation/Stride.Core.Presentation.Quantum/View/NodeViewModelTemplateProvider.cs
+++ b/sources/presentation/Stride.Core.Presentation.Quantum/View/NodeViewModelTemplateProvider.cs
@ -1,11 +1,12 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
 using System;
 using Stride.Core.Annotations;
 using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Core.Presentation.View;

-namespace Stride.Core.Presentation.Quantum.View
+namespace Stride.Core.Assets.Editor.View
 {
    /// <summary>
    /// A base class for implementations of <see cref="ITemplateProvider"/> that can provide templates for <see cref="Stride.Core.Presentation.Quantum.ViewModels.NodeViewModel"/> instances.
--- a/sources/editor/Stride.Core.Assets.Editor/View/SettingsWindow.xaml.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/SettingsWindow.xaml.cs
@ -5,7 +5,6 @@ using System.Windows;
 using Stride.Core.Assets.Editor.Components.Properties;
 using Stride.Core.Assets.Editor.Settings;
 using Stride.Core.Assets.Editor.Settings.ViewModels;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Core.Presentation.ViewModels;

--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/AbstractTypeTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/AbstractTypeTemplateProvider.cs
@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using Stride.Core.Assets.Editor.Quantum.NodePresenters.Keys;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ArrayItemTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ArrayItemTemplateProvider.cs
@ -1,6 +1,5 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ArrayTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ArrayTemplateProvider.cs
@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/CategoryNodeTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/CategoryNodeTemplateProvider.cs
@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using Stride.Core.Assets.Editor.Quantum.NodePresenters.Keys;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ContentReferenceTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ContentReferenceTemplateProvider.cs
@ -1,6 +1,5 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/DictionaryTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/DictionaryTemplateProvider.cs
@ -1,6 +1,5 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/EnumTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/EnumTemplateProvider.cs
@ -2,10 +2,8 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Linq;
-
 using Stride.Core.Assets.Editor.Services;
 using Stride.Core.Assets.Editor.ViewModel;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/GenericDictionaryNodeTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/GenericDictionaryNodeTemplateProvider.cs
@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/InlinedPropertyTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/InlinedPropertyTemplateProvider.cs
@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using Stride.Core.Assets.Editor.Quantum.NodePresenters.Keys;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/InlinedPropertyValueTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/InlinedPropertyValueTemplateProvider.cs
@ -1,6 +1,5 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ListItemTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ListItemTemplateProvider.cs
@ -1,6 +1,5 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ListTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ListTemplateProvider.cs
@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/NullableStructTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/NullableStructTemplateProvider.cs
@ -1,10 +1,8 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
-
-using Stride.Core.Reflection;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
+using Stride.Core.Reflection;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
 {
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/NullableTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/NullableTemplateProvider.cs
@ -1,10 +1,8 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
-
-using Stride.Core.Reflection;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
+using Stride.Core.Reflection;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
 {
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ObjectTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/ObjectTemplateProvider.cs
@ -1,8 +1,7 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Stride.Core.Reflection;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
+using Stride.Core.Reflection;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
 {
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/RangedValueTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/RangedValueTemplateProvider.cs
@ -2,9 +2,8 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.

 using Stride.Core.Assets.Editor.Quantum.NodePresenters.Keys;
-using Stride.Core.Reflection;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
+using Stride.Core.Reflection;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
 {
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/SetTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/SetTemplateProvider.cs
@ -1,6 +1,5 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
--- a/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/UnloadableObjectTemplateProvider.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/TemplateProviders/UnloadableObjectTemplateProvider.cs
@ -1,9 +1,8 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using Stride.Core.Assets.Editor.Quantum.NodePresenters.Keys;
-using Stride.Core.Yaml;
-using Stride.Core.Presentation.Quantum.View;
 using Stride.Core.Presentation.Quantum.ViewModels;
+using Stride.Core.Yaml;

 namespace Stride.Core.Assets.Editor.View.TemplateProviders
 {
--- a/sources/presentation/Stride.Core.Presentation.Quantum/View/TypeMatchTemplateProvider.cs
+++ b/sources/presentation/Stride.Core.Presentation.Quantum/View/TypeMatchTemplateProvider.cs
@ -3,7 +3,7 @@
 using System;
 using Stride.Core.Presentation.Quantum.ViewModels;

-namespace Stride.Core.Presentation.Quantum.View
+namespace Stride.Core.Assets.Editor.View
 {
    /// <summary>
    /// An implementation of the <see cref="NodeViewModelTemplateProvider"/> that matches <see cref="Stride.Core.Presentation.Quantum.ViewModels.NodeViewModel"/> of a specific type.
--- a/sources/editor/Stride.Core.Assets.Editor/View/ValueConverters/DifferentValueToParam.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/ValueConverters/DifferentValueToParam.cs
@ -1,12 +1,11 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using Stride.Core.Presentation.Quantum.ViewModels;
 using Stride.Core.Presentation.ValueConverters;

-namespace Stride.Core.Presentation.Quantum.View
+namespace Stride.Core.Assets.Editor.View.ValueConverters
 {
    public class DifferentValueToParam : ValueConverterBase<DifferentValueToParam>
    {
--- a/sources/presentation/Stride.Core.Presentation.Quantum.Tests/Stride.Core.Presentation.Quantum.Tests.csproj
+++ b/sources/presentation/Stride.Core.Presentation.Quantum.Tests/Stride.Core.Presentation.Quantum.Tests.csproj
@ -16,6 +16,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\tests\xunit.runner.stride\xunit.runner.stride.csproj" />
    <ProjectReference Include="..\Stride.Core.Presentation.Quantum\Stride.Core.Presentation.Quantum.csproj" />
+    <ProjectReference Include="..\Stride.Core.Presentation.Wpf\Stride.Core.Presentation.Wpf.csproj" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
--- a/sources/presentation/Stride.Core.Presentation.Quantum/Stride.Core.Presentation.Quantum.csproj
+++ b/sources/presentation/Stride.Core.Presentation.Quantum/Stride.Core.Presentation.Quantum.csproj
@ -1,13 +1,8 @@
-<Project>
-
+<Project>
  <Import Project="..\..\targets\Stride.Core.props" />
 
  <PropertyGroup>
-    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
-    <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
-    <TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <EnableDefaultPageItems>false</EnableDefaultPageItems>
+    <TargetFramework>$(StrideXplatEditorTargetFramework)</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
@ -17,10 +12,9 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\Stride.Core.Presentation.Wpf\Stride.Core.Presentation.Wpf.csproj" />
+    <ProjectReference Include="..\Stride.Core.Presentation\Stride.Core.Presentation.csproj" />
    <ProjectReference Include="..\Stride.Core.Quantum\Stride.Core.Quantum.csproj" />
  </ItemGroup>

  <Import Project="$(StrideSdkTargets)" />
-
 </Project>
--- a/sources/presentation/Stride.Core.Presentation.Quantum/ViewModels/NodeViewModel.cs
+++ b/sources/presentation/Stride.Core.Presentation.Quantum/ViewModels/NodeViewModel.cs
@ -3,23 +3,20 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Dynamic;
 using System.Linq;
 using System.Reflection;
-using System.Windows;
-using Stride.Core;
 using Stride.Core.Annotations;
 using Stride.Core.Extensions;
 using Stride.Core.Reflection;
-using Stride.Core.TypeConverters;
 using Stride.Core.Presentation.Collections;
 using Stride.Core.Presentation.Commands;
 using Stride.Core.Presentation.Core;
 using Stride.Core.Presentation.Quantum.Presenters;
-using Stride.Core.Quantum;
-using Expression = System.Linq.Expressions.Expression;
 using Stride.Core.Presentation.ViewModels;
+using Stride.Core.Quantum;
+using Stride.Core.TypeConverters;
+using Expression = System.Linq.Expressions.Expression;

 namespace Stride.Core.Presentation.Quantum.ViewModels
 {
@ -320,7 +317,7 @@ namespace Stride.Core.Presentation.Quantum.ViewModels
        public object GetDynamicObject(string name)
        {
            name = EscapeName(name);
-            return GetChild(name) ?? GetCommand(name) ?? GetAssociatedData(name) ?? DependencyProperty.UnsetValue;
+            return GetChild(name) ?? GetCommand(name) ?? GetAssociatedData(name);
        }

        /// <inheritdoc/>