diff --git a/Ao.ObjectDesign.sln b/Ao.ObjectDesign.sln index 9a21617..4077121 100644 --- a/Ao.ObjectDesign.sln +++ b/Ao.ObjectDesign.sln @@ -33,8 +33,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.Designing", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.Designing.Test", "test\Ao.ObjectDesign.Designing.Test\Ao.ObjectDesign.Designing.Test.csproj", "{54ECB04E-7557-46A4-B7DB-D01E592135D5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.WpfDesign", "src\Ao.ObjectDesign.WpfDesign\Ao.ObjectDesign.WpfDesign.csproj", "{A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.WpfDesign.Test", "test\Ao.ObjectDesign.WpfDesign.Test\Ao.ObjectDesign.WpfDesign.Test.csproj", "{440E7D30-AD38-4F71-AC3B-5AF21DA5AF39}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.TextJson", "src\Ao.ObjectDesign.TextJson\Ao.ObjectDesign.TextJson.csproj", "{A4E941B2-9F20-48C3-A609-2FA3682E296A}" @@ -43,8 +41,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.MessagePack EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.Xaml", "src\Ao.ObjectDesign.Xaml\Ao.ObjectDesign.Xaml.csproj", "{45925D03-B5C5-40FF-A710-ECF2926614EB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.Session", "src\Ao.ObjectDesign.Session\Ao.ObjectDesign.Session.csproj", "{14C986C6-7F19-46F6-8E94-92BDBBC1CB12}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.Bindings", "src\Ao.ObjectDesign.Bindings\Ao.ObjectDesign.Bindings.csproj", "{F0FC7F1F-B5AA-49BC-9C9D-19FEBD092FA2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObjectDesign.Brock.Controls", "samples\ObjectDesign.Brock.Controls\ObjectDesign.Brock.Controls.csproj", "{DFC1C2C0-41EE-4F86-9E37-49B935AEFE60}" @@ -65,7 +61,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.Sources.Inf EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObjectDesign.Projecting", "samples\ObjectDesign.Projecting\ObjectDesign.Projecting.csproj", "{975C5F94-B2A5-4CCF-BA7A-0341461B2F79}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ao.ObjectDesign.Sources.Abstract", "src\Ao.ObjectDesign.Sources.Abstract\Ao.ObjectDesign.Sources.Abstract.csproj", "{F25BB79C-F5C3-489C-B025-7127F2FAAFC6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.Sources.Abstract", "src\Ao.ObjectDesign.Sources.Abstract\Ao.ObjectDesign.Sources.Abstract.csproj", "{F25BB79C-F5C3-489C-B025-7127F2FAAFC6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ao.ObjectDesign.Session.Wpf", "src\Ao.ObjectDesign.Session.Wpf\Ao.ObjectDesign.Session.Wpf.csproj", "{D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -233,18 +231,6 @@ Global {54ECB04E-7557-46A4-B7DB-D01E592135D5}.Release|x64.Build.0 = Release|Any CPU {54ECB04E-7557-46A4-B7DB-D01E592135D5}.Release|x86.ActiveCfg = Release|Any CPU {54ECB04E-7557-46A4-B7DB-D01E592135D5}.Release|x86.Build.0 = Release|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Debug|x64.ActiveCfg = Debug|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Debug|x64.Build.0 = Debug|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Debug|x86.ActiveCfg = Debug|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Debug|x86.Build.0 = Debug|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Release|Any CPU.Build.0 = Release|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Release|x64.ActiveCfg = Release|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Release|x64.Build.0 = Release|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Release|x86.ActiveCfg = Release|Any CPU - {A6A3945D-10A2-4CF4-8009-C7D5DDF9B581}.Release|x86.Build.0 = Release|Any CPU {440E7D30-AD38-4F71-AC3B-5AF21DA5AF39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {440E7D30-AD38-4F71-AC3B-5AF21DA5AF39}.Debug|Any CPU.Build.0 = Debug|Any CPU {440E7D30-AD38-4F71-AC3B-5AF21DA5AF39}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -293,18 +279,6 @@ Global {45925D03-B5C5-40FF-A710-ECF2926614EB}.Release|x64.Build.0 = Release|Any CPU {45925D03-B5C5-40FF-A710-ECF2926614EB}.Release|x86.ActiveCfg = Release|Any CPU {45925D03-B5C5-40FF-A710-ECF2926614EB}.Release|x86.Build.0 = Release|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Debug|x64.ActiveCfg = Debug|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Debug|x64.Build.0 = Debug|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Debug|x86.ActiveCfg = Debug|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Debug|x86.Build.0 = Debug|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Release|Any CPU.Build.0 = Release|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Release|x64.ActiveCfg = Release|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Release|x64.Build.0 = Release|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Release|x86.ActiveCfg = Release|Any CPU - {14C986C6-7F19-46F6-8E94-92BDBBC1CB12}.Release|x86.Build.0 = Release|Any CPU {F0FC7F1F-B5AA-49BC-9C9D-19FEBD092FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F0FC7F1F-B5AA-49BC-9C9D-19FEBD092FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU {F0FC7F1F-B5AA-49BC-9C9D-19FEBD092FA2}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -437,6 +411,18 @@ Global {F25BB79C-F5C3-489C-B025-7127F2FAAFC6}.Release|x64.Build.0 = Release|Any CPU {F25BB79C-F5C3-489C-B025-7127F2FAAFC6}.Release|x86.ActiveCfg = Release|Any CPU {F25BB79C-F5C3-489C-B025-7127F2FAAFC6}.Release|x86.Build.0 = Release|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Debug|x64.ActiveCfg = Debug|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Debug|x64.Build.0 = Debug|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Debug|x86.ActiveCfg = Debug|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Debug|x86.Build.0 = Debug|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Release|Any CPU.Build.0 = Release|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Release|x64.ActiveCfg = Release|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Release|x64.Build.0 = Release|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Release|x86.ActiveCfg = Release|Any CPU + {D5E2D6AC-32FC-4A73-A5E2-511AAE269F3F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/ActionsBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/ActionsBindingCreatorFactory.cs deleted file mode 100644 index d78c707..0000000 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ActionsBindingCreatorFactory.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Ao.ObjectDesign.Bindings; -using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; -using ObjectDesign.Brock.Components; -using System; -using System.Collections.Generic; -using System.Windows; - -namespace ObjectDesign.Brock.Controls.BindingCreators -{ -} diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/BindingCreators.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/BindingCreators.cs deleted file mode 100644 index 91a6f81..0000000 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/BindingCreators.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Ao.ObjectDesign; -using Ao.ObjectDesign.Bindings; -using Ao.ObjectDesign.Bindings.Annotations; -using Ao.ObjectDesign.Designing; -using Ao.ObjectDesign.Designing.Annotations; -using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; -using FastExpressionCompiler; -using ObjectDesign.Brock.Components; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Windows; -using LExpressions = System.Linq.Expressions; - -namespace ObjectDesign.Brock.Controls.BindingCreators -{ -} diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/BrockAutoBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/BrockAutoBindingCreatorFactory.cs index 572cd66..fef825e 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/BrockAutoBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/BrockAutoBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.AutoBind; using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System; using System.Collections.Generic; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreator.cs index dd8613e..2c9ef23 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreator.cs @@ -2,8 +2,8 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Annotations; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Data; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System; using System.Collections.Generic; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreatorFactory.cs index 646a2e0..8727cef 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Windows; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/ControlSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/ControlSettingBindingCreator.cs index 02bd5c9..24de701 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ControlSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ControlSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/ControlSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/ControlSettingBindingCreatorFactory.cs index f4778bd..2ab44f1 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ControlSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ControlSettingBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Windows; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/FrameworkElementSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/FrameworkElementSettingBindingCreator.cs index 4af995c..fb6b29f 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/FrameworkElementSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/FrameworkElementSettingBindingCreator.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; -using Ao.ObjectDesign.Wpf.Designing; +using Ao.ObjectDesign.Data; +using Ao.ObjectDesign.Designing; using ObjectDesign.Brock.Components; using System; using System.Collections.Generic; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/ImageSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/ImageSettingBindingCreator.cs index fcd3f28..3414b8d 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ImageSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ImageSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/ImageSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/ImageSettingBindingCreatorFactory.cs index 2cff10e..467a1ca 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ImageSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ImageSettingBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Windows; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/ItemsControlSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/ItemsControlSettingBindingCreator.cs index a1d7909..f1944ad 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ItemsControlSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ItemsControlSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/ItemsControlSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/ItemsControlSettingBindingCreatorFactory.cs index 0847a40..0f368ed 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ItemsControlSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ItemsControlSettingBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Windows; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/LineSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/LineSettingBindingCreator.cs index 804f882..9c5e49e 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/LineSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/LineSettingBindingCreator.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf; -using Ao.ObjectDesign.Wpf.Data; + +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/LineSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/LineSettingBindingCreatorFactory.cs index fbc972c..fff725c 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/LineSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/LineSettingBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Windows; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/MediaElementSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/MediaElementSettingBindingCreator.cs index b503b5e..99c00ed 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/MediaElementSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/MediaElementSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System; using System.Collections.Generic; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/MediaElementSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/MediaElementSettingBindingCreatorFactory.cs index c4f8ddc..36a5af7 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/MediaElementSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/MediaElementSettingBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Windows; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/PanelSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/PanelSettingBindingCreator.cs index 15f18bc..fdd9979 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/PanelSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/PanelSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/ProgressBarSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/ProgressBarSettingBindingCreator.cs index 8bb7605..6b578e0 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ProgressBarSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ProgressBarSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/ProgressBarSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/ProgressBarSettingBindingCreatorFactory.cs index 11d30c7..6424399 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ProgressBarSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ProgressBarSettingBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Windows; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/RangeBaseSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/RangeBaseSettingBindingCreator.cs index 77a779e..a9fef74 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/RangeBaseSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/RangeBaseSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/RectangleSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/RectangleSettingBindingCreator.cs index 0ce6cdc..a238032 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/RectangleSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/RectangleSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/RectangleSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/RectangleSettingBindingCreatorFactory.cs index 3a6a5ff..1b5fc6c 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/RectangleSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/RectangleSettingBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Windows; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/ShapeSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/ShapeSettingBindingCreator.cs index 91d6677..a96839c 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ShapeSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ShapeSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBlockSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBlockSettingBindingCreator.cs index 2d5c575..12e1ea1 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBlockSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBlockSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBlockSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBlockSettingBindingCreatorFactory.cs index e5bc780..7b949d2 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBlockSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBlockSettingBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Windows; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxBaseSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxBaseSettingBindingCreator.cs index 06b8b6a..f9fb7f1 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxBaseSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxBaseSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxSettingBindingCreator.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxSettingBindingCreator.cs index 5bf873e..1752b96 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxSettingBindingCreator.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Linq; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxSettingBindingCreatorFactory.cs index fff81f3..f248a7e 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxSettingBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System.Collections.Generic; using System.Windows; diff --git a/samples/ObjectDesign.Brock.Controls/ControlSetting.cs b/samples/ObjectDesign.Brock.Controls/ControlSetting.cs index 90b4200..fd36468 100644 --- a/samples/ObjectDesign.Brock.Controls/ControlSetting.cs +++ b/samples/ObjectDesign.Brock.Controls/ControlSetting.cs @@ -1,5 +1,5 @@ using Ao.ObjectDesign.Designing.Annotations; -using Ao.ObjectDesign.Wpf.Designing; +using Ao.ObjectDesign.Designing; using ObjectDesign.Brock.Components; using System.Windows; using System.Windows.Controls; diff --git a/samples/ObjectDesign.Brock.Controls/ImageSetting.cs b/samples/ObjectDesign.Brock.Controls/ImageSetting.cs index 986e76d..f304d9d 100644 --- a/samples/ObjectDesign.Brock.Controls/ImageSetting.cs +++ b/samples/ObjectDesign.Brock.Controls/ImageSetting.cs @@ -1,5 +1,5 @@ using Ao.ObjectDesign.Designing.Annotations; -using Ao.ObjectDesign.Wpf.Designing; +using Ao.ObjectDesign.Designing; using ObjectDesign.Brock.Components; using System.Windows.Controls; using System.Windows.Media; diff --git a/samples/ObjectDesign.Brock.Controls/ObjectDesign.Brock.Controls.csproj b/samples/ObjectDesign.Brock.Controls/ObjectDesign.Brock.Controls.csproj index c2d9e68..dc943f4 100644 --- a/samples/ObjectDesign.Brock.Controls/ObjectDesign.Brock.Controls.csproj +++ b/samples/ObjectDesign.Brock.Controls/ObjectDesign.Brock.Controls.csproj @@ -9,8 +9,6 @@ - - diff --git a/samples/ObjectDesign.Brock.Controls/PanelSetting.cs b/samples/ObjectDesign.Brock.Controls/PanelSetting.cs index 56c5e4c..ebc0957 100644 --- a/samples/ObjectDesign.Brock.Controls/PanelSetting.cs +++ b/samples/ObjectDesign.Brock.Controls/PanelSetting.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Designing.Annotations; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Designing; +using Ao.ObjectDesign.Designing; using ObjectDesign.Brock.Components; using System; using System.Collections.Generic; diff --git a/samples/ObjectDesign.Brock.Controls/ShapeSetting.cs b/samples/ObjectDesign.Brock.Controls/ShapeSetting.cs index 7c83c95..a14aefe 100644 --- a/samples/ObjectDesign.Brock.Controls/ShapeSetting.cs +++ b/samples/ObjectDesign.Brock.Controls/ShapeSetting.cs @@ -1,5 +1,5 @@ using Ao.ObjectDesign.Designing.Annotations; -using Ao.ObjectDesign.Wpf.Designing; +using Ao.ObjectDesign.Designing; using ObjectDesign.Brock.Components; using System.Windows.Media; using System.Windows.Shapes; diff --git a/samples/ObjectDesign.Brock.Controls/TextBlockSetting.cs b/samples/ObjectDesign.Brock.Controls/TextBlockSetting.cs index b66f90e..35aa496 100644 --- a/samples/ObjectDesign.Brock.Controls/TextBlockSetting.cs +++ b/samples/ObjectDesign.Brock.Controls/TextBlockSetting.cs @@ -1,5 +1,5 @@ using Ao.ObjectDesign.Designing.Annotations; -using Ao.ObjectDesign.Wpf.Designing; +using Ao.ObjectDesign.Designing; using ObjectDesign.Brock.Components; using System.Windows; using System.Windows.Controls; diff --git a/samples/ObjectDesign.Brock.Controls/UIElementSetting.cs b/samples/ObjectDesign.Brock.Controls/UIElementSetting.cs index d2ccb36..92c17f0 100644 --- a/samples/ObjectDesign.Brock.Controls/UIElementSetting.cs +++ b/samples/ObjectDesign.Brock.Controls/UIElementSetting.cs @@ -1,10 +1,7 @@ using Ao.ObjectDesign.Bindings.Annotations; using Ao.ObjectDesign.Designing; using Ao.ObjectDesign.Designing.Annotations; -using Ao.ObjectDesign.Wpf.Designing; using System; -using System.Collections.Specialized; -using System.Linq; using System.Windows; namespace ObjectDesign.Brock.Components diff --git a/samples/ObjectDesign.Brock/AppEngine.cs b/samples/ObjectDesign.Brock/AppEngine.cs index 70ce366..9c00b79 100644 --- a/samples/ObjectDesign.Brock/AppEngine.cs +++ b/samples/ObjectDesign.Brock/AppEngine.cs @@ -2,8 +2,8 @@ using Ao.Lang.Lookup; using Ao.Lang.Runtime; using Ao.ObjectDesign.Bindings; -using Ao.ObjectDesign.Session; -using Ao.ObjectDesign.Session.BuildIn; +using Ao.ObjectDesign.Session.Wpf; +using Ao.ObjectDesign.Session.Wpf.BuildIn; using Ao.ObjectDesign.Sources; using Ao.Project; using MahApps.Metro.Controls; diff --git a/samples/ObjectDesign.Brock/BindingCreators/RelativeFileImageSettingBindingCreator.cs b/samples/ObjectDesign.Brock/BindingCreators/RelativeFileImageSettingBindingCreator.cs index 9cac7c7..8234c16 100644 --- a/samples/ObjectDesign.Brock/BindingCreators/RelativeFileImageSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock/BindingCreators/RelativeFileImageSettingBindingCreator.cs @@ -1,8 +1,8 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.Annotations; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Session.Wpf.Annotations; +using Ao.ObjectDesign.Data; using Microsoft.Extensions.DependencyInjection; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Controls; diff --git a/samples/ObjectDesign.Brock/BindingCreators/RelativeFileImageSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock/BindingCreators/RelativeFileImageSettingBindingCreatorFactory.cs index 41a7ca8..cb8c9fc 100644 --- a/samples/ObjectDesign.Brock/BindingCreators/RelativeFileImageSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock/BindingCreators/RelativeFileImageSettingBindingCreatorFactory.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Controls.BindingCreators; using System.Collections.Generic; diff --git a/samples/ObjectDesign.Brock/Controls/DesignPanel.cs b/samples/ObjectDesign.Brock/Controls/DesignPanel.cs index ec555c3..f5ad315 100644 --- a/samples/ObjectDesign.Brock/Controls/DesignPanel.cs +++ b/samples/ObjectDesign.Brock/Controls/DesignPanel.cs @@ -1,5 +1,5 @@ using Ao.ObjectDesign.Designing; -using Ao.ObjectDesign.Session.Desiging; +using Ao.ObjectDesign.Session.Wpf.Desiging; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; using System.Windows; diff --git a/samples/ObjectDesign.Brock/Converters/PenBrushTypeBoolConverter.cs b/samples/ObjectDesign.Brock/Converters/PenBrushTypeBoolConverter.cs index 6e70bb5..4128a9b 100644 --- a/samples/ObjectDesign.Brock/Converters/PenBrushTypeBoolConverter.cs +++ b/samples/ObjectDesign.Brock/Converters/PenBrushTypeBoolConverter.cs @@ -1,4 +1,4 @@ -using Ao.ObjectDesign.Wpf.Designing; +using Ao.ObjectDesign.Designing; namespace ObjectDesign.Brock.Converters { diff --git a/samples/ObjectDesign.Brock/Converters/PenBrushTypeVisibilityConverter.cs b/samples/ObjectDesign.Brock/Converters/PenBrushTypeVisibilityConverter.cs index bc0b0ea..26ddc15 100644 --- a/samples/ObjectDesign.Brock/Converters/PenBrushTypeVisibilityConverter.cs +++ b/samples/ObjectDesign.Brock/Converters/PenBrushTypeVisibilityConverter.cs @@ -1,4 +1,4 @@ -using Ao.ObjectDesign.Wpf.Designing; +using Ao.ObjectDesign.Designing; namespace ObjectDesign.Brock.Converters { diff --git a/samples/ObjectDesign.Brock/InMemory/BuildIn/MemorySceneMakerStartup.cs b/samples/ObjectDesign.Brock/InMemory/BuildIn/MemorySceneMakerStartup.cs index 772b5e6..7fd7559 100644 --- a/samples/ObjectDesign.Brock/InMemory/BuildIn/MemorySceneMakerStartup.cs +++ b/samples/ObjectDesign.Brock/InMemory/BuildIn/MemorySceneMakerStartup.cs @@ -1,5 +1,5 @@ -using Ao.ObjectDesign.Session.BuildIn; -using Ao.ObjectDesign.Session.Environment; +using Ao.ObjectDesign.Session.Wpf.BuildIn; +using Ao.ObjectDesign.Session.Wpf.Environment; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; diff --git a/samples/ObjectDesign.Brock/InMemory/MemoryDesignClipboardManager.cs b/samples/ObjectDesign.Brock/InMemory/MemoryDesignClipboardManager.cs index a13f35f..e815d0a 100644 --- a/samples/ObjectDesign.Brock/InMemory/MemoryDesignClipboardManager.cs +++ b/samples/ObjectDesign.Brock/InMemory/MemoryDesignClipboardManager.cs @@ -1,4 +1,4 @@ -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System.Collections.Generic; diff --git a/samples/ObjectDesign.Brock/InMemory/MemoryEngineEnvironment.cs b/samples/ObjectDesign.Brock/InMemory/MemoryEngineEnvironment.cs index 3a8e2fa..2602362 100644 --- a/samples/ObjectDesign.Brock/InMemory/MemoryEngineEnvironment.cs +++ b/samples/ObjectDesign.Brock/InMemory/MemoryEngineEnvironment.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Designing; -using Ao.ObjectDesign.Session; -using Ao.ObjectDesign.Session.Desiging; -using Ao.ObjectDesign.Session.Environment; +using Ao.ObjectDesign.Session.Wpf; +using Ao.ObjectDesign.Session.Wpf.Desiging; +using Ao.ObjectDesign.Session.Wpf.Environment; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; using System; diff --git a/samples/ObjectDesign.Brock/InMemory/MemorySceneFetcher.cs b/samples/ObjectDesign.Brock/InMemory/MemorySceneFetcher.cs index 7a64523..7cafbd4 100644 --- a/samples/ObjectDesign.Brock/InMemory/MemorySceneFetcher.cs +++ b/samples/ObjectDesign.Brock/InMemory/MemorySceneFetcher.cs @@ -1,4 +1,4 @@ -using Ao.ObjectDesign.Session; +using Ao.ObjectDesign.Session.Wpf; using ObjectDesign.Brock.Level; using System.Collections.Generic; using System.IO.Abstractions; diff --git a/samples/ObjectDesign.Brock/InputBindings/CopyPasteInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/CopyPasteInputBinding.cs index 0d87949..f3da1bc 100644 --- a/samples/ObjectDesign.Brock/InputBindings/CopyPasteInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/CopyPasteInputBinding.cs @@ -1,11 +1,10 @@ using Ao.ObjectDesign; using Ao.ObjectDesign.Designing; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session; -using Ao.ObjectDesign.Session.Desiging; -using Ao.ObjectDesign.Wpf.Designing; -using Ao.ObjectDesign.WpfDesign; -using Ao.ObjectDesign.WpfDesign.Input; +using Ao.ObjectDesign.Session.Wpf; +using Ao.ObjectDesign.Session.Wpf.Desiging; +using Ao.ObjectDesign.Wpf; +using Ao.ObjectDesign.Wpf.Input; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; using System.Collections.Generic; diff --git a/samples/ObjectDesign.Brock/InputBindings/CtrlCopyInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/CtrlCopyInputBinding.cs index dac5a2a..fd7d2b0 100644 --- a/samples/ObjectDesign.Brock/InputBindings/CtrlCopyInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/CtrlCopyInputBinding.cs @@ -1,5 +1,5 @@ -using Ao.ObjectDesign.Session.Desiging; -using Ao.ObjectDesign.WpfDesign.Input; +using Ao.ObjectDesign.Session.Wpf.Desiging; +using Ao.ObjectDesign.Wpf.Input; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; using ObjectDesign.Brock.Services; diff --git a/samples/ObjectDesign.Brock/InputBindings/DeleteInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/DeleteInputBinding.cs index 99e6aa3..d680b13 100644 --- a/samples/ObjectDesign.Brock/InputBindings/DeleteInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/DeleteInputBinding.cs @@ -1,8 +1,8 @@ using Ao.ObjectDesign; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.Desiging; -using Ao.ObjectDesign.WpfDesign; -using Ao.ObjectDesign.WpfDesign.Input; +using Ao.ObjectDesign.Session.Wpf.Desiging; +using Ao.ObjectDesign.Wpf; +using Ao.ObjectDesign.Wpf.Input; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; using System.Collections.Generic; diff --git a/samples/ObjectDesign.Brock/InputBindings/FallbackInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/FallbackInputBinding.cs index 98dabe7..85553cd 100644 --- a/samples/ObjectDesign.Brock/InputBindings/FallbackInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/FallbackInputBinding.cs @@ -1,6 +1,6 @@ -using Ao.ObjectDesign.Session.Desiging; -using Ao.ObjectDesign.WpfDesign; -using Ao.ObjectDesign.WpfDesign.Input; +using Ao.ObjectDesign.Session.Wpf.Desiging; +using Ao.ObjectDesign.Wpf; +using Ao.ObjectDesign.Wpf.Input; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; using System.Windows.Input; diff --git a/samples/ObjectDesign.Brock/InputBindings/RangeSelectInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/RangeSelectInputBinding.cs index 06780d0..57bded2 100644 --- a/samples/ObjectDesign.Brock/InputBindings/RangeSelectInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/RangeSelectInputBinding.cs @@ -1,8 +1,8 @@ using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.Desiging; -using Ao.ObjectDesign.Session.DesignHelpers; -using Ao.ObjectDesign.WpfDesign; -using Ao.ObjectDesign.WpfDesign.Input; +using Ao.ObjectDesign.Session.Wpf.Desiging; +using Ao.ObjectDesign.Session.Wpf.DesignHelpers; +using Ao.ObjectDesign.Wpf; +using Ao.ObjectDesign.Wpf.Input; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; using System; diff --git a/samples/ObjectDesign.Brock/InputBindings/SelectAllInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/SelectAllInputBinding.cs index b9219c4..17a2f85 100644 --- a/samples/ObjectDesign.Brock/InputBindings/SelectAllInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/SelectAllInputBinding.cs @@ -1,7 +1,7 @@ -using Ao.ObjectDesign.Session.Controllers; -using Ao.ObjectDesign.Session.Desiging; -using Ao.ObjectDesign.WpfDesign; -using Ao.ObjectDesign.WpfDesign.Input; +using Ao.ObjectDesign.Session.Wpf.Controllers; +using Ao.ObjectDesign.Session.Wpf.Desiging; +using Ao.ObjectDesign.Wpf; +using Ao.ObjectDesign.Wpf.Input; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; using System.Linq; diff --git a/samples/ObjectDesign.Brock/InputBindings/SelectDesignInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/SelectDesignInputBinding.cs index 6280e98..ba558f0 100644 --- a/samples/ObjectDesign.Brock/InputBindings/SelectDesignInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/SelectDesignInputBinding.cs @@ -1,8 +1,8 @@ using Ao.ObjectDesign.Designing; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.Desiging; -using Ao.ObjectDesign.WpfDesign; -using Ao.ObjectDesign.WpfDesign.Input; +using Ao.ObjectDesign.Session.Wpf.Desiging; +using Ao.ObjectDesign.Wpf; +using Ao.ObjectDesign.Wpf.Input; using System; using System.Linq; using System.Windows; diff --git a/samples/ObjectDesign.Brock/InputBindings/TextInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/TextInputBinding.cs index 0f3fac7..5b51879 100644 --- a/samples/ObjectDesign.Brock/InputBindings/TextInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/TextInputBinding.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign; -using Ao.ObjectDesign.Session.Desiging; -using Ao.ObjectDesign.WpfDesign; -using Ao.ObjectDesign.WpfDesign.Input; +using Ao.ObjectDesign.Session.Wpf.Desiging; +using Ao.ObjectDesign.Wpf; +using Ao.ObjectDesign.Wpf.Input; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; using System; diff --git a/samples/ObjectDesign.Brock/InputBindings/TransferFocusInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/TransferFocusInputBinding.cs index c1f590d..868801d 100644 --- a/samples/ObjectDesign.Brock/InputBindings/TransferFocusInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/TransferFocusInputBinding.cs @@ -1,4 +1,4 @@ -using Ao.ObjectDesign.WpfDesign.Input; +using Ao.ObjectDesign.Wpf.Input; using System.Windows; using System.Windows.Input; diff --git a/samples/ObjectDesign.Brock/MainWindowModel.cs b/samples/ObjectDesign.Brock/MainWindowModel.cs index 37ca080..999af78 100644 --- a/samples/ObjectDesign.Brock/MainWindowModel.cs +++ b/samples/ObjectDesign.Brock/MainWindowModel.cs @@ -1,8 +1,8 @@ using Ao.Lang.Runtime; using Ao.ObjectDesign; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session; -using Ao.ObjectDesign.Session.BuildIn; +using Ao.ObjectDesign.Session.Wpf; +using Ao.ObjectDesign.Session.Wpf.BuildIn; using MahApps.Metro.Controls; using MahApps.Metro.Controls.Dialogs; using Microsoft.Toolkit.Mvvm.ComponentModel; diff --git a/samples/ObjectDesign.Brock/MySceneMakerRuntime.cs b/samples/ObjectDesign.Brock/MySceneMakerRuntime.cs index 2f245af..c85e33a 100644 --- a/samples/ObjectDesign.Brock/MySceneMakerRuntime.cs +++ b/samples/ObjectDesign.Brock/MySceneMakerRuntime.cs @@ -1,4 +1,4 @@ -using Ao.ObjectDesign.Session; +using Ao.ObjectDesign.Session.Wpf; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; using ObjectDesign.Brock.Models; diff --git a/samples/ObjectDesign.Brock/MySceneMakerStartup.cs b/samples/ObjectDesign.Brock/MySceneMakerStartup.cs index 96f79cc..8c0a7a2 100644 --- a/samples/ObjectDesign.Brock/MySceneMakerStartup.cs +++ b/samples/ObjectDesign.Brock/MySceneMakerStartup.cs @@ -1,11 +1,11 @@ using Ao.ObjectDesign.AutoBind; using Ao.ObjectDesign.Designing; -using Ao.ObjectDesign.Session; -using Ao.ObjectDesign.Session.BuildIn; -using Ao.ObjectDesign.Session.Desiging; -using Ao.ObjectDesign.Session.DesignHelpers; -using Ao.ObjectDesign.Session.Environment; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Session.Wpf; +using Ao.ObjectDesign.Session.Wpf.BuildIn; +using Ao.ObjectDesign.Session.Wpf.Desiging; +using Ao.ObjectDesign.Session.Wpf.DesignHelpers; +using Ao.ObjectDesign.Session.Wpf.Environment; +using Ao.ObjectDesign.Data; using Microsoft.Extensions.DependencyInjection; using ObjectDesign.Brock.BindingCreators; using ObjectDesign.Brock.Components; diff --git a/samples/ObjectDesign.Brock/ObjectDesign.Brock.csproj b/samples/ObjectDesign.Brock/ObjectDesign.Brock.csproj index 9ae3750..c385ed8 100644 --- a/samples/ObjectDesign.Brock/ObjectDesign.Brock.csproj +++ b/samples/ObjectDesign.Brock/ObjectDesign.Brock.csproj @@ -23,8 +23,7 @@ - - + diff --git a/samples/ObjectDesign.Brock/RunContext.cs b/samples/ObjectDesign.Brock/RunContext.cs index e62d5ae..1dc5588 100644 --- a/samples/ObjectDesign.Brock/RunContext.cs +++ b/samples/ObjectDesign.Brock/RunContext.cs @@ -1,4 +1,4 @@ -using Ao.ObjectDesign.Session.Desiging; +using Ao.ObjectDesign.Session.Wpf.Desiging; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; using System; diff --git a/samples/ObjectDesign.Brock/Services/ActionInScene.cs b/samples/ObjectDesign.Brock/Services/ActionInScene.cs index 2fe14c4..1bea931 100644 --- a/samples/ObjectDesign.Brock/Services/ActionInScene.cs +++ b/samples/ObjectDesign.Brock/Services/ActionInScene.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.WpfDesign; +using Ao.ObjectDesign.Wpf; using ObjectDesign.Brock.Components; using System; using System.Collections.Generic; diff --git a/samples/ObjectDesign.Brock/Services/ActionSettingService.cs b/samples/ObjectDesign.Brock/Services/ActionSettingService.cs index e19c21c..ff08af6 100644 --- a/samples/ObjectDesign.Brock/Services/ActionSettingService.cs +++ b/samples/ObjectDesign.Brock/Services/ActionSettingService.cs @@ -1,13 +1,13 @@ using Ao.ObjectDesign; using Ao.ObjectDesign.Store; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session; -using Ao.ObjectDesign.Session.BuildIn; -using Ao.ObjectDesign.Session.Desiging; +using Ao.ObjectDesign.Session.Wpf; +using Ao.ObjectDesign.Session.Wpf.BuildIn; +using Ao.ObjectDesign.Session.Wpf.Desiging; + +using Ao.ObjectDesign.Designing; +using Ao.ObjectDesign.Json; using Ao.ObjectDesign.Wpf; -using Ao.ObjectDesign.Wpf.Designing; -using Ao.ObjectDesign.Wpf.Json; -using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Controls; using ObjectDesign.Brock.Level; diff --git a/samples/ObjectDesign.Brock/Views/BrushDesigner.xaml b/samples/ObjectDesign.Brock/Views/BrushDesigner.xaml index e29a9b7..bd867dd 100644 --- a/samples/ObjectDesign.Brock/Views/BrushDesigner.xaml +++ b/samples/ObjectDesign.Brock/Views/BrushDesigner.xaml @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:m="http://metro.mahapps.com/winfx/xaml/controls" xmlns:w="https://github.com/Cricle/Ao.ObjectDesign" - xmlns:loc="clr-namespace:Ao.ObjectDesign.Wpf.Designing;assembly=Ao.ObjectDesign.Wpf" + xmlns:loc="clr-namespace:Ao.ObjectDesign.Designing;assembly=Ao.ObjectDesign.Wpf" xmlns:l="https://github.com/Cricle/Ao.Lang" xmlns:conv="clr-namespace:ObjectDesign.Brock.Converters"> + xmlns:d="clr-namespace:Ao.ObjectDesign.Wpf;assembly=Ao.ObjectDesign.Wpf"> + xmlns:w="clr-namespace:Ao.ObjectDesign;assembly=Ao.ObjectDesign.Wpf"> diff --git a/samples/ObjectDesign.Wpf/Views/EnumCondition.cs b/samples/ObjectDesign.Wpf/Views/EnumCondition.cs index 27c78fd..9716e9e 100644 --- a/samples/ObjectDesign.Wpf/Views/EnumCondition.cs +++ b/samples/ObjectDesign.Wpf/Views/EnumCondition.cs @@ -1,5 +1,6 @@ -using Ao.ObjectDesign.ForView; -using Ao.ObjectDesign.Wpf; +using Ao.ObjectDesign; +using Ao.ObjectDesign.ForView; + using System.Windows; namespace ObjectDesign.Wpf.Views diff --git a/samples/ObjectDesign.Wpf/Views/FontSetting.xaml b/samples/ObjectDesign.Wpf/Views/FontSetting.xaml index 9d6b44e..531a5e4 100644 --- a/samples/ObjectDesign.Wpf/Views/FontSetting.xaml +++ b/samples/ObjectDesign.Wpf/Views/FontSetting.xaml @@ -1,7 +1,7 @@