DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Robert 2025-12-09 20:48:52 +01:00
parent 3c8d8b2387
commit bfffa99737
150 changed files with 300 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/Artemis.UI/Artemis.UI.csproj
View File

@ -44,53 +44,53 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Screens\Profile\" /> <Folder Include="Screens\Profiles\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\DisplayCondition\ConditionTypes\AlwaysOnConditionView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\DisplayCondition\ConditionTypes\AlwaysOnConditionView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\DisplayCondition\ConditionTypes\EventConditionView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\DisplayCondition\ConditionTypes\EventConditionView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\DisplayCondition\ConditionTypes\PlayOnceConditionView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\DisplayCondition\ConditionTypes\PlayOnceConditionView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\DisplayCondition\ConditionTypes\StaticConditionView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\DisplayCondition\ConditionTypes\StaticConditionView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\DisplayCondition\DisplayConditionScriptView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\DisplayCondition\DisplayConditionScriptView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\MenuBar\MenuBarView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\MenuBar\MenuBarView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Playback\PlaybackView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Playback\PlaybackView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\ContentDialogs\ProfileElementRenameView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\ContentDialogs\ProfileElementRenameView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\CategoryAdaptionHintView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\CategoryAdaptionHintView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\DeviceAdaptionHintView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\DeviceAdaptionHintView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\KeyboardSectionAdaptionHintView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\KeyboardSectionAdaptionHintView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\SingleLedAdaptionHintView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\SingleLedAdaptionHintView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\Dialogs\LayerHintsDialogView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\Dialogs\LayerHintsDialogView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\FolderTreeItemView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\FolderTreeItemView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\LayerTreeItemView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\LayerTreeItemView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\ProfileTreeView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\ProfileTreeView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\DataBinding\DataBindingView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\DataBinding\DataBindingView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Dialogs\AddEffectView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Dialogs\AddEffectView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Dialogs\TimelineSegmentEditView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Dialogs\TimelineSegmentEditView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\PropertiesView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\PropertiesView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Keyframes\TimelineEasingView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Keyframes\TimelineEasingView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Keyframes\TimelineKeyframeView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Keyframes\TimelineKeyframeView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Segments\EndSegmentView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Segments\EndSegmentView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Segments\MainSegmentView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Segments\MainSegmentView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Segments\Segment.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Segments\Segment.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Segments\StartSegmentView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Segments\StartSegmentView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\TimelineGroupView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\TimelineGroupView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\TimelinePropertyView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\TimelinePropertyView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\TimelineView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\TimelineView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Tree\ContentDialogs\LayerEffectRenameView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Tree\ContentDialogs\LayerEffectRenameView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Tree\Dialogs\LayerBrushPresetView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Tree\Dialogs\LayerBrushPresetView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Tree\TreeGroupView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Tree\TreeGroupView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Tree\TreePropertyView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Tree\TreePropertyView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Windows\BrushConfigurationWindowView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Windows\BrushConfigurationWindowView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Windows\EffectConfigurationWindowView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Windows\EffectConfigurationWindowView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\StatusBar\StatusBarView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\StatusBar\StatusBarView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\Tools\SelectionAddToolView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\Tools\SelectionAddToolView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\Tools\SelectionRemoveToolView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\Tools\SelectionRemoveToolView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\Tools\TransformToolView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\Tools\TransformToolView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\VisualEditorView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\VisualEditorView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\Visualizers\LayerShapeVisualizerView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\Visualizers\LayerShapeVisualizerView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\Visualizers\LayerVisualizerView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\Visualizers\LayerVisualizerView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\ProfileEditorTitleBarView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\ProfileEditorTitleBarView.axaml" />
<AdditionalFiles Include="Screens\Profile\ProfileEditor\ProfileEditorView.axaml" /> <AdditionalFiles Include="Screens\Profiles\ProfileEditor\ProfileEditorView.axaml" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using System.Globalization; using System.Globalization;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
using Artemis.UI.Screens.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
using Avalonia; using Avalonia;
using Avalonia.Data.Converters; using Avalonia.Data.Converters;

4
src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs
View File

@ -6,7 +6,7 @@ using System.Reactive.Linq;
using Artemis.Core; using Artemis.Core;
using Artemis.Core.LayerBrushes; using Artemis.Core.LayerBrushes;
using Artemis.Core.Services; using Artemis.Core.Services;
using Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs;
using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services;
using Artemis.UI.Shared.Services.Builders; using Artemis.UI.Shared.Services.Builders;
using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor;
@ -14,7 +14,7 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands;
using Artemis.UI.Shared.Services.PropertyInput; using Artemis.UI.Shared.Services.PropertyInput;
using Avalonia.Threading; using Avalonia.Threading;
using ReactiveUI; using ReactiveUI;
using LayerBrushPresetViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetViewModel; using LayerBrushPresetViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetViewModel;
namespace Artemis.UI.DefaultTypes.PropertyInput; namespace Artemis.UI.DefaultTypes.PropertyInput;

35
src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
View File

@ -11,19 +11,12 @@ using Artemis.UI.Screens.Device.Leds;
using Artemis.UI.Screens.Plugins; using Artemis.UI.Screens.Plugins;
using Artemis.UI.Screens.Plugins.Features; using Artemis.UI.Screens.Plugins.Features;
using Artemis.UI.Screens.Plugins.Prerequisites; using Artemis.UI.Screens.Plugins.Prerequisites;
using Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; using Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree; using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
using Artemis.UI.Screens.ProfileEditor;
using Artemis.UI.Screens.ProfileEditor.ProfileTree;
using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
using Artemis.UI.Screens.ProfileEditor.Properties;
using Artemis.UI.Screens.ProfileEditor.Properties.Timeline;
using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
using Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers;
using Artemis.UI.Screens.Settings; using Artemis.UI.Screens.Settings;
using Artemis.UI.Screens.Settings.Updating; using Artemis.UI.Screens.Settings.Updating;
using Artemis.UI.Screens.Sidebar; using Artemis.UI.Screens.Sidebar;
@ -33,14 +26,14 @@ using Artemis.UI.Screens.VisualScripting.Pins;
using Artemis.WebClient.Updating; using Artemis.WebClient.Updating;
using DryIoc; using DryIoc;
using ReactiveUI; using ReactiveUI;
using LayerShapeVisualizerViewModel = Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerViewModel; using LayerShapeVisualizerViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerViewModel;
using LayerVisualizerViewModel = Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers.LayerVisualizerViewModel; using LayerVisualizerViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers.LayerVisualizerViewModel;
using ProfileEditorViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileEditorViewModel; using ProfileEditorViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileEditorViewModel;
using PropertyGroupViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertyGroupViewModel; using PropertyGroupViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertyGroupViewModel;
using PropertyViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertyViewModel; using PropertyViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertyViewModel;
using SingleLedAdaptionHintViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintViewModel; using SingleLedAdaptionHintViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintViewModel;
using TimelineGroupViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelineGroupViewModel; using TimelineGroupViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelineGroupViewModel;
using TreeItemViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.TreeItemViewModel; using TreeItemViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.TreeItemViewModel;
namespace Artemis.UI.DryIoc.Factories; namespace Artemis.UI.DryIoc.Factories;

12
src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs
View File

@ -2,13 +2,13 @@
using Artemis.Core; using Artemis.Core;
using Artemis.UI.DryIoc.Factories; using Artemis.UI.DryIoc.Factories;
using Artemis.UI.Exceptions; using Artemis.UI.Exceptions;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
using Artemis.UI.Screens.ProfileEditor.Properties; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
using Artemis.UI.Screens.ProfileEditor.Properties.Timeline; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
using Artemis.UI.Screens.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
using DryIoc; using DryIoc;
using PropertyViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertyViewModel; using PropertyViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertyViewModel;
namespace Artemis.UI.DryIoc.InstanceProviders; namespace Artemis.UI.DryIoc.InstanceProviders;

4
src/Artemis.UI/Routing/Routes.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using Artemis.UI.Screens.Home; using Artemis.UI.Screens.Home;
using Artemis.UI.Screens.ProfileEditor; using Artemis.UI.Screens.Profiles.ProfileEditor;
using Artemis.UI.Screens.Root; using Artemis.UI.Screens.Root;
using Artemis.UI.Screens.Settings; using Artemis.UI.Screens.Settings;
using Artemis.UI.Screens.Settings.Updating; 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.Screens.Workshop.Profile;
using Artemis.UI.Shared.Routing; using Artemis.UI.Shared.Routing;
using PluginDetailsViewModel = Artemis.UI.Screens.Workshop.Plugins.PluginDetailsViewModel; using PluginDetailsViewModel = Artemis.UI.Screens.Workshop.Plugins.PluginDetailsViewModel;
using ProfileEditorViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileEditorViewModel; using ProfileEditorViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileEditorViewModel;
namespace Artemis.UI.Routing namespace Artemis.UI.Routing
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using Artemis.UI.Shared; using Artemis.UI.Shared;
namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition; namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition;
public class ConditionTypeViewModel : ViewModelBase public class ConditionTypeViewModel : ViewModelBase
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml
View File

@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.AlwaysOnConditionView"> x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.AlwaysOnConditionView">
<DockPanel VerticalAlignment="Top" Margin="0 5"> <DockPanel VerticalAlignment="Top" Margin="0 5">
<avalonia:MaterialIcon Kind="InfoCircle" Margin="5 0" /> <avalonia:MaterialIcon Kind="InfoCircle" Margin="5 0" />

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.Controls; using Avalonia.Controls;
namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
public partial class AlwaysOnConditionView : UserControl public partial class AlwaysOnConditionView : UserControl
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs
View File

@ -1,7 +1,7 @@
using Artemis.Core; using Artemis.Core;
using Artemis.UI.Shared; using Artemis.UI.Shared;
namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
public class AlwaysOnConditionViewModel : ViewModelBase public class AlwaysOnConditionViewModel : ViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml
View File

@ -3,9 +3,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:dataModelPicker="clr-namespace:Artemis.UI.Shared.DataModelPicker;assembly=Artemis.UI.Shared" xmlns:dataModelPicker="clr-namespace:Artemis.UI.Shared.DataModelPicker;assembly=Artemis.UI.Shared"
xmlns:conditionTypes="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes" xmlns:conditionTypes="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.EventConditionView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.EventConditionView"
x:DataType="conditionTypes:EventConditionViewModel"> x:DataType="conditionTypes:EventConditionViewModel">
<DockPanel HorizontalAlignment="Stretch"> <DockPanel HorizontalAlignment="Stretch">
<DockPanel.Styles> <DockPanel.Styles>

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
public partial class EventConditionView : ReactiveUserControl<EventConditionViewModel> public partial class EventConditionView : ReactiveUserControl<EventConditionViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs
View File

@ -11,7 +11,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.ProfileEditor.Commands;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
public class EventConditionViewModel : ActivatableViewModelBase public class EventConditionViewModel : ActivatableViewModelBase
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml
View File

@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.PlayOnceConditionView"> x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.PlayOnceConditionView">
<DockPanel VerticalAlignment="Top" Margin="0 5"> <DockPanel VerticalAlignment="Top" Margin="0 5">
<avalonia:MaterialIcon Kind="InfoCircle" Margin="5 0" /> <avalonia:MaterialIcon Kind="InfoCircle" Margin="5 0" />
<TextBlock Foreground="{DynamicResource TextFillColorSecondaryBrush}" <TextBlock Foreground="{DynamicResource TextFillColorSecondaryBrush}"

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.Controls; using Avalonia.Controls;
namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
public partial class PlayOnceConditionView : UserControl public partial class PlayOnceConditionView : UserControl
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionViewModel.cs
View File

@ -1,7 +1,7 @@
using Artemis.Core; using Artemis.Core;
using Artemis.UI.Shared; using Artemis.UI.Shared;
namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
public class PlayOnceConditionViewModel : ViewModelBase public class PlayOnceConditionViewModel : ViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml
View File

@ -3,9 +3,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:conditionTypes="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes" xmlns:conditionTypes="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.StaticConditionView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.StaticConditionView"
x:DataType="conditionTypes:StaticConditionViewModel"> x:DataType="conditionTypes:StaticConditionViewModel">
<DockPanel HorizontalAlignment="Stretch"> <DockPanel HorizontalAlignment="Stretch">
<DockPanel.Styles> <DockPanel.Styles>

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
public partial class StaticConditionView : ReactiveUserControl<StaticConditionViewModel> public partial class StaticConditionView : ReactiveUserControl<StaticConditionViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs
View File

@ -10,7 +10,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.ProfileEditor.Commands;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
public class StaticConditionViewModel : ActivatableViewModelBase public class StaticConditionViewModel : ActivatableViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml
View File

@ -2,9 +2,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:displayCondition="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition" xmlns:displayCondition="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition"
mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="650" mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="650"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.DisplayConditionScriptView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.DisplayConditionScriptView"
x:DataType="displayCondition:DisplayConditionScriptViewModel"> x:DataType="displayCondition:DisplayConditionScriptViewModel">
<UserControl.Styles> <UserControl.Styles>
<Style Selector="ComboBox.condition-type /template/ ContentPresenter#ContentPresenter"> <Style Selector="ComboBox.condition-type /template/ ContentPresenter#ContentPresenter">

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition; namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition;
public partial class DisplayConditionScriptView : ReactiveUserControl<DisplayConditionScriptViewModel> public partial class DisplayConditionScriptView : ReactiveUserControl<DisplayConditionScriptViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs
View File

@ -9,7 +9,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.ProfileEditor.Commands;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition; namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition;
public class DisplayConditionScriptViewModel : ActivatableViewModelBase public class DisplayConditionScriptViewModel : ActivatableViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarView.axaml
View File

@ -4,9 +4,9 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:profileEditor="clr-namespace:Artemis.UI.Shared.Services.ProfileEditor;assembly=Artemis.UI.Shared" xmlns:profileEditor="clr-namespace:Artemis.UI.Shared.Services.ProfileEditor;assembly=Artemis.UI.Shared"
xmlns:menuBar1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.MenuBar" xmlns:menuBar1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.MenuBar"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.MenuBar.MenuBarView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.MenuBar.MenuBarView"
x:DataType="menuBar1:MenuBarViewModel"> x:DataType="menuBar1:MenuBarViewModel">
<Menu VerticalAlignment="Top" Closed="MenuBase_OnMenuClosed"> <Menu VerticalAlignment="Top" Closed="MenuBase_OnMenuClosed">
<MenuItem Header="_File"> <MenuItem Header="_File">

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs
View File

@ -3,7 +3,7 @@ using Avalonia.Interactivity;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
using Avalonia.VisualTree; using Avalonia.VisualTree;
namespace Artemis.UI.Screens.Profile.ProfileEditor.MenuBar; namespace Artemis.UI.Screens.Profiles.ProfileEditor.MenuBar;
public partial class MenuBarView : ReactiveUserControl<MenuBarViewModel> public partial class MenuBarView : ReactiveUserControl<MenuBarViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs
View File

@ -16,7 +16,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
using PropertyChanged.SourceGenerator; using PropertyChanged.SourceGenerator;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.MenuBar; namespace Artemis.UI.Screens.Profiles.ProfileEditor.MenuBar;
public partial class MenuBarViewModel : ActivatableViewModelBase public partial class MenuBarViewModel : ActivatableViewModelBase
{ {

6
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackView.axaml
View File

@ -3,10 +3,10 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:playback1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Playback" xmlns:playback="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Playback"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="48" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="48"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Playback.PlaybackView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Playback.PlaybackView"
x:DataType="playback1:PlaybackViewModel"> x:DataType="playback:PlaybackViewModel">
<Grid Margin="8 0"> <Grid Margin="8 0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>

3
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs
View File

@ -1,6 +1,7 @@
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Playback; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Playback;
public partial class PlaybackView : ReactiveUserControl<PlaybackViewModel> public partial class PlaybackView : ReactiveUserControl<PlaybackViewModel>
{ {

6
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackViewModel.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Reactive; using System.Reactive;
using System.Reactive.Disposables; using System.Reactive.Disposables;
using System.Reactive.Linq; using System.Reactive.Linq;
@ -11,7 +11,7 @@ using Avalonia.Threading;
using PropertyChanged.SourceGenerator; using PropertyChanged.SourceGenerator;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Playback; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Playback;
public partial class PlaybackViewModel : ActivatableViewModelBase public partial class PlaybackViewModel : ActivatableViewModelBase
{ {
@ -154,7 +154,7 @@ public partial class PlaybackViewModel : ActivatableViewModelBase
{ {
RepeatTimeline = false; RepeatTimeline = false;
RepeatSegment = true; RepeatSegment = true;
this.RaisePropertyChanged(nameof(Screens.ProfileEditor.Playback.PlaybackViewModel.Repeating)); this.RaisePropertyChanged(nameof(Repeating));
} }
else if (RepeatSegment) else if (RepeatSegment)
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs
View File

@ -8,7 +8,7 @@ using Avalonia.Interactivity;
using Avalonia.VisualTree; using Avalonia.VisualTree;
using Avalonia.Xaml.Interactions.DragAndDrop; using Avalonia.Xaml.Interactions.DragAndDrop;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Behaviors; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Behaviors;
public class ProfileTreeViewDropHandler : DropHandlerBase public class ProfileTreeViewDropHandler : DropHandlerBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml
View File

@ -2,9 +2,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:contentDialogs1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ContentDialogs" xmlns:contentDialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ContentDialogs"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ContentDialogs.ProfileElementRenameView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ContentDialogs.ProfileElementRenameView"
x:DataType="contentDialogs1:ProfileElementRenameViewModel"> x:DataType="contentDialogs1:ProfileElementRenameViewModel">
<StackPanel> <StackPanel>
<TextBox Name="NameTextBox" Text="{CompiledBinding ProfileElementName}" Watermark="Profile element name" /> <TextBox Name="NameTextBox" Text="{CompiledBinding ProfileElementName}" Watermark="Profile element name" />

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs
View File

@ -4,7 +4,7 @@ using Avalonia.ReactiveUI;
using Avalonia.Threading; using Avalonia.Threading;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ContentDialogs; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ContentDialogs;
public partial class ProfileElementRenameView : ReactiveUserControl<ProfileElementRenameViewModel> public partial class ProfileElementRenameView : ReactiveUserControl<ProfileElementRenameViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs
View File

@ -8,7 +8,7 @@ using PropertyChanged.SourceGenerator;
using ReactiveUI; using ReactiveUI;
using ReactiveUI.Validation.Extensions; using ReactiveUI.Validation.Extensions;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ContentDialogs; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ContentDialogs;
public partial class ProfileElementRenameViewModel : ContentDialogViewModelBase public partial class ProfileElementRenameViewModel : ContentDialogViewModelBase
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/AdaptionHintViewModelBase.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/AdaptionHintViewModelBase.cs
View File

@ -3,7 +3,7 @@ using Artemis.Core;
using Artemis.UI.Shared; using Artemis.UI.Shared;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
public abstract class AdaptionHintViewModelBase : ViewModelBase public abstract class AdaptionHintViewModelBase : ViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml
View File

@ -5,9 +5,9 @@
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints" xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.CategoryAdaptionHintView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.CategoryAdaptionHintView"
x:DataType="adaptionHints1:CategoryAdaptionHintViewModel"> x:DataType="adaptionHints1:CategoryAdaptionHintViewModel">
<Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto"> <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto">
<StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5"> <StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5">

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.Controls; using Avalonia.Controls;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
public partial class CategoryAdaptionHintView : UserControl public partial class CategoryAdaptionHintView : UserControl
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintViewModel.cs
View File

@ -1,6 +1,6 @@
using Artemis.Core; using Artemis.Core;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
public class CategoryAdaptionHintViewModel : AdaptionHintViewModelBase public class CategoryAdaptionHintViewModel : AdaptionHintViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml
View File

@ -5,9 +5,9 @@
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints" xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.DeviceAdaptionHintView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.DeviceAdaptionHintView"
x:DataType="adaptionHints1:DeviceAdaptionHintViewModel"> x:DataType="adaptionHints1:DeviceAdaptionHintViewModel">
<Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto"> <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto">
<StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5"> <StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5">

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.Controls; using Avalonia.Controls;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
public partial class DeviceAdaptionHintView : UserControl public partial class DeviceAdaptionHintView : UserControl
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintViewModel.cs
View File

@ -1,6 +1,6 @@
using Artemis.Core; using Artemis.Core;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
public class DeviceAdaptionHintViewModel : AdaptionHintViewModelBase public class DeviceAdaptionHintViewModel : AdaptionHintViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml
View File

@ -4,9 +4,9 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints" xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.KeyboardSectionAdaptionHintView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.KeyboardSectionAdaptionHintView"
x:DataType="adaptionHints1:KeyboardSectionAdaptionHintViewModel"> x:DataType="adaptionHints1:KeyboardSectionAdaptionHintViewModel">
<Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto"> <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto">
<StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5"> <StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5">

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.Controls; using Avalonia.Controls;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
public partial class KeyboardSectionAdaptionHintView : UserControl public partial class KeyboardSectionAdaptionHintView : UserControl
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintViewModel.cs
View File

@ -1,6 +1,6 @@
using Artemis.Core; using Artemis.Core;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
public class KeyboardSectionAdaptionHintViewModel : AdaptionHintViewModelBase public class KeyboardSectionAdaptionHintViewModel : AdaptionHintViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml
View File

@ -4,9 +4,9 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints" xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintView"
x:DataType="adaptionHints1:SingleLedAdaptionHintViewModel"> x:DataType="adaptionHints1:SingleLedAdaptionHintViewModel">
<Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto"> <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto">
<StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5"> <StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5">

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.Controls; using Avalonia.Controls;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
public partial class SingleLedAdaptionHintView : UserControl public partial class SingleLedAdaptionHintView : UserControl
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintViewModel.cs
View File

@ -7,7 +7,7 @@ using PropertyChanged.SourceGenerator;
using ReactiveUI; using ReactiveUI;
using RGB.NET.Core; using RGB.NET.Core;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
public partial class SingleLedAdaptionHintViewModel : AdaptionHintViewModelBase public partial class SingleLedAdaptionHintViewModel : AdaptionHintViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml
View File

@ -4,9 +4,9 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia" xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs" xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs"
mc:Ignorable="d" mc:Ignorable="d"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.LayerHintsDialogView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.LayerHintsDialogView"
x:DataType="dialogs1:LayerHintsDialogViewModel" x:DataType="dialogs1:LayerHintsDialogViewModel"
WindowStartupLocation="CenterOwner" WindowStartupLocation="CenterOwner"
Icon="/Assets/Images/Logo/application.ico" Icon="/Assets/Images/Logo/application.ico"

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs
View File

@ -1,6 +1,6 @@
using Artemis.UI.Shared; using Artemis.UI.Shared;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs;
public partial class LayerHintsDialogView : ReactiveAppWindow<LayerHintsDialogViewModel> public partial class LayerHintsDialogView : ReactiveAppWindow<LayerHintsDialogViewModel>
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs
View File

@ -6,12 +6,12 @@ using System.Reactive.Linq;
using Artemis.Core; using Artemis.Core;
using Artemis.Core.Services; using Artemis.Core.Services;
using Artemis.UI.DryIoc.Factories; using Artemis.UI.DryIoc.Factories;
using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
using Artemis.UI.Shared; using Artemis.UI.Shared;
using DynamicData; using DynamicData;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs;
public class LayerHintsDialogViewModel : DialogViewModelBase<bool> public class LayerHintsDialogViewModel : DialogViewModelBase<bool>
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml
View File

@ -3,9 +3,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree" xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.FolderTreeItemView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.FolderTreeItemView"
x:DataType="profileTree1:FolderTreeItemViewModel"> x:DataType="profileTree1:FolderTreeItemViewModel">
<Grid ColumnDefinitions="Auto,Auto,*,Auto,Auto"> <Grid ColumnDefinitions="Auto,Auto,*,Auto,Auto">
<HyperlinkButton Grid.Column="0" <HyperlinkButton Grid.Column="0"

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
public partial class FolderTreeItemView : ReactiveUserControl<FolderTreeItemViewModel> public partial class FolderTreeItemView : ReactiveUserControl<FolderTreeItemViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs
View File

@ -9,7 +9,7 @@ using Artemis.UI.Shared.Services;
using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor;
using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.ProfileEditor.Commands;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
public class FolderTreeItemViewModel : TreeItemViewModel public class FolderTreeItemViewModel : TreeItemViewModel
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml
View File

@ -3,9 +3,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree" xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.LayerTreeItemView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.LayerTreeItemView"
x:DataType="profileTree1:LayerTreeItemViewModel"> x:DataType="profileTree1:LayerTreeItemViewModel">
<Grid ColumnDefinitions="Auto,Auto,*,Auto,Auto"> <Grid ColumnDefinitions="Auto,Auto,*,Auto,Auto">
<HyperlinkButton Grid.Column="0" <HyperlinkButton Grid.Column="0"

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
public partial class LayerTreeItemView : ReactiveUserControl<LayerTreeItemViewModel> public partial class LayerTreeItemView : ReactiveUserControl<LayerTreeItemViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs
View File

@ -10,7 +10,7 @@ using Artemis.UI.Shared.Services;
using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor;
using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.ProfileEditor.Commands;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
public class LayerTreeItemViewModel : TreeItemViewModel public class LayerTreeItemViewModel : TreeItemViewModel
{ {

6
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml
View File

@ -5,10 +5,10 @@
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:behaviors="clr-namespace:Artemis.UI.Behaviors" xmlns:behaviors="clr-namespace:Artemis.UI.Behaviors"
xmlns:converters="clr-namespace:Artemis.UI.Converters" xmlns:converters="clr-namespace:Artemis.UI.Converters"
xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree" xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree"
xmlns:behaviors1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Behaviors" xmlns:behaviors1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Behaviors"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ProfileTreeView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ProfileTreeView"
x:DataType="profileTree1:ProfileTreeViewModel"> x:DataType="profileTree1:ProfileTreeViewModel">
<!-- These cause binding errors, not my fault - https://github.com/AvaloniaUI/Avalonia/issues/5762 --> <!-- These cause binding errors, not my fault - https://github.com/AvaloniaUI/Avalonia/issues/5762 -->
<UserControl.KeyBindings> <UserControl.KeyBindings>

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs
View File

@ -10,7 +10,7 @@ using Avalonia.Media.Imaging;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
using Avalonia.VisualTree; using Avalonia.VisualTree;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
public partial class ProfileTreeView : ReactiveUserControl<ProfileTreeViewModel> public partial class ProfileTreeView : ReactiveUserControl<ProfileTreeViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs
View File

@ -14,7 +14,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
using PropertyChanged.SourceGenerator; using PropertyChanged.SourceGenerator;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
public partial class ProfileTreeViewModel : TreeItemViewModel public partial class ProfileTreeViewModel : TreeItemViewModel
{ {

6
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs
View File

@ -10,8 +10,8 @@ using Artemis.Core;
using Artemis.Core.Services; using Artemis.Core.Services;
using Artemis.UI.DryIoc.Factories; using Artemis.UI.DryIoc.Factories;
using Artemis.UI.Extensions; using Artemis.UI.Extensions;
using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ContentDialogs; using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ContentDialogs;
using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs; using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs;
using Artemis.UI.Shared; using Artemis.UI.Shared;
using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services;
using Artemis.UI.Shared.Services.Builders; using Artemis.UI.Shared.Services.Builders;
@ -21,7 +21,7 @@ using Avalonia.ReactiveUI;
using PropertyChanged.SourceGenerator; using PropertyChanged.SourceGenerator;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree; namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
public abstract partial class TreeItemViewModel : ActivatableViewModelBase public abstract partial class TreeItemViewModel : ActivatableViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml
View File

@ -3,9 +3,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:dataBinding="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding" xmlns:dataBinding="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding.DataBindingView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding.DataBindingView"
x:DataType="dataBinding:DataBindingViewModel"> x:DataType="dataBinding:DataBindingViewModel">
<Grid RowDefinitions="48,*"> <Grid RowDefinitions="48,*">
<Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*" Background="{DynamicResource ControlFillColorDefaultBrush}"> <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*" Background="{DynamicResource ControlFillColorDefaultBrush}">

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding;
public partial class DataBindingView : ReactiveUserControl<DataBindingViewModel> public partial class DataBindingView : ReactiveUserControl<DataBindingViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs
View File

@ -14,7 +14,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.ProfileEditor.Commands;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding;
public class DataBindingViewModel : ActivatableViewModelBase public class DataBindingViewModel : ActivatableViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml
View File

@ -5,9 +5,9 @@
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:layerEffects="clr-namespace:Artemis.Core.LayerEffects;assembly=Artemis.Core" xmlns:layerEffects="clr-namespace:Artemis.Core.LayerEffects;assembly=Artemis.Core"
xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs" xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs.AddEffectView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs.AddEffectView"
x:DataType="dialogs1:AddEffectViewModel" x:DataType="dialogs1:AddEffectViewModel"
Width="500"> Width="500">
<Grid RowDefinitions="Auto,*"> <Grid RowDefinitions="Auto,*">

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs
View File

@ -3,7 +3,7 @@ using Avalonia;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
public partial class AddEffectView : ReactiveUserControl<AddEffectViewModel> public partial class AddEffectView : ReactiveUserControl<AddEffectViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectViewModel.cs
View File

@ -11,7 +11,7 @@ using DynamicData;
using PropertyChanged.SourceGenerator; using PropertyChanged.SourceGenerator;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
public partial class AddEffectViewModel : ContentDialogViewModelBase public partial class AddEffectViewModel : ContentDialogViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml
View File

@ -4,9 +4,9 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:attachedProperties="clr-namespace:Artemis.UI.Shared.AttachedProperties;assembly=Artemis.UI.Shared" xmlns:attachedProperties="clr-namespace:Artemis.UI.Shared.AttachedProperties;assembly=Artemis.UI.Shared"
xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs" xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs.TimelineSegmentEditView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs.TimelineSegmentEditView"
x:DataType="dialogs1:TimelineSegmentEditViewModel"> x:DataType="dialogs1:TimelineSegmentEditViewModel">
<StackPanel> <StackPanel>
<controls:NumberBox Name="LengthNumberBox" <controls:NumberBox Name="LengthNumberBox"

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
public partial class TimelineSegmentEditView : ReactiveUserControl<TimelineSegmentEditViewModel> public partial class TimelineSegmentEditView : ReactiveUserControl<TimelineSegmentEditViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditViewModel.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using Artemis.UI.Shared; using Artemis.UI.Shared;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
public class TimelineSegmentEditViewModel : ContentDialogViewModelBase public class TimelineSegmentEditViewModel : ContentDialogViewModelBase
{ {

6
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesView.axaml
View File

@ -4,12 +4,12 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="clr-namespace:Artemis.UI.Controls" xmlns:controls="clr-namespace:Artemis.UI.Controls"
xmlns:converters="clr-namespace:Artemis.UI.Converters" xmlns:converters="clr-namespace:Artemis.UI.Converters"
xmlns:properties="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties" xmlns:properties="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties"
mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="350" mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="350"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertiesView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertiesView"
x:DataType="properties:PropertiesViewModel"> x:DataType="properties:PropertiesViewModel">
<UserControl.Styles> <UserControl.Styles>
<StyleInclude Source="/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" /> <StyleInclude Source="/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
</UserControl.Styles> </UserControl.Styles>
<UserControl.Resources> <UserControl.Resources>
<converters:DoubleToGridLengthConverter x:Key="DoubleToGridLengthConverter" /> <converters:DoubleToGridLengthConverter x:Key="DoubleToGridLengthConverter" />

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs
View File

@ -6,7 +6,7 @@ using Avalonia.Input;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
using Avalonia.VisualTree; using Avalonia.VisualTree;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
public partial class PropertiesView : ReactiveUserControl<PropertiesViewModel> public partial class PropertiesView : ReactiveUserControl<PropertiesViewModel>
{ {

10
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesViewModel.cs
View File

@ -11,17 +11,17 @@ using Artemis.Core.LayerBrushes;
using Artemis.Core.LayerEffects; using Artemis.Core.LayerEffects;
using Artemis.Core.Services; using Artemis.Core.Services;
using Artemis.UI.DryIoc.Factories; using Artemis.UI.DryIoc.Factories;
using Artemis.UI.Screens.Profile.ProfileEditor.Playback; using Artemis.UI.Screens.Profiles.ProfileEditor.Playback;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
using Artemis.UI.Shared; using Artemis.UI.Shared;
using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services;
using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor;
using PropertyChanged.SourceGenerator; using PropertyChanged.SourceGenerator;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
public partial class PropertiesViewModel : ActivatableViewModelBase public partial class PropertiesViewModel : ActivatableViewModelBase
{ {

8
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs
View File

@ -7,15 +7,15 @@ using Artemis.Core;
using Artemis.Core.LayerBrushes; using Artemis.Core.LayerBrushes;
using Artemis.Core.LayerEffects; using Artemis.Core.LayerEffects;
using Artemis.UI.DryIoc.Factories; using Artemis.UI.DryIoc.Factories;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
using Artemis.UI.Shared.Services.PropertyInput; using Artemis.UI.Shared.Services.PropertyInput;
using DynamicData; using DynamicData;
using DynamicData.Binding; using DynamicData.Binding;
using PropertyChanged.SourceGenerator; using PropertyChanged.SourceGenerator;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
public partial class PropertyGroupViewModel : PropertyViewModelBase, IDisposable public partial class PropertyGroupViewModel : PropertyViewModelBase, IDisposable
{ {

6
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyViewModel.cs
View File

@ -2,12 +2,12 @@
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using Artemis.Core; using Artemis.Core;
using Artemis.UI.DryIoc.Factories; using Artemis.UI.DryIoc.Factories;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
using DynamicData; using DynamicData;
using PropertyChanged.SourceGenerator; using PropertyChanged.SourceGenerator;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
public partial class PropertyViewModel : PropertyViewModelBase, IDisposable public partial class PropertyViewModel : PropertyViewModelBase, IDisposable
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyViewModelBase.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyViewModelBase.cs
View File

@ -2,7 +2,7 @@
using Artemis.Core; using Artemis.Core;
using Artemis.UI.Shared; using Artemis.UI.Shared;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
public abstract class PropertyViewModelBase : ViewModelBase public abstract class PropertyViewModelBase : ViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/ITimelinePropertyViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/ITimelinePropertyViewModel.cs
View File

@ -1,10 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Artemis.Core; using Artemis.Core;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
public interface ITimelinePropertyViewModel : IReactiveObject public interface ITimelinePropertyViewModel : IReactiveObject
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/ITimelineKeyframeViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/ITimelineKeyframeViewModel.cs
View File

@ -3,7 +3,7 @@ using System.Reactive;
using Artemis.Core; using Artemis.Core;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
public interface ITimelineKeyframeViewModel public interface ITimelineKeyframeViewModel
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml
View File

@ -3,9 +3,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:keyframes1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes" xmlns:keyframes1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes.TimelineEasingView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes.TimelineEasingView"
x:DataType="keyframes1:TimelineEasingViewModel"> x:DataType="keyframes1:TimelineEasingViewModel">
<Grid ColumnDefinitions="25,30,*"> <Grid ColumnDefinitions="25,30,*">
<avalonia:MaterialIcon Grid.Column="0" Kind="Check" IsVisible="{CompiledBinding IsEasingModeSelected}" HorizontalAlignment="Left"/> <avalonia:MaterialIcon Grid.Column="0" Kind="Check" IsVisible="{CompiledBinding IsEasingModeSelected}" HorizontalAlignment="Left"/>

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.Controls; using Avalonia.Controls;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
public partial class TimelineEasingView : UserControl public partial class TimelineEasingView : UserControl
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingViewModel.cs
View File

@ -6,7 +6,7 @@ using Avalonia;
using Humanizer; using Humanizer;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
public class TimelineEasingViewModel : ViewModelBase public class TimelineEasingViewModel : ViewModelBase
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml
View File

@ -3,9 +3,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:keyframes1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes" xmlns:keyframes1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes.TimelineKeyframeView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes.TimelineKeyframeView"
ClipToBounds="False"> ClipToBounds="False">
<Ellipse Fill="{DynamicResource SystemAccentColorLight2}" <Ellipse Fill="{DynamicResource SystemAccentColorLight2}"
Stroke="White" Stroke="White"

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs
View File

@ -3,7 +3,7 @@ using Avalonia.Input;
using Avalonia.LogicalTree; using Avalonia.LogicalTree;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
public partial class TimelineKeyframeView : ReactiveUserControl<ITimelineKeyframeViewModel> public partial class TimelineKeyframeView : ReactiveUserControl<ITimelineKeyframeViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs
View File

@ -19,7 +19,7 @@ using DynamicData.Binding;
using PropertyChanged.SourceGenerator; using PropertyChanged.SourceGenerator;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
public partial class TimelineKeyframeViewModel<T> : ActivatableViewModelBase, ITimelineKeyframeViewModel public partial class TimelineKeyframeViewModel<T> : ActivatableViewModelBase, ITimelineKeyframeViewModel
{ {

6
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml
View File

@ -3,12 +3,12 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments" xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments.EndSegmentView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments.EndSegmentView"
x:DataType="segments1:EndSegmentViewModel"> x:DataType="segments1:EndSegmentViewModel">
<UserControl.Styles> <UserControl.Styles>
<StyleInclude Source="/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" /> <StyleInclude Source="/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
</UserControl.Styles> </UserControl.Styles>
<Border Classes="segment-container"> <Border Classes="segment-container">
<Grid Name="SegmentGrid" <Grid Name="SegmentGrid"

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs
View File

@ -1,7 +1,7 @@
using Avalonia.Input; using Avalonia.Input;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
public partial class EndSegmentView : ReactiveUserControl<EndSegmentViewModel> public partial class EndSegmentView : ReactiveUserControl<EndSegmentViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs
View File

@ -7,7 +7,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.ProfileEditor.Commands;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
public class EndSegmentViewModel : TimelineSegmentViewModel public class EndSegmentViewModel : TimelineSegmentViewModel
{ {

6
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml
View File

@ -3,12 +3,12 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments" xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments.MainSegmentView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments.MainSegmentView"
x:DataType="segments1:MainSegmentViewModel"> x:DataType="segments1:MainSegmentViewModel">
<UserControl.Styles> <UserControl.Styles>
<StyleInclude Source="/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" /> <StyleInclude Source="/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
</UserControl.Styles> </UserControl.Styles>
<Border Classes="segment-container"> <Border Classes="segment-container">
<Grid Name="SegmentGrid" <Grid Name="SegmentGrid"

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs
View File

@ -1,7 +1,7 @@
using Avalonia.Input; using Avalonia.Input;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
public partial class MainSegmentView : ReactiveUserControl<MainSegmentViewModel> public partial class MainSegmentView : ReactiveUserControl<MainSegmentViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs
View File

@ -7,7 +7,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.ProfileEditor.Commands;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
public class MainSegmentViewModel : TimelineSegmentViewModel public class MainSegmentViewModel : TimelineSegmentViewModel
{ {

0
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml
View File

6
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml
View File

@ -3,12 +3,12 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments" xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments.StartSegmentView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments.StartSegmentView"
x:DataType="segments1:StartSegmentViewModel"> x:DataType="segments1:StartSegmentViewModel">
<UserControl.Styles> <UserControl.Styles>
<StyleInclude Source="/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" /> <StyleInclude Source="/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
</UserControl.Styles> </UserControl.Styles>
<Border Classes="segment-container"> <Border Classes="segment-container">
<Grid Name="SegmentGrid" <Grid Name="SegmentGrid"

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs
View File

@ -1,7 +1,7 @@
using Avalonia.Input; using Avalonia.Input;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
public partial class StartSegmentView : ReactiveUserControl<StartSegmentViewModel> public partial class StartSegmentView : ReactiveUserControl<StartSegmentViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs
View File

@ -7,7 +7,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.ProfileEditor.Commands;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
public class StartSegmentViewModel : TimelineSegmentViewModel public class StartSegmentViewModel : TimelineSegmentViewModel
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs
View File

@ -6,7 +6,7 @@ using System.Reactive.Disposables;
using System.Reactive.Linq; using System.Reactive.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Artemis.Core; using Artemis.Core;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
using Artemis.UI.Shared; using Artemis.UI.Shared;
using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services;
using Artemis.UI.Shared.Services.Builders; using Artemis.UI.Shared.Services.Builders;
@ -15,7 +15,7 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands;
using PropertyChanged.SourceGenerator; using PropertyChanged.SourceGenerator;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
public abstract partial class TimelineSegmentViewModel : ActivatableViewModelBase public abstract partial class TimelineSegmentViewModel : ActivatableViewModelBase
{ {

6
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml
View File

@ -3,10 +3,10 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:system="clr-namespace:System;assembly=netstandard" xmlns:system="clr-namespace:System;assembly=netstandard"
xmlns:timeline1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline" xmlns:timeline1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline"
xmlns:properties1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties" xmlns:properties1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelineGroupView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelineGroupView"
x:DataType="timeline1:TimelineGroupViewModel"> x:DataType="timeline1:TimelineGroupViewModel">
<Grid RowDefinitions="28,1,Auto"> <Grid RowDefinitions="28,1,Auto">
<ItemsControl Grid.Row="0" <ItemsControl Grid.Row="0"

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
public partial class TimelineGroupView : ReactiveUserControl<TimelineGroupViewModel> public partial class TimelineGroupView : ReactiveUserControl<TimelineGroupViewModel>
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs
View File

@ -8,7 +8,7 @@ using DynamicData.Binding;
using PropertyChanged.SourceGenerator; using PropertyChanged.SourceGenerator;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
public partial class TimelineGroupViewModel : ActivatableViewModelBase public partial class TimelineGroupViewModel : ActivatableViewModelBase
{ {

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml
View File

@ -3,7 +3,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelinePropertyView"> x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelinePropertyView">
<Border Height="29" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource ButtonBorderBrush}"> <Border Height="29" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource ButtonBorderBrush}">
<ItemsControl ItemsSource="{Binding KeyframeViewModels}"> <ItemsControl ItemsSource="{Binding KeyframeViewModels}">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>

2
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
public partial class TimelinePropertyView : ReactiveUserControl<ITimelinePropertyViewModel> public partial class TimelinePropertyView : ReactiveUserControl<ITimelinePropertyViewModel>
{ {

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs
View File

@ -5,13 +5,13 @@ using System.Linq;
using System.Reactive.Disposables; using System.Reactive.Disposables;
using System.Reactive.Linq; using System.Reactive.Linq;
using Artemis.Core; using Artemis.Core;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
using Artemis.UI.Shared; using Artemis.UI.Shared;
using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor;
using DynamicData; using DynamicData;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
public class TimelinePropertyViewModel<T> : ActivatableViewModelBase, ITimelinePropertyViewModel public class TimelinePropertyViewModel<T> : ActivatableViewModelBase, ITimelinePropertyViewModel
{ {

6
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml
View File

@ -3,10 +3,10 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
xmlns:timeline1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline" xmlns:timeline1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline"
xmlns:properties="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties" xmlns:properties="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelineView" x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelineView"
x:DataType="timeline1:TimelineViewModel"> x:DataType="timeline1:TimelineViewModel">
<UserControl.Resources> <UserControl.Resources>
</UserControl.Resources> </UserControl.Resources>

4
src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs → src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes; using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
using Artemis.UI.Shared.Events; using Artemis.UI.Shared.Events;
using Artemis.UI.Shared.Extensions; using Artemis.UI.Shared.Extensions;
using Avalonia; using Avalonia;
@ -8,7 +8,7 @@ using Avalonia.Input;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
using Avalonia.VisualTree; using Avalonia.VisualTree;
namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline; namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
public partial class TimelineView : ReactiveUserControl<TimelineViewModel> public partial class TimelineView : ReactiveUserControl<TimelineViewModel>
{ {

Some files were not shown because too many files have changed in this diff Show More