DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +00:00
Code Issues Releases Wiki Activity

Plugins - Adjusted namespaces

Browse Source
This commit is contained in:
SpoinkyNL committed 2020-08-21 22:32:46 +02:00
1 parent c71faba2c9
commit f68d2629b7
144 files changed
+267 -252
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/Module/ModuleRootViewModel.cs
+2 -4
View File
@@ -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()
{
src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportViewModel.cs
+1 -1
View File
@@ -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;
src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListPredicateViewModel.cs
+1 -1
View File
@@ -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;
src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs
+1 -1
View File
@@ -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;
src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs
+1 -1
View File
@@ -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;
src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowViewModel.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins.Abstract.ViewModels;
using Artemis.Core.Plugins.LayerBrushes;
using Stylet;
namespace Artemis.UI.Screens.ProfileEditor
src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowViewModel.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins.Abstract.ViewModels;
using Artemis.Core.Plugins.LayerEffects;
using Stylet;
namespace Artemis.UI.Screens.ProfileEditor
src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml
+1 -1
View File
@@ -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}">
src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs
+1 -2
View File
@@ -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;
src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs
+2 -1
View File
@@ -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;
src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml
-1
View File
@@ -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"
src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs
+2 -2
View File
@@ -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;
src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs
+1 -1
View File
@@ -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;
src/Artemis.UI/Screens/RootViewModel.cs
+1 -1
View File
@@ -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;
src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml
+2 -2
View File
@@ -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}">
<Grid>
@@ -46,7 +46,7 @@
ItemsSource="{Binding Modules}">
<ComboBox.ItemTemplate>
<DataTemplate>
<StackPanel d:DataContext="{d:DesignInstance Type=plugins:Module}" Orientation="Horizontal">
<StackPanel d:DataContext="{d:DesignInstance Type=modules:Module}" Orientation="Horizontal">
<wpf:PackIcon Kind="{Binding DisplayIcon}" VerticalAlignment="Center" Margin="0 0 5 0" />
<TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center" />
</StackPanel>
src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs
+5 -5
View File
@@ -16,9 +16,9 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
private readonly Timer _updateTimer;
private bool _isModuleFilterEnabled;
private DataModelPropertiesViewModel _mainDataModel;
private List<Core.Plugins.Abstract.Module> _modules;
private List<Core.Plugins.Modules.Module> _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<Core.Plugins.Abstract.Module> Modules
public List<Core.Plugins.Modules.Module> 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<Core.Plugins.Abstract.Module>().Where(p => p.Enabled).ToList();
Modules = _pluginService.GetPluginsOfType<Core.Plugins.Modules.Module>().Where(p => p.Enabled).ToList();
}
}
}
src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs
-1
View File
@@ -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;
src/Artemis.UI/Screens/Settings/Tabs/Modules/ModuleOrderTabViewModel.cs
+8 -8
View File
@@ -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<Core.Plugins.Abstract.Module>();
ApplicationModules = new BindableCollection<Core.Plugins.Abstract.Module>();
OverlayModules = new BindableCollection<Core.Plugins.Abstract.Module>();
NormalModules = new BindableCollection<Core.Plugins.Modules.Module>();
ApplicationModules = new BindableCollection<Core.Plugins.Modules.Module>();
OverlayModules = new BindableCollection<Core.Plugins.Modules.Module>();
}
public BindableCollection<Core.Plugins.Abstract.Module> NormalModules { get; set; }
public BindableCollection<Core.Plugins.Abstract.Module> ApplicationModules { get; set; }
public BindableCollection<Core.Plugins.Abstract.Module> OverlayModules { get; set; }
public BindableCollection<Core.Plugins.Modules.Module> NormalModules { get; set; }
public BindableCollection<Core.Plugins.Modules.Module> ApplicationModules { get; set; }
public BindableCollection<Core.Plugins.Modules.Module> 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<Core.Plugins.Abstract.Module>().ToList();
var instances = _pluginService.GetPluginsOfType<Core.Plugins.Modules.Module>().ToList();
foreach (var module in instances)
{
if (module.PriorityCategory == ModulePriorityCategory.Normal)
src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsViewModel.cs
+7 -4
View File
@@ -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;
src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowViewModel.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins.Abstract.ViewModels;
using Artemis.Core.Plugins;
using MaterialDesignThemes.Wpf;
using Stylet;
src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs
+8 -8
View File
@@ -26,7 +26,7 @@ namespace Artemis.UI.Screens.Sidebar
private readonly IModuleVmFactory _moduleVmFactory;
private readonly IPluginService _pluginService;
private BindableCollection<INavigationItem> _sidebarItems;
private Dictionary<INavigationItem, Core.Plugins.Abstract.Module> _sidebarModules;
private Dictionary<INavigationItem, Core.Plugins.Modules.Module> _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<INavigationItem, Core.Plugins.Abstract.Module>();
SidebarModules = new Dictionary<INavigationItem, Core.Plugins.Modules.Module>();
SidebarItems = new BindableCollection<INavigationItem>();
_activeModulesUpdateTimer = new Timer(1000);
@@ -67,7 +67,7 @@ namespace Artemis.UI.Screens.Sidebar
set => SetAndNotify(ref _sidebarItems, value);
}
public Dictionary<INavigationItem, Core.Plugins.Abstract.Module> SidebarModules
public Dictionary<INavigationItem, Core.Plugins.Modules.Module> 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<Core.Plugins.Abstract.Module>().ToList();
var modules = _pluginService.GetPluginsOfType<Core.Plugins.Modules.Module>().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);
}
src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
+1 -1
View File
@@ -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;