diff --git a/src/Artemis.Core/Plugins/IPluginConfigurationDialog.cs b/src/Artemis.Core/Plugins/IPluginConfigurationDialog.cs index 7df4491bb..d75ed35be 100644 --- a/src/Artemis.Core/Plugins/IPluginConfigurationDialog.cs +++ b/src/Artemis.Core/Plugins/IPluginConfigurationDialog.cs @@ -11,4 +11,10 @@ public interface IPluginConfigurationDialog /// The type of view model the tab contains /// Type Type { get; } + + /// + /// A value indicating whether it's mandatory to configure this plugin. + /// If set to , the dialog will open the first time the plugin is enabled. + /// + bool IsMandatory { get; } } \ No newline at end of file diff --git a/src/Artemis.UI.Shared/Controls/TagsInput/TagsInputStyles.axaml b/src/Artemis.UI.Shared/Controls/TagsInput/TagsInputStyles.axaml index e2a0ff8e5..5d492c436 100644 --- a/src/Artemis.UI.Shared/Controls/TagsInput/TagsInputStyles.axaml +++ b/src/Artemis.UI.Shared/Controls/TagsInput/TagsInputStyles.axaml @@ -1,6 +1,5 @@ diff --git a/src/Artemis.UI.Shared/Plugins/PluginConfigurationDialog.cs b/src/Artemis.UI.Shared/Plugins/PluginConfigurationDialog.cs index 7febeeb80..0c46da3c6 100644 --- a/src/Artemis.UI.Shared/Plugins/PluginConfigurationDialog.cs +++ b/src/Artemis.UI.Shared/Plugins/PluginConfigurationDialog.cs @@ -6,6 +6,22 @@ namespace Artemis.UI.Shared; /// public class PluginConfigurationDialog : PluginConfigurationDialog where T : PluginConfigurationViewModel { + /// + /// Creates a new instance of the class. + /// + public PluginConfigurationDialog() + { + } + + /// + /// Creates a new instance of the class with the specified flag. + /// + /// A value indicating whether the configuration dialog is mandatory. + public PluginConfigurationDialog(bool isMandatory) + { + IsMandatory = isMandatory; + } + /// public override Type Type => typeof(T); } @@ -17,4 +33,7 @@ public abstract class PluginConfigurationDialog : IPluginConfigurationDialog { /// public abstract Type Type { get; } + + /// + public bool IsMandatory { get; protected set; } } \ No newline at end of file diff --git a/src/Artemis.UI.Shared/Styles/BrokenState.axaml b/src/Artemis.UI.Shared/Styles/BrokenState.axaml index c28d4bca2..a72803f26 100644 --- a/src/Artemis.UI.Shared/Styles/BrokenState.axaml +++ b/src/Artemis.UI.Shared/Styles/BrokenState.axaml @@ -1,6 +1,5 @@  diff --git a/src/Artemis.UI.Shared/Styles/Button.axaml b/src/Artemis.UI.Shared/Styles/Button.axaml index 41b7529c0..b8e7a4da4 100644 --- a/src/Artemis.UI.Shared/Styles/Button.axaml +++ b/src/Artemis.UI.Shared/Styles/Button.axaml @@ -1,7 +1,6 @@  + xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"> diff --git a/src/Artemis.UI.Shared/Styles/Controls/DataModelPicker.axaml b/src/Artemis.UI.Shared/Styles/Controls/DataModelPicker.axaml index d4cd0f731..5a7e24c39 100644 --- a/src/Artemis.UI.Shared/Styles/Controls/DataModelPicker.axaml +++ b/src/Artemis.UI.Shared/Styles/Controls/DataModelPicker.axaml @@ -2,7 +2,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:dataModel="clr-namespace:Artemis.UI.Shared.DataModelVisualization.Shared" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" - xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:dataModelPicker="clr-namespace:Artemis.UI.Shared.DataModelPicker"> diff --git a/src/Artemis.UI.Shared/Styles/Controls/DataModelPickerButton.axaml b/src/Artemis.UI.Shared/Styles/Controls/DataModelPickerButton.axaml index 3308fedc9..8e90e6c26 100644 --- a/src/Artemis.UI.Shared/Styles/Controls/DataModelPickerButton.axaml +++ b/src/Artemis.UI.Shared/Styles/Controls/DataModelPickerButton.axaml @@ -1,6 +1,5 @@  diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index c53778340..049023504 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -42,4 +42,55 @@ Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.UI/Artemis.UI.csproj.DotSettings b/src/Artemis.UI/Artemis.UI.csproj.DotSettings index e73de0af9..19751458b 100644 --- a/src/Artemis.UI/Artemis.UI.csproj.DotSettings +++ b/src/Artemis.UI/Artemis.UI.csproj.DotSettings @@ -1,5 +1,4 @@ - + True True True @@ -7,6 +6,8 @@ True False True + False + True True True True \ No newline at end of file diff --git a/src/Artemis.UI/Controls/SplitMarkdownEditor.axaml b/src/Artemis.UI/Controls/SplitMarkdownEditor.axaml index a84b7d6ed..f264335d7 100644 --- a/src/Artemis.UI/Controls/SplitMarkdownEditor.axaml +++ b/src/Artemis.UI/Controls/SplitMarkdownEditor.axaml @@ -4,8 +4,6 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit" xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight" - xmlns:fa="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" - xmlns:input="clr-namespace:System.Windows.Input;assembly=System.ObjectModel" xmlns:ui="clr-namespace:Artemis.UI" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Artemis.UI.Controls.SplitMarkdownEditor"> diff --git a/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs b/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs index aa7cfc232..8be626e0d 100644 --- a/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs +++ b/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs @@ -1,5 +1,6 @@ using System; using System.Globalization; +using Artemis.UI.Screens.Profile.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 92321d8a0..589ddaa95 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs @@ -14,6 +14,7 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.PropertyInput; using Avalonia.Threading; using ReactiveUI; +using LayerBrushPresetViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetViewModel; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs index 6e8bb8bd3..4ea40ce84 100644 --- a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs +++ b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs @@ -11,12 +11,16 @@ using Artemis.UI.Screens.Device.Leds; using Artemis.UI.Screens.Plugins; using Artemis.UI.Screens.Plugins.Features; using Artemis.UI.Screens.Plugins.Prerequisites; +using Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; +using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree; +using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; +using Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding; +using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; +using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.ProfileEditor; -using Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; using Artemis.UI.Screens.ProfileEditor.ProfileTree; using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; using Artemis.UI.Screens.ProfileEditor.Properties; -using Artemis.UI.Screens.ProfileEditor.Properties.DataBinding; using Artemis.UI.Screens.ProfileEditor.Properties.Timeline; using Artemis.UI.Screens.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers; @@ -29,6 +33,14 @@ using Artemis.UI.Screens.VisualScripting.Pins; using Artemis.WebClient.Updating; using DryIoc; using ReactiveUI; +using LayerShapeVisualizerViewModel = Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerViewModel; +using LayerVisualizerViewModel = Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers.LayerVisualizerViewModel; +using ProfileEditorViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileEditorViewModel; +using PropertyGroupViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertyGroupViewModel; +using PropertyViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertyViewModel; +using SingleLedAdaptionHintViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintViewModel; +using TimelineGroupViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelineGroupViewModel; +using TreeItemViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.TreeItemViewModel; namespace Artemis.UI.DryIoc.Factories; diff --git a/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs b/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs index 108caeb84..ff4b761f1 100644 --- a/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs +++ b/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs @@ -2,10 +2,13 @@ using Artemis.Core; using Artemis.UI.DryIoc.Factories; using Artemis.UI.Exceptions; +using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; +using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.ProfileEditor.Properties; using Artemis.UI.Screens.ProfileEditor.Properties.Timeline; using Artemis.UI.Screens.ProfileEditor.Properties.Tree; using DryIoc; +using PropertyViewModel = Artemis.UI.Screens.Profile.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 b600e635f..05ba5b7fd 100644 --- a/src/Artemis.UI/Routing/Routes.cs +++ b/src/Artemis.UI/Routing/Routes.cs @@ -16,6 +16,7 @@ using Artemis.UI.Screens.Workshop.Plugins; using Artemis.UI.Screens.Workshop.Profile; using Artemis.UI.Shared.Routing; using PluginDetailsViewModel = Artemis.UI.Screens.Workshop.Plugins.PluginDetailsViewModel; +using ProfileEditorViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileEditorViewModel; namespace Artemis.UI.Routing { diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml index 3430c04d0..ad8b75823 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml @@ -2,8 +2,7 @@ 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:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" - xmlns:debugger="clr-namespace:Artemis.UI.Screens.Debugger.Performance;assembly=Artemis.UI" + xmlns:debugger="clr-namespace:Artemis.UI.Screens.Debugger.Performance;assembly=Artemis.UI" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:DataType="debugger:PerformanceDebugViewModel" x:Class="Artemis.UI.Screens.Debugger.Performance.PerformanceDebugView"> diff --git a/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml b/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml index e3157ba28..028303543 100644 --- a/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml +++ b/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml @@ -3,7 +3,6 @@ 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:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" xmlns:local="clr-namespace:Artemis.UI.Screens.Device" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" diff --git a/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabView.axaml b/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabView.axaml index c6d42e2b5..ba1c825b1 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabView.axaml +++ b/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabView.axaml @@ -4,7 +4,6 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:converters="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared" - xmlns:device="clr-namespace:Artemis.UI.Screens.Device" xmlns:general="clr-namespace:Artemis.UI.Screens.Device.General" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="650" x:Class="Artemis.UI.Screens.Device.General.DeviceGeneralTabView" diff --git a/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabView.axaml b/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabView.axaml index f76881aed..0c3914b31 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabView.axaml +++ b/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabView.axaml @@ -2,7 +2,6 @@ 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:device="clr-namespace:Artemis.UI.Screens.Device" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:inputMappings="clr-namespace:Artemis.UI.Screens.Device.InputMappings" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" diff --git a/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml b/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml index 1020b7d03..386d1ef92 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml +++ b/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml @@ -2,7 +2,6 @@ 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:services="clr-namespace:Artemis.WebClient.Workshop.Services;assembly=Artemis.WebClient.Workshop" xmlns:layoutProviders="clr-namespace:Artemis.UI.Screens.Device.Layout.LayoutProviders" xmlns:models="clr-namespace:Artemis.WebClient.Workshop.Models;assembly=Artemis.WebClient.Workshop" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" diff --git a/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabView.axaml b/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabView.axaml index 9b0ccf258..40f297554 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabView.axaml +++ b/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabView.axaml @@ -2,7 +2,6 @@ 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:device="clr-namespace:Artemis.UI.Screens.Device" xmlns:converters="clr-namespace:Artemis.UI.Converters" xmlns:shared="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared" xmlns:leds="clr-namespace:Artemis.UI.Screens.Device.Leds" diff --git a/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureView.axaml b/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureView.axaml index 4141ec69e..44a79ca8f 100644 --- a/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureView.axaml +++ b/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureView.axaml @@ -3,8 +3,6 @@ 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:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" - xmlns:plugins="clr-namespace:Artemis.UI.Screens.Plugins" xmlns:features="clr-namespace:Artemis.UI.Screens.Plugins.Features" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Artemis.UI.Screens.Plugins.Features.PluginFeatureView" diff --git a/src/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml b/src/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml index 648239132..ccab77d68 100644 --- a/src/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml +++ b/src/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml @@ -4,7 +4,6 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia" xmlns:plugins="clr-namespace:Artemis.UI.Screens.Plugins" - xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" diff --git a/src/Artemis.UI/Screens/Plugins/PluginView.axaml b/src/Artemis.UI/Screens/Plugins/PluginView.axaml index 4e4aecc13..a0a6beb70 100644 --- a/src/Artemis.UI/Screens/Plugins/PluginView.axaml +++ b/src/Artemis.UI/Screens/Plugins/PluginView.axaml @@ -4,7 +4,6 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:plugins="clr-namespace:Artemis.UI.Screens.Plugins" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" - xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" 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.Plugins.PluginView" diff --git a/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteActionView.axaml b/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteActionView.axaml index d7a09a975..953124768 100644 --- a/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteActionView.axaml +++ b/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteActionView.axaml @@ -2,7 +2,6 @@ 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:plugins="clr-namespace:Artemis.UI.Screens.Plugins" xmlns:prerequisites="clr-namespace:Artemis.UI.Screens.Plugins.Prerequisites" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Artemis.UI.Screens.Plugins.Prerequisites.PluginPrerequisiteActionView" diff --git a/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteView.axaml b/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteView.axaml index 6fa41801c..36e6b229d 100644 --- a/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteView.axaml +++ b/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteView.axaml @@ -2,7 +2,6 @@ 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:plugins="clr-namespace:Artemis.UI.Screens.Plugins" xmlns:prerequisites="clr-namespace:Artemis.UI.Screens.Plugins.Prerequisites" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Artemis.UI.Screens.Plugins.Prerequisites.PluginPrerequisiteView" diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs similarity index 85% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs index 20683fb03..8fb8c8444 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs @@ -1,7 +1,7 @@ using System; using Artemis.UI.Shared; -namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition; +namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition; public class ConditionTypeViewModel : ViewModelBase { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml similarity index 87% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml index 0f18dd967..7609940ae 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.DisplayCondition.ConditionTypes.AlwaysOnConditionView"> + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.AlwaysOnConditionView"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs similarity index 61% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs index 20c9a7452..03367b6c9 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs @@ -1,7 +1,6 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; -namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; public partial class AlwaysOnConditionView : UserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs similarity index 78% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs index 94e6eeb55..4ae79f2c6 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs @@ -1,7 +1,7 @@ using Artemis.Core; using Artemis.UI.Shared; -namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; public class AlwaysOnConditionViewModel : ViewModelBase { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml similarity index 95% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml index d45a21c9f..981594e4b 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml +++ b/src/Artemis.UI/Screens/Profile/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.Profile.ProfileEditor.DisplayCondition.ConditionTypes" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes.EventConditionView" + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.EventConditionView" x:DataType="conditionTypes:EventConditionViewModel"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs similarity index 65% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs index 2240a63ea..bd33d86d7 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs @@ -1,7 +1,6 @@ -using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; public partial class EventConditionView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs similarity index 98% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs index fbd8eea25..73dc2e6a2 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; public class EventConditionViewModel : ActivatableViewModelBase { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml similarity index 86% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml index c93b52499..e3ea967ec 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.DisplayCondition.ConditionTypes.PlayOnceConditionView"> + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.PlayOnceConditionView"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs similarity index 65% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs index cbe8b1ab1..7c0fdf07b 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs @@ -1,7 +1,6 @@ -using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; public partial class StaticConditionView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs similarity index 96% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs index 086c67091..95134ddd5 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.DisplayCondition.ConditionTypes; +namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; public class StaticConditionViewModel : ActivatableViewModelBase { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml similarity index 94% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml index d0352947e..1b2f50ad3 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.DisplayCondition" + xmlns:displayCondition="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition" mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="650" - x:Class="Artemis.UI.Screens.ProfileEditor.DisplayCondition.DisplayConditionScriptView" + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.DisplayConditionScriptView" x:DataType="displayCondition:DisplayConditionScriptViewModel"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs similarity index 96% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs index cebade11d..abb7b51bc 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs @@ -1,10 +1,9 @@ using System; using Avalonia.Input; using Avalonia.LogicalTree; -using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; public partial class TimelineKeyframeView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs similarity index 98% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs index 3c618d0b8..18a5a5a88 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs @@ -13,14 +13,13 @@ 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.ProfileEditor.Properties.Timeline.Keyframes; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; public partial class TimelineKeyframeViewModel : ActivatableViewModelBase, ITimelineKeyframeViewModel { @@ -49,7 +48,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(vm => vm.IsFlyoutOpen).Subscribe(UpdateCanPaste); + this.WhenAnyValue, bool>(vm => vm.IsFlyoutOpen).Subscribe(UpdateCanPaste); Duplicate = ReactiveCommand.Create(ExecuteDuplicate); Copy = ReactiveCommand.CreateFromTask(ExecuteCopy); diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml similarity index 92% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml index d49617362..4b6d3fc7e 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml @@ -3,10 +3,10 @@ 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:segments="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments" + xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18" - x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments.EndSegmentView" - x:DataType="segments:EndSegmentViewModel"> + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments.EndSegmentView" + x:DataType="segments1:EndSegmentViewModel"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs similarity index 93% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs index b93038748..5ab5af82e 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs @@ -1,8 +1,7 @@ using Avalonia.Input; -using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; public partial class EndSegmentView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs index 1d556bb59..567039090 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Timeline.Segments; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; public class EndSegmentViewModel : TimelineSegmentViewModel { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml similarity index 93% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml index 846f1d021..9bdd7b4f4 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml @@ -3,10 +3,10 @@ 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:segments="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments" + xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18" - x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments.MainSegmentView" - x:DataType="segments:MainSegmentViewModel"> + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments.MainSegmentView" + x:DataType="segments1:MainSegmentViewModel"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs similarity index 94% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs index 4923e2def..b48f2cf7d 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs @@ -1,8 +1,7 @@ using Avalonia.Input; -using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; public partial class MainSegmentView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs index a122bbb56..2688189bf 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Timeline.Segments; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; public class MainSegmentViewModel : TimelineSegmentViewModel { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml similarity index 100% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml similarity index 92% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml index a121edb07..e2289262a 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml @@ -3,10 +3,10 @@ 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:segments="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments" + xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18" - x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments.StartSegmentView" - x:DataType="segments:StartSegmentViewModel"> + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments.StartSegmentView" + x:DataType="segments1:StartSegmentViewModel"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs similarity index 93% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs index 231a80b51..fee59c2b9 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs @@ -1,8 +1,7 @@ using Avalonia.Input; -using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; public partial class StartSegmentView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs similarity index 96% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs index 38acf3c31..6e27862d4 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Timeline.Segments; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; public class StartSegmentViewModel : TimelineSegmentViewModel { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs index 04397ef25..a3439f132 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Dialogs; +using Artemis.UI.Screens.Profile.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.ProfileEditor.Properties.Timeline.Segments; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; public abstract partial class TimelineSegmentViewModel : ActivatableViewModelBase { @@ -38,7 +38,7 @@ public abstract partial class TimelineSegmentViewModel : ActivatableViewModelBas EditTime = ReactiveCommand.CreateFromTask(ExecuteEditTime); - this.WhenActivated(d => + ViewForMixins.WhenActivated((IActivatableViewModel) this, (CompositeDisposable d) => { profileEditorService.ProfileElement.Subscribe(p => _profileElement = p).DisposeWith(d); profileEditorService.PixelsPerSecond.Subscribe(p => _pixelsPerSecond = p).DisposeWith(d); diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml similarity index 83% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml index 5f78cb52e..35b9682df 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml +++ b/src/Artemis.UI/Screens/Profile/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.Profile.ProfileEditor.Properties.Timeline" + xmlns:properties1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.TimelineGroupView" - x:DataType="timeline:TimelineGroupViewModel"> + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelineGroupView" + x:DataType="timeline1:TimelineGroupViewModel"> - + - + diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs similarity index 67% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs index 327a9ef5b..8e0d3ec9c 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs @@ -1,7 +1,6 @@ -using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; public partial class TimelineGroupView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs similarity index 82% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs index b3876c952..6a6b6d2be 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs @@ -8,7 +8,7 @@ using DynamicData.Binding; using PropertyChanged.SourceGenerator; using ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; public partial class TimelineGroupViewModel : ActivatableViewModelBase { @@ -20,11 +20,11 @@ public partial class TimelineGroupViewModel : ActivatableViewModelBase PropertyGroupViewModel = propertyGroupViewModel; _keyframePositions = new ReadOnlyObservableCollection(new ObservableCollection()); - this.WhenActivated(d => + ViewForMixins.WhenActivated((IActivatableViewModel) this, (CompositeDisposable 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/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml similarity index 90% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml index 2cc8139e6..ab8004516 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Timeline.TimelinePropertyView"> + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelinePropertyView"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs similarity index 68% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs index 8bb5494d0..e2afd768c 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs @@ -1,7 +1,6 @@ -using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; public partial class TimelinePropertyView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs similarity index 96% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs index 4ae156667..df7e5fe59 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Timeline.Keyframes; +using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; using Artemis.UI.Shared; using Artemis.UI.Shared.Services.ProfileEditor; using DynamicData; using ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; public class TimelinePropertyViewModel : ActivatableViewModelBase, ITimelinePropertyViewModel { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml similarity index 80% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml index bba79ebed..cada9d795 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml +++ b/src/Artemis.UI/Screens/Profile/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.Profile.ProfileEditor.Properties.Timeline" + xmlns:properties="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.TimelineView" - x:DataType="timeline:TimelineViewModel"> + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelineView" + x:DataType="timeline1:TimelineViewModel"> @@ -19,7 +19,7 @@ - + diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs similarity index 89% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs index dce407954..511cf600b 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; using System.Linq; -using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; +using Artemis.UI.Screens.Profile.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.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; public partial class TimelineView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs index a4c4952ba..15f10a0a1 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs @@ -8,16 +8,15 @@ using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; using Artemis.UI.Models; -using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; -using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; +using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; +using Artemis.UI.Screens.Profile.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.ProfileEditor.Properties.Timeline; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; public class TimelineViewModel : ActivatableViewModelBase { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml similarity index 62% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml index 854942d2f..ac51f6d62 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml +++ b/src/Artemis.UI/Screens/Profile/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:contentDialogs="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Tree.ContentDialogs" + xmlns:contentDialogs1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.ContentDialogs" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Tree.ContentDialogs.LayerEffectRenameView" - x:DataType="contentDialogs:LayerEffectRenameViewModel"> + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.ContentDialogs.LayerEffectRenameView" + x:DataType="contentDialogs1:LayerEffectRenameViewModel"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs similarity index 86% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs index 9f99d70b9..ae413e46a 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs @@ -1,11 +1,10 @@ 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.ProfileEditor.Properties.Tree.ContentDialogs; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.ContentDialogs; public partial class LayerEffectRenameView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs similarity index 82% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs index 9924dc746..34d44ed5e 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs @@ -8,7 +8,7 @@ using PropertyChanged.SourceGenerator; using ReactiveUI; using ReactiveUI.Validation.Extensions; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree.ContentDialogs; +namespace Artemis.UI.Screens.Profile.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/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml similarity index 92% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml index 464e1d37d..8ebe14b95 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml +++ b/src/Artemis.UI/Screens/Profile/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.Profile.ProfileEditor.Properties.Tree.Dialogs" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetView" - x:DataType="dialogs:LayerBrushPresetViewModel" + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetView" + x:DataType="dialogs1:LayerBrushPresetViewModel" Width="500"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs similarity index 85% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs index 9f25e9c19..d81777e4d 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs @@ -1,10 +1,9 @@ using Artemis.Core.LayerBrushes; using Avalonia; using Avalonia.Input; -using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.Dialogs; public partial class LayerBrushPresetView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs similarity index 89% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs index 2577aa1b5..33ab6f923 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs @@ -7,7 +7,7 @@ using DynamicData; using PropertyChanged.SourceGenerator; using ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs; +namespace Artemis.UI.Screens.Profile.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/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs similarity index 78% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs index b91eca4e7..bc1eb16ea 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs @@ -1,7 +1,7 @@ using Artemis.Core; using ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; public interface ITreePropertyViewModel : IReactiveObject { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml similarity index 93% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml index 9ed3c8be1..ea10aba37 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml +++ b/src/Artemis.UI/Screens/Profile/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.Profile.ProfileEditor.Properties.Tree" + xmlns:properties1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Tree.TreeGroupView" - x:DataType="viewModel:TreeGroupViewModel"> + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.TreeGroupView" + x:DataType="tree:TreeGroupViewModel"> @@ -48,12 +48,12 @@ VerticalAlignment="Center" HorizontalAlignment="Left" Margin="3 5 0 5" - IsVisible="{CompiledBinding GroupType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static viewModel:LayerPropertyGroupType.None}}" /> + IsVisible="{CompiledBinding GroupType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static tree:LayerPropertyGroupType.None}}" /> + IsVisible="{CompiledBinding GroupType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static tree:LayerPropertyGroupType.General}}"> General @@ -61,13 +61,13 @@ + IsVisible="{CompiledBinding GroupType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static tree:LayerPropertyGroupType.Transform}}"> Transform - - - + - + diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs similarity index 83% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs index eb5e233a1..253d98d9c 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs @@ -1,8 +1,7 @@ using Avalonia.Input; -using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; public partial class TreeGroupView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs similarity index 93% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs index 9a5409908..b3cb38bb1 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Tree.ContentDialogs; -using Artemis.UI.Screens.ProfileEditor.Properties.Windows; +using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.ContentDialogs; +using Artemis.UI.Screens.Profile.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.ProfileEditor.Properties.Tree; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; public class TreeGroupViewModel : ActivatableViewModelBase { @@ -35,9 +35,9 @@ public class TreeGroupViewModel : ActivatableViewModelBase PropertyGroupViewModel = propertyGroupViewModel; DetermineGroupType(); - this.WhenActivated(d => + ViewForMixins.WhenActivated((IActivatableViewModel) this, (CompositeDisposable 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/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml similarity index 92% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml index 2d87a8108..07c62ad53 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml +++ b/src/Artemis.UI/Screens/Profile/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:tree="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Tree" + xmlns:tree1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Tree.TreePropertyView" - x:DataType="tree:ITreePropertyViewModel"> + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.TreePropertyView" + x:DataType="tree1:ITreePropertyViewModel"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs similarity index 92% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs index 04a3a4d99..666bc8410 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs @@ -4,11 +4,10 @@ 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.ProfileEditor.Properties.Tree; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; public partial class TreePropertyView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs index 8c7e214a5..27f54a399 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Tree; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; internal class TreePropertyViewModel : ActivatableViewModelBase, ITreePropertyViewModel { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml similarity index 76% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml index cf0b73621..45db57691 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Windows" - x:DataType="local:BrushConfigurationWindowViewModel" + xmlns:local="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows" + x:DataType="local:BrushConfigurationWindowViewModel" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Windows.BrushConfigurationWindowView" + x:Class="Artemis.UI.Screens.Profile.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/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs similarity index 90% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs index d01dc274c..85fb0e956 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs @@ -1,9 +1,8 @@ using System.ComponentModel; using Artemis.UI.Shared; -using Avalonia; using Avalonia.Markup.Xaml; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Windows; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows; public partial class BrushConfigurationWindowView : ReactiveAppWindow { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs similarity index 93% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs index 4a51d9f74..633a92a28 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Windows; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows; public class BrushConfigurationWindowViewModel : DialogViewModelBase { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml similarity index 87% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml index 134bb9147..886fd487c 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Windows" + xmlns:local="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows" x:DataType="local:EffectConfigurationWindowViewModel" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Windows.EffectConfigurationWindowView" + x:Class="Artemis.UI.Screens.Profile.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/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs similarity index 90% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs index ddee1ec69..5a87687e9 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs @@ -1,9 +1,8 @@ using System.ComponentModel; using Artemis.UI.Shared; -using Avalonia; using Avalonia.Markup.Xaml; -namespace Artemis.UI.Screens.ProfileEditor.Properties.Windows; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows; public partial class EffectConfigurationWindowView : ReactiveAppWindow { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs similarity index 93% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs index dd3778036..4f9922894 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.Properties.Windows; +namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows; public class EffectConfigurationWindowViewModel : DialogViewModelBase { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/StatusBar/StatusBarView.axaml similarity index 91% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/StatusBar/StatusBarView.axaml index 25c79efee..30c64a103 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarView.axaml +++ b/src/Artemis.UI/Screens/Profile/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:vm="clr-namespace:Artemis.UI.Screens.ProfileEditor.StatusBar;assembly=Artemis.UI" - x:DataType="vm:StatusBarViewModel" - x:Class="Artemis.UI.Screens.ProfileEditor.StatusBar.StatusBarView"> + xmlns:statusBar="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.StatusBar" + x:DataType="statusBar:StatusBarViewModel" + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.StatusBar.StatusBarView"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs similarity index 97% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs index f7e4491a5..0d5ee2008 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs @@ -10,7 +10,7 @@ using Avalonia.ReactiveUI; using Avalonia.Threading; using ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.VisualEditor; +namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor; public partial class VisualEditorView : ReactiveUserControl { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs similarity index 97% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs index a5246024b..5db1a5c35 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/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.ProfileEditor.VisualEditor.Visualizers; +using Artemis.UI.Screens.Profile.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.ProfileEditor.VisualEditor; +namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor; public partial class VisualEditorViewModel : ActivatableViewModelBase { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs similarity index 69% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs index 357f99e7e..0fee58c46 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs +++ b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs @@ -1,6 +1,6 @@ using Artemis.Core; -namespace Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers; +namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers; public interface IVisualizerViewModel { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml b/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml similarity index 90% rename from src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml rename to src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml index 78a2f969a..dc1aee5e8 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml +++ b/src/Artemis.UI/Screens/Profile/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:visualizers="clr-namespace:Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers" + xmlns:visualizers1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerView" - x:DataType="visualizers:LayerShapeVisualizerViewModel" + x:Class="Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerView" + x:DataType="visualizers1:LayerShapeVisualizerViewModel" ClipToBounds="False">