From eb2503e0a079b9b0841f92ee767c3e3b6dafa42d Mon Sep 17 00:00:00 2001 From: HCricle Date: Sat, 19 Nov 2022 21:43:07 +0800 Subject: [PATCH 1/2] update name space --- Ao.ObjectDesign.sln | 30 +++++++++---------- .../ActionsBindingCreatorFactory.cs | 12 -------- .../BindingCreators/BindingCreators.cs | 20 ------------- .../BrockAutoBindingCreatorFactory.cs | 2 +- .../CanvasSettingBindingCreator.cs | 2 +- .../CanvasSettingBindingCreatorFactory.cs | 2 +- .../ControlSettingBindingCreator.cs | 2 +- .../ControlSettingBindingCreatorFactory.cs | 2 +- .../FrameworkElementSettingBindingCreator.cs | 4 +-- .../ImageSettingBindingCreator.cs | 2 +- .../ImageSettingBindingCreatorFactory.cs | 2 +- .../ItemsControlSettingBindingCreator.cs | 2 +- ...temsControlSettingBindingCreatorFactory.cs | 2 +- .../LineSettingBindingCreator.cs | 4 +-- .../LineSettingBindingCreatorFactory.cs | 2 +- .../MediaElementSettingBindingCreator.cs | 2 +- ...ediaElementSettingBindingCreatorFactory.cs | 2 +- .../PanelSettingBindingCreator.cs | 2 +- .../ProgressBarSettingBindingCreator.cs | 2 +- ...ProgressBarSettingBindingCreatorFactory.cs | 2 +- .../RangeBaseSettingBindingCreator.cs | 2 +- .../RectangleSettingBindingCreator.cs | 2 +- .../RectangleSettingBindingCreatorFactory.cs | 2 +- .../ShapeSettingBindingCreator.cs | 2 +- .../TextBlockSettingBindingCreator.cs | 2 +- .../TextBlockSettingBindingCreatorFactory.cs | 2 +- .../TextBoxBaseSettingBindingCreator.cs | 2 +- .../TextBoxSettingBindingCreator.cs | 2 +- .../TextBoxSettingBindingCreatorFactory.cs | 2 +- .../ControlSetting.cs | 2 +- .../ImageSetting.cs | 2 +- .../PanelSetting.cs | 2 +- .../ShapeSetting.cs | 2 +- .../TextBlockSetting.cs | 2 +- .../UIElementSetting.cs | 2 +- samples/ObjectDesign.Brock/AppEngine.cs | 4 +-- .../RelativeFileImageSettingBindingCreator.cs | 4 +-- ...veFileImageSettingBindingCreatorFactory.cs | 2 +- .../Controls/DesignPanel.cs | 2 +- .../Converters/PenBrushTypeBoolConverter.cs | 2 +- .../PenBrushTypeVisibilityConverter.cs | 2 +- .../BuildIn/MemorySceneMakerStartup.cs | 4 +-- .../InMemory/MemoryEngineEnvironment.cs | 6 ++-- .../InMemory/MemorySceneFetcher.cs | 2 +- .../InputBindings/CopyPasteInputBinding.cs | 5 ++-- .../InputBindings/CtrlCopyInputBinding.cs | 2 +- .../InputBindings/DeleteInputBinding.cs | 2 +- .../InputBindings/FallbackInputBinding.cs | 2 +- .../InputBindings/RangeSelectInputBinding.cs | 4 +-- .../InputBindings/SelectAllInputBinding.cs | 4 +-- .../InputBindings/SelectDesignInputBinding.cs | 2 +- .../InputBindings/TextInputBinding.cs | 2 +- samples/ObjectDesign.Brock/MainWindowModel.cs | 4 +-- .../ObjectDesign.Brock/MySceneMakerRuntime.cs | 2 +- .../ObjectDesign.Brock/MySceneMakerStartup.cs | 12 ++++---- .../ObjectDesign.Brock.csproj | 2 +- samples/ObjectDesign.Brock/RunContext.cs | 2 +- .../Services/ActionSettingService.cs | 12 ++++---- .../Views/BrushDesigner.xaml | 2 +- .../Views/BrushDesignerCondition.cs | 4 +-- .../Views/ClipToBoundsCondition.cs | 5 ++-- .../Views/FontSizeCondition.cs | 5 ++-- .../Views/IsIndeterminateCondition.cs | 5 ++-- .../Views/MediaElementSource.cs | 5 ++-- .../ObjectDesign.Brock/Views/NameCondition.cs | 5 ++-- .../Views/OpacityCondition.cs | 5 ++-- .../Views/PositionSizeForViewCondition.cs | 5 ++-- .../Views/ResourceIdentityCondition.cs | 2 +- .../Views/ResourceSelection.cs | 5 ++-- .../ObjectDesign.Brock/Views/RotateSection.cs | 5 ++-- .../Views/RotateTransformDesignerCondition.cs | 4 +-- .../Views/StretchCondition.cs | 2 +- .../Views/StrokeThicknessCondition.cs | 5 ++-- .../Views/TextAlignmentCondition.cs | 2 +- .../ObjectDesign.Brock/Views/TextCondition.cs | 5 ++-- .../Views/TextTrimmingCondition.cs | 5 ++-- .../Views/TextWrappingCondition.cs | 2 +- .../Controls/MoveIdSetting.cs | 1 - .../Converters/PenBrushTypeBoolConverter.cs | 2 +- .../DateTimeBrushForViewCondition.cs | 4 +-- samples/ObjectDesign.Wpf/MainWindow.xaml.cs | 10 +++---- .../SolidColorBrushForViewCondition.cs | 5 ++-- .../Views/CornerDesignCondition.cs | 4 +-- samples/ObjectDesign.Wpf/Views/Enum.xaml | 3 +- .../ObjectDesign.Wpf/Views/EnumCondition.cs | 5 ++-- .../ObjectDesign.Wpf/Views/FontSetting.xaml | 2 +- .../Views/FontSettingCondition.cs | 2 +- .../Views/LocationSizeCondition.cs | 4 +-- .../Views/PenBrushCondition.cs | 4 +-- samples/ObjectDesign.Wpf/Views/Primitive.xaml | 4 +-- .../Views/PrimitiveCondition.cs | 4 +-- .../Ao.ObjectDesign.AutoBind.csproj | 2 +- .../AutoBindingCreator.Compile.cs | 4 +-- .../AutoBindingCreator.cs | 2 +- .../AutoBindingCreatorFactory.cs | 4 +-- .../WpfBindingScopeCompiler.cs | 4 +-- .../WpfSharedBindingInfo.cs | 2 +- src/Ao.ObjectDesign.Controls/BorderSetting.cs | 2 +- src/Ao.ObjectDesign.Controls/ButtonBase.cs | 2 +- src/Ao.ObjectDesign.Controls/ButtonSetting.cs | 2 +- .../CheckBoxSetting.cs | 2 +- .../ControlSetting.cs | 2 +- .../DatePickerSetting.cs | 2 +- .../EllipseSetting.cs | 2 +- .../ExpanderSetting.cs | 2 +- .../FrameworkElementSetting.cs | 2 +- src/Ao.ObjectDesign.Controls/ImageSetting.cs | 2 +- .../ItemsControlSetting.cs | 2 +- src/Ao.ObjectDesign.Controls/LineSetting.cs | 2 +- .../ListBoxSetting.cs | 2 +- .../ListViewSetting.cs | 2 +- src/Ao.ObjectDesign.Controls/PanelSetting.cs | 2 +- .../PasswordBoxSetting.cs | 2 +- .../PolygonSetting.cs | 2 +- .../PolylineSetting.cs | 2 +- .../ProgressBarSetting.cs | 2 +- .../RadioButtonSetting.cs | 2 +- .../RangeBaseSetting.cs | 2 +- .../RectangleSetting.cs | 2 +- .../ScrollViewerSetting.cs | 2 +- .../SelectorSetting.cs | 2 +- src/Ao.ObjectDesign.Controls/ShapeSetting.cs | 2 +- src/Ao.ObjectDesign.Controls/SliderSetting.cs | 2 +- .../StackPanelSetting.cs | 2 +- .../TextBlockSetting.cs | 2 +- .../TextBoxBaseSetting.cs | 2 +- .../TextBoxSetting.cs | 2 +- .../ToggleButtonSetting.cs | 2 +- .../ToolTipSetting.cs | 2 +- .../UIElementSetting.cs | 2 +- .../ViewboxSetting.cs | 2 +- src/Ao.ObjectDesign.Controls/WindowSetting.cs | 2 +- ...Ao.ObjectDesign.DependencyInjection.csproj | 2 +- .../DesignDependencyInjection.cs | 4 +-- src/Ao.ObjectDesign.Json/BsonDesignInterop.cs | 2 +- src/Ao.ObjectDesign.Json/Json.cs | 2 +- src/Ao.ObjectDesign.Json/JsonDesignInterop.cs | 2 +- .../MessagePackDesignInterop.cs | 2 +- .../TypelessFormatterResolver.cs | 2 +- .../Annotations/BindingCreatorForAttribute.cs | 2 +- .../HasInstanceCreatorAttribute.cs | 2 +- .../Ao.ObjectDesign.Session.Wpf.csproj} | 0 .../AssemblyInfo.cs | 2 +- .../AutoSceneManager.cs | 6 ++-- .../BindingCreatorStateCreatorAsExtensions.cs | 4 +-- .../BindingCreators/BindingCreatorFactory.cs | 4 +-- .../DelegateBindingCreatorFactory.cs | 2 +- .../BindingCreators/WpfBindingCreator.cs | 4 +-- .../BuildIn/ControlBuildIn.Adds.cs | 8 ++--- .../BuildIn/ControlBuildIn.With.cs | 6 ++-- .../BuildIn/ControlBuildIn.cs | 2 +- .../BuildIn/EnvironmentSceneMakerStartup.cs | 6 ++-- .../BuildIn/ISceneMakerStartup.Session.cs | 4 +-- .../BuildIn/ISceneMakerStartup.cs | 6 ++-- .../BuildIn/SceneMakerStartup.cs | 6 ++-- .../Controllers/WpfSceneController.cs | 10 +++---- .../WpfSceneItemsSceneController.cs | 4 +-- .../WpfSceneObservableSceneController.cs | 4 +-- .../Desiging/BindingCreatorStateCreator.cs | 2 +- .../BindingCreatorStateDecoraterCollection.cs | 2 +- .../Desiging/DataTemplatePropertyPanel.cs | 6 ++-- .../Desiging/DesignSession.cs | 4 +-- .../Desiging/DesignSessionSettings.cs | 2 +- .../Desiging/DesignSufaceActionsExtensions.cs | 2 +- .../Desiging/EnvironmentDesignSession.cs | 4 +-- .../Desiging/EnvironmentSessionManager.cs | 2 +- .../Desiging/IBindingCreatorStateDecorater.cs | 2 +- .../Desiging/IDesignSession.cs | 2 +- .../Desiging/IDesignSessionActions.cs | 2 +- .../Desiging/IDesignSessionDesignable.cs | 4 +-- .../Desiging/IDesignSessionFallbackable.cs | 2 +- .../Desiging/IDesignSessionInfo.cs | 2 +- .../Desiging/IDesignSessionInput.cs | 2 +- .../Desiging/IDesignSessionSettings.cs | 2 +- .../Desiging/IDesignSessionWorking.cs | 2 +- .../Desiging/IPropertyContextCreator.cs | 2 +- .../Desiging/IPropertyContextsDecorater.cs | 2 +- .../Desiging/IPropertyPanel.cs | 2 +- .../PropertyContextsDecoraterCollection.cs | 2 +- .../PropertyPanelCreateContextExtensions.cs | 2 +- .../Desiging/SessionActionsExtensions.cs | 2 +- .../Desiging/SessionManager.cs | 6 ++-- .../TemplateContextsDecoraterCollection.cs | 4 +-- .../Desiging/TemplateDesignSession.cs | 4 +-- .../Desiging/WpfDesignPackage.cs | 4 +-- .../DesignHelpers/BoundsDesignHelper.cs | 4 +-- .../DesignHelpers/DesignHelperSyles.cs | 2 +- .../DesignHelpers/DistanceDesignHelper.cs | 4 +-- .../DesignHelpers/IWpfDesignHelper.cs | 2 +- .../DesignHelpers/MoveDesignHelper.cs | 4 +-- .../DesignHelpers/ResizeDesignHelper.cs | 4 +-- .../DesignHelpers/ViewHelper.cs | 2 +- .../DesignStatePropertyContextsDecorater.cs | 6 ++-- .../DesigningDataHelper.cs | 4 +-- .../Environment/EngineEnvironmentBase.cs | 4 +-- .../Environment/IEngineEnvironment.cs | 4 +-- .../Events/SessionCreatedEventArgs.cs | 4 +-- .../Events/SessionRemovedEventArgs.cs | 4 +-- .../IBindingCreatorStateCreator.cs | 2 +- .../ISceneFetcher.cs | 2 +- .../PropertyContextOrderDecoratere.cs | 6 ++-- .../SceneEngine.cs | 10 +++---- .../SceneMakerRuntime.DesignPanel.cs | 6 ++-- .../SceneMakerRuntime.cs | 6 ++-- .../SceneManagerActionExtensions.cs | 2 +- .../ValueChangedEventArgs.cs | 2 +- .../WpfSceneManager.cs | 4 +-- .../TextJsonDesignInterop.cs | 2 +- .../TypeDiscriminatorConvention.cs | 2 +- .../Ao.ObjectDesign.Uno.csproj | 18 +++++++++++ .../Annotations/IgnoreDesignAttribute.cs | 2 +- src/Ao.ObjectDesign.Wpf/AssemblyInfo.cs | 8 ++--- src/Ao.ObjectDesign.Wpf/AttackModes.cs | 2 +- .../BindingToTypeCreatorBase.cs | 4 +-- .../Conditions/BooleanForViewCondition.cs | 2 +- .../Conditions/DelegateTemplateCondition.cs | 2 +- .../Conditions/DelegateWpfForViewCondition.cs | 2 +- .../Conditions/EnumForViewCondition.cs | 2 +- .../Conditions/TemplateCondition.cs | 2 +- .../Conditions/ValueTypeForViewCondition.cs | 2 +- .../Conditions/WpfForViewCondition.cs | 2 +- .../Converters/PrimitiveConverter.cs | 2 +- .../Converters/StringFontFamilyConverter.cs | 4 +-- .../Converters/TypeEnumConverter.cs | 2 +- .../CreateTemplateContextsResult.cs | 2 +- .../Data/BindingCreatorAddExtensions.cs | 2 +- src/Ao.ObjectDesign.Wpf/Data/BindingMaker.cs | 2 +- .../Data/BindingMakerBase.cs | 2 +- src/Ao.ObjectDesign.Wpf/Data/BindingScope.cs | 2 +- .../Data/BindingScopeBase.cs | 2 +- .../Data/BindingScopeWithSourceExtensions.cs | 2 +- .../Data/BindingSetExtensions.cs | 2 +- src/Ao.ObjectDesign.Wpf/Data/BindingUnit.cs | 2 +- .../Data/DependencyPropertyBuilders.cs | 2 +- .../Data/DesignerManager.cs | 2 +- src/Ao.ObjectDesign.Wpf/Data/IBindingMaker.cs | 2 +- src/Ao.ObjectDesign.Wpf/Data/IBindingScope.cs | 2 +- .../Data/IWithSourceBindingScope.cs | 2 +- .../Data/IWpfBindingDrawingItem.cs | 2 +- .../Data/MultiBindingMaker.cs | 2 +- .../Data/MultiBindingScope.cs | 2 +- .../Data/PropertyWithSourceBindingScope.cs | 2 +- .../Data/TargetWithSourceBindingScope.cs | 2 +- .../Data/WithSourceBindingScope.cs | 2 +- .../Data/WpfBindingDrawing.cs | 2 +- .../Data/WpfBindingDrawingItem.cs | 2 +- .../DependencyObjectHelper.cs | 2 +- src/Ao.ObjectDesign.Wpf/DesignLevels.cs | 2 +- .../Designing/BindingBaseDesigner.cs | 2 +- .../Designing/BindingDesigner.cs | 2 +- .../Designing/BlurEffectDesigner.cs | 2 +- .../Designing/BrushDesigner.cs | 2 +- .../Designing/ColorDesigner.cs | 2 +- .../Designing/ColumnDefinitionDesigner.cs | 2 +- .../Designing/CornerRadiusDesigner.cs | 2 +- .../Designing/CultureInfoDesigner.cs | 2 +- .../Designing/CursorDesigner.cs | 2 +- .../Designing/CursorTypes.cs | 2 +- .../Designing/DesigningHelpers.cs | 2 +- .../Designing/DoubleCollectionDesigner.cs | 2 +- .../Designing/DropShadowEffectDesigner.cs | 2 +- .../DynamicResourceExtensionDesigner.cs | 2 +- .../Designing/EffectDesigner.cs | 2 +- .../Designing/EffectTypes.cs | 2 +- .../Designing/FontFamilyDesigner.cs | 2 +- .../Designing/FontStretchDesigner.cs | 2 +- .../Designing/FontStretchTypes.cs | 2 +- .../Designing/FontStyleDesigner.cs | 2 +- .../Designing/FontWeightDesigner.cs | 2 +- .../Designing/GradientStopDesigner.cs | 2 +- .../Designing/GridLengthDesigner.cs | 2 +- .../Designing/IDefaulted.cs | 2 +- .../Designing/IMiddlewareDesigner.cs | 2 +- .../Designing/ImageBrushDesigner.cs | 2 +- .../Designing/ImageSourceDesigner.cs | 2 +- .../Designing/LinearGradientBrushDesigner.cs | 2 +- .../Designing/PenBrushTypes.cs | 2 +- .../Designing/PenFontWeights.cs | 2 +- .../Designing/PenGradientDesigner.cs | 2 +- .../Designing/PointCollectionDesigner.cs | 2 +- .../Designing/PointDesigner.cs | 2 +- .../Designing/PropertyPathDesigner.cs | 2 +- .../Designing/RadialGradientBrushDesigner.cs | 2 +- .../Designing/RectDesigner.cs | 2 +- .../Designing/RelativeSourceDesigner.cs | 2 +- .../Designing/RotateTransformDesigner.cs | 2 +- .../Designing/RowDefinitionDesigner.cs | 2 +- .../Designing/ScaleTransformDesigner.cs | 2 +- .../Designing/SizeDesigner.cs | 2 +- .../Designing/SkewTransformDesigner.cs | 2 +- .../Designing/SolidColorBrushDesigner.cs | 2 +- .../StaticResourceExtensionDesigner.cs | 2 +- .../TextDecorationCollectionDesigner.cs | 2 +- .../Designing/ThicknessDesigner.cs | 2 +- .../Designing/TileBrushDesigner.cs | 2 +- .../Designing/TransformCollectionDesigner.cs | 2 +- .../Designing/TransformDesigner.cs | 2 +- .../Designing/TransformGroupDesign.cs | 2 +- .../Designing/TransformTypes.cs | 2 +- .../Designing/TranslateTransformDesigner.cs | 2 +- .../ForViewDataTemplateSelector.cs | 2 +- .../IBindingToTypeCreator.cs | 4 +-- .../IWpfDesignBuildResult.cs | 2 +- .../IWpfDesignBuildUIResult.cs | 2 +- .../IWpfDesignDataTemplateBuildResult.cs | 2 +- src/Ao.ObjectDesign.Wpf/IWpfObjectDesigner.cs | 2 +- .../IWpfObjectDesignerSettings.cs | 2 +- src/Ao.ObjectDesign.Wpf/IWpfUIGenerator.cs | 2 +- src/Ao.ObjectDesign.Wpf/IWpfUISpirit.cs | 2 +- src/Ao.ObjectDesign.Wpf/NotifySubscriber.cs | 2 +- src/Ao.ObjectDesign.Wpf/UIGenerator.cs | 2 +- .../WpfDesignBuildResult.cs | 2 +- .../WpfDesignBuildUIResult.cs | 2 +- .../WpfDesignDataTemplateBuildResult.cs | 2 +- .../WpfForViewBuildContext.cs | 2 +- .../WpfForViewBuildContextBase.cs | 2 +- .../WpfForViewBuilderExtensions.cs | 4 +-- src/Ao.ObjectDesign.Wpf/WpfObjectDesigner.cs | 4 +-- .../WpfObjectDesignerSettings.cs | 2 +- .../WpfObjectDesignerSettingsExtensions.cs | 2 +- src/Ao.ObjectDesign.Wpf/WpfPropertyVisitor.cs | 2 +- .../WpfTemplateForViewBuildContext.cs | 2 +- src/Ao.ObjectDesign.Wpf/WpfUISpirit.cs | 2 +- src/Ao.ObjectDesign.WpfDesign/AssemblyInfo.cs | 2 +- .../IWithSourceBindingScopeCreator.cs | 2 +- .../IWpfBindingCreator.cs | 2 +- .../IWpfBindingCreatorFactory.cs | 2 +- .../IWpfDesignPackage.cs | 2 +- .../WpfBindingCreator.cs | 2 +- .../WpfBindingCreatorFactoryCollection.cs | 2 +- .../WpfDelegateBindingCreatorFactory.cs | 2 +- .../WpfDesignClipboardManager.cs | 2 +- .../WpfDesignSceneCloneExtensions.cs | 2 +- .../WpfItemsSceneController.cs | 2 +- .../WpfLazyBindingBox.cs | 2 +- .../WpfLazyMapSceneController.cs | 2 +- .../WpfMapSceneController.cs | 2 +- .../WpfObservableSceneController.cs | 2 +- src/Ao.ObjectDesign.Xaml/XamlDesignInterop.cs | 2 +- src/Ao.ObjectDesign.Yaml/YamlDesignInterop.cs | 2 +- .../JsonAndBsonDeserialize.cs | 2 +- .../JsonAndBsonSerialize.cs | 2 +- test/Ao.ObjectDesign.Benchmark/Serialize.cs | 6 ++-- .../SerializeHelper.cs | 2 +- .../BindingToTypeCreatorBaseTest.cs | 4 +-- .../Conditions/BooleanForViewConditionTest.cs | 4 +-- .../Conditions/WpfForViewConditionTest.cs | 7 +++-- .../Data/BindingUnitTest.cs | 4 +-- .../Data/NullBindingScope.cs | 4 +-- .../PropertyWithSourceBindingScopeTest.cs | 4 +-- .../Data/TargetWithSourceBindingScopeTest.cs | 4 +-- .../Data/WpfBindingDrawingTest.cs | 6 ++-- .../DependencyObjectHelperTest.cs | 2 +- .../DependencyPropertyBuildersTest.cs | 4 +-- .../Designing/ColumnDefinitionSettingTest.cs | 4 +-- .../Designing/CornerDesignTest.cs | 4 +-- .../Designing/CursorSettingTest.cs | 4 +-- .../Designing/DefaultValue.cs | 4 +-- .../Designing/DropShadowEffectSettingTest.cs | 4 +-- .../Designing/FontSettingTest.cs | 2 +- test/Ao.ObjectDesign.Wpf.Test/MyDepObject.cs | 2 +- test/Ao.ObjectDesign.Wpf.Test/SaveLoadTest.cs | 12 ++++---- .../UIGeneratorTest.cs | 2 +- .../WpfPropertyVisitorTest.cs | 2 +- .../NullWithSourceBindingScope.cs | 2 +- 365 files changed, 543 insertions(+), 547 deletions(-) delete mode 100644 samples/ObjectDesign.Brock.Controls/BindingCreators/ActionsBindingCreatorFactory.cs delete mode 100644 samples/ObjectDesign.Brock.Controls/BindingCreators/BindingCreators.cs rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Annotations/BindingCreatorForAttribute.cs (89%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Annotations/HasInstanceCreatorAttribute.cs (89%) rename src/{Ao.ObjectDesign.Session/Ao.ObjectDesign.Session.csproj => Ao.ObjectDesign.Session.Wpf/Ao.ObjectDesign.Session.Wpf.csproj} (100%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/AssemblyInfo.cs (91%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/AutoSceneManager.cs (89%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/BindingCreatorStateCreatorAsExtensions.cs (89%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/BindingCreators/BindingCreatorFactory.cs (92%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/BindingCreators/DelegateBindingCreatorFactory.cs (97%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/BindingCreators/WpfBindingCreator.cs (94%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/BuildIn/ControlBuildIn.Adds.cs (97%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/BuildIn/ControlBuildIn.With.cs (91%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/BuildIn/ControlBuildIn.cs (94%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/BuildIn/EnvironmentSceneMakerStartup.cs (91%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/BuildIn/ISceneMakerStartup.Session.cs (74%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/BuildIn/ISceneMakerStartup.cs (78%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/BuildIn/SceneMakerStartup.cs (94%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Controllers/WpfSceneController.cs (97%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Controllers/WpfSceneItemsSceneController.cs (96%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Controllers/WpfSceneObservableSceneController.cs (97%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/BindingCreatorStateCreator.cs (97%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/BindingCreatorStateDecoraterCollection.cs (94%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/DataTemplatePropertyPanel.cs (96%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/DesignSession.cs (98%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/DesignSessionSettings.cs (95%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/DesignSufaceActionsExtensions.cs (99%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/EnvironmentDesignSession.cs (95%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/EnvironmentSessionManager.cs (95%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IBindingCreatorStateDecorater.cs (84%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IDesignSession.cs (85%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IDesignSessionActions.cs (73%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IDesignSessionDesignable.cs (91%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IDesignSessionFallbackable.cs (77%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IDesignSessionInfo.cs (88%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IDesignSessionInput.cs (76%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IDesignSessionSettings.cs (89%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IDesignSessionWorking.cs (74%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IPropertyContextCreator.cs (90%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IPropertyContextsDecorater.cs (87%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/IPropertyPanel.cs (84%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/PropertyContextsDecoraterCollection.cs (95%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/PropertyPanelCreateContextExtensions.cs (97%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/SessionActionsExtensions.cs (99%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/SessionManager.cs (97%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/TemplateContextsDecoraterCollection.cs (91%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/TemplateDesignSession.cs (93%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Desiging/WpfDesignPackage.cs (94%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/DesignHelpers/BoundsDesignHelper.cs (94%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/DesignHelpers/DesignHelperSyles.cs (76%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/DesignHelpers/DistanceDesignHelper.cs (98%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/DesignHelpers/IWpfDesignHelper.cs (79%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/DesignHelpers/MoveDesignHelper.cs (98%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/DesignHelpers/ResizeDesignHelper.cs (98%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/DesignHelpers/ViewHelper.cs (97%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/DesignStatePropertyContextsDecorater.cs (90%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/DesigningDataHelper.cs (94%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Environment/EngineEnvironmentBase.cs (96%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Environment/IEngineEnvironment.cs (86%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Events/SessionCreatedEventArgs.cs (81%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/Events/SessionRemovedEventArgs.cs (81%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/IBindingCreatorStateCreator.cs (87%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/ISceneFetcher.cs (77%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/PropertyContextOrderDecoratere.cs (93%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/SceneEngine.cs (97%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/SceneMakerRuntime.DesignPanel.cs (93%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/SceneMakerRuntime.cs (97%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/SceneManagerActionExtensions.cs (97%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/ValueChangedEventArgs.cs (87%) rename src/{Ao.ObjectDesign.Session => Ao.ObjectDesign.Session.Wpf}/WpfSceneManager.cs (93%) create mode 100644 src/Ao.ObjectDesign.Uno/Ao.ObjectDesign.Uno.csproj diff --git a/Ao.ObjectDesign.sln b/Ao.ObjectDesign.sln index 9a21617..c04edf2 100644 --- a/Ao.ObjectDesign.sln +++ b/Ao.ObjectDesign.sln @@ -43,8 +43,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 +63,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 @@ -293,18 +293,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 +425,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..56274b9 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreator.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreator.cs @@ -2,7 +2,7 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Annotations; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Wpf.Data; +using Ao.ObjectDesign.Data; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using System; diff --git a/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreatorFactory.cs b/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreatorFactory.cs index 646a2e0..bf24b16 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/CanvasSettingBindingCreatorFactory.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using System.Collections.Generic; 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..219137d 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ControlSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ControlSettingBindingCreatorFactory.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using System.Collections.Generic; 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..c69d173 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ImageSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ImageSettingBindingCreatorFactory.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using System.Collections.Generic; 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..d3d1d91 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ItemsControlSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ItemsControlSettingBindingCreatorFactory.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using System.Collections.Generic; 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..432db4c 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/LineSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/LineSettingBindingCreatorFactory.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using System.Collections.Generic; 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..d1c432c 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/MediaElementSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/MediaElementSettingBindingCreatorFactory.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using System.Collections.Generic; 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..2626726 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/ProgressBarSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/ProgressBarSettingBindingCreatorFactory.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using System.Collections.Generic; 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..4fa785d 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/RectangleSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/RectangleSettingBindingCreatorFactory.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using System.Collections.Generic; 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..2822b59 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBlockSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBlockSettingBindingCreatorFactory.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using System.Collections.Generic; 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..5bb6bb9 100644 --- a/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock.Controls/BindingCreators/TextBoxSettingBindingCreatorFactory.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using System.Collections.Generic; 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/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..7099148 100644 --- a/samples/ObjectDesign.Brock.Controls/UIElementSetting.cs +++ b/samples/ObjectDesign.Brock.Controls/UIElementSetting.cs @@ -1,7 +1,7 @@ using Ao.ObjectDesign.Bindings.Annotations; using Ao.ObjectDesign.Designing; using Ao.ObjectDesign.Designing.Annotations; -using Ao.ObjectDesign.Wpf.Designing; +using Ao.ObjectDesign.Designing; using System; using System.Collections.Specialized; using System.Linq; 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..8e7352a 100644 --- a/samples/ObjectDesign.Brock/BindingCreators/RelativeFileImageSettingBindingCreatorFactory.cs +++ b/samples/ObjectDesign.Brock/BindingCreators/RelativeFileImageSettingBindingCreatorFactory.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Bindings; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.BindingCreators; +using Ao.ObjectDesign.Session.Wpf.BindingCreators; using Ao.ObjectDesign.WpfDesign; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Controls.BindingCreators; 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/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..d2f4fba 100644 --- a/samples/ObjectDesign.Brock/InputBindings/CopyPasteInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/CopyPasteInputBinding.cs @@ -1,9 +1,8 @@ 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.Session.Wpf; +using Ao.ObjectDesign.Session.Wpf.Desiging; using Ao.ObjectDesign.WpfDesign; using Ao.ObjectDesign.WpfDesign.Input; using ObjectDesign.Brock.Components; diff --git a/samples/ObjectDesign.Brock/InputBindings/CtrlCopyInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/CtrlCopyInputBinding.cs index dac5a2a..7b307f2 100644 --- a/samples/ObjectDesign.Brock/InputBindings/CtrlCopyInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/CtrlCopyInputBinding.cs @@ -1,4 +1,4 @@ -using Ao.ObjectDesign.Session.Desiging; +using Ao.ObjectDesign.Session.Wpf.Desiging; using Ao.ObjectDesign.WpfDesign.Input; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Level; diff --git a/samples/ObjectDesign.Brock/InputBindings/DeleteInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/DeleteInputBinding.cs index 99e6aa3..7008f15 100644 --- a/samples/ObjectDesign.Brock/InputBindings/DeleteInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/DeleteInputBinding.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.Desiging; +using Ao.ObjectDesign.Session.Wpf.Desiging; using Ao.ObjectDesign.WpfDesign; using Ao.ObjectDesign.WpfDesign.Input; using ObjectDesign.Brock.Components; diff --git a/samples/ObjectDesign.Brock/InputBindings/FallbackInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/FallbackInputBinding.cs index 98dabe7..4eddc91 100644 --- a/samples/ObjectDesign.Brock/InputBindings/FallbackInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/FallbackInputBinding.cs @@ -1,4 +1,4 @@ -using Ao.ObjectDesign.Session.Desiging; +using Ao.ObjectDesign.Session.Wpf.Desiging; using Ao.ObjectDesign.WpfDesign; using Ao.ObjectDesign.WpfDesign.Input; using ObjectDesign.Brock.Components; diff --git a/samples/ObjectDesign.Brock/InputBindings/RangeSelectInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/RangeSelectInputBinding.cs index 06780d0..40c2033 100644 --- a/samples/ObjectDesign.Brock/InputBindings/RangeSelectInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/RangeSelectInputBinding.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.Desiging; -using Ao.ObjectDesign.Session.DesignHelpers; +using Ao.ObjectDesign.Session.Wpf.Desiging; +using Ao.ObjectDesign.Session.Wpf.DesignHelpers; using Ao.ObjectDesign.WpfDesign; using Ao.ObjectDesign.WpfDesign.Input; using ObjectDesign.Brock.Components; diff --git a/samples/ObjectDesign.Brock/InputBindings/SelectAllInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/SelectAllInputBinding.cs index b9219c4..5333f97 100644 --- a/samples/ObjectDesign.Brock/InputBindings/SelectAllInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/SelectAllInputBinding.cs @@ -1,5 +1,5 @@ -using Ao.ObjectDesign.Session.Controllers; -using Ao.ObjectDesign.Session.Desiging; +using Ao.ObjectDesign.Session.Wpf.Controllers; +using Ao.ObjectDesign.Session.Wpf.Desiging; using Ao.ObjectDesign.WpfDesign; using Ao.ObjectDesign.WpfDesign.Input; using ObjectDesign.Brock.Components; diff --git a/samples/ObjectDesign.Brock/InputBindings/SelectDesignInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/SelectDesignInputBinding.cs index 6280e98..1553fbd 100644 --- a/samples/ObjectDesign.Brock/InputBindings/SelectDesignInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/SelectDesignInputBinding.cs @@ -1,6 +1,6 @@ using Ao.ObjectDesign.Designing; using Ao.ObjectDesign.Designing.Level; -using Ao.ObjectDesign.Session.Desiging; +using Ao.ObjectDesign.Session.Wpf.Desiging; using Ao.ObjectDesign.WpfDesign; using Ao.ObjectDesign.WpfDesign.Input; using System; diff --git a/samples/ObjectDesign.Brock/InputBindings/TextInputBinding.cs b/samples/ObjectDesign.Brock/InputBindings/TextInputBinding.cs index 0f3fac7..3a90d1e 100644 --- a/samples/ObjectDesign.Brock/InputBindings/TextInputBinding.cs +++ b/samples/ObjectDesign.Brock/InputBindings/TextInputBinding.cs @@ -1,5 +1,5 @@ using Ao.ObjectDesign; -using Ao.ObjectDesign.Session.Desiging; +using Ao.ObjectDesign.Session.Wpf.Desiging; using Ao.ObjectDesign.WpfDesign; using Ao.ObjectDesign.WpfDesign.Input; using ObjectDesign.Brock.Components; 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..35b9dbc 100644 --- a/samples/ObjectDesign.Brock/ObjectDesign.Brock.csproj +++ b/samples/ObjectDesign.Brock/ObjectDesign.Brock.csproj @@ -23,7 +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/ActionSettingService.cs b/samples/ObjectDesign.Brock/Services/ActionSettingService.cs index e19c21c..e3e0069 100644 --- a/samples/ObjectDesign.Brock/Services/ActionSettingService.cs +++ b/samples/ObjectDesign.Brock/Services/ActionSettingService.cs @@ -1,12 +1,12 @@ 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.Wpf; -using Ao.ObjectDesign.Wpf.Designing; -using Ao.ObjectDesign.Wpf.Json; +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.WpfDesign; using ObjectDesign.Brock.Components; using ObjectDesign.Brock.Controls; 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: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 @@