From e27f658cea749a1512456c0bfd01bb16081d8e64 Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Fri, 21 Aug 2020 22:32:46 +0200 Subject: [PATCH] Plugins - Adjusted namespaces --- src/Artemis.Core/Constants.cs | 2 +- .../Events/FrameRenderingEventArgs.cs | 2 +- src/Artemis.Core/Events/PluginEventArgs.cs | 2 +- .../Profile/Conditions/DisplayCondition.cs | 2 +- .../Conditions/DisplayConditionList.cs | 2 +- .../DisplayConditionListPredicate.cs | 2 +- .../Conditions/DisplayConditionOperator.cs | 2 +- .../Conditions/DisplayConditionPredicate.cs | 2 +- src/Artemis.Core/Models/Profile/Folder.cs | 2 +- src/Artemis.Core/Models/Profile/Layer.cs | 5 ++-- .../Models/Profile/LayerBrushReference.cs | 2 +- .../Models/Profile/LayerPropertyGroup.cs | 5 ++-- src/Artemis.Core/Models/Profile/Profile.cs | 3 +- .../Models/Profile/ProfileDescriptor.cs | 2 +- .../Models/Profile/RenderProfileElement.cs | 3 +- .../Models/Surface/ArtemisDevice.cs | 2 +- src/Artemis.Core/Ninject/CoreModule.cs | 2 +- .../Ninject/PluginSettingsProvider.cs | 4 +-- .../Ninject/SettingsServiceProvider.cs | 4 +-- .../Attributes/DataModelIgnoreAttribute.cs | 2 +- .../Attributes/DataModelProperty.cs | 2 +- .../BaseDataModelExpansion.cs | 5 ++-- .../DataModel.cs | 7 ++--- .../DeviceProvider.cs | 2 +- .../Exceptions/ArtemisPluginException.cs | 1 - .../BrushConfigurationViewModel.cs | 4 +-- .../Internal}/BaseLayerBrush.cs | 3 +- .../Internal}/PropertiesLayerBrush.cs | 2 +- .../Abstract => LayerBrushes}/LayerBrush.cs | 3 +- .../LayerBrushConfigurationDialog.cs | 5 ++-- .../LayerBrushDescriptor.cs | 3 +- .../LayerBrushProvider.cs | 5 ++-- .../PerLedLayerBrush.cs | 3 +- .../RgbNetLayerBrush.cs | 3 +- .../EffectConfigurationViewModel.cs | 5 ++-- .../Internal}/BaseLayerEffect.cs | 9 +++--- .../Abstract => LayerEffects}/LayerEffect.cs | 6 +--- .../LayerEffectConfigurationDialog.cs | 4 +-- .../LayerEffectDescriptor.cs | 3 +- .../LayerEffectProvider.cs | 4 +-- .../BooleanActivationRequirement.cs | 19 ++++++++++++ .../IModuleActivationRequirement.cs | 14 +++++++++ .../ProcessActivationRequirement.cs | 30 ++++++++++++------- .../Plugins/{Abstract => Modules}/Module.cs | 8 ++--- src/Artemis.Core/Plugins/Modules/ModuleTab.cs | 2 -- .../ViewModels => Modules}/ModuleViewModel.cs | 2 +- .../{Abstract => Modules}/ProfileModule.cs | 6 ++-- .../Plugins/{Abstract => }/Plugin.cs | 4 +-- .../PluginConfigurationDialog.cs | 3 +- .../PluginConfigurationViewModel.cs | 2 +- .../Plugins/{Models => }/PluginInfo.cs | 3 +- .../{Models => Settings}/PluginSetting.cs | 2 +- .../{Models => Settings}/PluginSettings.cs | 2 +- src/Artemis.Core/RGB.NET/BitmapBrush.cs | 2 +- src/Artemis.Core/Services/CoreService.cs | 6 ++-- src/Artemis.Core/Services/DataModelService.cs | 6 ++-- .../Services/Interfaces/IDataModelService.cs | 5 ++-- .../Services/Interfaces/IPluginService.cs | 3 +- .../Interfaces/IRenderElementService.cs | 7 ++--- src/Artemis.Core/Services/ModuleService.cs | 2 +- src/Artemis.Core/Services/PluginService.cs | 4 +-- .../Services/RenderElementService.cs | 7 ++--- src/Artemis.Core/Services/RgbService.cs | 2 +- src/Artemis.Core/Services/SettingsService.cs | 2 +- .../Storage/Interfaces/IProfileService.cs | 2 +- .../Services/Storage/ProfileService.cs | 5 ++-- .../Services/Storage/SurfaceService.cs | 2 +- src/Artemis.Core/Utilities/IntroAnimation.cs | 2 +- .../DataModelInputViewModel.cs | 2 +- .../DataModelVisualizationRegistration.cs | 2 +- .../DataModelListPropertiesViewModel.cs | 2 +- .../Shared/DataModelListPropertyViewModel.cs | 2 +- .../Shared/DataModelListViewModel.cs | 2 +- .../Shared/DataModelPropertiesViewModel.cs | 2 +- .../Shared/DataModelPropertyViewModel.cs | 2 +- .../Shared/DataModelVisualizationViewModel.cs | 4 +-- .../PropertyInputRegistration.cs | 2 +- .../ListDataModelWrapper.cs | 2 +- .../Services/DataModelVisualizationService.cs | 5 ++-- .../Interfaces/IProfileEditorService.cs | 4 +-- .../Services/ProfileEditorService.cs | 4 +-- .../Input/DoubleDataModelInputViewModel.cs | 2 +- .../Input/IntDataModelInputViewModel.cs | 2 +- .../Input/StringDataModelInputViewModel.cs | 2 +- .../Ninject/Factories/IVMFactory.cs | 3 +- .../PropertyInput/BrushPropertyInputView.xaml | 2 +- .../BrushPropertyInputViewModel.cs | 3 +- .../Screens/Module/ModuleRootViewModel.cs | 6 ++-- .../Dialogs/ProfileImportViewModel.cs | 2 +- .../DisplayConditionListPredicateViewModel.cs | 2 +- .../DisplayConditionListViewModel.cs | 2 +- .../DisplayConditionPredicateViewModel.cs | 2 +- .../LayerBrushSettingsWindowViewModel.cs | 2 +- .../LayerEffectSettingsWindowViewModel.cs | 2 +- .../LayerEffects/EffectsView.xaml | 2 +- .../LayerEffects/EffectsViewModel.cs | 3 +- .../Tree/TreePropertyGroupViewModel.cs | 3 +- .../ProfileEditor/ProfileEditorView.xaml | 1 - .../ProfileEditor/ProfileEditorViewModel.cs | 4 +-- .../Visualization/ProfileViewModel.cs | 2 +- src/Artemis.UI/Screens/RootViewModel.cs | 2 +- .../Debug/Tabs/DataModelDebugView.xaml | 4 +-- .../Debug/Tabs/DataModelDebugViewModel.cs | 10 +++---- .../General/GeneralSettingsTabViewModel.cs | 1 - .../Tabs/Modules/ModuleOrderTabViewModel.cs | 16 +++++----- .../Tabs/Plugins/PluginSettingsViewModel.cs | 11 ++++--- .../Plugins/PluginSettingsWindowViewModel.cs | 2 +- .../Screens/Sidebar/SidebarViewModel.cs | 16 +++++----- .../SurfaceEditor/SurfaceEditorViewModel.cs | 2 +- .../AsusDeviceProvider.cs | 2 +- .../CoolerMasterDeviceProvider.cs | 2 +- .../CorsairDeviceProvider.cs | 2 +- .../DMXDeviceProvider.cs | 3 +- .../ViewModels/DMXConfigurationViewModel.cs | 3 +- .../DebugDeviceProvider.cs | 5 ++-- .../ViewModels/DebugConfigurationViewModel.cs | 5 ++-- .../LogitechDeviceProvider.cs | 2 +- .../MsiDeviceProvider.cs | 2 +- .../NovationDeviceProvider.cs | 2 +- .../RazerDeviceProvider.cs | 2 +- .../RoccatDeviceProvider.cs | 2 +- .../SteelSeriesDeviceProvider.cs | 2 +- .../WS281XConfigurationViewModel.cs | 5 ++-- .../WS281XDeviceProvider.cs | 5 ++-- .../WootingDeviceProvider.cs | 2 +- .../ColorBrush.cs | 2 +- .../ColorBrushProvider.cs | 2 +- .../RgbNetColorBrush.cs | 2 +- .../RgbNetColorBrushProvider.cs | 2 +- .../NoiseBrush.cs | 2 +- .../NoiseBrushProvider.cs | 2 +- .../BlurEffect.cs | 2 +- .../ColorMatrixEffect.cs | 3 +- .../DilateEffect.cs | 2 +- .../ErodeEffect.cs | 2 +- .../FilterEffectProvider.cs | 2 +- .../GlowEffect.cs | 2 +- .../GrayScaleEffect.cs | 2 +- .../OpacityEffect.cs | 2 +- .../ColorMatrixConfigurationViewModel.cs | 2 +- .../DataModel/GeneralDataModel.cs | 4 +-- .../DataModel/Windows/WindowDataModel.cs | 2 +- .../GeneralModule.cs | 3 +- .../ViewModels/GeneralViewModel.cs | 2 +- 144 files changed, 267 insertions(+), 252 deletions(-) rename src/Artemis.Core/Plugins/{Abstract/DataModels => DataModelExpansions}/Attributes/DataModelIgnoreAttribute.cs (58%) rename src/Artemis.Core/Plugins/{Abstract/DataModels => DataModelExpansions}/Attributes/DataModelProperty.cs (96%) rename src/Artemis.Core/Plugins/{Abstract => DataModelExpansions}/BaseDataModelExpansion.cs (95%) rename src/Artemis.Core/Plugins/{Abstract/DataModels => DataModelExpansions}/DataModel.cs (96%) rename src/Artemis.Core/Plugins/{Abstract => DeviceProviders}/DeviceProvider.cs (98%) rename src/Artemis.Core/Plugins/{Abstract/ViewModels => LayerBrushes}/BrushConfigurationViewModel.cs (72%) rename src/Artemis.Core/Plugins/{LayerBrush/Abstract => LayerBrushes/Internal}/BaseLayerBrush.cs (98%) rename src/Artemis.Core/Plugins/{LayerBrush/Abstract => LayerBrushes/Internal}/PropertiesLayerBrush.cs (96%) rename src/Artemis.Core/Plugins/{LayerBrush/Abstract => LayerBrushes}/LayerBrush.cs (93%) rename src/Artemis.Core/Plugins/{LayerBrush => LayerBrushes}/LayerBrushConfigurationDialog.cs (83%) rename src/Artemis.Core/Plugins/{LayerBrush => LayerBrushes}/LayerBrushDescriptor.cs (94%) rename src/Artemis.Core/Plugins/{Abstract => LayerBrushes}/LayerBrushProvider.cs (94%) rename src/Artemis.Core/Plugins/{LayerBrush/Abstract => LayerBrushes}/PerLedLayerBrush.cs (97%) rename src/Artemis.Core/Plugins/{LayerBrush/Abstract => LayerBrushes}/RgbNetLayerBrush.cs (96%) rename src/Artemis.Core/Plugins/{Abstract/ViewModels => LayerEffects}/EffectConfigurationViewModel.cs (69%) rename src/Artemis.Core/Plugins/{LayerEffect/Abstract => LayerEffects/Internal}/BaseLayerEffect.cs (96%) rename src/Artemis.Core/Plugins/{LayerEffect/Abstract => LayerEffects}/LayerEffect.cs (89%) rename src/Artemis.Core/Plugins/{LayerEffect => LayerEffects}/LayerEffectConfigurationDialog.cs (83%) rename src/Artemis.Core/Plugins/{LayerEffect => LayerEffects}/LayerEffectDescriptor.cs (94%) rename src/Artemis.Core/Plugins/{Abstract => LayerEffects}/LayerEffectProvider.cs (94%) create mode 100644 src/Artemis.Core/Plugins/Modules/ActivationRequirements/BooleanActivationRequirement.cs create mode 100644 src/Artemis.Core/Plugins/Modules/ActivationRequirements/IModuleActivationRequirement.cs rename src/Artemis.Core/Plugins/Modules/{ => ActivationRequirements}/ProcessActivationRequirement.cs (53%) rename src/Artemis.Core/Plugins/{Abstract => Modules}/Module.cs (97%) rename src/Artemis.Core/Plugins/{Abstract/ViewModels => Modules}/ModuleViewModel.cs (93%) rename src/Artemis.Core/Plugins/{Abstract => Modules}/ProfileModule.cs (98%) rename src/Artemis.Core/Plugins/{Abstract => }/Plugin.cs (97%) rename src/Artemis.Core/Plugins/{Abstract => }/PluginConfigurationDialog.cs (88%) rename src/Artemis.Core/Plugins/{Abstract/ViewModels => }/PluginConfigurationViewModel.cs (82%) rename src/Artemis.Core/Plugins/{Models => }/PluginInfo.cs (98%) rename src/Artemis.Core/Plugins/{Models => Settings}/PluginSetting.cs (98%) rename src/Artemis.Core/Plugins/{Models => Settings}/PluginSettings.cs (98%) diff --git a/src/Artemis.Core/Constants.cs b/src/Artemis.Core/Constants.cs index acdbddc91..5762b16eb 100644 --- a/src/Artemis.Core/Constants.cs +++ b/src/Artemis.Core/Constants.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.IO; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; namespace Artemis.Core { diff --git a/src/Artemis.Core/Events/FrameRenderingEventArgs.cs b/src/Artemis.Core/Events/FrameRenderingEventArgs.cs index 05d05eff0..1066a2950 100644 --- a/src/Artemis.Core/Events/FrameRenderingEventArgs.cs +++ b/src/Artemis.Core/Events/FrameRenderingEventArgs.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.Modules; using RGB.NET.Core; using SkiaSharp; diff --git a/src/Artemis.Core/Events/PluginEventArgs.cs b/src/Artemis.Core/Events/PluginEventArgs.cs index 81647cde4..8c71dcd2b 100644 --- a/src/Artemis.Core/Events/PluginEventArgs.cs +++ b/src/Artemis.Core/Events/PluginEventArgs.cs @@ -1,5 +1,5 @@ using System; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; namespace Artemis.Core.Events { diff --git a/src/Artemis.Core/Models/Profile/Conditions/DisplayCondition.cs b/src/Artemis.Core/Models/Profile/Conditions/DisplayCondition.cs index cf8f02ef5..96bf9e33f 100644 --- a/src/Artemis.Core/Models/Profile/Conditions/DisplayCondition.cs +++ b/src/Artemis.Core/Models/Profile/Conditions/DisplayCondition.cs @@ -1,6 +1,6 @@ using System; using System.Linq.Expressions; -using Artemis.Core.Plugins.Abstract.DataModels; +using Artemis.Core.Plugins.DataModelExpansions; namespace Artemis.Core.Models.Profile.Conditions { diff --git a/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionList.cs b/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionList.cs index 754fef6a3..42b7b33ed 100644 --- a/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionList.cs +++ b/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionList.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Linq.Expressions; using Artemis.Core.Exceptions; using Artemis.Core.Models.Profile.Conditions.Abstract; -using Artemis.Core.Plugins.Abstract.DataModels; +using Artemis.Core.Plugins.DataModelExpansions; using Artemis.Core.Services.Interfaces; using Artemis.Storage.Entities.Profile; using Artemis.Storage.Entities.Profile.Abstract; diff --git a/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionListPredicate.cs b/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionListPredicate.cs index a4266ef37..cff1a145b 100644 --- a/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionListPredicate.cs +++ b/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionListPredicate.cs @@ -4,7 +4,7 @@ using System.Linq.Expressions; using Artemis.Core.Exceptions; using Artemis.Core.Extensions; using Artemis.Core.Models.Profile.Conditions.Abstract; -using Artemis.Core.Plugins.Abstract.DataModels; +using Artemis.Core.Plugins.DataModelExpansions; using Artemis.Core.Services.Interfaces; using Artemis.Storage.Entities.Profile; using Artemis.Storage.Entities.Profile.Abstract; diff --git a/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionOperator.cs b/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionOperator.cs index 186644a2a..535168b46 100644 --- a/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionOperator.cs +++ b/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionOperator.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using Artemis.Core.Extensions; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; using Artemis.Core.Services.Interfaces; namespace Artemis.Core.Models.Profile.Conditions diff --git a/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionPredicate.cs b/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionPredicate.cs index 57f56c3e3..0b8e5eb85 100644 --- a/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionPredicate.cs +++ b/src/Artemis.Core/Models/Profile/Conditions/DisplayConditionPredicate.cs @@ -4,7 +4,7 @@ using System.Linq.Expressions; using Artemis.Core.Exceptions; using Artemis.Core.Extensions; using Artemis.Core.Models.Profile.Conditions.Abstract; -using Artemis.Core.Plugins.Abstract.DataModels; +using Artemis.Core.Plugins.DataModelExpansions; using Artemis.Core.Services.Interfaces; using Artemis.Storage.Entities.Profile; using Artemis.Storage.Entities.Profile.Abstract; diff --git a/src/Artemis.Core/Models/Profile/Folder.cs b/src/Artemis.Core/Models/Profile/Folder.cs index 05e10ea10..a432d6a62 100644 --- a/src/Artemis.Core/Models/Profile/Folder.cs +++ b/src/Artemis.Core/Models/Profile/Folder.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerEffects; using Artemis.Core.Utilities; using Artemis.Storage.Entities.Profile; using Artemis.Storage.Entities.Profile.Abstract; diff --git a/src/Artemis.Core/Models/Profile/Layer.cs b/src/Artemis.Core/Models/Profile/Layer.cs index 753a90e38..b97a13592 100644 --- a/src/Artemis.Core/Models/Profile/Layer.cs +++ b/src/Artemis.Core/Models/Profile/Layer.cs @@ -7,8 +7,9 @@ using Artemis.Core.Models.Profile.LayerProperties; using Artemis.Core.Models.Profile.LayerProperties.Attributes; using Artemis.Core.Models.Profile.LayerShapes; using Artemis.Core.Models.Surface; -using Artemis.Core.Plugins.LayerBrush.Abstract; -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerBrushes; +using Artemis.Core.Plugins.LayerBrushes.Internal; +using Artemis.Core.Plugins.LayerEffects; using Artemis.Core.Services; using Artemis.Core.Services.Interfaces; using Artemis.Storage.Entities.Profile; diff --git a/src/Artemis.Core/Models/Profile/LayerBrushReference.cs b/src/Artemis.Core/Models/Profile/LayerBrushReference.cs index 2e1930f0f..3d575c9c9 100644 --- a/src/Artemis.Core/Models/Profile/LayerBrushReference.cs +++ b/src/Artemis.Core/Models/Profile/LayerBrushReference.cs @@ -1,5 +1,5 @@ using System; -using Artemis.Core.Plugins.LayerBrush; +using Artemis.Core.Plugins.LayerBrushes; namespace Artemis.Core.Models.Profile { diff --git a/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs b/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs index 3c29ea526..0898786a3 100644 --- a/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs +++ b/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs @@ -8,8 +8,9 @@ using Artemis.Core.Exceptions; using Artemis.Core.Models.Profile.LayerProperties; using Artemis.Core.Models.Profile.LayerProperties.Attributes; using Artemis.Core.Plugins.Exceptions; -using Artemis.Core.Plugins.LayerBrush.Abstract; -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerBrushes; +using Artemis.Core.Plugins.LayerBrushes.Internal; +using Artemis.Core.Plugins.LayerEffects; using Artemis.Core.Services.Interfaces; using Artemis.Storage.Entities.Profile; diff --git a/src/Artemis.Core/Models/Profile/Profile.cs b/src/Artemis.Core/Models/Profile/Profile.cs index b130da1bd..6392d828c 100644 --- a/src/Artemis.Core/Models/Profile/Profile.cs +++ b/src/Artemis.Core/Models/Profile/Profile.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.Linq; using Artemis.Core.Exceptions; using Artemis.Core.Models.Surface; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Modules; using Artemis.Storage.Entities.Profile; using SkiaSharp; diff --git a/src/Artemis.Core/Models/Profile/ProfileDescriptor.cs b/src/Artemis.Core/Models/Profile/ProfileDescriptor.cs index 2ff49ab28..6ce41edf1 100644 --- a/src/Artemis.Core/Models/Profile/ProfileDescriptor.cs +++ b/src/Artemis.Core/Models/Profile/ProfileDescriptor.cs @@ -1,5 +1,5 @@ using System; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.Modules; using Artemis.Storage.Entities.Profile; namespace Artemis.Core.Models.Profile diff --git a/src/Artemis.Core/Models/Profile/RenderProfileElement.cs b/src/Artemis.Core/Models/Profile/RenderProfileElement.cs index 8408a6b31..ed0022aa1 100644 --- a/src/Artemis.Core/Models/Profile/RenderProfileElement.cs +++ b/src/Artemis.Core/Models/Profile/RenderProfileElement.cs @@ -5,8 +5,7 @@ using System.Linq; using Artemis.Core.Annotations; using Artemis.Core.Models.Profile.Conditions; using Artemis.Core.Models.Profile.LayerProperties; -using Artemis.Core.Plugins.LayerBrush.Abstract; -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerEffects; using Artemis.Storage.Entities.Profile; using Artemis.Storage.Entities.Profile.Abstract; using SkiaSharp; diff --git a/src/Artemis.Core/Models/Surface/ArtemisDevice.cs b/src/Artemis.Core/Models/Surface/ArtemisDevice.cs index a8b2444c1..926032ca0 100644 --- a/src/Artemis.Core/Models/Surface/ArtemisDevice.cs +++ b/src/Artemis.Core/Models/Surface/ArtemisDevice.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; using Artemis.Core.Extensions; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins; using Artemis.Storage.Entities.Surface; using RGB.NET.Core; using SkiaSharp; diff --git a/src/Artemis.Core/Ninject/CoreModule.cs b/src/Artemis.Core/Ninject/CoreModule.cs index 9583369cc..a245b74e7 100644 --- a/src/Artemis.Core/Ninject/CoreModule.cs +++ b/src/Artemis.Core/Ninject/CoreModule.cs @@ -1,6 +1,6 @@ using System.IO; using Artemis.Core.Exceptions; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services.Interfaces; using Artemis.Storage; using Artemis.Storage.Migrations.Interfaces; diff --git a/src/Artemis.Core/Ninject/PluginSettingsProvider.cs b/src/Artemis.Core/Ninject/PluginSettingsProvider.cs index 96aef2db4..1e8fc404f 100644 --- a/src/Artemis.Core/Ninject/PluginSettingsProvider.cs +++ b/src/Artemis.Core/Ninject/PluginSettingsProvider.cs @@ -1,7 +1,7 @@ using System.Linq; using Artemis.Core.Exceptions; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services.Interfaces; using Artemis.Storage.Repositories.Interfaces; using Ninject.Activation; diff --git a/src/Artemis.Core/Ninject/SettingsServiceProvider.cs b/src/Artemis.Core/Ninject/SettingsServiceProvider.cs index 49f97654e..1e1d8e094 100644 --- a/src/Artemis.Core/Ninject/SettingsServiceProvider.cs +++ b/src/Artemis.Core/Ninject/SettingsServiceProvider.cs @@ -1,6 +1,6 @@ -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins; using Artemis.Core.Plugins.Exceptions; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services; using Ninject; using Ninject.Activation; diff --git a/src/Artemis.Core/Plugins/Abstract/DataModels/Attributes/DataModelIgnoreAttribute.cs b/src/Artemis.Core/Plugins/DataModelExpansions/Attributes/DataModelIgnoreAttribute.cs similarity index 58% rename from src/Artemis.Core/Plugins/Abstract/DataModels/Attributes/DataModelIgnoreAttribute.cs rename to src/Artemis.Core/Plugins/DataModelExpansions/Attributes/DataModelIgnoreAttribute.cs index 0dd67b97a..e41d3db61 100644 --- a/src/Artemis.Core/Plugins/Abstract/DataModels/Attributes/DataModelIgnoreAttribute.cs +++ b/src/Artemis.Core/Plugins/DataModelExpansions/Attributes/DataModelIgnoreAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Artemis.Core.Plugins.Abstract.DataModels.Attributes +namespace Artemis.Core.Plugins.DataModelExpansions.Attributes { public class DataModelIgnoreAttribute : Attribute { diff --git a/src/Artemis.Core/Plugins/Abstract/DataModels/Attributes/DataModelProperty.cs b/src/Artemis.Core/Plugins/DataModelExpansions/Attributes/DataModelProperty.cs similarity index 96% rename from src/Artemis.Core/Plugins/Abstract/DataModels/Attributes/DataModelProperty.cs rename to src/Artemis.Core/Plugins/DataModelExpansions/Attributes/DataModelProperty.cs index 0f9bf18f0..7428d5f3c 100644 --- a/src/Artemis.Core/Plugins/Abstract/DataModels/Attributes/DataModelProperty.cs +++ b/src/Artemis.Core/Plugins/DataModelExpansions/Attributes/DataModelProperty.cs @@ -1,6 +1,6 @@ using System; -namespace Artemis.Core.Plugins.Abstract.DataModels.Attributes +namespace Artemis.Core.Plugins.DataModelExpansions.Attributes { [AttributeUsage(AttributeTargets.Property)] public class DataModelPropertyAttribute : Attribute diff --git a/src/Artemis.Core/Plugins/Abstract/BaseDataModelExpansion.cs b/src/Artemis.Core/Plugins/DataModelExpansions/BaseDataModelExpansion.cs similarity index 95% rename from src/Artemis.Core/Plugins/Abstract/BaseDataModelExpansion.cs rename to src/Artemis.Core/Plugins/DataModelExpansions/BaseDataModelExpansion.cs index 6aae3af27..80ed5ce07 100644 --- a/src/Artemis.Core/Plugins/Abstract/BaseDataModelExpansion.cs +++ b/src/Artemis.Core/Plugins/DataModelExpansions/BaseDataModelExpansion.cs @@ -4,11 +4,10 @@ using System.Collections.ObjectModel; using System.Linq; using System.Linq.Expressions; using System.Reflection; -using Artemis.Core.Plugins.Abstract.DataModels; -using Artemis.Core.Plugins.Abstract.DataModels.Attributes; +using Artemis.Core.Plugins.DataModelExpansions.Attributes; using Artemis.Core.Utilities; -namespace Artemis.Core.Plugins.Abstract +namespace Artemis.Core.Plugins.DataModelExpansions { /// /// Allows you to expand the application-wide datamodel diff --git a/src/Artemis.Core/Plugins/Abstract/DataModels/DataModel.cs b/src/Artemis.Core/Plugins/DataModelExpansions/DataModel.cs similarity index 96% rename from src/Artemis.Core/Plugins/Abstract/DataModels/DataModel.cs rename to src/Artemis.Core/Plugins/DataModelExpansions/DataModel.cs index 9b78aaf52..7770913b8 100644 --- a/src/Artemis.Core/Plugins/Abstract/DataModels/DataModel.cs +++ b/src/Artemis.Core/Plugins/DataModelExpansions/DataModel.cs @@ -4,12 +4,11 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reflection; -using System.Text; using Artemis.Core.Exceptions; -using Artemis.Core.Plugins.Abstract.DataModels.Attributes; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.DataModelExpansions.Attributes; +using Artemis.Core.Plugins.Modules; -namespace Artemis.Core.Plugins.Abstract.DataModels +namespace Artemis.Core.Plugins.DataModelExpansions { public abstract class DataModel { diff --git a/src/Artemis.Core/Plugins/Abstract/DeviceProvider.cs b/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs similarity index 98% rename from src/Artemis.Core/Plugins/Abstract/DeviceProvider.cs rename to src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs index cf17cd9e3..4444200c5 100644 --- a/src/Artemis.Core/Plugins/Abstract/DeviceProvider.cs +++ b/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs @@ -5,7 +5,7 @@ using Ninject; using RGB.NET.Core; using Serilog; -namespace Artemis.Core.Plugins.Abstract +namespace Artemis.Core.Plugins.DeviceProviders { /// /// diff --git a/src/Artemis.Core/Plugins/Exceptions/ArtemisPluginException.cs b/src/Artemis.Core/Plugins/Exceptions/ArtemisPluginException.cs index 25d8546a5..a69362c39 100644 --- a/src/Artemis.Core/Plugins/Exceptions/ArtemisPluginException.cs +++ b/src/Artemis.Core/Plugins/Exceptions/ArtemisPluginException.cs @@ -1,5 +1,4 @@ using System; -using Artemis.Core.Plugins.Models; namespace Artemis.Core.Plugins.Exceptions { diff --git a/src/Artemis.Core/Plugins/Abstract/ViewModels/BrushConfigurationViewModel.cs b/src/Artemis.Core/Plugins/LayerBrushes/BrushConfigurationViewModel.cs similarity index 72% rename from src/Artemis.Core/Plugins/Abstract/ViewModels/BrushConfigurationViewModel.cs rename to src/Artemis.Core/Plugins/LayerBrushes/BrushConfigurationViewModel.cs index 04d8748cc..00d510ad6 100644 --- a/src/Artemis.Core/Plugins/Abstract/ViewModels/BrushConfigurationViewModel.cs +++ b/src/Artemis.Core/Plugins/LayerBrushes/BrushConfigurationViewModel.cs @@ -1,7 +1,7 @@ -using Artemis.Core.Plugins.LayerBrush.Abstract; +using Artemis.Core.Plugins.LayerBrushes.Internal; using Stylet; -namespace Artemis.Core.Plugins.Abstract.ViewModels +namespace Artemis.Core.Plugins.LayerBrushes { public abstract class BrushConfigurationViewModel : Screen { diff --git a/src/Artemis.Core/Plugins/LayerBrush/Abstract/BaseLayerBrush.cs b/src/Artemis.Core/Plugins/LayerBrushes/Internal/BaseLayerBrush.cs similarity index 98% rename from src/Artemis.Core/Plugins/LayerBrush/Abstract/BaseLayerBrush.cs rename to src/Artemis.Core/Plugins/LayerBrushes/Internal/BaseLayerBrush.cs index 9e2d03aad..9e9a825bc 100644 --- a/src/Artemis.Core/Plugins/LayerBrush/Abstract/BaseLayerBrush.cs +++ b/src/Artemis.Core/Plugins/LayerBrushes/Internal/BaseLayerBrush.cs @@ -1,12 +1,11 @@ using System; using Artemis.Core.Models.Profile; using Artemis.Core.Plugins.Exceptions; -using Artemis.Core.Plugins.Models; using Artemis.Core.Services.Interfaces; using SkiaSharp; using Stylet; -namespace Artemis.Core.Plugins.LayerBrush.Abstract +namespace Artemis.Core.Plugins.LayerBrushes.Internal { /// /// For internal use only, please use or or instead diff --git a/src/Artemis.Core/Plugins/LayerBrush/Abstract/PropertiesLayerBrush.cs b/src/Artemis.Core/Plugins/LayerBrushes/Internal/PropertiesLayerBrush.cs similarity index 96% rename from src/Artemis.Core/Plugins/LayerBrush/Abstract/PropertiesLayerBrush.cs rename to src/Artemis.Core/Plugins/LayerBrushes/Internal/PropertiesLayerBrush.cs index 5adb2513d..3e68aeedc 100644 --- a/src/Artemis.Core/Plugins/LayerBrush/Abstract/PropertiesLayerBrush.cs +++ b/src/Artemis.Core/Plugins/LayerBrushes/Internal/PropertiesLayerBrush.cs @@ -3,7 +3,7 @@ using Artemis.Core.Models.Profile; using Artemis.Core.Plugins.Exceptions; using Artemis.Core.Services.Interfaces; -namespace Artemis.Core.Plugins.LayerBrush.Abstract +namespace Artemis.Core.Plugins.LayerBrushes.Internal { /// /// For internal use only, please use or or instead diff --git a/src/Artemis.Core/Plugins/LayerBrush/Abstract/LayerBrush.cs b/src/Artemis.Core/Plugins/LayerBrushes/LayerBrush.cs similarity index 93% rename from src/Artemis.Core/Plugins/LayerBrush/Abstract/LayerBrush.cs rename to src/Artemis.Core/Plugins/LayerBrushes/LayerBrush.cs index aaef52bd1..f7a2b83c6 100644 --- a/src/Artemis.Core/Plugins/LayerBrush/Abstract/LayerBrush.cs +++ b/src/Artemis.Core/Plugins/LayerBrushes/LayerBrush.cs @@ -1,8 +1,9 @@ using Artemis.Core.Models.Profile; +using Artemis.Core.Plugins.LayerBrushes.Internal; using Artemis.Core.Services.Interfaces; using SkiaSharp; -namespace Artemis.Core.Plugins.LayerBrush.Abstract +namespace Artemis.Core.Plugins.LayerBrushes { public abstract class LayerBrush : PropertiesLayerBrush where T : LayerPropertyGroup { diff --git a/src/Artemis.Core/Plugins/LayerBrush/LayerBrushConfigurationDialog.cs b/src/Artemis.Core/Plugins/LayerBrushes/LayerBrushConfigurationDialog.cs similarity index 83% rename from src/Artemis.Core/Plugins/LayerBrush/LayerBrushConfigurationDialog.cs rename to src/Artemis.Core/Plugins/LayerBrushes/LayerBrushConfigurationDialog.cs index b6747ee48..020eec55e 100644 --- a/src/Artemis.Core/Plugins/LayerBrush/LayerBrushConfigurationDialog.cs +++ b/src/Artemis.Core/Plugins/LayerBrushes/LayerBrushConfigurationDialog.cs @@ -1,8 +1,7 @@ using System; -using Artemis.Core.Plugins.Abstract.ViewModels; -using Artemis.Core.Plugins.LayerBrush.Abstract; +using Artemis.Core.Plugins.LayerBrushes.Internal; -namespace Artemis.Core.Plugins.LayerBrush +namespace Artemis.Core.Plugins.LayerBrushes { /// public class LayerBrushConfigurationDialog : LayerBrushConfigurationDialog where T : BrushConfigurationViewModel diff --git a/src/Artemis.Core/Plugins/LayerBrush/LayerBrushDescriptor.cs b/src/Artemis.Core/Plugins/LayerBrushes/LayerBrushDescriptor.cs similarity index 94% rename from src/Artemis.Core/Plugins/LayerBrush/LayerBrushDescriptor.cs rename to src/Artemis.Core/Plugins/LayerBrushes/LayerBrushDescriptor.cs index 25e5bfe38..447d2d3a8 100644 --- a/src/Artemis.Core/Plugins/LayerBrush/LayerBrushDescriptor.cs +++ b/src/Artemis.Core/Plugins/LayerBrushes/LayerBrushDescriptor.cs @@ -1,7 +1,6 @@ using System; -using Artemis.Core.Plugins.Abstract; -namespace Artemis.Core.Plugins.LayerBrush +namespace Artemis.Core.Plugins.LayerBrushes { /// /// A class that describes a layer brush diff --git a/src/Artemis.Core/Plugins/Abstract/LayerBrushProvider.cs b/src/Artemis.Core/Plugins/LayerBrushes/LayerBrushProvider.cs similarity index 94% rename from src/Artemis.Core/Plugins/Abstract/LayerBrushProvider.cs rename to src/Artemis.Core/Plugins/LayerBrushes/LayerBrushProvider.cs index c50847758..57e1d5f84 100644 --- a/src/Artemis.Core/Plugins/Abstract/LayerBrushProvider.cs +++ b/src/Artemis.Core/Plugins/LayerBrushes/LayerBrushProvider.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using Artemis.Core.Plugins.Exceptions; -using Artemis.Core.Plugins.LayerBrush; -using Artemis.Core.Plugins.LayerBrush.Abstract; +using Artemis.Core.Plugins.LayerBrushes.Internal; -namespace Artemis.Core.Plugins.Abstract +namespace Artemis.Core.Plugins.LayerBrushes { /// /// Allows you to create one or more s usable by profile layers. diff --git a/src/Artemis.Core/Plugins/LayerBrush/Abstract/PerLedLayerBrush.cs b/src/Artemis.Core/Plugins/LayerBrushes/PerLedLayerBrush.cs similarity index 97% rename from src/Artemis.Core/Plugins/LayerBrush/Abstract/PerLedLayerBrush.cs rename to src/Artemis.Core/Plugins/LayerBrushes/PerLedLayerBrush.cs index c435a2496..6a806fc31 100644 --- a/src/Artemis.Core/Plugins/LayerBrush/Abstract/PerLedLayerBrush.cs +++ b/src/Artemis.Core/Plugins/LayerBrushes/PerLedLayerBrush.cs @@ -1,9 +1,10 @@ using Artemis.Core.Models.Profile; using Artemis.Core.Models.Surface; +using Artemis.Core.Plugins.LayerBrushes.Internal; using Artemis.Core.Services.Interfaces; using SkiaSharp; -namespace Artemis.Core.Plugins.LayerBrush.Abstract +namespace Artemis.Core.Plugins.LayerBrushes { public abstract class PerLedLayerBrush : PropertiesLayerBrush where T : LayerPropertyGroup { diff --git a/src/Artemis.Core/Plugins/LayerBrush/Abstract/RgbNetLayerBrush.cs b/src/Artemis.Core/Plugins/LayerBrushes/RgbNetLayerBrush.cs similarity index 96% rename from src/Artemis.Core/Plugins/LayerBrush/Abstract/RgbNetLayerBrush.cs rename to src/Artemis.Core/Plugins/LayerBrushes/RgbNetLayerBrush.cs index c92044a58..1d43ca26f 100644 --- a/src/Artemis.Core/Plugins/LayerBrush/Abstract/RgbNetLayerBrush.cs +++ b/src/Artemis.Core/Plugins/LayerBrushes/RgbNetLayerBrush.cs @@ -1,12 +1,13 @@ using System; using System.Linq; using Artemis.Core.Models.Profile; +using Artemis.Core.Plugins.LayerBrushes.Internal; using Artemis.Core.Services.Interfaces; using RGB.NET.Core; using RGB.NET.Groups; using SkiaSharp; -namespace Artemis.Core.Plugins.LayerBrush.Abstract +namespace Artemis.Core.Plugins.LayerBrushes { /// /// An RGB.NET brush that uses RGB.NET's per-LED rendering engine. diff --git a/src/Artemis.Core/Plugins/Abstract/ViewModels/EffectConfigurationViewModel.cs b/src/Artemis.Core/Plugins/LayerEffects/EffectConfigurationViewModel.cs similarity index 69% rename from src/Artemis.Core/Plugins/Abstract/ViewModels/EffectConfigurationViewModel.cs rename to src/Artemis.Core/Plugins/LayerEffects/EffectConfigurationViewModel.cs index bce1850ba..388712638 100644 --- a/src/Artemis.Core/Plugins/Abstract/ViewModels/EffectConfigurationViewModel.cs +++ b/src/Artemis.Core/Plugins/LayerEffects/EffectConfigurationViewModel.cs @@ -1,7 +1,6 @@ -using Artemis.Core.Plugins.LayerEffect.Abstract; -using Stylet; +using Stylet; -namespace Artemis.Core.Plugins.Abstract.ViewModels +namespace Artemis.Core.Plugins.LayerEffects { public abstract class EffectConfigurationViewModel : Screen { diff --git a/src/Artemis.Core/Plugins/LayerEffect/Abstract/BaseLayerEffect.cs b/src/Artemis.Core/Plugins/LayerEffects/Internal/BaseLayerEffect.cs similarity index 96% rename from src/Artemis.Core/Plugins/LayerEffect/Abstract/BaseLayerEffect.cs rename to src/Artemis.Core/Plugins/LayerEffects/Internal/BaseLayerEffect.cs index 0c47944e3..9223402a2 100644 --- a/src/Artemis.Core/Plugins/LayerEffect/Abstract/BaseLayerEffect.cs +++ b/src/Artemis.Core/Plugins/LayerEffects/Internal/BaseLayerEffect.cs @@ -1,14 +1,13 @@ using System; using Artemis.Core.Models.Profile; -using Artemis.Core.Plugins.Models; using Artemis.Core.Services.Interfaces; using SkiaSharp; using Stylet; -namespace Artemis.Core.Plugins.LayerEffect.Abstract +namespace Artemis.Core.Plugins.LayerEffects { /// - /// For internal use only, please use instead + /// For internal use only, please use instead /// public abstract class BaseLayerEffect : PropertyChangedBase, IDisposable { @@ -114,12 +113,12 @@ namespace Artemis.Core.Plugins.LayerEffect.Abstract } /// - /// Called when the layer brush is activated + /// Called when the layer effect is activated /// public abstract void EnableLayerEffect(); /// - /// Called when the layer brush is deactivated + /// Called when the layer effect is deactivated /// public abstract void DisableLayerEffect(); diff --git a/src/Artemis.Core/Plugins/LayerEffect/Abstract/LayerEffect.cs b/src/Artemis.Core/Plugins/LayerEffects/LayerEffect.cs similarity index 89% rename from src/Artemis.Core/Plugins/LayerEffect/Abstract/LayerEffect.cs rename to src/Artemis.Core/Plugins/LayerEffects/LayerEffect.cs index c70bc32e8..f15765ced 100644 --- a/src/Artemis.Core/Plugins/LayerEffect/Abstract/LayerEffect.cs +++ b/src/Artemis.Core/Plugins/LayerEffects/LayerEffect.cs @@ -2,13 +2,9 @@ using Artemis.Core.Models.Profile; using Artemis.Core.Plugins.Exceptions; using Artemis.Core.Services.Interfaces; -using SkiaSharp; -namespace Artemis.Core.Plugins.LayerEffect.Abstract +namespace Artemis.Core.Plugins.LayerEffects { - /// - /// For internal use only, please use instead - /// public abstract class LayerEffect : BaseLayerEffect where T : LayerPropertyGroup { private T _properties; diff --git a/src/Artemis.Core/Plugins/LayerEffect/LayerEffectConfigurationDialog.cs b/src/Artemis.Core/Plugins/LayerEffects/LayerEffectConfigurationDialog.cs similarity index 83% rename from src/Artemis.Core/Plugins/LayerEffect/LayerEffectConfigurationDialog.cs rename to src/Artemis.Core/Plugins/LayerEffects/LayerEffectConfigurationDialog.cs index f51684b17..32cf0d42e 100644 --- a/src/Artemis.Core/Plugins/LayerEffect/LayerEffectConfigurationDialog.cs +++ b/src/Artemis.Core/Plugins/LayerEffects/LayerEffectConfigurationDialog.cs @@ -1,8 +1,6 @@ using System; -using Artemis.Core.Plugins.Abstract.ViewModels; -using Artemis.Core.Plugins.LayerEffect.Abstract; -namespace Artemis.Core.Plugins.LayerEffect +namespace Artemis.Core.Plugins.LayerEffects { /// public class LayerEffectConfigurationDialog : LayerEffectConfigurationDialog where T : EffectConfigurationViewModel diff --git a/src/Artemis.Core/Plugins/LayerEffect/LayerEffectDescriptor.cs b/src/Artemis.Core/Plugins/LayerEffects/LayerEffectDescriptor.cs similarity index 94% rename from src/Artemis.Core/Plugins/LayerEffect/LayerEffectDescriptor.cs rename to src/Artemis.Core/Plugins/LayerEffects/LayerEffectDescriptor.cs index 58d5a39eb..7f5d6e8c4 100644 --- a/src/Artemis.Core/Plugins/LayerEffect/LayerEffectDescriptor.cs +++ b/src/Artemis.Core/Plugins/LayerEffects/LayerEffectDescriptor.cs @@ -1,7 +1,6 @@ using System; -using Artemis.Core.Plugins.Abstract; -namespace Artemis.Core.Plugins.LayerEffect +namespace Artemis.Core.Plugins.LayerEffects { /// /// A class that describes a layer effect diff --git a/src/Artemis.Core/Plugins/Abstract/LayerEffectProvider.cs b/src/Artemis.Core/Plugins/LayerEffects/LayerEffectProvider.cs similarity index 94% rename from src/Artemis.Core/Plugins/Abstract/LayerEffectProvider.cs rename to src/Artemis.Core/Plugins/LayerEffects/LayerEffectProvider.cs index 367e2a23b..123f81780 100644 --- a/src/Artemis.Core/Plugins/Abstract/LayerEffectProvider.cs +++ b/src/Artemis.Core/Plugins/LayerEffects/LayerEffectProvider.cs @@ -2,10 +2,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using Artemis.Core.Plugins.Exceptions; -using Artemis.Core.Plugins.LayerEffect; -using Artemis.Core.Plugins.LayerEffect.Abstract; -namespace Artemis.Core.Plugins.Abstract +namespace Artemis.Core.Plugins.LayerEffects { /// /// Allows you to register one or more s usable by profile layers. diff --git a/src/Artemis.Core/Plugins/Modules/ActivationRequirements/BooleanActivationRequirement.cs b/src/Artemis.Core/Plugins/Modules/ActivationRequirements/BooleanActivationRequirement.cs new file mode 100644 index 000000000..2966fc4d0 --- /dev/null +++ b/src/Artemis.Core/Plugins/Modules/ActivationRequirements/BooleanActivationRequirement.cs @@ -0,0 +1,19 @@ +namespace Artemis.Core.Plugins.Modules.ActivationRequirements +{ + /// + /// Evaluates to true or false by returning the value of ActivationMet + /// + public class BooleanActivationRequirement : IModuleActivationRequirement + { + /// + /// Gets or sets whether the activation requirement is met + /// + public bool ActivationMet { get; set; } + + /// + public bool Evaluate() + { + return ActivationMet; + } + } +} \ No newline at end of file diff --git a/src/Artemis.Core/Plugins/Modules/ActivationRequirements/IModuleActivationRequirement.cs b/src/Artemis.Core/Plugins/Modules/ActivationRequirements/IModuleActivationRequirement.cs new file mode 100644 index 000000000..20a791477 --- /dev/null +++ b/src/Artemis.Core/Plugins/Modules/ActivationRequirements/IModuleActivationRequirement.cs @@ -0,0 +1,14 @@ +namespace Artemis.Core.Plugins.Modules.ActivationRequirements +{ + /// + /// Evaluates to true or false by checking requirements specific to the implementation + /// + public interface IModuleActivationRequirement + { + /// + /// Called to determine whether the activation requirement is met + /// + /// + bool Evaluate(); + } +} \ No newline at end of file diff --git a/src/Artemis.Core/Plugins/Modules/ProcessActivationRequirement.cs b/src/Artemis.Core/Plugins/Modules/ActivationRequirements/ProcessActivationRequirement.cs similarity index 53% rename from src/Artemis.Core/Plugins/Modules/ProcessActivationRequirement.cs rename to src/Artemis.Core/Plugins/Modules/ActivationRequirements/ProcessActivationRequirement.cs index b4c924300..dda84aa6d 100644 --- a/src/Artemis.Core/Plugins/Modules/ProcessActivationRequirement.cs +++ b/src/Artemis.Core/Plugins/Modules/ActivationRequirements/ProcessActivationRequirement.cs @@ -3,34 +3,44 @@ using System.IO; using System.Linq; using Artemis.Core.Extensions; -namespace Artemis.Core.Plugins.Modules +namespace Artemis.Core.Plugins.Modules.ActivationRequirements { + /// + /// Evaluates to true or false by checking if the specified process is running + /// public class ProcessActivationRequirement : IModuleActivationRequirement { - public string ProcessName { get; set; } - public string Location { get; set; } - + /// + /// Creates a new instance of the class + /// + /// The name of the process that must run + /// The location of where the process must be running from (optional) public ProcessActivationRequirement(string processName, string location = null) { ProcessName = processName; Location = location; } + /// + /// The name of the process that must run + /// + public string ProcessName { get; set; } + /// + /// The location of where the process must be running from + /// + public string Location { get; set; } + + /// public bool Evaluate() { if (ProcessName == null && Location == null) return false; var processes = ProcessName != null ? Process.GetProcessesByName(ProcessName).Where(p => !p.HasExited) : Process.GetProcesses().Where(p => !p.HasExited); - return Location != null + return Location != null ? processes.Any(p => Path.GetDirectoryName(p.GetProcessFilename()) == Location) : processes.Any(); } } - - public interface IModuleActivationRequirement - { - bool Evaluate(); - } } \ No newline at end of file diff --git a/src/Artemis.Core/Plugins/Abstract/Module.cs b/src/Artemis.Core/Plugins/Modules/Module.cs similarity index 97% rename from src/Artemis.Core/Plugins/Abstract/Module.cs rename to src/Artemis.Core/Plugins/Modules/Module.cs index 71a43340d..2c2a69ad6 100644 --- a/src/Artemis.Core/Plugins/Abstract/Module.cs +++ b/src/Artemis.Core/Plugins/Modules/Module.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; using System.Linq; using Artemis.Core.Models.Surface; -using Artemis.Core.Plugins.Abstract.DataModels; -using Artemis.Core.Plugins.Abstract.DataModels.Attributes; -using Artemis.Core.Plugins.Modules; +using Artemis.Core.Plugins.DataModelExpansions; +using Artemis.Core.Plugins.DataModelExpansions.Attributes; +using Artemis.Core.Plugins.Modules.ActivationRequirements; using Artemis.Storage.Entities.Module; using SkiaSharp; -namespace Artemis.Core.Plugins.Abstract +namespace Artemis.Core.Plugins.Modules { /// /// Allows you to add support for new games/applications while utilizing your own data model diff --git a/src/Artemis.Core/Plugins/Modules/ModuleTab.cs b/src/Artemis.Core/Plugins/Modules/ModuleTab.cs index 328a6045f..57f5985af 100644 --- a/src/Artemis.Core/Plugins/Modules/ModuleTab.cs +++ b/src/Artemis.Core/Plugins/Modules/ModuleTab.cs @@ -1,6 +1,4 @@ using System; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Abstract.ViewModels; namespace Artemis.Core.Plugins.Modules { diff --git a/src/Artemis.Core/Plugins/Abstract/ViewModels/ModuleViewModel.cs b/src/Artemis.Core/Plugins/Modules/ModuleViewModel.cs similarity index 93% rename from src/Artemis.Core/Plugins/Abstract/ViewModels/ModuleViewModel.cs rename to src/Artemis.Core/Plugins/Modules/ModuleViewModel.cs index cd1247e35..0900fb483 100644 --- a/src/Artemis.Core/Plugins/Abstract/ViewModels/ModuleViewModel.cs +++ b/src/Artemis.Core/Plugins/Modules/ModuleViewModel.cs @@ -1,6 +1,6 @@ using Stylet; -namespace Artemis.Core.Plugins.Abstract.ViewModels +namespace Artemis.Core.Plugins.Modules { /// /// The base class for any view model that belongs to a module diff --git a/src/Artemis.Core/Plugins/Abstract/ProfileModule.cs b/src/Artemis.Core/Plugins/Modules/ProfileModule.cs similarity index 98% rename from src/Artemis.Core/Plugins/Abstract/ProfileModule.cs rename to src/Artemis.Core/Plugins/Modules/ProfileModule.cs index 1fa60785b..71fbe0e8f 100644 --- a/src/Artemis.Core/Plugins/Abstract/ProfileModule.cs +++ b/src/Artemis.Core/Plugins/Modules/ProfileModule.cs @@ -8,12 +8,12 @@ using System.Threading.Tasks; using Artemis.Core.Exceptions; using Artemis.Core.Models.Profile; using Artemis.Core.Models.Surface; -using Artemis.Core.Plugins.Abstract.DataModels; -using Artemis.Core.Plugins.Abstract.DataModels.Attributes; +using Artemis.Core.Plugins.DataModelExpansions; +using Artemis.Core.Plugins.DataModelExpansions.Attributes; using Artemis.Core.Utilities; using SkiaSharp; -namespace Artemis.Core.Plugins.Abstract +namespace Artemis.Core.Plugins.Modules { /// /// Allows you to add support for new games/applications while utilizing Artemis' profile engine and your own data diff --git a/src/Artemis.Core/Plugins/Abstract/Plugin.cs b/src/Artemis.Core/Plugins/Plugin.cs similarity index 97% rename from src/Artemis.Core/Plugins/Abstract/Plugin.cs rename to src/Artemis.Core/Plugins/Plugin.cs index 209a3015b..e0773d604 100644 --- a/src/Artemis.Core/Plugins/Abstract/Plugin.cs +++ b/src/Artemis.Core/Plugins/Plugin.cs @@ -1,10 +1,8 @@ using System; using System.Threading.Tasks; -using Artemis.Core.Plugins.Abstract.ViewModels; using Artemis.Core.Plugins.Exceptions; -using Artemis.Core.Plugins.Models; -namespace Artemis.Core.Plugins.Abstract +namespace Artemis.Core.Plugins { /// /// This is the base plugin type, use the other interfaces such as Module to create plugins diff --git a/src/Artemis.Core/Plugins/Abstract/PluginConfigurationDialog.cs b/src/Artemis.Core/Plugins/PluginConfigurationDialog.cs similarity index 88% rename from src/Artemis.Core/Plugins/Abstract/PluginConfigurationDialog.cs rename to src/Artemis.Core/Plugins/PluginConfigurationDialog.cs index 90fd5598e..571c22471 100644 --- a/src/Artemis.Core/Plugins/Abstract/PluginConfigurationDialog.cs +++ b/src/Artemis.Core/Plugins/PluginConfigurationDialog.cs @@ -1,7 +1,6 @@ using System; -using Artemis.Core.Plugins.Abstract.ViewModels; -namespace Artemis.Core.Plugins.Abstract +namespace Artemis.Core.Plugins { /// public class PluginConfigurationDialog : PluginConfigurationDialog where T : PluginConfigurationViewModel diff --git a/src/Artemis.Core/Plugins/Abstract/ViewModels/PluginConfigurationViewModel.cs b/src/Artemis.Core/Plugins/PluginConfigurationViewModel.cs similarity index 82% rename from src/Artemis.Core/Plugins/Abstract/ViewModels/PluginConfigurationViewModel.cs rename to src/Artemis.Core/Plugins/PluginConfigurationViewModel.cs index 56bc05dcd..4f18c77e3 100644 --- a/src/Artemis.Core/Plugins/Abstract/ViewModels/PluginConfigurationViewModel.cs +++ b/src/Artemis.Core/Plugins/PluginConfigurationViewModel.cs @@ -1,6 +1,6 @@ using Stylet; -namespace Artemis.Core.Plugins.Abstract.ViewModels +namespace Artemis.Core.Plugins { public abstract class PluginConfigurationViewModel : Screen { diff --git a/src/Artemis.Core/Plugins/Models/PluginInfo.cs b/src/Artemis.Core/Plugins/PluginInfo.cs similarity index 98% rename from src/Artemis.Core/Plugins/Models/PluginInfo.cs rename to src/Artemis.Core/Plugins/PluginInfo.cs index 3ff3676d5..7848707c8 100644 --- a/src/Artemis.Core/Plugins/Models/PluginInfo.cs +++ b/src/Artemis.Core/Plugins/PluginInfo.cs @@ -1,13 +1,12 @@ using System; using System.IO; using System.Reflection; -using Artemis.Core.Plugins.Abstract; using Artemis.Storage.Entities.Plugins; using McMaster.NETCore.Plugins; using Newtonsoft.Json; using Stylet; -namespace Artemis.Core.Plugins.Models +namespace Artemis.Core.Plugins { [JsonObject(MemberSerialization.OptIn)] public class PluginInfo : PropertyChangedBase diff --git a/src/Artemis.Core/Plugins/Models/PluginSetting.cs b/src/Artemis.Core/Plugins/Settings/PluginSetting.cs similarity index 98% rename from src/Artemis.Core/Plugins/Models/PluginSetting.cs rename to src/Artemis.Core/Plugins/Settings/PluginSetting.cs index 7c21c8ddd..5220c4d5d 100644 --- a/src/Artemis.Core/Plugins/Models/PluginSetting.cs +++ b/src/Artemis.Core/Plugins/Settings/PluginSetting.cs @@ -4,7 +4,7 @@ using Artemis.Storage.Repositories.Interfaces; using Newtonsoft.Json; using Stylet; -namespace Artemis.Core.Plugins.Models +namespace Artemis.Core.Plugins.Settings { public class PluginSetting : PropertyChangedBase { diff --git a/src/Artemis.Core/Plugins/Models/PluginSettings.cs b/src/Artemis.Core/Plugins/Settings/PluginSettings.cs similarity index 98% rename from src/Artemis.Core/Plugins/Models/PluginSettings.cs rename to src/Artemis.Core/Plugins/Settings/PluginSettings.cs index f23db2d34..b145dd948 100644 --- a/src/Artemis.Core/Plugins/Models/PluginSettings.cs +++ b/src/Artemis.Core/Plugins/Settings/PluginSettings.cs @@ -3,7 +3,7 @@ using Artemis.Storage.Entities.Plugins; using Artemis.Storage.Repositories.Interfaces; using Newtonsoft.Json; -namespace Artemis.Core.Plugins.Models +namespace Artemis.Core.Plugins.Settings { /// /// This contains all the settings for your plugin. To access a setting use . diff --git a/src/Artemis.Core/RGB.NET/BitmapBrush.cs b/src/Artemis.Core/RGB.NET/BitmapBrush.cs index eaf01451a..b413a3e9a 100644 --- a/src/Artemis.Core/RGB.NET/BitmapBrush.cs +++ b/src/Artemis.Core/RGB.NET/BitmapBrush.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Artemis.Core.Extensions; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using RGB.NET.Core; using SkiaSharp; diff --git a/src/Artemis.Core/Services/CoreService.cs b/src/Artemis.Core/Services/CoreService.cs index d69df8d80..5ea7d57c0 100644 --- a/src/Artemis.Core/Services/CoreService.cs +++ b/src/Artemis.Core/Services/CoreService.cs @@ -9,8 +9,8 @@ using Artemis.Core.Exceptions; using Artemis.Core.JsonConverters; using Artemis.Core.Models.Profile; using Artemis.Core.Ninject; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.DataModelExpansions; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services.Interfaces; using Artemis.Core.Services.Storage.Interfaces; using Artemis.Core.Utilities; @@ -20,7 +20,7 @@ using RGB.NET.Core; using Serilog; using Serilog.Events; using SkiaSharp; -using Module = Artemis.Core.Plugins.Abstract.Module; +using Module = Artemis.Core.Plugins.Modules.Module; namespace Artemis.Core.Services { diff --git a/src/Artemis.Core/Services/DataModelService.cs b/src/Artemis.Core/Services/DataModelService.cs index a8086c18d..6cb887d58 100644 --- a/src/Artemis.Core/Services/DataModelService.cs +++ b/src/Artemis.Core/Services/DataModelService.cs @@ -7,10 +7,10 @@ using Artemis.Core.Exceptions; using Artemis.Core.Extensions; using Artemis.Core.Models.Profile.Conditions; using Artemis.Core.Models.Profile.Conditions.Operators; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Abstract.DataModels; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.DataModelExpansions; using Artemis.Core.Plugins.Exceptions; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Modules; using Artemis.Core.Services.Interfaces; using Newtonsoft.Json; using Serilog; diff --git a/src/Artemis.Core/Services/Interfaces/IDataModelService.cs b/src/Artemis.Core/Services/Interfaces/IDataModelService.cs index 4b9fc1220..f1586204d 100644 --- a/src/Artemis.Core/Services/Interfaces/IDataModelService.cs +++ b/src/Artemis.Core/Services/Interfaces/IDataModelService.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using Artemis.Core.Annotations; using Artemis.Core.Models.Profile.Conditions; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Abstract.DataModels; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.DataModelExpansions; using Newtonsoft.Json; namespace Artemis.Core.Services.Interfaces diff --git a/src/Artemis.Core/Services/Interfaces/IPluginService.cs b/src/Artemis.Core/Services/Interfaces/IPluginService.cs index e8b88943a..f806b5d37 100644 --- a/src/Artemis.Core/Services/Interfaces/IPluginService.cs +++ b/src/Artemis.Core/Services/Interfaces/IPluginService.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Reflection; using Artemis.Core.Events; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; using RGB.NET.Core; namespace Artemis.Core.Services.Interfaces diff --git a/src/Artemis.Core/Services/Interfaces/IRenderElementService.cs b/src/Artemis.Core/Services/Interfaces/IRenderElementService.cs index 70f8e0681..b7e84fa0a 100644 --- a/src/Artemis.Core/Services/Interfaces/IRenderElementService.cs +++ b/src/Artemis.Core/Services/Interfaces/IRenderElementService.cs @@ -1,8 +1,7 @@ using Artemis.Core.Models.Profile; -using Artemis.Core.Plugins.LayerBrush; -using Artemis.Core.Plugins.LayerBrush.Abstract; -using Artemis.Core.Plugins.LayerEffect; -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerBrushes; +using Artemis.Core.Plugins.LayerBrushes.Internal; +using Artemis.Core.Plugins.LayerEffects; namespace Artemis.Core.Services.Interfaces { diff --git a/src/Artemis.Core/Services/ModuleService.cs b/src/Artemis.Core/Services/ModuleService.cs index 0e9166fd2..e037fbf5d 100644 --- a/src/Artemis.Core/Services/ModuleService.cs +++ b/src/Artemis.Core/Services/ModuleService.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Timers; using Artemis.Core.Events; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.Modules; using Artemis.Core.Services.Interfaces; using Artemis.Core.Services.Storage.Interfaces; using Artemis.Storage.Repositories.Interfaces; diff --git a/src/Artemis.Core/Services/PluginService.cs b/src/Artemis.Core/Services/PluginService.cs index c80bf38de..e0865687c 100644 --- a/src/Artemis.Core/Services/PluginService.cs +++ b/src/Artemis.Core/Services/PluginService.cs @@ -6,9 +6,9 @@ using System.Reflection; using Artemis.Core.Events; using Artemis.Core.Exceptions; using Artemis.Core.Extensions; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Plugins.Exceptions; -using Artemis.Core.Plugins.Models; using Artemis.Core.Services.Interfaces; using Artemis.Core.Utilities; using Artemis.Storage.Entities.Plugins; diff --git a/src/Artemis.Core/Services/RenderElementService.cs b/src/Artemis.Core/Services/RenderElementService.cs index 263e7a04c..c848bbe07 100644 --- a/src/Artemis.Core/Services/RenderElementService.cs +++ b/src/Artemis.Core/Services/RenderElementService.cs @@ -4,10 +4,9 @@ using System.Linq; using Artemis.Core.Exceptions; using Artemis.Core.Models.Profile; using Artemis.Core.Models.Profile.Conditions; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.LayerBrush.Abstract; -using Artemis.Core.Plugins.LayerEffect; -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerBrushes; +using Artemis.Core.Plugins.LayerBrushes.Internal; +using Artemis.Core.Plugins.LayerEffects; using Artemis.Core.Services.Interfaces; using Artemis.Storage.Entities.Profile; using Ninject; diff --git a/src/Artemis.Core/Services/RgbService.cs b/src/Artemis.Core/Services/RgbService.cs index 667eceb33..9b8038c11 100644 --- a/src/Artemis.Core/Services/RgbService.cs +++ b/src/Artemis.Core/Services/RgbService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using Artemis.Core.Events; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using Artemis.Core.RGB.NET; using Artemis.Core.Services.Interfaces; using RGB.NET.Core; diff --git a/src/Artemis.Core/Services/SettingsService.cs b/src/Artemis.Core/Services/SettingsService.cs index b74351c91..25e5bc411 100644 --- a/src/Artemis.Core/Services/SettingsService.cs +++ b/src/Artemis.Core/Services/SettingsService.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services.Interfaces; using Artemis.Storage.Repositories.Interfaces; diff --git a/src/Artemis.Core/Services/Storage/Interfaces/IProfileService.cs b/src/Artemis.Core/Services/Storage/Interfaces/IProfileService.cs index b4cb7235b..5fea023cb 100644 --- a/src/Artemis.Core/Services/Storage/Interfaces/IProfileService.cs +++ b/src/Artemis.Core/Services/Storage/Interfaces/IProfileService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Artemis.Core.Models.Profile; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.Modules; using Artemis.Core.Services.Interfaces; namespace Artemis.Core.Services.Storage.Interfaces diff --git a/src/Artemis.Core/Services/Storage/ProfileService.cs b/src/Artemis.Core/Services/Storage/ProfileService.cs index 1edae26ef..964eb9266 100644 --- a/src/Artemis.Core/Services/Storage/ProfileService.cs +++ b/src/Artemis.Core/Services/Storage/ProfileService.cs @@ -6,8 +6,9 @@ using Artemis.Core.Events; using Artemis.Core.Exceptions; using Artemis.Core.Models.Profile; using Artemis.Core.Models.Surface; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerBrushes; +using Artemis.Core.Plugins.LayerEffects; +using Artemis.Core.Plugins.Modules; using Artemis.Core.Services.Interfaces; using Artemis.Core.Services.Storage.Interfaces; using Artemis.Storage.Entities.Profile; diff --git a/src/Artemis.Core/Services/Storage/SurfaceService.cs b/src/Artemis.Core/Services/Storage/SurfaceService.cs index fc3d2cea3..e108c6bb7 100644 --- a/src/Artemis.Core/Services/Storage/SurfaceService.cs +++ b/src/Artemis.Core/Services/Storage/SurfaceService.cs @@ -6,7 +6,7 @@ using Artemis.Core.Events; using Artemis.Core.Exceptions; using Artemis.Core.Extensions; using Artemis.Core.Models.Surface; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services.Interfaces; using Artemis.Core.Services.Storage.Interfaces; using Artemis.Storage.Repositories.Interfaces; diff --git a/src/Artemis.Core/Utilities/IntroAnimation.cs b/src/Artemis.Core/Utilities/IntroAnimation.cs index 77541c8bb..06a6ba79c 100644 --- a/src/Artemis.Core/Utilities/IntroAnimation.cs +++ b/src/Artemis.Core/Utilities/IntroAnimation.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using Artemis.Core.Extensions; using Artemis.Core.Models.Profile; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.Modules; using Artemis.Core.Services.Storage.Interfaces; using Artemis.Storage.Entities.Profile; using Newtonsoft.Json; diff --git a/src/Artemis.UI.Shared/DataModelVisualization/DataModelInputViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/DataModelInputViewModel.cs index cb1bbcb00..947381da9 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/DataModelInputViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/DataModelInputViewModel.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Data; using System.Windows.Input; -using Artemis.Core.Plugins.Abstract.DataModels.Attributes; +using Artemis.Core.Plugins.DataModelExpansions.Attributes; using Stylet; namespace Artemis.UI.Shared.DataModelVisualization diff --git a/src/Artemis.UI.Shared/DataModelVisualization/DataModelVisualizationRegistration.cs b/src/Artemis.UI.Shared/DataModelVisualization/DataModelVisualizationRegistration.cs index 2b5b3b9cf..397ea40d8 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/DataModelVisualizationRegistration.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/DataModelVisualizationRegistration.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Artemis.Core; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; using Artemis.UI.Shared.Services; namespace Artemis.UI.Shared.DataModelVisualization diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListPropertiesViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListPropertiesViewModel.cs index 016ae6298..0b7a76f94 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListPropertiesViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListPropertiesViewModel.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Reflection; -using Artemis.Core.Plugins.Abstract.DataModels; +using Artemis.Core.Plugins.DataModelExpansions; using Artemis.UI.Shared.Services; namespace Artemis.UI.Shared.DataModelVisualization.Shared diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListPropertyViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListPropertyViewModel.cs index 434082dae..e6270de43 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListPropertyViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListPropertyViewModel.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Reflection; -using Artemis.Core.Plugins.Abstract.DataModels; +using Artemis.Core.Plugins.DataModelExpansions; using Artemis.UI.Shared.Services; namespace Artemis.UI.Shared.DataModelVisualization.Shared diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs index 0beaa714b..b7e2dbeca 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Reflection; using Artemis.Core.Extensions; -using Artemis.Core.Plugins.Abstract.DataModels; +using Artemis.Core.Plugins.DataModelExpansions; using Artemis.UI.Shared.Services; using Stylet; diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertiesViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertiesViewModel.cs index f089da6e1..4cc0b0ee7 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertiesViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertiesViewModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Artemis.Core.Plugins.Abstract.DataModels; +using Artemis.Core.Plugins.DataModelExpansions; using Artemis.UI.Shared.Services; namespace Artemis.UI.Shared.DataModelVisualization.Shared diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertyViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertyViewModel.cs index b99174856..d057eaa42 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertyViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertyViewModel.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Reflection; -using Artemis.Core.Plugins.Abstract.DataModels; +using Artemis.Core.Plugins.DataModelExpansions; using Artemis.UI.Shared.Services; namespace Artemis.UI.Shared.DataModelVisualization.Shared diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs index 223f3b110..301b0d7c6 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs @@ -6,8 +6,8 @@ using System.Reflection; using System.Windows.Documents; using Artemis.Core.Extensions; using Artemis.Core.Models.Profile.Conditions; -using Artemis.Core.Plugins.Abstract.DataModels; -using Artemis.Core.Plugins.Abstract.DataModels.Attributes; +using Artemis.Core.Plugins.DataModelExpansions; +using Artemis.Core.Plugins.DataModelExpansions.Attributes; using Artemis.UI.Shared.Exceptions; using Artemis.UI.Shared.Services; using Humanizer; diff --git a/src/Artemis.UI.Shared/PropertyInput/PropertyInputRegistration.cs b/src/Artemis.UI.Shared/PropertyInput/PropertyInputRegistration.cs index 425c4e827..2b2786d8c 100644 --- a/src/Artemis.UI.Shared/PropertyInput/PropertyInputRegistration.cs +++ b/src/Artemis.UI.Shared/PropertyInput/PropertyInputRegistration.cs @@ -1,6 +1,6 @@ using System; using Artemis.Core; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; using Artemis.UI.Shared.Services.Interfaces; namespace Artemis.UI.Shared.PropertyInput diff --git a/src/Artemis.UI.Shared/Services/DataModelVisualization/ListDataModelWrapper.cs b/src/Artemis.UI.Shared/Services/DataModelVisualization/ListDataModelWrapper.cs index 9123edeee..49f570fc6 100644 --- a/src/Artemis.UI.Shared/Services/DataModelVisualization/ListDataModelWrapper.cs +++ b/src/Artemis.UI.Shared/Services/DataModelVisualization/ListDataModelWrapper.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Text; -using Artemis.Core.Plugins.Abstract.DataModels; +using Artemis.Core.Plugins.DataModelExpansions; namespace Artemis.UI.Shared.Services.DataModelVisualization { diff --git a/src/Artemis.UI.Shared/Services/DataModelVisualizationService.cs b/src/Artemis.UI.Shared/Services/DataModelVisualizationService.cs index 87d82bc6e..47d5770dc 100644 --- a/src/Artemis.UI.Shared/Services/DataModelVisualizationService.cs +++ b/src/Artemis.UI.Shared/Services/DataModelVisualizationService.cs @@ -3,10 +3,9 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using Artemis.Core.Extensions; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Abstract.DataModels.Attributes; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.DataModelExpansions.Attributes; using Artemis.Core.Plugins.Exceptions; -using Artemis.Core.Plugins.Models; using Artemis.Core.Services.Interfaces; using Artemis.UI.Shared.DataModelVisualization; using Artemis.UI.Shared.DataModelVisualization.Shared; diff --git a/src/Artemis.UI.Shared/Services/Interfaces/IProfileEditorService.cs b/src/Artemis.UI.Shared/Services/Interfaces/IProfileEditorService.cs index 4c2fa7b65..0b19365ee 100644 --- a/src/Artemis.UI.Shared/Services/Interfaces/IProfileEditorService.cs +++ b/src/Artemis.UI.Shared/Services/Interfaces/IProfileEditorService.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using Artemis.Core.Models.Profile; using Artemis.Core.Models.Profile.LayerProperties; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.Modules; using Artemis.UI.Shared.Events; using Artemis.UI.Shared.PropertyInput; using Ninject; diff --git a/src/Artemis.UI.Shared/Services/ProfileEditorService.cs b/src/Artemis.UI.Shared/Services/ProfileEditorService.cs index 2a38b64ec..1de95a0d3 100644 --- a/src/Artemis.UI.Shared/Services/ProfileEditorService.cs +++ b/src/Artemis.UI.Shared/Services/ProfileEditorService.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using Artemis.Core.Models.Profile; using Artemis.Core.Models.Profile.LayerProperties; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins; using Artemis.Core.Plugins.Exceptions; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Modules; using Artemis.Core.Services.Storage.Interfaces; using Artemis.UI.Shared.Events; using Artemis.UI.Shared.PropertyInput; diff --git a/src/Artemis.UI/DataModelVisualization/Input/DoubleDataModelInputViewModel.cs b/src/Artemis.UI/DataModelVisualization/Input/DoubleDataModelInputViewModel.cs index 6a73466b5..af4b87bad 100644 --- a/src/Artemis.UI/DataModelVisualization/Input/DoubleDataModelInputViewModel.cs +++ b/src/Artemis.UI/DataModelVisualization/Input/DoubleDataModelInputViewModel.cs @@ -1,7 +1,7 @@ using System.Globalization; using System.Text.RegularExpressions; using System.Windows.Input; -using Artemis.Core.Plugins.Abstract.DataModels.Attributes; +using Artemis.Core.Plugins.DataModelExpansions.Attributes; using Artemis.UI.Shared.DataModelVisualization; namespace Artemis.UI.DataModelVisualization.Input diff --git a/src/Artemis.UI/DataModelVisualization/Input/IntDataModelInputViewModel.cs b/src/Artemis.UI/DataModelVisualization/Input/IntDataModelInputViewModel.cs index ccd780489..601728283 100644 --- a/src/Artemis.UI/DataModelVisualization/Input/IntDataModelInputViewModel.cs +++ b/src/Artemis.UI/DataModelVisualization/Input/IntDataModelInputViewModel.cs @@ -1,6 +1,6 @@ using System.Text.RegularExpressions; using System.Windows.Input; -using Artemis.Core.Plugins.Abstract.DataModels.Attributes; +using Artemis.Core.Plugins.DataModelExpansions.Attributes; using Artemis.UI.Shared.DataModelVisualization; namespace Artemis.UI.DataModelVisualization.Input diff --git a/src/Artemis.UI/DataModelVisualization/Input/StringDataModelInputViewModel.cs b/src/Artemis.UI/DataModelVisualization/Input/StringDataModelInputViewModel.cs index 7fd951fa7..b848049c9 100644 --- a/src/Artemis.UI/DataModelVisualization/Input/StringDataModelInputViewModel.cs +++ b/src/Artemis.UI/DataModelVisualization/Input/StringDataModelInputViewModel.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract.DataModels.Attributes; +using Artemis.Core.Plugins.DataModelExpansions.Attributes; using Artemis.UI.Shared.DataModelVisualization; namespace Artemis.UI.DataModelVisualization.Input diff --git a/src/Artemis.UI/Ninject/Factories/IVMFactory.cs b/src/Artemis.UI/Ninject/Factories/IVMFactory.cs index 6875eb055..8a6135300 100644 --- a/src/Artemis.UI/Ninject/Factories/IVMFactory.cs +++ b/src/Artemis.UI/Ninject/Factories/IVMFactory.cs @@ -3,7 +3,8 @@ using Artemis.Core.Models.Profile.Conditions; using Artemis.Core.Models.Profile.LayerProperties; using Artemis.Core.Models.Profile.LayerProperties.Attributes; using Artemis.Core.Models.Surface; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.Modules; using Artemis.UI.Screens.Module; using Artemis.UI.Screens.ProfileEditor; using Artemis.UI.Screens.ProfileEditor.DisplayConditions; diff --git a/src/Artemis.UI/PropertyInput/BrushPropertyInputView.xaml b/src/Artemis.UI/PropertyInput/BrushPropertyInputView.xaml index 33f04e1d5..af4d33f31 100644 --- a/src/Artemis.UI/PropertyInput/BrushPropertyInputView.xaml +++ b/src/Artemis.UI/PropertyInput/BrushPropertyInputView.xaml @@ -5,8 +5,8 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:propertyInput="clr-namespace:Artemis.UI.PropertyInput" - xmlns:layerBrush="clr-namespace:Artemis.Core.Plugins.LayerBrush;assembly=Artemis.Core" xmlns:dataTemplateSelectors="clr-namespace:Artemis.UI.DataTemplateSelectors" + xmlns:layerBrush="clr-namespace:Artemis.Core.Plugins.LayerBrushes;assembly=Artemis.Core" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance {x:Type propertyInput:BrushPropertyInputViewModel}}"> diff --git a/src/Artemis.UI/PropertyInput/BrushPropertyInputViewModel.cs b/src/Artemis.UI/PropertyInput/BrushPropertyInputViewModel.cs index 86008bd5b..5fd5fb66d 100644 --- a/src/Artemis.UI/PropertyInput/BrushPropertyInputViewModel.cs +++ b/src/Artemis.UI/PropertyInput/BrushPropertyInputViewModel.cs @@ -3,8 +3,7 @@ using System.Linq; using Artemis.Core.Events; using Artemis.Core.Models.Profile; using Artemis.Core.Models.Profile.LayerProperties; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.LayerBrush; +using Artemis.Core.Plugins.LayerBrushes; using Artemis.Core.Services.Interfaces; using Artemis.UI.Shared.PropertyInput; using Artemis.UI.Shared.Services.Interfaces; diff --git a/src/Artemis.UI/Screens/Module/ModuleRootViewModel.cs b/src/Artemis.UI/Screens/Module/ModuleRootViewModel.cs index 73659603a..0ac585fe6 100644 --- a/src/Artemis.UI/Screens/Module/ModuleRootViewModel.cs +++ b/src/Artemis.UI/Screens/Module/ModuleRootViewModel.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Abstract.ViewModels; using Artemis.Core.Plugins.Modules; using Artemis.UI.Ninject.Factories; using Ninject; @@ -16,7 +14,7 @@ namespace Artemis.UI.Screens.Module private readonly IProfileEditorVmFactory _profileEditorVmFactory; private readonly IKernel _kernel; - public ModuleRootViewModel(Core.Plugins.Abstract.Module module, IProfileEditorVmFactory profileEditorVmFactory, IKernel kernel) + public ModuleRootViewModel(Core.Plugins.Modules.Module module, IProfileEditorVmFactory profileEditorVmFactory, IKernel kernel) { DisplayName = module?.DisplayName; Module = module; @@ -27,7 +25,7 @@ namespace Artemis.UI.Screens.Module Task.Run(AddTabsAsync); } - public Core.Plugins.Abstract.Module Module { get; } + public Core.Plugins.Modules.Module Module { get; } private async Task AddTabsAsync() { diff --git a/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportViewModel.cs index 8217c22ba..69c0ff8e8 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportViewModel.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.Modules; using Artemis.Core.Services.Storage.Interfaces; using Artemis.UI.Shared.Services.Dialog; using ICSharpCode.AvalonEdit.Document; diff --git a/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListPredicateViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListPredicateViewModel.cs index 686aa9642..b5f903146 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListPredicateViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListPredicateViewModel.cs @@ -6,7 +6,7 @@ using System.Timers; using System.Windows; using System.Windows.Input; using Artemis.Core.Models.Profile.Conditions; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services; using Artemis.Core.Services.Interfaces; using Artemis.UI.Events; diff --git a/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs index e93ae5d67..93912b77d 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using System.Timers; using Artemis.Core.Models.Profile.Conditions; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services; using Artemis.UI.Ninject.Factories; using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract; diff --git a/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs index 4cf0a3071..e1be747ca 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs @@ -6,7 +6,7 @@ using System.Timers; using System.Windows; using System.Windows.Input; using Artemis.Core.Models.Profile.Conditions; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services; using Artemis.Core.Services.Interfaces; using Artemis.UI.Events; diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowViewModel.cs index fc8496235..e2a64b3eb 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowViewModel.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract.ViewModels; +using Artemis.Core.Plugins.LayerBrushes; using Stylet; namespace Artemis.UI.Screens.ProfileEditor diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowViewModel.cs index 1e45118a8..4a7980134 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowViewModel.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract.ViewModels; +using Artemis.Core.Plugins.LayerEffects; using Stylet; namespace Artemis.UI.Screens.ProfileEditor diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml index 92b684251..108c5f6cf 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml @@ -5,9 +5,9 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerEffects" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" - xmlns:layerEffect="clr-namespace:Artemis.Core.Plugins.LayerEffect;assembly=Artemis.Core" xmlns:s="https://github.com/canton7/Stylet" xmlns:behaviors="clr-namespace:Artemis.UI.Behaviors" + xmlns:layerEffect="clr-namespace:Artemis.Core.Plugins.LayerEffects;assembly=Artemis.Core" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance local:EffectsViewModel}"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs index 9144bf534..86ce9d06a 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs @@ -2,8 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Artemis.Core.Models.Profile; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.LayerEffect; +using Artemis.Core.Plugins.LayerEffects; using Artemis.Core.Services.Interfaces; using Artemis.UI.Shared.Services.Interfaces; using Stylet; diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs index ef5636737..82f230f1f 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; -using Artemis.Core.Plugins.Abstract.ViewModels; +using Artemis.Core.Plugins.LayerBrushes; +using Artemis.Core.Plugins.LayerEffects; using Artemis.Core.Services.Interfaces; using Artemis.UI.Screens.ProfileEditor.Dialogs; using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract; diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml index 28d99b194..bb63ce092 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml @@ -8,7 +8,6 @@ xmlns:profileEditor="clr-namespace:Artemis.UI.Screens.ProfileEditor" xmlns:behaviors="clr-namespace:Artemis.UI.Behaviors" xmlns:profile="clr-namespace:Artemis.Core.Models.Profile;assembly=Artemis.Core" - xmlns:layerBrush="clr-namespace:Artemis.Core.Plugins.LayerBrush;assembly=Artemis.Core" xmlns:dataTemplateSelectors="clr-namespace:Artemis.UI.DataTemplateSelectors" mc:Ignorable="d" behaviors:InputBindingBehavior.PropagateInputBindingsToWindow="True" diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs index 9a4a0624b..a4d803ee7 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs @@ -4,8 +4,8 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; using Artemis.Core.Models.Profile; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Modules; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services; using Artemis.Core.Services.Storage.Interfaces; using Artemis.UI.Screens.ProfileEditor.Dialogs; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs index a65eb6163..cbfb7df58 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs @@ -6,7 +6,7 @@ using System.Windows.Input; using Artemis.Core.Events; using Artemis.Core.Models.Profile; using Artemis.Core.Models.Surface; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services; using Artemis.Core.Services.Storage.Interfaces; using Artemis.UI.Events; diff --git a/src/Artemis.UI/Screens/RootViewModel.cs b/src/Artemis.UI/Screens/RootViewModel.cs index 2cefeb3a1..830237a8a 100644 --- a/src/Artemis.UI/Screens/RootViewModel.cs +++ b/src/Artemis.UI/Screens/RootViewModel.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using System.Timers; using System.Windows; using System.Windows.Input; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services; using Artemis.Core.Services.Interfaces; using Artemis.UI.Events; diff --git a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml index c0e7f5da0..bcd6ad5a9 100644 --- a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml +++ b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml @@ -6,8 +6,8 @@ xmlns:local="clr-namespace:Artemis.UI.Screens.Settings.Debug.Tabs" xmlns:s="https://github.com/canton7/Stylet" xmlns:wpf="http://materialdesigninxaml.net/winfx/xaml/themes" - xmlns:plugins="clr-namespace:Artemis.Core.Plugins.Abstract;assembly=Artemis.Core" xmlns:dataModel="clr-namespace:Artemis.UI.Shared.DataModelVisualization.Shared;assembly=Artemis.UI.Shared" + xmlns:modules="clr-namespace:Artemis.Core.Plugins.Modules;assembly=Artemis.Core" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance local:DataModelDebugViewModel}"> @@ -46,7 +46,7 @@ ItemsSource="{Binding Modules}"> - + diff --git a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs index f7a0e6ef4..8f29dfd17 100644 --- a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs @@ -16,9 +16,9 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs private readonly Timer _updateTimer; private bool _isModuleFilterEnabled; private DataModelPropertiesViewModel _mainDataModel; - private List _modules; + private List _modules; private string _propertySearch; - private Core.Plugins.Abstract.Module _selectedModule; + private Core.Plugins.Modules.Module _selectedModule; public DataModelDebugViewModel(IDataModelVisualizationService dataModelVisualizationService, IPluginService pluginService) { @@ -41,13 +41,13 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs set => SetAndNotify(ref _propertySearch, value); } - public List Modules + public List Modules { get => _modules; set => SetAndNotify(ref _modules, value); } - public Core.Plugins.Abstract.Module SelectedModule + public Core.Plugins.Modules.Module SelectedModule { get => _selectedModule; set @@ -109,7 +109,7 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs private void PopulateModules() { - Modules = _pluginService.GetPluginsOfType().Where(p => p.Enabled).ToList(); + Modules = _pluginService.GetPluginsOfType().Where(p => p.Enabled).ToList(); } } } \ No newline at end of file diff --git a/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs index cb14d872a..629f38bf8 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs @@ -5,7 +5,6 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using Artemis.Core; -using Artemis.Core.Plugins.Models; using Artemis.Core.Services; using Artemis.Core.Utilities; using Artemis.UI.Services.Interfaces; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/Modules/ModuleOrderTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/Modules/ModuleOrderTabViewModel.cs index 0bfcdb394..5c79f19da 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/Modules/ModuleOrderTabViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/Modules/ModuleOrderTabViewModel.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Threading.Tasks; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.Modules; using Artemis.Core.Services.Interfaces; using Stylet; @@ -15,14 +15,14 @@ namespace Artemis.UI.Screens.Settings.Tabs.Modules DisplayName = "MODULE PRIORITY"; _pluginService = pluginService; - NormalModules = new BindableCollection(); - ApplicationModules = new BindableCollection(); - OverlayModules = new BindableCollection(); + NormalModules = new BindableCollection(); + ApplicationModules = new BindableCollection(); + OverlayModules = new BindableCollection(); } - public BindableCollection NormalModules { get; set; } - public BindableCollection ApplicationModules { get; set; } - public BindableCollection OverlayModules { get; set; } + public BindableCollection NormalModules { get; set; } + public BindableCollection ApplicationModules { get; set; } + public BindableCollection OverlayModules { get; set; } protected override void OnActivate() { @@ -33,7 +33,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Modules ApplicationModules.Clear(); OverlayModules.Clear(); - var instances = _pluginService.GetPluginsOfType().ToList(); + var instances = _pluginService.GetPluginsOfType().ToList(); foreach (var module in instances) { if (module.PriorityCategory == ModulePriorityCategory.Normal) diff --git a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsViewModel.cs index 551fe0b26..3715bd266 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsViewModel.cs @@ -2,9 +2,12 @@ using System.Diagnostics; using System.IO; using System.Threading.Tasks; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Abstract.ViewModels; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.DataModelExpansions; +using Artemis.Core.Plugins.DeviceProviders; +using Artemis.Core.Plugins.LayerBrushes; +using Artemis.Core.Plugins.LayerEffects; +using Artemis.Core.Plugins.Modules; using Artemis.Core.Services.Interfaces; using Artemis.UI.Shared.Services.Interfaces; using MaterialDesignThemes.Wpf; @@ -127,7 +130,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins return PackIconKind.Devices; case ProfileModule _: return PackIconKind.VectorRectangle; - case Core.Plugins.Abstract.Module _: + case Core.Plugins.Modules.Module _: return PackIconKind.GearBox; case LayerBrushProvider _: return PackIconKind.Brush; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowViewModel.cs index daf808b5d..98e229ffa 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowViewModel.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract.ViewModels; +using Artemis.Core.Plugins; using MaterialDesignThemes.Wpf; using Stylet; diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs b/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs index 2b708ee6f..8bc5fff76 100644 --- a/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs +++ b/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs @@ -26,7 +26,7 @@ namespace Artemis.UI.Screens.Sidebar private readonly IModuleVmFactory _moduleVmFactory; private readonly IPluginService _pluginService; private BindableCollection _sidebarItems; - private Dictionary _sidebarModules; + private Dictionary _sidebarModules; private IScreen _selectedItem; private bool _isSidebarOpen; private readonly Timer _activeModulesUpdateTimer; @@ -38,7 +38,7 @@ namespace Artemis.UI.Screens.Sidebar _moduleVmFactory = moduleVmFactory; _pluginService = pluginService; - SidebarModules = new Dictionary(); + SidebarModules = new Dictionary(); SidebarItems = new BindableCollection(); _activeModulesUpdateTimer = new Timer(1000); @@ -67,7 +67,7 @@ namespace Artemis.UI.Screens.Sidebar set => SetAndNotify(ref _sidebarItems, value); } - public Dictionary SidebarModules + public Dictionary SidebarModules { get => _sidebarModules; set => SetAndNotify(ref _sidebarModules, value); @@ -111,7 +111,7 @@ namespace Artemis.UI.Screens.Sidebar // Add all activated modules SidebarItems.Add(new DividerNavigationItem()); SidebarItems.Add(new SubheaderNavigationItem {Subheader = "Modules"}); - var modules = _pluginService.GetPluginsOfType().ToList(); + var modules = _pluginService.GetPluginsOfType().ToList(); foreach (var module in modules) AddModule(module); @@ -131,7 +131,7 @@ namespace Artemis.UI.Screens.Sidebar await SelectSidebarItem(args.NavigationItemToSelect); } - public void AddModule(Core.Plugins.Abstract.Module module) + public void AddModule(Core.Plugins.Modules.Module module) { // Ensure the module is not already in the list if (SidebarModules.Any(io => io.Value == module)) @@ -146,7 +146,7 @@ namespace Artemis.UI.Screens.Sidebar SidebarModules.Add(sidebarItem, module); } - public void RemoveModule(Core.Plugins.Abstract.Module module) + public void RemoveModule(Core.Plugins.Modules.Module module) { // If not in the list there's nothing to do if (SidebarModules.All(io => io.Value != module)) @@ -211,13 +211,13 @@ namespace Artemis.UI.Screens.Sidebar private void PluginServiceOnPluginEnabled(object sender, PluginEventArgs e) { - if (e.PluginInfo.Instance is Core.Plugins.Abstract.Module module) + if (e.PluginInfo.Instance is Core.Plugins.Modules.Module module) AddModule(module); } private void PluginServiceOnPluginDisabled(object sender, PluginEventArgs e) { - if (e.PluginInfo.Instance is Core.Plugins.Abstract.Module module) + if (e.PluginInfo.Instance is Core.Plugins.Modules.Module module) RemoveModule(module); } diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs index 4e9c1f567..a4f0e52e5 100644 --- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs +++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs @@ -8,7 +8,7 @@ using System.Windows.Controls; using System.Windows.Input; using System.Windows.Media; using Artemis.Core.Models.Surface; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services; using Artemis.Core.Services.Interfaces; using Artemis.Core.Services.Storage.Interfaces; diff --git a/src/Plugins/Artemis.Plugins.Devices.Asus/AsusDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Asus/AsusDeviceProvider.cs index 2730eb529..aad55a026 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Asus/AsusDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.Asus/AsusDeviceProvider.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Services.Interfaces; using RGB.NET.Core; using RGB.NET.Devices.Asus; diff --git a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs index 3fb101bac..796ffd6de 100644 --- a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs @@ -1,5 +1,5 @@ using System.IO; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Services.Interfaces; using RGB.NET.Core; using RGB.NET.Devices.CoolerMaster; diff --git a/src/Plugins/Artemis.Plugins.Devices.Corsair/CorsairDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Corsair/CorsairDeviceProvider.cs index 2b46d0c81..d4d86a637 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Corsair/CorsairDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.Corsair/CorsairDeviceProvider.cs @@ -1,6 +1,6 @@ using System.IO; using System.Threading.Tasks; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Services.Interfaces; using Microsoft.Win32; using RGB.NET.Core; diff --git a/src/Plugins/Artemis.Plugins.Devices.DMX/DMXDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.DMX/DMXDeviceProvider.cs index c33934032..d7bed7d4b 100644 --- a/src/Plugins/Artemis.Plugins.Devices.DMX/DMXDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.DMX/DMXDeviceProvider.cs @@ -1,4 +1,5 @@ -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Services.Interfaces; using Artemis.Plugins.Devices.DMX.ViewModels; diff --git a/src/Plugins/Artemis.Plugins.Devices.DMX/ViewModels/DMXConfigurationViewModel.cs b/src/Plugins/Artemis.Plugins.Devices.DMX/ViewModels/DMXConfigurationViewModel.cs index 010933d59..959f6e89e 100644 --- a/src/Plugins/Artemis.Plugins.Devices.DMX/ViewModels/DMXConfigurationViewModel.cs +++ b/src/Plugins/Artemis.Plugins.Devices.DMX/ViewModels/DMXConfigurationViewModel.cs @@ -1,5 +1,4 @@ -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Abstract.ViewModels; +using Artemis.Core.Plugins; namespace Artemis.Plugins.Devices.DMX.ViewModels { diff --git a/src/Plugins/Artemis.Plugins.Devices.Debug/DebugDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Debug/DebugDeviceProvider.cs index 5b1176077..8fb860c76 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Debug/DebugDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.Debug/DebugDeviceProvider.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using System.IO; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.DeviceProviders; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services.Interfaces; using Artemis.Plugins.Devices.Debug.Settings; using Artemis.Plugins.Devices.Debug.ViewModels; diff --git a/src/Plugins/Artemis.Plugins.Devices.Debug/ViewModels/DebugConfigurationViewModel.cs b/src/Plugins/Artemis.Plugins.Devices.Debug/ViewModels/DebugConfigurationViewModel.cs index c0b170cee..ce55edbd4 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Debug/ViewModels/DebugConfigurationViewModel.cs +++ b/src/Plugins/Artemis.Plugins.Devices.Debug/ViewModels/DebugConfigurationViewModel.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Abstract.ViewModels; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.Settings; using Artemis.Plugins.Devices.Debug.Settings; using Stylet; diff --git a/src/Plugins/Artemis.Plugins.Devices.Logitech/LogitechDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Logitech/LogitechDeviceProvider.cs index 5aa6b954d..ce2c6f4ee 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Logitech/LogitechDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.Logitech/LogitechDeviceProvider.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using Artemis.Core.Extensions; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Services.Interfaces; using HidSharp; using RGB.NET.Core; diff --git a/src/Plugins/Artemis.Plugins.Devices.Msi/MsiDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Msi/MsiDeviceProvider.cs index 4e66a980f..a6226986b 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Msi/MsiDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.Msi/MsiDeviceProvider.cs @@ -1,5 +1,5 @@ using System.IO; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Services.Interfaces; using RGB.NET.Core; using RGB.NET.Devices.Msi; diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/NovationDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Novation/NovationDeviceProvider.cs index e60b8bc3a..9d46ac5dc 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Novation/NovationDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.Novation/NovationDeviceProvider.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Services.Interfaces; using RGB.NET.Core; using RGB.NET.Devices.Novation; diff --git a/src/Plugins/Artemis.Plugins.Devices.Razer/RazerDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Razer/RazerDeviceProvider.cs index 6f1233d52..91f117942 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Razer/RazerDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.Razer/RazerDeviceProvider.cs @@ -1,5 +1,5 @@ using System.IO; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Plugins.Exceptions; using Artemis.Core.Services.Interfaces; using RGB.NET.Core; diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/RoccatDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Roccat/RoccatDeviceProvider.cs index 9f710c3b4..90d6d171e 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Roccat/RoccatDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.Roccat/RoccatDeviceProvider.cs @@ -1,5 +1,5 @@ using System.IO; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Services.Interfaces; namespace Artemis.Plugins.Devices.Roccat diff --git a/src/Plugins/Artemis.Plugins.Devices.SteelSeries/SteelSeriesDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/SteelSeriesDeviceProvider.cs index d869b70d4..56f9d3f17 100644 --- a/src/Plugins/Artemis.Plugins.Devices.SteelSeries/SteelSeriesDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/SteelSeriesDeviceProvider.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Services.Interfaces; using RGB.NET.Core; using RGB.NET.Devices.SteelSeries; diff --git a/src/Plugins/Artemis.Plugins.Devices.WS281X/ViewModels/WS281XConfigurationViewModel.cs b/src/Plugins/Artemis.Plugins.Devices.WS281X/ViewModels/WS281XConfigurationViewModel.cs index 941722396..22ec89dc5 100644 --- a/src/Plugins/Artemis.Plugins.Devices.WS281X/ViewModels/WS281XConfigurationViewModel.cs +++ b/src/Plugins/Artemis.Plugins.Devices.WS281X/ViewModels/WS281XConfigurationViewModel.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Abstract.ViewModels; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.Settings; using Artemis.Plugins.Devices.WS281X.Settings; namespace Artemis.Plugins.Devices.WS281X.ViewModels diff --git a/src/Plugins/Artemis.Plugins.Devices.WS281X/WS281XDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.WS281X/WS281XDeviceProvider.cs index 48764abb2..0a44995ff 100644 --- a/src/Plugins/Artemis.Plugins.Devices.WS281X/WS281XDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.WS281X/WS281XDeviceProvider.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; -using Artemis.Core.Plugins.Abstract; -using Artemis.Core.Plugins.Models; +using Artemis.Core.Plugins; +using Artemis.Core.Plugins.DeviceProviders; +using Artemis.Core.Plugins.Settings; using Artemis.Core.Services.Interfaces; using Artemis.Plugins.Devices.WS281X.Settings; using Artemis.Plugins.Devices.WS281X.ViewModels; diff --git a/src/Plugins/Artemis.Plugins.Devices.Wooting/WootingDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Wooting/WootingDeviceProvider.cs index f228a7b5b..3a70a0fd5 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Wooting/WootingDeviceProvider.cs +++ b/src/Plugins/Artemis.Plugins.Devices.Wooting/WootingDeviceProvider.cs @@ -1,5 +1,5 @@ using System.IO; -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.DeviceProviders; using Artemis.Core.Services.Interfaces; using RGB.NET.Core; using RGB.NET.Devices.Wooting.Generic; diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs index 68f81fe16..b06bed489 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel; using Artemis.Core.Models.Profile; -using Artemis.Core.Plugins.LayerBrush.Abstract; +using Artemis.Core.Plugins.LayerBrushes; using Artemis.Plugins.LayerBrushes.Color.PropertyGroups; using SkiaSharp; using static Artemis.Plugins.LayerBrushes.Color.PropertyGroups.ColorBrushProperties; diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrushProvider.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrushProvider.cs index a7a18eb7f..6cd52bf9b 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrushProvider.cs +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrushProvider.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.LayerBrushes; namespace Artemis.Plugins.LayerBrushes.Color { diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrush.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrush.cs index ee7c9b04a..14335b764 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrush.cs +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrush.cs @@ -1,5 +1,5 @@ using Artemis.Core.Extensions; -using Artemis.Core.Plugins.LayerBrush.Abstract; +using Artemis.Core.Plugins.LayerBrushes; using RGB.NET.Brushes; using RGB.NET.Core; diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrushProvider.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrushProvider.cs index 2c511a8e5..52350a401 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrushProvider.cs +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrushProvider.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.LayerBrushes; using Artemis.Plugins.LayerBrushes.ColorRgbNet.PropertyInput; using Artemis.UI.Shared.Services.Interfaces; diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs index ce3d29804..b37345403 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using Artemis.Core.Extensions; using Artemis.Core.Models.Surface; -using Artemis.Core.Plugins.LayerBrush.Abstract; +using Artemis.Core.Plugins.LayerBrushes; using Artemis.Core.Services.Interfaces; using Artemis.Plugins.LayerBrushes.Noise.Utilities; using SkiaSharp; diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrushProvider.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrushProvider.cs index 9bc4017f9..7cdab6713 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrushProvider.cs +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrushProvider.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.LayerBrushes; namespace Artemis.Plugins.LayerBrushes.Noise { diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/BlurEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/BlurEffect.cs index 100844314..9d4ce3233 100644 --- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/BlurEffect.cs +++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/BlurEffect.cs @@ -1,5 +1,5 @@ using System; -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerEffects; using SkiaSharp; namespace Artemis.Plugins.LayerEffects.Filter diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ColorMatrixEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ColorMatrixEffect.cs index a335f2830..3dfb3bdda 100644 --- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ColorMatrixEffect.cs +++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ColorMatrixEffect.cs @@ -1,5 +1,4 @@ -using Artemis.Core.Plugins.LayerEffect; -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerEffects; using Artemis.Plugins.LayerEffects.Filter.ViewModels; using SkiaSharp; diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/DilateEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/DilateEffect.cs index 5acfd32f7..ef67c1a6f 100644 --- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/DilateEffect.cs +++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/DilateEffect.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerEffects; using SkiaSharp; namespace Artemis.Plugins.LayerEffects.Filter diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffect.cs index 8a7dc4edf..faace9bb6 100644 --- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffect.cs +++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffect.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerEffects; using SkiaSharp; namespace Artemis.Plugins.LayerEffects.Filter diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/FilterEffectProvider.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/FilterEffectProvider.cs index 83d73ac0a..a17dfb4ba 100644 --- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/FilterEffectProvider.cs +++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/FilterEffectProvider.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract; +using Artemis.Core.Plugins.LayerEffects; namespace Artemis.Plugins.LayerEffects.Filter { diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GlowEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GlowEffect.cs index ca2308bda..a9f281640 100644 --- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GlowEffect.cs +++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GlowEffect.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerEffects; using SkiaSharp; namespace Artemis.Plugins.LayerEffects.Filter diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GrayScaleEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GrayScaleEffect.cs index fe0274023..a2d7b6519 100644 --- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GrayScaleEffect.cs +++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GrayScaleEffect.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerEffects; using SkiaSharp; namespace Artemis.Plugins.LayerEffects.Filter diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/OpacityEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/OpacityEffect.cs index 5d404b544..17b4c7f13 100644 --- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/OpacityEffect.cs +++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/OpacityEffect.cs @@ -1,7 +1,7 @@ using Artemis.Core.Models.Profile; using Artemis.Core.Models.Profile.LayerProperties.Attributes; using Artemis.Core.Models.Profile.LayerProperties.Types; -using Artemis.Core.Plugins.LayerEffect.Abstract; +using Artemis.Core.Plugins.LayerEffects; using SkiaSharp; namespace Artemis.Plugins.LayerEffects.Filter diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ViewModels/ColorMatrixConfigurationViewModel.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ViewModels/ColorMatrixConfigurationViewModel.cs index 2661c07a8..02e2aa449 100644 --- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ViewModels/ColorMatrixConfigurationViewModel.cs +++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ViewModels/ColorMatrixConfigurationViewModel.cs @@ -1,5 +1,5 @@ using System.Diagnostics; -using Artemis.Core.Plugins.Abstract.ViewModels; +using Artemis.Core.Plugins.LayerEffects; namespace Artemis.Plugins.LayerEffects.Filter.ViewModels { diff --git a/src/Plugins/Artemis.Plugins.Modules.General/DataModel/GeneralDataModel.cs b/src/Plugins/Artemis.Plugins.Modules.General/DataModel/GeneralDataModel.cs index 894561308..202e2146a 100644 --- a/src/Plugins/Artemis.Plugins.Modules.General/DataModel/GeneralDataModel.cs +++ b/src/Plugins/Artemis.Plugins.Modules.General/DataModel/GeneralDataModel.cs @@ -5,7 +5,7 @@ using Artemis.Plugins.Modules.General.DataModel.Windows; namespace Artemis.Plugins.Modules.General.DataModel { - public class GeneralDataModel : Core.Plugins.Abstract.DataModels.DataModel + public class GeneralDataModel : Core.Plugins.DataModelExpansions.DataModel { public GeneralDataModel() { @@ -25,7 +25,7 @@ namespace Artemis.Plugins.Modules.General.DataModel public List TestTimeList { get; set; } } - public class TimeDataModel : Core.Plugins.Abstract.DataModels.DataModel + public class TimeDataModel : Core.Plugins.DataModelExpansions.DataModel { public DateTime CurrentTime { get; set; } public DateTime CurrentTimeUTC { get; set; } diff --git a/src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowDataModel.cs b/src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowDataModel.cs index e5e7e1da2..45e2538f7 100644 --- a/src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowDataModel.cs +++ b/src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowDataModel.cs @@ -1,6 +1,6 @@ using System.Diagnostics; using Artemis.Core.Extensions; -using Artemis.Core.Plugins.Abstract.DataModels.Attributes; +using Artemis.Core.Plugins.DataModelExpansions.Attributes; using Artemis.Plugins.Modules.General.Utilities; namespace Artemis.Plugins.Modules.General.DataModel.Windows diff --git a/src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs b/src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs index 07ffb84a7..60cb9b2dd 100644 --- a/src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs +++ b/src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using Artemis.Core.Plugins.Abstract; using Artemis.Core.Plugins.Modules; using Artemis.Plugins.Modules.General.DataModel; using Artemis.Plugins.Modules.General.DataModel.Windows; @@ -45,7 +44,7 @@ namespace Artemis.Plugins.Modules.General UpdateCurrentWindow(); base.Update(deltaTime); } - + #region Open windows public void UpdateCurrentWindow() diff --git a/src/Plugins/Artemis.Plugins.Modules.General/ViewModels/GeneralViewModel.cs b/src/Plugins/Artemis.Plugins.Modules.General/ViewModels/GeneralViewModel.cs index e8c3f9e4d..e5bb2ded4 100644 --- a/src/Plugins/Artemis.Plugins.Modules.General/ViewModels/GeneralViewModel.cs +++ b/src/Plugins/Artemis.Plugins.Modules.General/ViewModels/GeneralViewModel.cs @@ -1,4 +1,4 @@ -using Artemis.Core.Plugins.Abstract.ViewModels; +using Artemis.Core.Plugins.Modules; namespace Artemis.Plugins.Modules.General.ViewModels {