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

Nuget - Updated packages

Browse Source 
Brush properties - Added default values
Brush properties - Removed option to always auto-expand groups
Layer properties - Remember expanded/collapsed groups
Storage - Added migration system
Storage - Added migration that removes profiles made in the old layer properties format
Layer timeline - Added back zoom functionality
This commit is contained in:
SpoinkyNL committed 2020-05-29 00:09:04 +02:00
1 parent 221c8bc7e7
commit dd000e7bed
58 files changed
+329 -188
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Plugins/Artemis.Plugins.Devices.Asus/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
src/Plugins/Artemis.Plugins.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using System;
using System.IO;
using System.IO;
using Artemis.Core.Plugins.Abstract;
using Artemis.Core.Plugins.Models;
using Artemis.Core.Services.Interfaces;
src/Plugins/Artemis.Plugins.Devices.CoolerMaster/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
src/Plugins/Artemis.Plugins.Devices.Corsair/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a779b2f8-c253-4c4b-8634-6eb8f594e96d")]
[assembly: Guid("a779b2f8-c253-4c4b-8634-6eb8f594e96d")]
src/Plugins/Artemis.Plugins.Devices.DMX/Artemis.Plugins.Devices.DMX.csproj
+1 -1
View File
@@ -24,7 +24,7 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="MaterialDesignThemes" Version="3.1.0" />
<PackageReference Include="MaterialDesignThemes" Version="3.1.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
src/Plugins/Artemis.Plugins.Devices.DMX/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
src/Plugins/Artemis.Plugins.Devices.DMX/ViewModels/DMXConfigurationViewModel.cs
+2 -6
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using Artemis.Core.Plugins.Abstract;
using Artemis.Core.Plugins.Abstract;
using Artemis.Core.Plugins.Abstract.ViewModels;
namespace Artemis.Plugins.Devices.DMX.ViewModels
@@ -11,7 +8,6 @@ namespace Artemis.Plugins.Devices.DMX.ViewModels
public DMXConfigurationViewModel(Plugin plugin) : base(plugin)
{
var dmxInstance = RGB.NET.Devices.DMX.DMXDeviceProvider.Instance;
}
}
}
}
src/Plugins/Artemis.Plugins.Devices.Logitech/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("235a45c7-24ad-4f47-b9d4-cd67e610a04d")]
[assembly: Guid("235a45c7-24ad-4f47-b9d4-cd67e610a04d")]
src/Plugins/Artemis.Plugins.Devices.Msi/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
src/Plugins/Artemis.Plugins.Devices.Novation/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
src/Plugins/Artemis.Plugins.Devices.Razer/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
src/Plugins/Artemis.Plugins.Devices.Roccat/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
src/Plugins/Artemis.Plugins.Devices.Roccat/RoccatDeviceProvider.cs
-2
View File
@@ -2,8 +2,6 @@
using Artemis.Core.Plugins.Abstract;
using Artemis.Core.Plugins.Models;
using Artemis.Core.Services.Interfaces;
using RGB.NET.Core;
using RGB.NET.Devices.Roccat;
namespace Artemis.Plugins.Devices.Roccat
{
src/Plugins/Artemis.Plugins.Devices.SteelSeries/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
src/Plugins/Artemis.Plugins.Devices.SteelSeries/SteelSeriesDeviceProvider.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using System.IO;
using Artemis.Core.Plugins.Abstract;
using Artemis.Core.Plugins.Abstract;
using Artemis.Core.Plugins.Models;
using Artemis.Core.Services.Interfaces;
using RGB.NET.Core;
src/Plugins/Artemis.Plugins.Devices.WS281X/Artemis.Plugins.Devices.WS281X.csproj
+1 -1
View File
@@ -24,7 +24,7 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="MaterialDesignThemes" Version="3.1.0" />
<PackageReference Include="MaterialDesignThemes" Version="3.1.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
src/Plugins/Artemis.Plugins.Devices.WS281X/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
src/Plugins/Artemis.Plugins.Devices.WS281X/WS281XDeviceProvider.cs
+2 -1
View File
@@ -14,7 +14,6 @@ namespace Artemis.Plugins.Devices.WS281X
// ReSharper disable once UnusedMember.Global
public class WS281XDeviceProvider : DeviceProvider
{
public PluginSettings Settings { get; }
private readonly IRgbService _rgbService;
public WS281XDeviceProvider(PluginInfo pluginInfo, IRgbService rgbService, PluginSettings settings) : base(pluginInfo, RGB.NET.Devices.WS281X.WS281XDeviceProvider.Instance)
@@ -24,6 +23,8 @@ namespace Artemis.Plugins.Devices.WS281X
HasConfigurationViewModel = true;
}
public PluginSettings Settings { get; }
public override void EnablePlugin()
{
var definitions = Settings.GetSetting<List<DeviceDefinition>>("DeviceDefinitions");
src/Plugins/Artemis.Plugins.Devices.Wooting/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj
+1 -1
View File
@@ -23,7 +23,7 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="1.68.2-preview.29" />
<PackageReference Include="SkiaSharp" Version="1.68.3" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrushProperties.cs
+7 -11
View File
@@ -19,19 +19,15 @@ namespace Artemis.Plugins.LayerBrushes.Color
[PropertyDescription(Description = "The gradient of the brush")]
public ColorGradientLayerProperty Gradient { get; set; }
protected override void PopulateDefaults()
{
GradientType.DefaultValue = LayerBrushes.Color.GradientType.Solid;
Color.DefaultValue = new SKColor(255, 0, 0);
Gradient.DefaultValue = ColorGradient.GetUnicornBarf();
}
protected override void OnPropertiesInitialized()
{
// Populate defaults
if (!GradientType.IsLoadedFromStorage)
GradientType.BaseValue = LayerBrushes.Color.GradientType.Solid;
if (!Color.IsLoadedFromStorage)
Color.BaseValue = new SKColor(255, 0, 0);
if (!Gradient.IsLoadedFromStorage)
{
Gradient.BaseValue = new ColorGradient();
Gradient.BaseValue.MakeFabulous();
}
GradientType.BaseValueChanged += GradientTypeOnBaseValueChanged;
}
src/Plugins/Artemis.Plugins.LayerBrushes.Color/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("0f288a66-6eb0-4589-8595-e33a3a3eaea2")]
[assembly: Guid("0f288a66-6eb0-4589-8595-e33a3a3eaea2")]
src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj
+2 -2
View File
@@ -23,8 +23,8 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="1.68.2-preview.29" />
<PackageReference Include="Stylet" Version="1.3.1" />
<PackageReference Include="SkiaSharp" Version="1.68.3" />
<PackageReference Include="Stylet" Version="1.3.2" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrushProperties.cs
+10 -18
View File
@@ -34,26 +34,18 @@ namespace Artemis.Plugins.LayerBrushes.Noise
[PropertyDescription(Description = "The speed at which the noise moves", MinInputValue = 0f, MaxInputValue = 64f)]
public FloatLayerProperty AnimationSpeed { get; set; }
protected override void PopulateDefaults()
{
MainColor.DefaultValue = new SKColor(255, 0, 0);
SecondaryColor.DefaultValue = new SKColor(0, 0, 255);
GradientColor.DefaultValue = ColorGradient.GetUnicornBarf();
Scale.DefaultValue = new SKSize(100, 100);
Hardness.DefaultValue = 500f;
AnimationSpeed.DefaultValue = 25f;
}
protected override void OnPropertiesInitialized()
{
// Populate defaults
if (!MainColor.IsLoadedFromStorage)
MainColor.BaseValue = new SKColor(255, 0, 0);
if (!SecondaryColor.IsLoadedFromStorage)
SecondaryColor.BaseValue = new SKColor(0, 0, 255);
if (!GradientColor.IsLoadedFromStorage)
{
GradientColor.BaseValue = new ColorGradient();
GradientColor.BaseValue.MakeFabulous();
}
if (!Scale.IsLoadedFromStorage)
Scale.BaseValue = new SKSize(100, 100);
if (!Hardness.IsLoadedFromStorage)
Hardness.BaseValue = 500f;
if (!AnimationSpeed.IsLoadedFromStorage)
AnimationSpeed.BaseValue = 25f;
ColorType.BaseValueChanged += ColorTypeOnBaseValueChanged;
}
src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("7f4c7ab0-4c9b-452d-afed-34544c903def")]
[assembly: Guid("7f4c7ab0-4c9b-452d-afed-34544c903def")]
src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj
+2 -2
View File
@@ -23,8 +23,8 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="1.68.2-preview.29" />
<PackageReference Include="Stylet" Version="1.3.1" />
<PackageReference Include="SkiaSharp" Version="1.68.3" />
<PackageReference Include="Stylet" Version="1.3.2" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
src/Plugins/Artemis.Plugins.Modules.General/GeneralDataModel.cs
+4 -5
View File
@@ -1,7 +1,6 @@
using Artemis.Core.Plugins.Abstract;
using Artemis.Core.Plugins.Abstract.DataModels;
using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
using SkiaSharp;
namespace Artemis.Plugins.Modules.General
{
@@ -24,14 +23,14 @@ namespace Artemis.Plugins.Modules.General
public class PlayerInfo : DataModel
{
public PlayerInfo(Module module) : base(module)
{
}
[DataModelProperty(Name = "A test string", Description = "This is a test string that's not of any use outside testing!")]
public string TestString { get; set; }
[DataModelProperty(Name = "A test boolean", Description = "This is a test boolean that's not of any use outside testing!")]
public bool TestBoolean { get; set; }
public PlayerInfo(Module module) : base(module)
{
}
}
}
src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs
+1 -1
View File
@@ -21,7 +21,7 @@ namespace Artemis.Plugins.Modules.General
var testSetting = _settings.GetSetting("TestSetting", DateTime.Now);
}
public override void EnablePlugin()
{
}
src/Plugins/Artemis.Plugins.Modules.General/Properties/AssemblyInfo.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -7,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("e592f239-faa0-4840-9c85-46e5867d06d5")]
[assembly: Guid("e592f239-faa0-4840-9c85-46e5867d06d5")]