From bfffa997377e3a5c54ebb91557893165e063e1e8 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 9 Dec 2025 20:48:52 +0100 Subject: [PATCH] Fix build --- src/Artemis.UI/Artemis.UI.csproj | 90 +++++++++---------- .../Converters/PropertyTreeMarginConverter.cs | 4 +- .../BrushPropertyInputViewModel.cs | 4 +- src/Artemis.UI/DryIoc/Factories/IVMFactory.cs | 35 +++----- .../LayerPropertyViewModelInstanceProvider.cs | 12 +-- src/Artemis.UI/Routing/Routes.cs | 4 +- .../ConditionTypeViewModel.cs | 2 +- .../AlwaysOnConditionView.axaml | 2 +- .../AlwaysOnConditionView.axaml.cs | 2 +- .../AlwaysOnConditionViewModel.cs | 2 +- .../ConditionTypes/EventConditionView.axaml | 4 +- .../EventConditionView.axaml.cs | 2 +- .../ConditionTypes/EventConditionViewModel.cs | 2 +- .../PlayOnceConditionView.axaml | 2 +- .../PlayOnceConditionView.axaml.cs | 2 +- .../PlayOnceConditionViewModel.cs | 2 +- .../ConditionTypes/StaticConditionView.axaml | 4 +- .../StaticConditionView.axaml.cs | 2 +- .../StaticConditionViewModel.cs | 2 +- .../DisplayConditionScriptView.axaml | 4 +- .../DisplayConditionScriptView.axaml.cs | 2 +- .../DisplayConditionScriptViewModel.cs | 2 +- .../Panels/MenuBar/MenuBarView.axaml | 4 +- .../Panels/MenuBar/MenuBarView.axaml.cs | 2 +- .../Panels/MenuBar/MenuBarViewModel.cs | 2 +- .../Panels/Playback/PlaybackView.axaml | 6 +- .../Panels/Playback/PlaybackView.axaml.cs | 3 +- .../Panels/Playback/PlaybackViewModel.cs | 6 +- .../Behaviors/ProfileTreeViewDropHandler.cs | 2 +- .../ProfileElementRenameView.axaml | 4 +- .../ProfileElementRenameView.axaml.cs | 2 +- .../ProfileElementRenameViewModel.cs | 2 +- .../AdaptionHintViewModelBase.cs | 2 +- .../CategoryAdaptionHintView.axaml | 4 +- .../CategoryAdaptionHintView.axaml.cs | 2 +- .../CategoryAdaptionHintViewModel.cs | 2 +- .../DeviceAdaptionHintView.axaml | 4 +- .../DeviceAdaptionHintView.axaml.cs | 2 +- .../DeviceAdaptionHintViewModel.cs | 2 +- .../KeyboardSectionAdaptionHintView.axaml | 4 +- .../KeyboardSectionAdaptionHintView.axaml.cs | 2 +- .../KeyboardSectionAdaptionHintViewModel.cs | 2 +- .../SingleLedAdaptionHintView.axaml | 4 +- .../SingleLedAdaptionHintView.axaml.cs | 2 +- .../SingleLedAdaptionHintViewModel.cs | 2 +- .../Dialogs/LayerHintsDialogView.axaml | 4 +- .../Dialogs/LayerHintsDialogView.axaml.cs | 2 +- .../Dialogs/LayerHintsDialogViewModel.cs | 4 +- .../ProfileTree/FolderTreeItemView.axaml | 4 +- .../ProfileTree/FolderTreeItemView.axaml.cs | 2 +- .../ProfileTree/FolderTreeItemViewModel.cs | 2 +- .../ProfileTree/LayerTreeItemView.axaml | 4 +- .../ProfileTree/LayerTreeItemView.axaml.cs | 2 +- .../ProfileTree/LayerTreeItemViewModel.cs | 2 +- .../Panels/ProfileTree/ProfileTreeView.axaml | 6 +- .../ProfileTree/ProfileTreeView.axaml.cs | 2 +- .../ProfileTree/ProfileTreeViewModel.cs | 2 +- .../Panels/ProfileTree/TreeItemViewModel.cs | 6 +- .../DataBinding/DataBindingView.axaml | 4 +- .../DataBinding/DataBindingView.axaml.cs | 2 +- .../DataBinding/DataBindingViewModel.cs | 2 +- .../Properties/Dialogs/AddEffectView.axaml | 4 +- .../Properties/Dialogs/AddEffectView.axaml.cs | 2 +- .../Properties/Dialogs/AddEffectViewModel.cs | 2 +- .../Dialogs/TimelineSegmentEditView.axaml | 4 +- .../Dialogs/TimelineSegmentEditView.axaml.cs | 2 +- .../Dialogs/TimelineSegmentEditViewModel.cs | 2 +- .../Panels/Properties/PropertiesView.axaml | 6 +- .../Panels/Properties/PropertiesView.axaml.cs | 2 +- .../Panels/Properties/PropertiesViewModel.cs | 10 +-- .../Properties/PropertyGroupViewModel.cs | 8 +- .../Panels/Properties/PropertyViewModel.cs | 6 +- .../Properties/PropertyViewModelBase.cs | 2 +- .../Timeline/ITimelinePropertyViewModel.cs | 4 +- .../Keyframes/ITimelineKeyframeViewModel.cs | 2 +- .../Keyframes/TimelineEasingView.axaml | 4 +- .../Keyframes/TimelineEasingView.axaml.cs | 2 +- .../Keyframes/TimelineEasingViewModel.cs | 2 +- .../Keyframes/TimelineKeyframeView.axaml | 4 +- .../Keyframes/TimelineKeyframeView.axaml.cs | 2 +- .../Keyframes/TimelineKeyframeViewModel.cs | 2 +- .../Timeline/Segments/EndSegmentView.axaml | 6 +- .../Timeline/Segments/EndSegmentView.axaml.cs | 2 +- .../Timeline/Segments/EndSegmentViewModel.cs | 2 +- .../Timeline/Segments/MainSegmentView.axaml | 6 +- .../Segments/MainSegmentView.axaml.cs | 2 +- .../Timeline/Segments/MainSegmentViewModel.cs | 2 +- .../Timeline/Segments/Segment.axaml | 0 .../Timeline/Segments/StartSegmentView.axaml | 6 +- .../Segments/StartSegmentView.axaml.cs | 2 +- .../Segments/StartSegmentViewModel.cs | 2 +- .../Segments/TimelineSegmentViewModel.cs | 4 +- .../Timeline/TimelineGroupView.axaml | 6 +- .../Timeline/TimelineGroupView.axaml.cs | 2 +- .../Timeline/TimelineGroupViewModel.cs | 2 +- .../Timeline/TimelinePropertyView.axaml | 2 +- .../Timeline/TimelinePropertyView.axaml.cs | 2 +- .../Timeline/TimelinePropertyViewModel.cs | 4 +- .../Properties/Timeline/TimelineView.axaml | 6 +- .../Properties/Timeline/TimelineView.axaml.cs | 4 +- .../Properties/Timeline/TimelineViewModel.cs | 6 +- .../LayerEffectRenameView.axaml | 4 +- .../LayerEffectRenameView.axaml.cs | 2 +- .../LayerEffectRenameViewModel.cs | 2 +- .../Tree/Dialogs/LayerBrushPresetView.axaml | 4 +- .../Dialogs/LayerBrushPresetView.axaml.cs | 2 +- .../Tree/Dialogs/LayerBrushPresetViewModel.cs | 2 +- .../Properties/Tree/ITreePropertyViewModel.cs | 2 +- .../Properties/Tree/TreeGroupView.axaml | 6 +- .../Properties/Tree/TreeGroupView.axaml.cs | 2 +- .../Properties/Tree/TreeGroupViewModel.cs | 6 +- .../Properties/Tree/TreePropertyView.axaml | 4 +- .../Properties/Tree/TreePropertyView.axaml.cs | 2 +- .../Properties/Tree/TreePropertyViewModel.cs | 2 +- .../BrushConfigurationWindowView.axaml | 4 +- .../BrushConfigurationWindowView.axaml.cs | 2 +- .../BrushConfigurationWindowViewModel.cs | 2 +- .../EffectConfigurationWindowView.axaml | 4 +- .../EffectConfigurationWindowView.axaml.cs | 2 +- .../EffectConfigurationWindowViewModel.cs | 2 +- .../Panels/StatusBar/StatusBarView.axaml | 4 +- .../Panels/StatusBar/StatusBarView.axaml.cs | 2 +- .../Panels/StatusBar/StatusBarViewModel.cs | 2 +- .../Tools/SelectionAddToolView.axaml | 2 +- .../Tools/SelectionAddToolView.axaml.cs | 2 +- .../Tools/SelectionAddToolViewModel.cs | 2 +- .../Tools/SelectionRemoveToolView.axaml | 2 +- .../Tools/SelectionRemoveToolView.axaml.cs | 2 +- .../Tools/SelectionRemoveToolViewModel.cs | 2 +- .../Tools/TransformToolView.axaml | 6 +- .../Tools/TransformToolView.axaml.cs | 6 +- .../Tools/TransformToolViewModel.cs | 5 +- .../VisualEditor/VisualEditorView.axaml | 6 +- .../VisualEditor/VisualEditorView.axaml.cs | 2 +- .../VisualEditor/VisualEditorViewModel.cs | 4 +- .../Visualizers/IVisualizerViewModel.cs | 2 +- .../LayerShapeVisualizerView.axaml | 4 +- .../LayerShapeVisualizerView.axaml.cs | 2 +- .../LayerShapeVisualizerViewModel.cs | 2 +- .../Visualizers/LayerVisualizerView.axaml | 4 +- .../Visualizers/LayerVisualizerView.axaml.cs | 2 +- .../Visualizers/LayerVisualizerViewModel.cs | 2 +- .../ProfileEditorTitleBarView.axaml | 4 +- .../ProfileEditorTitleBarView.axaml.cs | 2 +- .../ProfileEditorTitleBarViewModel.cs | 4 +- .../ProfileEditor/ProfileEditorView.axaml | 4 +- .../ProfileEditor/ProfileEditorView.axaml.cs | 2 +- .../ProfileEditor/ProfileEditorViewModel.cs | 12 +-- .../ProfileAdaptionHintsLayerViewModel.cs | 4 +- .../ProfileAdaptionHintsStepViewModel.cs | 4 +- 150 files changed, 300 insertions(+), 303 deletions(-) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs (85%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml (87%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs (66%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs (78%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml (95%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs (69%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml (86%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs (66%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionViewModel.cs (78%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml (92%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs (69%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml (94%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs (75%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/MenuBar/MenuBarView.axaml (99%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs (89%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs (99%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Playback/PlaybackView.axaml (94%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs (66%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Playback/PlaybackViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml (79%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs (89%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs (94%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/AdaptionHintViewModelBase.cs (87%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml (93%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs (66%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintViewModel.cs (79%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml (93%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs (66%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintViewModel.cs (78%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml (89%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs (68%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintViewModel.cs (81%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml (94%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs (67%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintViewModel.cs (93%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs (77%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs (95%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml (95%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs (74%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml (94%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs (74%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml (95%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs (70%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs (88%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Dialogs/AddEffectViewModel.cs (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml (87%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs (74%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditViewModel.cs (80%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/PropertiesView.axaml (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/PropertiesViewModel.cs (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/PropertyViewModel.cs (92%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/PropertyViewModelBase.cs (79%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/ITimelinePropertyViewModel.cs (72%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Keyframes/ITimelineKeyframeViewModel.cs (90%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml (87%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs (65%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingViewModel.cs (93%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml (95%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs (99%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml (92%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs (94%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml (93%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs (95%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml (100%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml (92%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs (94%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml (94%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs (72%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml (90%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs (73%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml (93%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs (90%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml (78%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs (88%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs (94%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml (95%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs (87%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs (95%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs (78%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs (86%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs (93%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml (87%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs (91%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs (93%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml (87%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs (91%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs (93%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/StatusBar/StatusBarView.axaml (95%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/StatusBar/StatusBarView.axaml.cs (74%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml (90%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml.cs (88%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml (92%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml.cs (86%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolViewModel.cs (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Tools/TransformToolViewModel.cs (99%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs (69%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml (94%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs (96%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerViewModel.cs (97%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml (91%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs (94%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerViewModel.cs (95%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/ProfileEditorTitleBarView.axaml (89%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/ProfileEditorTitleBarView.axaml.cs (76%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/ProfileEditorTitleBarViewModel.cs (81%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/ProfileEditorView.axaml (98%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/ProfileEditorView.axaml.cs (78%) rename src/Artemis.UI/Screens/{Profile => Profiles}/ProfileEditor/ProfileEditorViewModel.cs (96%) diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index 049023504..54d1eeb34 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -44,53 +44,53 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs b/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs index 8be626e0d..e452d9825 100644 --- a/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs +++ b/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs @@ -1,7 +1,7 @@ using System; using System.Globalization; -using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; -using Artemis.UI.Screens.ProfileEditor.Properties.Tree; +using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree; +using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree; using Avalonia; using Avalonia.Data.Converters; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs index 589ddaa95..9194bc0e6 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs @@ -6,7 +6,7 @@ using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.LayerBrushes; using Artemis.Core.Services; -using Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs; +using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs; using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Builders; using Artemis.UI.Shared.Services.ProfileEditor; @@ -14,7 +14,7 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.PropertyInput; using Avalonia.Threading; using ReactiveUI; -using LayerBrushPresetViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetViewModel; +using LayerBrushPresetViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetViewModel; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs index 4ea40ce84..6f389768d 100644 --- a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs +++ b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs @@ -11,19 +11,12 @@ using Artemis.UI.Screens.Device.Leds; using Artemis.UI.Screens.Plugins; using Artemis.UI.Screens.Plugins.Features; using Artemis.UI.Screens.Plugins.Prerequisites; -using Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; -using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree; -using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; -using Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding; -using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; -using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; -using Artemis.UI.Screens.ProfileEditor; -using Artemis.UI.Screens.ProfileEditor.ProfileTree; -using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; -using Artemis.UI.Screens.ProfileEditor.Properties; -using Artemis.UI.Screens.ProfileEditor.Properties.Timeline; -using Artemis.UI.Screens.ProfileEditor.Properties.Tree; -using Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers; +using Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; +using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree; +using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; +using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding; +using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline; +using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.Settings; using Artemis.UI.Screens.Settings.Updating; using Artemis.UI.Screens.Sidebar; @@ -33,14 +26,14 @@ using Artemis.UI.Screens.VisualScripting.Pins; using Artemis.WebClient.Updating; using DryIoc; using ReactiveUI; -using LayerShapeVisualizerViewModel = Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerViewModel; -using LayerVisualizerViewModel = Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers.LayerVisualizerViewModel; -using ProfileEditorViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileEditorViewModel; -using PropertyGroupViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertyGroupViewModel; -using PropertyViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertyViewModel; -using SingleLedAdaptionHintViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintViewModel; -using TimelineGroupViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelineGroupViewModel; -using TreeItemViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.TreeItemViewModel; +using LayerShapeVisualizerViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerViewModel; +using LayerVisualizerViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers.LayerVisualizerViewModel; +using ProfileEditorViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileEditorViewModel; +using PropertyGroupViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertyGroupViewModel; +using PropertyViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertyViewModel; +using SingleLedAdaptionHintViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintViewModel; +using TimelineGroupViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelineGroupViewModel; +using TreeItemViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.TreeItemViewModel; namespace Artemis.UI.DryIoc.Factories; diff --git a/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs b/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs index ff4b761f1..c3c46d26c 100644 --- a/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs +++ b/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs @@ -2,13 +2,13 @@ using Artemis.Core; using Artemis.UI.DryIoc.Factories; using Artemis.UI.Exceptions; -using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; -using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; -using Artemis.UI.Screens.ProfileEditor.Properties; -using Artemis.UI.Screens.ProfileEditor.Properties.Timeline; -using Artemis.UI.Screens.ProfileEditor.Properties.Tree; +using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline; +using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree; +using Artemis.UI.Screens.Profiles.ProfileEditor.Properties; +using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline; +using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree; using DryIoc; -using PropertyViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertyViewModel; +using PropertyViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertyViewModel; namespace Artemis.UI.DryIoc.InstanceProviders; diff --git a/src/Artemis.UI/Routing/Routes.cs b/src/Artemis.UI/Routing/Routes.cs index 05ba5b7fd..766375606 100644 --- a/src/Artemis.UI/Routing/Routes.cs +++ b/src/Artemis.UI/Routing/Routes.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Artemis.UI.Screens.Home; -using Artemis.UI.Screens.ProfileEditor; +using Artemis.UI.Screens.Profiles.ProfileEditor; using Artemis.UI.Screens.Root; using Artemis.UI.Screens.Settings; using Artemis.UI.Screens.Settings.Updating; @@ -16,7 +16,7 @@ using Artemis.UI.Screens.Workshop.Plugins; using Artemis.UI.Screens.Workshop.Profile; using Artemis.UI.Shared.Routing; using PluginDetailsViewModel = Artemis.UI.Screens.Workshop.Plugins.PluginDetailsViewModel; -using ProfileEditorViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileEditorViewModel; +using ProfileEditorViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileEditorViewModel; namespace Artemis.UI.Routing { diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs similarity index 85% rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs index 8fb8c8444..15d8c14f7 100644 --- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs +++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs @@ -1,7 +1,7 @@ using System; using Artemis.UI.Shared; -namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition; +namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition; public class ConditionTypeViewModel : ViewModelBase { diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml similarity index 87% rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml index 7609940ae..1901a83a8 100644 --- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml +++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.AlwaysOnConditionView"> + x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.AlwaysOnConditionView"> diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs similarity index 66% rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs index 03367b6c9..94df86ed1 100644 --- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs @@ -1,6 +1,6 @@ using Avalonia.Controls; -namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; public partial class AlwaysOnConditionView : UserControl { diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs similarity index 78% rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs index 4ae79f2c6..a4d0af4e1 100644 --- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs +++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs @@ -1,7 +1,7 @@ using Artemis.Core; using Artemis.UI.Shared; -namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; public class AlwaysOnConditionViewModel : ViewModelBase { diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml similarity index 95% rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml index 981594e4b..38c232a9d 100644 --- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml +++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml @@ -3,9 +3,9 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:dataModelPicker="clr-namespace:Artemis.UI.Shared.DataModelPicker;assembly=Artemis.UI.Shared" - xmlns:conditionTypes="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes" + xmlns:conditionTypes="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.EventConditionView" + x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.EventConditionView" x:DataType="conditionTypes:EventConditionViewModel"> diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs similarity index 69% rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs index bd33d86d7..f33d0bb12 100644 --- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs @@ -1,6 +1,6 @@ using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; public partial class EventConditionView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs index 73dc2e6a2..586f00a7b 100644 --- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs +++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs @@ -11,7 +11,7 @@ using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; using ReactiveUI; -namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; public class EventConditionViewModel : ActivatableViewModelBase { diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml similarity index 86% rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml index e3ea967ec..68861b4c9 100644 --- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml +++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.PlayOnceConditionView"> + x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.PlayOnceConditionView"> diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs similarity index 69% rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs index 7c0fdf07b..0ac036acc 100644 --- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs @@ -1,6 +1,6 @@ using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; public partial class StaticConditionView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs similarity index 96% rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs index 95134ddd5..9d70fa410 100644 --- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs +++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs @@ -10,7 +10,7 @@ using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; using ReactiveUI; -namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; public class StaticConditionViewModel : ActivatableViewModelBase { diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml similarity index 94% rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml index 1b2f50ad3..6453d45ac 100644 --- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml +++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml @@ -2,9 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:displayCondition="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition" + xmlns:displayCondition="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition" mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="650" - x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.DisplayConditionScriptView" + x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.DisplayConditionScriptView" x:DataType="displayCondition:DisplayConditionScriptViewModel">