From 75e2fb1689229f43d40cb1efa272443cf086990b Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Sat, 15 Aug 2020 17:53:12 +0200 Subject: [PATCH] Profile editor - Moved files --- src/Artemis.UI/Artemis.UI.csproj | 1 - .../Ninject/Factories/IVMFactory.cs | 22 +++++++-------- src/Artemis.UI/Ninject/UiModule.cs | 3 +- .../Timeline/PropertyRailItemView.xaml.cs | 28 ------------------- .../Dialogs/ProfileCreateView.xaml | 2 +- .../Dialogs/ProfileCreateViewModel.cs | 2 +- .../Dialogs/ProfileExportView.xaml | 4 +-- .../Dialogs/ProfileExportViewModel.cs | 2 +- .../Dialogs/ProfileImportView.xaml | 4 +-- .../Dialogs/ProfileImportViewModel.cs | 6 ++-- .../ProfileEditor/Dialogs/RenameView.xaml | 2 +- .../ProfileEditor/Dialogs/RenameView.xaml.cs | 2 +- .../ProfileEditor/Dialogs/RenameViewModel.cs | 2 +- .../Abstract/DisplayConditionViewModel.cs | 3 +- .../DisplayConditionGroupView.xaml | 4 +-- .../DisplayConditionGroupViewModel.cs | 4 +-- .../DisplayConditionListView.xaml | 4 +-- .../DisplayConditionListView.xaml.cs | 2 +- .../DisplayConditionListViewModel.cs | 5 ++-- .../DisplayConditionPredicateView.xaml | 7 +++-- .../DisplayConditionPredicateView.xaml.cs | 2 +- .../DisplayConditionPredicateViewModel.cs | 4 +-- .../DisplayConditionsView.xaml | 7 +++-- .../DisplayConditionsViewModel.cs | 2 +- .../LayerBrushSettingsWindowView.xaml | 4 +-- .../LayerBrushSettingsWindowViewModel.cs | 3 +- .../LayerEffectSettingsWindowView.xaml | 4 +-- .../LayerEffectSettingsWindowViewModel.cs | 2 +- .../Abstract/LayerPropertyBaseViewModel.cs | 2 +- .../LayerEffects/EffectsView.xaml | 4 +-- .../LayerEffects/EffectsViewModel.cs | 2 +- .../LayerProperties/LayerPropertiesView.xaml | 12 ++++---- .../LayerPropertiesView.xaml.cs | 2 +- .../LayerPropertiesViewModel.cs | 10 +++---- .../LayerPropertyGroupViewModel.cs | 8 +++--- .../LayerProperties/LayerPropertyViewModel.cs | 8 +++--- .../Controls/PropertyTimelineHeader.cs | 2 +- .../Timeline/TimelineEasingViewModel.cs | 2 +- .../Timeline/TimelineKeyframeViewModel.cs | 2 +- .../Timeline/TimelinePropertyGroupView.xaml | 11 ++++---- .../TimelinePropertyGroupViewModel.cs | 4 +-- .../Timeline/TimelinePropertyView.xaml | 7 +++-- .../Timeline/TimelinePropertyViewModel.cs | 4 +-- .../Timeline/TimelineSegmentView.xaml | 7 +++-- .../Timeline/TimelineSegmentViewModel.cs | 3 +- .../Timeline/TimelineView.xaml | 4 +-- .../Timeline/TimelineViewModel.cs | 4 +-- .../Tree/TreePropertyGroupView.xaml | 4 +-- .../Tree/TreePropertyGroupViewModel.cs | 7 ++--- .../Tree/TreePropertyView.xaml | 7 +++-- .../Tree/TreePropertyViewModel.cs | 4 +-- .../LayerProperties/Tree/TreeView.xaml | 16 ++++++----- .../LayerProperties/Tree/TreeViewModel.cs | 2 +- .../ProfileEditorPanelViewModel.cs | 2 +- .../ProfileEditor/ProfileEditorView.xaml | 4 +-- .../ProfileEditor/ProfileEditorViewModel.cs | 12 ++++---- .../ProfileTree/ProfileTreeView.xaml | 14 ++++++---- .../ProfileTree/ProfileTreeViewModel.cs | 5 ++-- .../ProfileTree/TreeItem/FolderView.xaml | 7 +++-- .../ProfileTree/TreeItem/FolderViewModel.cs | 2 +- .../ProfileTree/TreeItem/LayerView.xaml | 7 +++-- .../ProfileTree/TreeItem/LayerViewModel.cs | 2 +- .../ProfileTree/TreeItem/TreeItemViewModel.cs | 4 +-- .../Visualization/CanvasViewModel.cs | 2 +- .../Visualization/ProfileDeviceView.xaml | 7 +++-- .../Visualization/ProfileDeviceViewModel.cs | 2 +- .../Visualization/ProfileLayerView.xaml | 7 +++-- .../Visualization/ProfileLayerViewModel.cs | 2 +- .../Visualization/ProfileLedView.xaml | 7 +++-- .../Visualization/ProfileLedViewModel.cs | 2 +- .../Visualization/ProfileView.xaml | 7 +++-- .../Visualization/ProfileViewModel.cs | 4 +-- .../Visualization/Tools/EditToolView.xaml | 12 ++++---- .../Visualization/Tools/EditToolViewModel.cs | 2 +- .../Tools/SelectionRemoveToolView.xaml | 2 +- .../Tools/SelectionRemoveToolView.xaml.cs | 2 +- .../Tools/SelectionRemoveToolViewModel.cs | 2 +- .../Tools/SelectionToolView.xaml | 2 +- .../Tools/SelectionToolView.xaml.cs | 2 +- .../Tools/SelectionToolViewModel.cs | 2 +- .../Tools/ViewpointMoveToolView.xaml | 4 +-- .../Tools/ViewpointMoveToolView.xaml.cs | 2 +- .../Tools/ViewpointMoveToolViewModel.cs | 2 +- .../Tools/VisualizationToolViewModel.cs | 2 +- .../UserControls/LayerShapeControl.xaml | 2 +- .../UserControls/LayerShapeControl.xaml.cs | 2 +- 86 files changed, 199 insertions(+), 215 deletions(-) delete mode 100644 src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/PropertyRailItemView.xaml.cs rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Dialogs/ProfileCreateView.xaml (94%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Dialogs/ProfileCreateViewModel.cs (94%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Dialogs/ProfileExportView.xaml (91%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Dialogs/ProfileExportViewModel.cs (95%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Dialogs/ProfileImportView.xaml (93%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Dialogs/ProfileImportViewModel.cs (89%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Dialogs/RenameView.xaml (96%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Dialogs/RenameView.xaml.cs (90%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Dialogs/RenameViewModel.cs (95%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs (92%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml.cs (91%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs (91%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs (99%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml (96%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs (98%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerBrushSettingsWindowView.xaml (93%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerBrushSettingsWindowViewModel.cs (80%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerEffectSettingsWindowView.xaml (93%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerEffectSettingsWindowViewModel.cs (87%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs (92%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml (94%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs (98%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/LayerPropertiesView.xaml (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/LayerPropertiesView.xaml.cs (94%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs (98%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs (96%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs (95%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs (99%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs (94%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs (98%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml (87%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs (94%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml (94%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Timeline/TimelinePropertyViewModel.cs (96%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml (95%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs (99%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml (94%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Timeline/TimelineViewModel.cs (99%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Tree/TreePropertyGroupView.xaml (98%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs (93%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml (87%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs (95%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Tree/TreeView.xaml (89%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs (94%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/ProfileEditorPanelViewModel.cs (63%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/ProfileEditorView.xaml (98%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/ProfileEditorViewModel.cs (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/ProfileTree/ProfileTreeView.xaml (86%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml (90%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs (95%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml (89%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs (92%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs (98%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/CanvasViewModel.cs (91%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/ProfileDeviceView.xaml (92%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/ProfileDeviceViewModel.cs (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/ProfileLayerView.xaml (89%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/ProfileLayerViewModel.cs (99%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/ProfileLedView.xaml (95%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/ProfileLedViewModel.cs (98%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/ProfileView.xaml (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/ProfileViewModel.cs (99%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/EditToolView.xaml (72%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/EditToolViewModel.cs (99%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml (95%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml.cs (81%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/SelectionRemoveToolViewModel.cs (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/SelectionToolView.xaml (95%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/SelectionToolView.xaml.cs (80%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/SelectionToolViewModel.cs (98%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml (66%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml.cs (81%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/ViewpointMoveToolViewModel.cs (90%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/Tools/VisualizationToolViewModel.cs (97%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml (98%) rename src/Artemis.UI/Screens/{Module => }/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml.cs (99%) diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index 2142d0508..7d5a3bd20 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -184,7 +184,6 @@ - diff --git a/src/Artemis.UI/Ninject/Factories/IVMFactory.cs b/src/Artemis.UI/Ninject/Factories/IVMFactory.cs index d29816eae..bdb8a2fc3 100644 --- a/src/Artemis.UI/Ninject/Factories/IVMFactory.cs +++ b/src/Artemis.UI/Ninject/Factories/IVMFactory.cs @@ -5,17 +5,17 @@ using Artemis.Core.Models.Profile.LayerProperties.Attributes; using Artemis.Core.Models.Surface; using Artemis.Core.Plugins.Abstract; using Artemis.UI.Screens.Module; -using Artemis.UI.Screens.Module.ProfileEditor; -using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions; -using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerEffects; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree; -using Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem; -using Artemis.UI.Screens.Module.ProfileEditor.Visualization; -using Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools; +using Artemis.UI.Screens.ProfileEditor; +using Artemis.UI.Screens.ProfileEditor.DisplayConditions; +using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract; +using Artemis.UI.Screens.ProfileEditor.LayerProperties; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerEffects; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree; +using Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem; +using Artemis.UI.Screens.ProfileEditor.Visualization; +using Artemis.UI.Screens.ProfileEditor.Visualization.Tools; using Artemis.UI.Screens.Settings.Debug; using Artemis.UI.Screens.Settings.Tabs.Devices; using Artemis.UI.Screens.Settings.Tabs.Plugins; diff --git a/src/Artemis.UI/Ninject/UiModule.cs b/src/Artemis.UI/Ninject/UiModule.cs index 01de5c687..d780614d3 100644 --- a/src/Artemis.UI/Ninject/UiModule.cs +++ b/src/Artemis.UI/Ninject/UiModule.cs @@ -1,7 +1,8 @@ using System; using Artemis.UI.Ninject.Factories; using Artemis.UI.Screens; -using Artemis.UI.Screens.Module.ProfileEditor; +using Artemis.UI.Screens.ProfileEditor; +using Artemis.UI.Screens.ProfileEditor; using Artemis.UI.Services.Interfaces; using Artemis.UI.Shared.Services.Dialog; using Artemis.UI.Stylet; diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/PropertyRailItemView.xaml.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/PropertyRailItemView.xaml.cs deleted file mode 100644 index de529c138..000000000 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/PropertyRailItemView.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline -{ - /// - /// Interaction logic for PropertyRailItemView.xaml - /// - public partial class PropertyTrackView : UserControl - { - public PropertyTrackView() - { - InitializeComponent(); - } - } -} diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileCreateView.xaml similarity index 94% rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileCreateView.xaml index 5ae3034fe..84291c076 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileCreateView.xaml @@ -1,4 +1,4 @@ - diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileExportViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileExportViewModel.cs similarity index 95% rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileExportViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileExportViewModel.cs index cb3766e04..133166c24 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileExportViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileExportViewModel.cs @@ -4,7 +4,7 @@ using Artemis.Core.Services.Storage.Interfaces; using Artemis.UI.Shared.Services.Dialog; using MaterialDesignThemes.Wpf; -namespace Artemis.UI.Screens.Module.ProfileEditor.Dialogs +namespace Artemis.UI.Screens.ProfileEditor.Dialogs { public class ProfileExportViewModel : DialogViewModelBase { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileImportView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportView.xaml similarity index 93% rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileImportView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportView.xaml index cbf70009b..e2bce8be1 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileImportView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportView.xaml @@ -1,9 +1,9 @@ - /// Interaction logic for RenameView.xaml diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameViewModel.cs similarity index 95% rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameViewModel.cs index c20b94793..cea634860 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameViewModel.cs @@ -3,7 +3,7 @@ using Artemis.UI.Shared.Services.Dialog; using FluentValidation; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.Dialogs +namespace Artemis.UI.Screens.ProfileEditor.Dialogs { public class RenameViewModel : DialogViewModelBase { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs similarity index 92% rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs index 1c261413b..69728ff3a 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs @@ -1,10 +1,9 @@ using System; -using System.Collections.Generic; using Artemis.Core.Models.Profile.Conditions.Abstract; using Artemis.UI.Shared.DataModelVisualization.Shared; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract +namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract { public abstract class DisplayConditionViewModel : PropertyChangedBase, IDisposable { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml similarity index 97% rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml index 21180d338..cd31bb539 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml @@ -1,9 +1,9 @@ - /// Interaction logic for DisplayConditionListView.xaml diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs index 1c26b8682..82ffe8c0a 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs @@ -1,6 +1,5 @@ using System; using System.Collections; -using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System.Timers; @@ -8,14 +7,14 @@ using Artemis.Core.Models.Profile.Conditions; using Artemis.Core.Plugins.Models; using Artemis.Core.Services; using Artemis.UI.Ninject.Factories; -using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract; +using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract; using Artemis.UI.Shared.DataModelVisualization.Shared; using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Interfaces; using Artemis.UI.Utilities; using Humanizer; -namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions +namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions { public class DisplayConditionListViewModel : DisplayConditionViewModel { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml similarity index 97% rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml index 490182a86..84d39c7d7 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml @@ -3,15 +3,16 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions" + xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions" xmlns:s="https://github.com/canton7/Stylet" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:converters="clr-namespace:Artemis.UI.Converters" xmlns:utilities="clr-namespace:Artemis.UI.Utilities" - x:Class="Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.DisplayConditionPredicateView" + xmlns:displayConditions="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions" + x:Class="Artemis.UI.Screens.ProfileEditor.DisplayConditions.DisplayConditionPredicateView" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800" - d:DataContext="{d:DesignInstance IsDesignTimeCreatable=False, Type={x:Type local:DisplayConditionPredicateViewModel}}"> + d:DataContext="{d:DesignInstance IsDesignTimeCreatable=False, Type={x:Type displayConditions:DisplayConditionPredicateViewModel}}"> diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs similarity index 91% rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs index 9b52d41af..bfef45278 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs @@ -1,7 +1,7 @@ using System.Windows; using System.Windows.Controls; -namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions +namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions { /// /// Interaction logic for DisplayConditionPredicateView.xaml diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs similarity index 99% rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs index 8b4d64039..9914593b1 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs @@ -10,7 +10,7 @@ using Artemis.Core.Plugins.Models; using Artemis.Core.Services; using Artemis.Core.Services.Interfaces; using Artemis.UI.Events; -using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract; +using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract; using Artemis.UI.Shared.DataModelVisualization; using Artemis.UI.Shared.DataModelVisualization.Shared; using Artemis.UI.Shared.Services; @@ -18,7 +18,7 @@ using Artemis.UI.Shared.Services.Interfaces; using Artemis.UI.Utilities; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions +namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions { public class DisplayConditionPredicateViewModel : DisplayConditionViewModel, IHandle, IHandle { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml similarity index 96% rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml index b8b30d465..73148588c 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml @@ -3,14 +3,15 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions" + xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:s="https://github.com/canton7/Stylet" xmlns:converters="clr-namespace:Artemis.UI.Converters" - x:Class="Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.DisplayConditionsView" + xmlns:displayConditions="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions" + x:Class="Artemis.UI.Screens.ProfileEditor.DisplayConditions.DisplayConditionsView" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800" - d:DataContext="{d:DesignInstance {x:Type local:DisplayConditionsViewModel}}"> + d:DataContext="{d:DesignInstance {x:Type displayConditions:DisplayConditionsViewModel}}"> diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs similarity index 98% rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs index b1195b782..85b84bafa 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs @@ -5,7 +5,7 @@ using Artemis.UI.Ninject.Factories; using Artemis.UI.Shared.Events; using Artemis.UI.Shared.Services.Interfaces; -namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions +namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions { public class DisplayConditionsViewModel : ProfileEditorPanelViewModel { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerBrushSettingsWindowView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowView.xaml similarity index 93% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerBrushSettingsWindowView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowView.xaml index f98ae0fb6..6acacbc9a 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerBrushSettingsWindowView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowView.xaml @@ -1,9 +1,9 @@ - { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerEffectSettingsWindowView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowView.xaml similarity index 93% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerEffectSettingsWindowView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowView.xaml index 64ebfe774..f7f6d2977 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerEffectSettingsWindowView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowView.xaml @@ -1,9 +1,9 @@ - { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs similarity index 92% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs index 6cfb11aed..661234793 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Artemis.Core.Models.Profile.LayerProperties; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract +namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract { public abstract class LayerPropertyBaseViewModel : PropertyChangedBase, IDisposable { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml similarity index 94% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml index 446ac79ac..92b684251 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml @@ -1,9 +1,9 @@ - @@ -199,7 +201,7 @@ - /// Interaction logic for LayerPropertiesView.xaml diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs similarity index 98% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs index 0a846301d..2ff954934 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs @@ -12,16 +12,16 @@ using Artemis.Core.Models.Profile.LayerProperties.Attributes; using Artemis.Core.Services; using Artemis.Core.Services.Interfaces; using Artemis.UI.Ninject.Factories; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerEffects; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerEffects; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree; using Artemis.UI.Shared.Events; using Artemis.UI.Shared.Services.Interfaces; using GongSolutions.Wpf.DragDrop; using Stylet; -using static Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerPropertyGroupViewModel.ViewModelType; +using static Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerPropertyGroupViewModel.ViewModelType; -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties +namespace Artemis.UI.Screens.ProfileEditor.LayerProperties { public class LayerPropertiesViewModel : ProfileEditorPanelViewModel, IDropTarget { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs similarity index 96% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs index 506fb3b80..3ede71c73 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs @@ -5,15 +5,15 @@ using Artemis.Core.Models.Profile; using Artemis.Core.Models.Profile.LayerProperties; using Artemis.Core.Models.Profile.LayerProperties.Attributes; using Artemis.UI.Ninject.Factories; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree; using Artemis.UI.Shared.Services.Interfaces; using Humanizer; using Ninject; using Ninject.Parameters; -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties +namespace Artemis.UI.Screens.ProfileEditor.LayerProperties { public class LayerPropertyGroupViewModel : LayerPropertyBaseViewModel { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs similarity index 95% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs index bb6aaf9c3..b23e124bd 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs @@ -4,16 +4,16 @@ using System.Linq; using Artemis.Core.Models.Profile.LayerProperties; using Artemis.UI.Exceptions; using Artemis.UI.PropertyInput; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree; using Artemis.UI.Shared.PropertyInput; using Artemis.UI.Shared.Services.Interfaces; using Humanizer; using Ninject; using Ninject.Parameters; -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties +namespace Artemis.UI.Screens.ProfileEditor.LayerProperties { public class LayerPropertyViewModel : LayerPropertyViewModel { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs similarity index 99% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs index 3b96466a7..5eb3cbf83 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs @@ -4,7 +4,7 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Media; -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline +namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline.Controls { public class PropertyTimelineHeader : FrameworkElement { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs similarity index 94% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs index 1e787c13f..dd064de87 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs @@ -3,7 +3,7 @@ using System.Windows.Media; using Artemis.Core.Utilities; using Humanizer; -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline +namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline { public class TimelineEasingViewModel { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs similarity index 98% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs index a9549b4f2..3005b209c 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs @@ -6,7 +6,7 @@ using Artemis.Core.Utilities; using Artemis.UI.Shared.Services.Interfaces; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline +namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline { public class TimelineKeyframeViewModel : TimelineKeyframeViewModel { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml similarity index 87% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml index 7fa179733..233f864b0 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml @@ -1,12 +1,13 @@ - - + - + diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs similarity index 94% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs index 881e40045..3cde9cd48 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs @@ -1,11 +1,11 @@ using System; using System.ComponentModel; using System.Linq; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract; using Artemis.UI.Shared.Services.Interfaces; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline +namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline { public class TimelinePropertyGroupViewModel : PropertyChangedBase { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml similarity index 94% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml index d20695b20..93b1a3a3d 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml @@ -1,11 +1,12 @@ - : TimelinePropertyViewModel { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml similarity index 95% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml index 56d957874..f8d1d8922 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml @@ -1,15 +1,16 @@ - + d:DataContext="{d:DesignInstance {x:Type timeline:TimelineSegmentViewModel}}"> diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs similarity index 99% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs index 85f49afe0..36c41ddbd 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs @@ -4,13 +4,12 @@ using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Input; -using System.Windows.Media; using Artemis.Core.Models.Profile; using Artemis.UI.Shared.Services.Interfaces; using Artemis.UI.Shared.Utilities; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline +namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline { public class TimelineSegmentViewModel : PropertyChangedBase, IDisposable { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml similarity index 94% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml index ecc2c3c42..a5fcb3adb 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml @@ -1,9 +1,9 @@ - + d:DataContext="{d:DesignInstance {x:Type tree:TreePropertyViewModel}}"> diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs similarity index 95% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs index c0470e579..007d08e7a 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs @@ -2,12 +2,12 @@ using System.Linq; using Artemis.Core.Models.Profile.LayerProperties; using Artemis.Core.Utilities; -using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract; +using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract; using Artemis.UI.Shared.PropertyInput; using Artemis.UI.Shared.Services.Interfaces; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree +namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree { public class TreePropertyViewModel : TreePropertyViewModel diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeView.xaml similarity index 89% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeView.xaml index f96b3d4a2..74bcfa955 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeView.xaml @@ -1,17 +1,19 @@ - + d:DataContext="{d:DesignInstance {x:Type tree:TreeViewModel}}"> - + - + diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs similarity index 94% rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs index e5b7cc3d2..bb0f128f3 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs @@ -3,7 +3,7 @@ using System.Windows.Controls; using System.Windows.Input; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree +namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree { public class TreeViewModel : PropertyChangedBase { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorPanelViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorPanelViewModel.cs similarity index 63% rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorPanelViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/ProfileEditorPanelViewModel.cs index 4d58d279f..e2829cefe 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorPanelViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorPanelViewModel.cs @@ -1,6 +1,6 @@ using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor +namespace Artemis.UI.Screens.ProfileEditor { public class ProfileEditorPanelViewModel : Screen { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml similarity index 98% rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml index 13371f599..28d99b194 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml @@ -1,11 +1,11 @@ -.Collection.AllActive { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeView.xaml similarity index 86% rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeView.xaml index 761447d45..2107c3b2f 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeView.xaml @@ -1,4 +1,4 @@ - + d:DataContext="{d:DesignInstance {x:Type profileTree1:ProfileTreeViewModel}}"> @@ -36,11 +38,11 @@ - + - + diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs index 4009ab0f7..24f8d0870 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs @@ -1,16 +1,15 @@ using System; using System.Linq; -using System.Threading.Tasks; using System.Windows; using Artemis.Core.Models.Profile; using Artemis.UI.Ninject.Factories; -using Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem; +using Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem; using Artemis.UI.Shared.Events; using Artemis.UI.Shared.Services.Interfaces; using GongSolutions.Wpf.DragDrop; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree +namespace Artemis.UI.Screens.ProfileEditor.ProfileTree { public class ProfileTreeViewModel : ProfileEditorPanelViewModel, IDropTarget { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml similarity index 90% rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml index 35ecdc2ef..644d79918 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml @@ -1,14 +1,15 @@ - + d:DataContext="{d:DesignInstance {x:Type treeItem1:FolderViewModel}}"> diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs similarity index 95% rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs index 06f613eb8..94571d760 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs @@ -3,7 +3,7 @@ using Artemis.Core.Services.Interfaces; using Artemis.UI.Ninject.Factories; using Artemis.UI.Shared.Services.Interfaces; -namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem +namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem { public class FolderViewModel : TreeItemViewModel { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml similarity index 89% rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml index 1cb6d3db4..339ab0a7c 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml @@ -1,14 +1,15 @@ - + d:DataContext="{d:DesignInstance {x:Type treeItem1:LayerViewModel}}"> diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs similarity index 92% rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs index 31ea44012..c2b8e9e6a 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs @@ -3,7 +3,7 @@ using Artemis.Core.Services.Interfaces; using Artemis.UI.Ninject.Factories; using Artemis.UI.Shared.Services.Interfaces; -namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem +namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem { public class LayerViewModel : TreeItemViewModel { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs similarity index 98% rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs index 04d32a845..094676aac 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs @@ -6,11 +6,11 @@ using Artemis.Core.Models.Profile; using Artemis.Core.Services.Interfaces; using Artemis.UI.Exceptions; using Artemis.UI.Ninject.Factories; -using Artemis.UI.Screens.Module.ProfileEditor.Dialogs; +using Artemis.UI.Screens.ProfileEditor.Dialogs; using Artemis.UI.Shared.Services.Interfaces; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem +namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem { public abstract class TreeItemViewModel : PropertyChangedBase, IDisposable { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/CanvasViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/CanvasViewModel.cs similarity index 91% rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/CanvasViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/CanvasViewModel.cs index 2095e0fc0..ae843deaf 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/CanvasViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/CanvasViewModel.cs @@ -1,7 +1,7 @@ using System; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization +namespace Artemis.UI.Screens.ProfileEditor.Visualization { public abstract class CanvasViewModel : PropertyChangedBase, IDisposable { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceView.xaml similarity index 92% rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceView.xaml index 998917d05..c05915fac 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceView.xaml @@ -1,16 +1,17 @@ - + d:DataContext="{d:DesignInstance {x:Type visualization1:ProfileDeviceViewModel}}"> diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceViewModel.cs index 4706628a9..332663a13 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceViewModel.cs @@ -5,7 +5,7 @@ using System.Windows; using Artemis.Core.Models.Surface; using Stylet; -namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization +namespace Artemis.UI.Screens.ProfileEditor.Visualization { public class ProfileDeviceViewModel : CanvasViewModel { diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLayerView.xaml similarity index 89% rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerView.xaml rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLayerView.xaml index bd729bd1c..37c85752d 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLayerView.xaml @@ -1,14 +1,15 @@ - + d:DataContext="{d:DesignInstance {x:Type visualization:ProfileLayerViewModel}}">