diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index 54d1eeb34..36b83abef 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -46,51 +46,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs b/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs index e452d9825..8c69358ff 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.Profiles.ProfileEditor.Properties.Tree; -using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree; +using Artemis.UI.Screens.ProfileEditor.Properties.Tree; +using Artemis.UI.Screens.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 9194bc0e6..d382da86d 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.Profiles.ProfileEditor.Properties.Tree.Dialogs; +using Artemis.UI.Screens.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.Profiles.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetViewModel; +using LayerBrushPresetViewModel = Artemis.UI.Screens.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 6f389768d..fbbb215eb 100644 --- a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs +++ b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs @@ -11,12 +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.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.ProfileEditor.DisplayCondition.ConditionTypes; +using Artemis.UI.Screens.ProfileEditor.ProfileTree; +using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; +using Artemis.UI.Screens.ProfileEditor.Properties.DataBinding; +using Artemis.UI.Screens.ProfileEditor.Properties.Timeline; +using Artemis.UI.Screens.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.Settings; using Artemis.UI.Screens.Settings.Updating; using Artemis.UI.Screens.Sidebar; @@ -26,14 +26,14 @@ using Artemis.UI.Screens.VisualScripting.Pins; using Artemis.WebClient.Updating; using DryIoc; using ReactiveUI; -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; +using LayerShapeVisualizerViewModel = Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerViewModel; +using LayerVisualizerViewModel = Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers.LayerVisualizerViewModel; +using ProfileEditorViewModel = Artemis.UI.Screens.ProfileEditor.ProfileEditorViewModel; +using PropertyGroupViewModel = Artemis.UI.Screens.ProfileEditor.Properties.PropertyGroupViewModel; +using PropertyViewModel = Artemis.UI.Screens.ProfileEditor.Properties.PropertyViewModel; +using SingleLedAdaptionHintViewModel = Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintViewModel; +using TimelineGroupViewModel = Artemis.UI.Screens.ProfileEditor.Properties.Timeline.TimelineGroupViewModel; +using TreeItemViewModel = Artemis.UI.Screens.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 c3c46d26c..c082b201b 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.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 Artemis.UI.Screens.ProfileEditor.Properties.Timeline; +using Artemis.UI.Screens.ProfileEditor.Properties.Tree; +using Artemis.UI.Screens.ProfileEditor.Properties; +using Artemis.UI.Screens.ProfileEditor.Properties.Timeline; +using Artemis.UI.Screens.ProfileEditor.Properties.Tree; using DryIoc; -using PropertyViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertyViewModel; +using PropertyViewModel = Artemis.UI.Screens.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 766375606..50ca44147 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.Profiles.ProfileEditor; +using Artemis.UI.Screens.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.Profiles.ProfileEditor.ProfileEditorViewModel; +using ProfileEditorViewModel = Artemis.UI.Screens.ProfileEditor.ProfileEditorViewModel; namespace Artemis.UI.Routing { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs similarity index 85% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs index 15d8c14f7..20683fb03 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs @@ -1,7 +1,7 @@ using System; using Artemis.UI.Shared; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition; +namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition; public class ConditionTypeViewModel : ViewModelBase { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml similarity index 87% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml index 1901a83a8..0f18dd967 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml +++ b/src/Artemis.UI/Screens/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.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.AlwaysOnConditionView"> + x:Class="Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes.AlwaysOnConditionView"> diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs similarity index 61% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs index 94df86ed1..20c9a7452 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs @@ -1,6 +1,7 @@ using Avalonia.Controls; +using Avalonia.Markup.Xaml; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; public partial class AlwaysOnConditionView : UserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs similarity index 78% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs index a4d0af4e1..94e6eeb55 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs @@ -1,7 +1,7 @@ using Artemis.Core; using Artemis.UI.Shared; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; public class AlwaysOnConditionViewModel : ViewModelBase { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml similarity index 95% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml index 38c232a9d..d45a21c9f 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml @@ -2,10 +2,10 @@ 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:conditionTypes="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes" xmlns:dataModelPicker="clr-namespace:Artemis.UI.Shared.DataModelPicker;assembly=Artemis.UI.Shared" - 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.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.EventConditionView" + x:Class="Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes.EventConditionView" x:DataType="conditionTypes:EventConditionViewModel"> diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs similarity index 65% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs index f33d0bb12..2240a63ea 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs @@ -1,6 +1,7 @@ +using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; public partial class EventConditionView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs index 586f00a7b..fbd8eea25 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs +++ b/src/Artemis.UI/Screens/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.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; public class EventConditionViewModel : ActivatableViewModelBase { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml similarity index 86% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml index 68861b4c9..c93b52499 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml +++ b/src/Artemis.UI/Screens/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.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.PlayOnceConditionView"> + x:Class="Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes.PlayOnceConditionView"> diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs similarity index 65% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs index 0ac036acc..cbe8b1ab1 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs @@ -1,6 +1,7 @@ +using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; public partial class StaticConditionView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs similarity index 96% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs index 9d70fa410..086c67091 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs +++ b/src/Artemis.UI/Screens/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.Profiles.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; public class StaticConditionViewModel : ActivatableViewModelBase { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml similarity index 94% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml index 6453d45ac..d0352947e 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml +++ b/src/Artemis.UI/Screens/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.Profiles.ProfileEditor.DisplayCondition" + xmlns:displayCondition="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayCondition" mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="650" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.DisplayConditionScriptView" + x:Class="Artemis.UI.Screens.ProfileEditor.DisplayCondition.DisplayConditionScriptView" x:DataType="displayCondition:DisplayConditionScriptViewModel"> diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs similarity index 96% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs index 7afb4a813..cebade11d 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs @@ -1,9 +1,10 @@ using System; using Avalonia.Input; using Avalonia.LogicalTree; +using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; public partial class TimelineKeyframeView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs index 3fc3931a1..3c618d0b8 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs @@ -13,13 +13,14 @@ using Artemis.UI.Shared; using Artemis.UI.Shared.Extensions; using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; +using Avalonia; using Avalonia.Input; using DynamicData; using DynamicData.Binding; using PropertyChanged.SourceGenerator; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; public partial class TimelineKeyframeViewModel : ActivatableViewModelBase, ITimelineKeyframeViewModel { @@ -48,7 +49,7 @@ public partial class TimelineKeyframeViewModel : ActivatableViewModelBase, IT profileEditorService.PixelsPerSecond.Subscribe(_ => Update()).DisposeWith(d); this.WhenAnyValue(vm => vm.LayerPropertyKeyframe.Position).Subscribe(_ => Update()).DisposeWith(d); }); - this.WhenAnyValue, bool>(vm => vm.IsFlyoutOpen).Subscribe(UpdateCanPaste); + this.WhenAnyValue(vm => vm.IsFlyoutOpen).Subscribe(UpdateCanPaste); Duplicate = ReactiveCommand.Create(ExecuteDuplicate); Copy = ReactiveCommand.CreateFromTask(ExecuteCopy); diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml similarity index 89% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml index 9a0cd2768..d49617362 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml @@ -3,12 +3,12 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" - xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments" + xmlns:segments="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments.EndSegmentView" - x:DataType="segments1:EndSegmentViewModel"> + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments.EndSegmentView" + x:DataType="segments:EndSegmentViewModel"> - + { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs index 6f00c1b5d..1d556bb59 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs @@ -7,7 +7,7 @@ using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; public class EndSegmentViewModel : TimelineSegmentViewModel { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml similarity index 90% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml index c5060ab80..846f1d021 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml @@ -3,12 +3,12 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" - xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments" + xmlns:segments="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments.MainSegmentView" - x:DataType="segments1:MainSegmentViewModel"> + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments.MainSegmentView" + x:DataType="segments:MainSegmentViewModel"> - + { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs index 7172e0e99..a122bbb56 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs @@ -7,7 +7,7 @@ using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; public class MainSegmentViewModel : TimelineSegmentViewModel { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml similarity index 100% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml similarity index 88% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml index 51ac4fb92..a121edb07 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml @@ -3,12 +3,12 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" - xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments" + xmlns:segments="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments.StartSegmentView" - x:DataType="segments1:StartSegmentViewModel"> + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments.StartSegmentView" + x:DataType="segments:StartSegmentViewModel"> - + { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs similarity index 96% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs index eadae620c..38acf3c31 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs @@ -7,7 +7,7 @@ using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; public class StartSegmentViewModel : TimelineSegmentViewModel { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs index 709571d2d..04397ef25 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs @@ -6,7 +6,7 @@ using System.Reactive.Disposables; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; -using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs; +using Artemis.UI.Screens.ProfileEditor.Properties.Dialogs; using Artemis.UI.Shared; using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Builders; @@ -15,7 +15,7 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands; using PropertyChanged.SourceGenerator; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; public abstract partial class TimelineSegmentViewModel : ActivatableViewModelBase { @@ -38,7 +38,7 @@ public abstract partial class TimelineSegmentViewModel : ActivatableViewModelBas EditTime = ReactiveCommand.CreateFromTask(ExecuteEditTime); - ViewForMixins.WhenActivated((IActivatableViewModel) this, (CompositeDisposable d) => + this.WhenActivated(d => { profileEditorService.ProfileElement.Subscribe(p => _profileElement = p).DisposeWith(d); profileEditorService.PixelsPerSecond.Subscribe(p => _pixelsPerSecond = p).DisposeWith(d); diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml similarity index 83% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml index 3910ea3f1..5f78cb52e 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml @@ -2,12 +2,12 @@ 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:properties="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties" + xmlns:timeline="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Timeline" xmlns:system="clr-namespace:System;assembly=netstandard" - xmlns:timeline1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline" - xmlns:properties1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelineGroupView" - x:DataType="timeline1:TimelineGroupViewModel"> + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.TimelineGroupView" + x:DataType="timeline:TimelineGroupViewModel"> - + - + diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs similarity index 67% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs index 7ee09a9be..327a9ef5b 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs @@ -1,6 +1,7 @@ +using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; public partial class TimelineGroupView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs similarity index 82% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs index cb9281d44..b3876c952 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs @@ -8,7 +8,7 @@ using DynamicData.Binding; using PropertyChanged.SourceGenerator; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; public partial class TimelineGroupViewModel : ActivatableViewModelBase { @@ -20,11 +20,11 @@ public partial class TimelineGroupViewModel : ActivatableViewModelBase PropertyGroupViewModel = propertyGroupViewModel; _keyframePositions = new ReadOnlyObservableCollection(new ObservableCollection()); - ViewForMixins.WhenActivated((IActivatableViewModel) this, (CompositeDisposable d) => + this.WhenActivated(d => { profileEditorService.PixelsPerSecond.Subscribe(p => _pixelsPerSecond = p).DisposeWith(d); - PropertyGroupViewModel.WhenAnyValue(vm => vm.IsExpanded).Subscribe(_ => this.RaisePropertyChanged(nameof(Children))).DisposeWith(d); + PropertyGroupViewModel.WhenAnyValue(vm => vm.IsExpanded).Subscribe(_ => this.RaisePropertyChanged(nameof(Children))).DisposeWith(d); PropertyGroupViewModel.Keyframes .ToObservableChangeSet() .AutoRefreshOnObservable(_ => profileEditorService.PixelsPerSecond) diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml similarity index 90% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml index 1ce25e725..2cc8139e6 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml @@ -3,7 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelinePropertyView"> + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.TimelinePropertyView"> diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs similarity index 68% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs index 012f3adcd..8bb5494d0 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs @@ -1,6 +1,7 @@ +using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; public partial class TimelinePropertyView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs similarity index 96% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs index a5eb1bcf4..4ae156667 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs @@ -5,13 +5,13 @@ using System.Linq; using System.Reactive.Disposables; using System.Reactive.Linq; using Artemis.Core; -using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes; +using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; using Artemis.UI.Shared; using Artemis.UI.Shared.Services.ProfileEditor; using DynamicData; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; public class TimelinePropertyViewModel : ActivatableViewModelBase, ITimelinePropertyViewModel { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml similarity index 80% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml index fd8ed76c3..bba79ebed 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml @@ -2,12 +2,12 @@ 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:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties" + xmlns:timeline="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Timeline" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" - xmlns:timeline1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline" - xmlns:properties="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelineView" - x:DataType="timeline1:TimelineViewModel"> + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.TimelineView" + x:DataType="timeline:TimelineViewModel"> @@ -19,7 +19,7 @@ - + diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs similarity index 89% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs index fac533bdf..dce407954 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs @@ -1,14 +1,15 @@ using System.Collections.Generic; using System.Linq; -using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes; +using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; using Artemis.UI.Shared.Events; using Artemis.UI.Shared.Extensions; using Avalonia; using Avalonia.Input; +using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; using Avalonia.VisualTree; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; public partial class TimelineView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs index 2d2c984cf..a4c4952ba 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs @@ -8,15 +8,16 @@ using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; using Artemis.UI.Models; -using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes; -using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments; +using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; +using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; using Artemis.UI.Services.ProfileEditor.Commands; using Artemis.UI.Shared; using Artemis.UI.Shared.Extensions; using Artemis.UI.Shared.Services.ProfileEditor; +using Avalonia; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; public class TimelineViewModel : ActivatableViewModelBase { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml similarity index 61% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml index 53d10e130..854942d2f 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml @@ -2,10 +2,10 @@ 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:contentDialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.ContentDialogs" + xmlns:contentDialogs="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Tree.ContentDialogs" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.ContentDialogs.LayerEffectRenameView" - x:DataType="contentDialogs1:LayerEffectRenameViewModel"> + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Tree.ContentDialogs.LayerEffectRenameView" + x:DataType="contentDialogs:LayerEffectRenameViewModel"> diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs similarity index 86% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs index a3b80f061..9f99d70b9 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs @@ -1,10 +1,11 @@ using System.Threading.Tasks; using Artemis.UI.Shared.Extensions; +using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; using Avalonia.Threading; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.ContentDialogs; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree.ContentDialogs; public partial class LayerEffectRenameView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs similarity index 82% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs index 2bca328cf..9924dc746 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs @@ -8,7 +8,7 @@ using PropertyChanged.SourceGenerator; using ReactiveUI; using ReactiveUI.Validation.Extensions; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.ContentDialogs; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree.ContentDialogs; public partial class LayerEffectRenameViewModel : ContentDialogViewModelBase { @@ -23,7 +23,7 @@ public partial class LayerEffectRenameViewModel : ContentDialogViewModelBase _layerEffectName = layerEffect.Name; Confirm = ReactiveCommand.Create(ExecuteConfirm, ValidationContext.Valid); - this.ValidationRule(vm => vm.LayerEffectName, categoryName => !string.IsNullOrWhiteSpace(categoryName), "You must specify a valid name"); + this.ValidationRule(vm => vm.LayerEffectName, categoryName => !string.IsNullOrWhiteSpace(categoryName), "You must specify a valid name"); } public ReactiveCommand Confirm { get; } diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml similarity index 92% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml index 65475153c..464e1d37d 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml @@ -4,11 +4,11 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" + xmlns:dialogs="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs" xmlns:layerBrushes="clr-namespace:Artemis.Core.LayerBrushes;assembly=Artemis.Core" - xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetView" - x:DataType="dialogs1:LayerBrushPresetViewModel" + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetView" + x:DataType="dialogs:LayerBrushPresetViewModel" Width="500"> diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs similarity index 85% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs index 5ad7af955..9f25e9c19 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs @@ -1,9 +1,10 @@ using Artemis.Core.LayerBrushes; using Avalonia; using Avalonia.Input; +using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs; public partial class LayerBrushPresetView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs similarity index 89% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs index 63b03b573..2577aa1b5 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs @@ -7,7 +7,7 @@ using DynamicData; using PropertyChanged.SourceGenerator; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs; public partial class LayerBrushPresetViewModel : ContentDialogViewModelBase { @@ -21,7 +21,7 @@ public partial class LayerBrushPresetViewModel : ContentDialogViewModelBase SourceList presetsSourceList = new(); if (layerBrush.Presets != null) presetsSourceList.AddRange(layerBrush.Presets); - IObservable> presetsFilter = this.WhenAnyValue(vm => vm.SearchText).Select(CreatePredicate); + IObservable> presetsFilter = this.WhenAnyValue(vm => vm.SearchText).Select(CreatePredicate); presetsSourceList.Connect() .Filter(presetsFilter) diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs similarity index 78% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs index ce05004c8..b91eca4e7 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs @@ -1,7 +1,7 @@ using Artemis.Core; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree; public interface ITreePropertyViewModel : IReactiveObject { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml similarity index 93% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml index 8157ba895..9ed3c8be1 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml @@ -5,12 +5,12 @@ xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:sharedConverters="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared" xmlns:converters="clr-namespace:Artemis.UI.Converters" + xmlns:viewModel="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Tree" + xmlns:properties="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" - xmlns:tree="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree" - xmlns:properties1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.TreeGroupView" - x:DataType="tree:TreeGroupViewModel"> + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Tree.TreeGroupView" + x:DataType="viewModel:TreeGroupViewModel"> @@ -48,12 +48,12 @@ VerticalAlignment="Center" HorizontalAlignment="Left" Margin="3 5 0 5" - IsVisible="{CompiledBinding GroupType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static tree:LayerPropertyGroupType.None}}" /> + IsVisible="{CompiledBinding GroupType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static viewModel:LayerPropertyGroupType.None}}" /> + IsVisible="{CompiledBinding GroupType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static viewModel:LayerPropertyGroupType.General}}"> General @@ -61,13 +61,13 @@ + IsVisible="{CompiledBinding GroupType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static viewModel:LayerPropertyGroupType.Transform}}"> Transform - - - + - + diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs similarity index 83% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs index ef04ea787..eb5e233a1 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs @@ -1,7 +1,8 @@ using Avalonia.Input; +using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree; public partial class TreeGroupView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs similarity index 93% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs index d7fe7258f..9a5409908 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs @@ -8,8 +8,8 @@ using Artemis.Core; using Artemis.Core.LayerBrushes; using Artemis.Core.LayerEffects; using Artemis.UI.Exceptions; -using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.ContentDialogs; -using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows; +using Artemis.UI.Screens.ProfileEditor.Properties.Tree.ContentDialogs; +using Artemis.UI.Screens.ProfileEditor.Properties.Windows; using Artemis.UI.Shared; using Artemis.UI.Shared.LayerBrushes; using Artemis.UI.Shared.LayerEffects; @@ -19,7 +19,7 @@ using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree; public class TreeGroupViewModel : ActivatableViewModelBase { @@ -35,9 +35,9 @@ public class TreeGroupViewModel : ActivatableViewModelBase PropertyGroupViewModel = propertyGroupViewModel; DetermineGroupType(); - ViewForMixins.WhenActivated((IActivatableViewModel) this, (CompositeDisposable d) => + this.WhenActivated(d => { - PropertyGroupViewModel.WhenAnyValue(vm => vm.IsExpanded).Subscribe(_ => this.RaisePropertyChanged(nameof(Children))).DisposeWith(d); + PropertyGroupViewModel.WhenAnyValue(vm => vm.IsExpanded).Subscribe(_ => this.RaisePropertyChanged(nameof(Children))).DisposeWith(d); Disposable.Create(CloseViewModels).DisposeWith(d); }); diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml similarity index 92% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml index b5008e3dc..2d87a8108 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml @@ -4,10 +4,10 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:converters="clr-namespace:Artemis.UI.Converters" - xmlns:tree1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree" + xmlns:tree="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Tree" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.TreePropertyView" - x:DataType="tree1:ITreePropertyViewModel"> + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Tree.TreePropertyView" + x:DataType="tree:ITreePropertyViewModel"> diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs similarity index 92% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs index 91d0bf19b..04a3a4d99 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs @@ -4,10 +4,11 @@ using System.Reactive.Linq; using Artemis.Core; using Avalonia.Controls; using Avalonia.Interactivity; +using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree; public partial class TreePropertyView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs index aa2cf1445..8c7e214a5 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs @@ -10,7 +10,7 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.PropertyInput; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree; internal class TreePropertyViewModel : ActivatableViewModelBase, ITreePropertyViewModel { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml similarity index 76% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml index f270bca4b..cf0b73621 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml @@ -3,12 +3,12 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia" - xmlns:local="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows" - x:DataType="local:BrushConfigurationWindowViewModel" + xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Windows" + x:DataType="local:BrushConfigurationWindowViewModel" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows.BrushConfigurationWindowView" + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Windows.BrushConfigurationWindowView" Icon="/Assets/Images/Logo/application.ico" Title="Artemis | Brush configuration" Width="{CompiledBinding Configuration.DialogWidth}" diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs similarity index 90% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs index dd8742b34..d01dc274c 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs @@ -1,8 +1,9 @@ using System.ComponentModel; using Artemis.UI.Shared; +using Avalonia; using Avalonia.Markup.Xaml; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Windows; public partial class BrushConfigurationWindowView : ReactiveAppWindow { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs similarity index 93% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs index 8bbf02f88..4a51d9f74 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Artemis.UI.Shared; using Artemis.UI.Shared.LayerBrushes; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Windows; public class BrushConfigurationWindowViewModel : DialogViewModelBase { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml similarity index 87% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml index 862355ade..134bb9147 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml @@ -3,12 +3,12 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia" - xmlns:local="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows" + xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Windows" x:DataType="local:EffectConfigurationWindowViewModel" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows.EffectConfigurationWindowView" + x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Windows.EffectConfigurationWindowView" Icon="/Assets/Images/Logo/application.ico" Title="Artemis | Effect configuration" Width="{CompiledBinding Configuration.DialogWidth}" diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs similarity index 90% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs index 679086e75..ddee1ec69 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs @@ -1,8 +1,9 @@ using System.ComponentModel; using Artemis.UI.Shared; +using Avalonia; using Avalonia.Markup.Xaml; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Windows; public partial class EffectConfigurationWindowView : ReactiveAppWindow { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs similarity index 93% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs index 65fde0979..dd3778036 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Artemis.UI.Shared; using Artemis.UI.Shared.LayerEffects; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows; +namespace Artemis.UI.Screens.ProfileEditor.Properties.Windows; public class EffectConfigurationWindowViewModel : DialogViewModelBase { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarView.axaml similarity index 91% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarView.axaml index afa31ddb8..25c79efee 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarView.axaml @@ -5,9 +5,9 @@ xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:core="clr-namespace:Artemis.Core;assembly=Artemis.Core" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="23" - xmlns:statusBar="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.StatusBar" - x:DataType="statusBar:StatusBarViewModel" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.StatusBar.StatusBarView"> + xmlns:vm="clr-namespace:Artemis.UI.Screens.ProfileEditor.StatusBar;assembly=Artemis.UI" + x:DataType="vm:StatusBarViewModel" + x:Class="Artemis.UI.Screens.ProfileEditor.StatusBar.StatusBarView"> diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs similarity index 97% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs index 4128edef4..f7e4491a5 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs @@ -10,7 +10,7 @@ using Avalonia.ReactiveUI; using Avalonia.Threading; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor; +namespace Artemis.UI.Screens.ProfileEditor.VisualEditor; public partial class VisualEditorView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs index 8c761f44f..a5246024b 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs @@ -8,7 +8,7 @@ using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.DryIoc.Factories; -using Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers; +using Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers; using Artemis.UI.Shared; using Artemis.UI.Shared.Services.ProfileEditor; using DynamicData; @@ -16,7 +16,7 @@ using DynamicData.Binding; using PropertyChanged.SourceGenerator; using ReactiveUI; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor; +namespace Artemis.UI.Screens.ProfileEditor.VisualEditor; public partial class VisualEditorViewModel : ActivatableViewModelBase { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs similarity index 69% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs rename to src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs index 02b813ed3..357f99e7e 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs @@ -1,6 +1,6 @@ using Artemis.Core; -namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers; +namespace Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers; public interface IVisualizerViewModel { diff --git a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml similarity index 90% rename from src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml rename to src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml index ab34ee678..78a2f969a 100644 --- a/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml @@ -2,10 +2,10 @@ 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:visualizers1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers" + xmlns:visualizers="clr-namespace:Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerView" - x:DataType="visualizers1:LayerShapeVisualizerViewModel" + x:Class="Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerView" + x:DataType="visualizers:LayerShapeVisualizerViewModel" ClipToBounds="False">