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

Core - Flattened namespaces

Browse Source 
Shared UI - Flattened namespaces
Shared UI - General housekeeping
Project - Code cleanup
This commit is contained in:
SpoinkyNL committed 2020-09-01 00:14:08 +02:00
1 parent aa06d8c43e
commit 29d4db55db
454 files changed
+1678 -1938
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Plugins/Artemis.Plugins.Devices.Asus/AsusDeviceProvider.cs
+2 -2
View File
@@ -1,5 +1,5 @@
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Services.Interfaces;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using RGB.NET.Core;
using RGB.NET.Devices.Asus;
using Serilog;
src/Plugins/Artemis.Plugins.Devices.Asus/Layouts/Asus/Mainboards/MAXIMUS-X-HERO.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Asus Maximus X Hero</Name>
<Description>Asus Maximus X Hero</Description>
src/Plugins/Artemis.Plugins.Devices.Asus/Layouts/Asus/Mainboards/PRIMEX370-PRO.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Asus Prime X370-PRO</Name>
<Description>Asus Prime X370-PRO Mainboard</Description>
src/Plugins/Artemis.Plugins.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using System.IO;
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Services.Interfaces;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using RGB.NET.Core;
using RGB.NET.Devices.CoolerMaster;
src/Plugins/Artemis.Plugins.Devices.Corsair/CorsairDeviceProvider.cs
+2 -3
View File
@@ -1,7 +1,6 @@
using System.IO;
using System.Threading.Tasks;
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Services.Interfaces;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using Microsoft.Win32;
using RGB.NET.Core;
using RGB.NET.Devices.Corsair;
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/LEDSTRIP.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair RGB LED Strip</Name>
<Description>Physical layout of Corsairs RGB LED Strip</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/LLFAN.xml
+14 -13
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair LL RGB Fan</Name>
<Description>Physical layout of Corsairs LL RGB Fan</Description>
@@ -32,63 +33,63 @@
<X>-</X>
<Y>-</Y>
</Led>
<Led Id="Fan5">
<Led Id="Fan5">
<Shape>Circle</Shape>
<X>7.9</X>
<Y>29.8</Y>
</Led>
</Led>
<Led Id="Fan6">
<Shape>Circle</Shape>
<X>0.4</X>
<Y>59.9</Y>
</Led>
<Led Id="Fan7">
<Led Id="Fan7">
<Shape>Circle</Shape>
<X>8</X>
<Y>90.4</Y>
</Led>
<Led Id="Fan8">
<Led Id="Fan8">
<Shape>Circle</Shape>
<X>30.7</X>
<Y>113.1</Y>
</Led>
<Led Id="Fan9">
<Led Id="Fan9">
<Shape>Circle</Shape>
<X>59.5</X>
<Y>120.5</Y>
</Led>
<Led Id="Fan10">
<Led Id="Fan10">
<Shape>Circle</Shape>
<X>90.5</X>
<Y>113.1</Y>
</Led>
<Led Id="Fan11">
<Led Id="Fan11">
<Shape>Circle</Shape>
<X>113</X>
<Y>90.4</Y>
</Led>
<Led Id="Fan12">
<Led Id="Fan12">
<Shape>Circle</Shape>
<X>120.5</X>
<Y>59.9</Y>
</Led>
<Led Id="Fan13">
<Led Id="Fan13">
<Shape>Circle</Shape>
<X>113</X>
<Y>29.8</Y>
</Led>
<Led Id="Fan14">
<Led Id="Fan14">
<Shape>Circle</Shape>
<X>90.5</X>
<Y>7.6</Y>
</Led>
<Led Id="Fan15">
<Led Id="Fan15">
<Shape>Circle</Shape>
<X>59.5</X>
<Y>0</Y>
</Led>
<Led Id="Fan16">
<Led Id="Fan16">
<Shape>Circle</Shape>
<X>28</X>
<Y>7.6</Y>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/PUMP.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair H115i RGB Pump</Name>
<Description>Physical layout of Corsairs H115i RGB Pump</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/HeadsetStands/ST100RGB.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair MM800 RGB</Name>
<Description>Physical layout of Corsairs ST100 RGB</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VIRTUOSO.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair Virtuoso</Name>
<Description>Physical layout of Corsairs Virtuoso</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VIRTUOSOSE.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair Virtuoso SE</Name>
<Description>Physical layout of Corsairs Virtuoso SE</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VOIDRGB.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair VOID RGB</Name>
<Description>Physical layout of Corsairs VOID RGB</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K65RGB/UK.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair K70 RGB - Physical UK</Name>
<Description>Physical UK-Layout of Corsairs K70 RGB (Logical: BE, CH, DE, ES, EU, FR, IT, ND, MEX, RU, UK, US_Int)</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K70RGB/UK.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair K70 RGB - Physical UK</Name>
<Description>Physical UK-Layout of Corsairs K70 RGB (Logical: BE, CH, DE, ES, EU, FR, IT, ND, MEX, RU, UK, US_Int)</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGB/UK.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair K95 RGB - Physical UK</Name>
<Description>Physical UK-Layout of Corsairs K95 RGB (Logical: BE, CH, DE, ES, EU, FR, IT, ND, MEX, RU, UK, US_Int)</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/UK.xml
+2 -1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair K95 RGB PLATINUM - Physical UK</Name>
<Description>Physical UK-Layout of Corsairs K95 RGB PLATINUM (Logical: BE, CH, DE, ES, EU_Int, FR, IT, ND, MEX, PT, TR, UK)</Description>
@@ -460,7 +461,7 @@
<LedImage Id="Keyboard_Custom19" Image="Empty.png" />
</LedImages>
</LedImageLayout>
<LedImageLayout Layout="EU_Int">
<LedImageLayout Layout="EU_Int">
<LedImages>
<LedImage Id="Keyboard_Brightness" Image="Strafe_Keys\Brightness.png" />
<LedImage Id="Keyboard_WinLock" Image="Strafe_Keys\WinLock.png" />
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/US.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair K95 RGB PLATINUM - Physical US</Name>
<Description>Physical UK-Layout of Corsairs K95 RGB PLATINUM (Logical: NA)</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUMXT/UK.xml
+2 -1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair K95 RGB PLATINUM XT - Physical UK</Name>
<Description>Physical UK-Layout of Corsairs K95 RGB PLATINUM (Logical: BE, CH, DE, ES, EU_Int, FR, IT, ND, MEX, PT, TR, UK)</Description>
@@ -459,7 +460,7 @@
<LedImage Id="Keyboard_Custom19" Image="Empty.png" />
</LedImages>
</LedImageLayout>
<LedImageLayout Layout="EU_Int">
<LedImageLayout Layout="EU_Int">
<LedImages>
<LedImage Id="Keyboard_Brightness" Image="Strafe_Keys\Brightness.png" />
<LedImage Id="Keyboard_WinLock" Image="Strafe_Keys\WinLock.png" />
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUMXT/US.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair K95 RGB PLATINUM XT - Physical US</Name>
<Description>Physical UK-Layout of Corsairs K95 RGB PLATINUM (Logical: NA)</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Memory/DOMINATORPLATINUMRGB.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair Dominator Platinum RGB</Name>
<Description>Physical layout of Corsairs Dominator Platinum RGB</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/DARKCORERGB.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair DARK CORE RGB</Name>
<Description>Physical layout of Corsairs DARK CORE RGB</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/GLAIVERGB.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair GLAIVE RGB</Name>
<Description>Physical layout of Corsairs GLAIVE RGB</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/HARPOONRGB.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair HARPOON RGB</Name>
<Description>Physical layout of Corsairs HARPOON RGB</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/IRONCLAWRGB.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair IRONCLAW RGB</Name>
<Description>Physical layout of Corsairs IRONCLAW RGB</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/M55RGB.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair M55 RGB</Name>
<Description>Physical layout of Corsairs M55 RGB</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/M65RGB.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair M65 RGB</Name>
<Description>Physical layout of Corsairs M65 RGB</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/NIGHTSWORDRGB.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair NIGHTSWORD RGB</Name>
<Description>Physical layout of Corsairs NIGHTSWORD RGB</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/SABRERGB.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair M65 RGB</Name>
<Description>Physical layout of Corsairs SABRE RGB</Description>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/SCIMITAR.xml
+2 -1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair SCIMITAR RGB</Name>
<Description>Physical layout of Corsairs SCIMITAR RGB</Description>
@@ -41,5 +42,5 @@
<Width>21</Width>
<Height>17</Height>
</Led>
</Leds>
</Leds>
</Device>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/SCIMITARPRORGB.xml
+2 -1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair SCIMITAR RGB</Name>
<Description>Physical layout of Corsairs SCIMITAR RGB</Description>
@@ -41,5 +42,5 @@
<Width>21</Width>
<Height>17</Height>
</Led>
</Leds>
</Leds>
</Device>
src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mousepads/MM800RGB.xml
+2 -1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Corsair MM800 RGB</Name>
<Description>Physical layout of Corsairs MM800 RGB</Description>
@@ -78,4 +79,4 @@
<Y>-</Y>
</Led>
</Leds>
</Device>
</Device>
src/Plugins/Artemis.Plugins.Devices.DMX/DMXDeviceProvider.cs
+3 -3
View File
@@ -1,6 +1,6 @@
using Artemis.Core.Plugins;
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Services.Interfaces;
using Artemis.Core;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using Artemis.Plugins.Devices.DMX.ViewModels;
namespace Artemis.Plugins.Devices.DMX
src/Plugins/Artemis.Plugins.Devices.DMX/ViewModels/DMXConfigurationViewModel.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins;
using Artemis.Core;
namespace Artemis.Plugins.Devices.DMX.ViewModels
{
src/Plugins/Artemis.Plugins.Devices.DMX/Views/DMXConfigurationView.xaml
-1
View File
@@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Artemis.Plugins.Devices.DMX.Views"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
src/Plugins/Artemis.Plugins.Devices.Debug/DebugDeviceProvider.cs
+4 -5
View File
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.IO;
using Artemis.Core.Plugins;
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Plugins.Settings;
using Artemis.Core.Services.Interfaces;
using Artemis.Core;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using Artemis.Plugins.Devices.Debug.Settings;
using Artemis.Plugins.Devices.Debug.ViewModels;
using RGB.NET.Core;
@@ -16,9 +15,9 @@ namespace Artemis.Plugins.Devices.Debug
// ReSharper disable once UnusedMember.Global
public class DebugDeviceProvider : DeviceProvider
{
private readonly ILogger _logger;
private readonly IRgbService _rgbService;
private readonly PluginSettings _settings;
private readonly ILogger _logger;
public DebugDeviceProvider(IRgbService rgbService, PluginSettings settings, ILogger logger) : base(RGB.NET.Devices.Debug.DebugDeviceProvider.Instance)
{
src/Plugins/Artemis.Plugins.Devices.Debug/ViewModels/DebugConfigurationViewModel.cs
+1 -2
View File
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Artemis.Core.Plugins;
using Artemis.Core.Plugins.Settings;
using Artemis.Core;
using Artemis.Plugins.Devices.Debug.Settings;
using Stylet;
src/Plugins/Artemis.Plugins.Devices.Debug/Views/DebugConfigurationView.xaml
+4 -5
View File
@@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Artemis.Plugins.Devices.Debug.Views"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:s="https://github.com/canton7/Stylet"
mc:Ignorable="d"
@@ -11,11 +10,11 @@
<Grid Margin="15">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock>
Enter absolute paths to the device layout and choose the image layout you wish to test. <LineBreak/>
Enter absolute paths to the device layout and choose the image layout you wish to test. <LineBreak />
Please note that currently RGB.NET does not support changing devices on runtime and so any changes below won't be applied until you restart Artemis.
</TextBlock>
<DataGrid Grid.Row="1"
@@ -38,7 +37,7 @@
</DataGrid.Columns>
</DataGrid>
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
<Button Style="{StaticResource MaterialDesignOutlinedButton}" Margin="0 0 5 0" Command="{s:Action Cancel}">
<Button Style="{StaticResource MaterialDesignOutlinedButton}" Margin="0 0 5 0" Command="{s:Action Cancel}">
CANCEL
</Button>
<Button Style="{StaticResource MaterialDesignFlatMidBgButton}" Command="{s:Action SaveChanges}">
src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G610/UK.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Logitech G610 - Physical UK</Name>
<Description>Physical UK-Layout of Logitech G610 (Logical: ???)</Description>
src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G810/UK.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Logitech G810 - Physical UK</Name>
<Description>Physical UK-Layout of Logitech G810 (Logical: ???)</Description>
src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G910/UK.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Logitech G910 - Physical UK</Name>
<Description>Physical UK-Layout of Logitech G910 (Logical: ???)</Description>
src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/Pro/UK.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Logitech Pro Gaming Keyboard - Physical UK</Name>
<Description>Physical UK-Layout of Logitech Pro Gaming Keyboard (Logical: ???)</Description>
src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Mice/G403.xml
+3 -2
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Logitech G403</Name>
<Description>Layout of the Logitech G403 Mouse</Description>
@@ -16,8 +17,8 @@
<Shape>m 0.7025,0.00275 -0.15,0 -0,0.26 h 0.15 z m -0.16732,0.7925 c -0.7,0.0159 -0.55,0.19383 -0.006236,0.19067 l 0.001707,-0.0416 c -0.425,-0.0115 -0.225,-0.11 0.005116,-0.10 z m 0.410,0.0779 -0.435,0 0,0.0401 0.225,0 0,0.0437 0.21,0 z</Shape>
<X>24</X>
<Y>15</Y>
<Width>17mm</Width>
<Height>81mm</Height>
<Width>17mm</Width>
<Height>81mm</Height>
</Led>
</Leds>
</Device>
src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Mice/G900.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Logitech G900</Name>
<Description>Layout of the G900 mouse</Description>
src/Plugins/Artemis.Plugins.Devices.Logitech/LogitechDeviceProvider.cs
+3 -3
View File
@@ -1,9 +1,9 @@
using System;
using System.IO;
using System.Linq;
using Artemis.Core.Extensions;
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Services.Interfaces;
using Artemis.Core;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using HidSharp;
using RGB.NET.Core;
using RGB.NET.Devices.Logitech;
src/Plugins/Artemis.Plugins.Devices.Msi/MsiDeviceProvider.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using System.IO;
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Services.Interfaces;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using RGB.NET.Core;
using RGB.NET.Devices.Msi;
src/Plugins/Artemis.Plugins.Devices.Novation/Layouts/Novation/Launchpads/LaunchpadMini.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Launchpad Mini</Name>
<Description>Launchpad Mini (8x8-Pad Grid)</Description>
src/Plugins/Artemis.Plugins.Devices.Novation/Layouts/Novation/Launchpads/LaunchpadS.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Launchpad S</Name>
<Description>Launchpad S (8x8-Pad Grid)</Description>
src/Plugins/Artemis.Plugins.Devices.Novation/NovationDeviceProvider.cs
+2 -2
View File
@@ -1,5 +1,5 @@
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Services.Interfaces;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using RGB.NET.Core;
using RGB.NET.Devices.Novation;
src/Plugins/Artemis.Plugins.Devices.Razer/RazerDeviceProvider.cs
+3 -3
View File
@@ -1,7 +1,7 @@
using System.IO;
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Plugins.Exceptions;
using Artemis.Core.Services.Interfaces;
using Artemis.Core;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using RGB.NET.Core;
using RGB.NET.Devices.Razer;
src/Plugins/Artemis.Plugins.Devices.Roccat/Layouts/Roccat/Mainboards/PRIMEX370-PRO.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Roccat Prime X370-PRO</Name>
<Description>Roccat Prime X370-PRO Mainboard</Description>
src/Plugins/Artemis.Plugins.Devices.Roccat/RoccatDeviceProvider.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using System.IO;
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Services.Interfaces;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
namespace Artemis.Plugins.Devices.Roccat
{
src/Plugins/Artemis.Plugins.Devices.SteelSeries/SteelSeriesDeviceProvider.cs
+2 -2
View File
@@ -1,5 +1,5 @@
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Services.Interfaces;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using RGB.NET.Core;
using RGB.NET.Devices.SteelSeries;
src/Plugins/Artemis.Plugins.Devices.WS281X/ViewModels/WS281XConfigurationViewModel.cs
+1 -2
View File
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using Artemis.Core.Plugins;
using Artemis.Core.Plugins.Settings;
using Artemis.Core;
using Artemis.Plugins.Devices.WS281X.Settings;
namespace Artemis.Plugins.Devices.WS281X.ViewModels
src/Plugins/Artemis.Plugins.Devices.WS281X/Views/WS281XConfigurationView.xaml
-1
View File
@@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Artemis.Plugins.Devices.WS281X.Views"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
src/Plugins/Artemis.Plugins.Devices.WS281X/WS281XDeviceProvider.cs
+3 -4
View File
@@ -1,9 +1,8 @@
using System;
using System.Collections.Generic;
using Artemis.Core.Plugins;
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Plugins.Settings;
using Artemis.Core.Services.Interfaces;
using Artemis.Core;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using Artemis.Plugins.Devices.WS281X.Settings;
using Artemis.Plugins.Devices.WS281X.ViewModels;
using RGB.NET.Devices.WS281X.Arduino;
src/Plugins/Artemis.Plugins.Devices.Wooting/Layouts/Wooting/Keyboards/WOOTINGONE/US.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Wooting One - Physical US</Name>
<Description>Physical US (ANSI) layout of the Wooting One</Description>
src/Plugins/Artemis.Plugins.Devices.Wooting/Layouts/Wooting/Keyboards/WOOTINGTWO/US.xml
+1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Wooting Two - Physical US</Name>
<Description>Physical US (ANSI) layout of the Wooting Two</Description>
src/Plugins/Artemis.Plugins.Devices.Wooting/WootingDeviceProvider.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using System.IO;
using Artemis.Core.Plugins.DeviceProviders;
using Artemis.Core.Services.Interfaces;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Services;
using RGB.NET.Core;
using RGB.NET.Devices.Wooting.Generic;
src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs
+4 -4
View File
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel;
using Artemis.Core.Models.Profile;
using Artemis.Core.Plugins.LayerBrushes;
using Artemis.Core;
using Artemis.Core.LayerBrushes;
using Artemis.Plugins.LayerBrushes.Color.PropertyGroups;
using SkiaSharp;
using static Artemis.Plugins.LayerBrushes.Color.PropertyGroups.ColorBrushProperties;
@@ -11,10 +11,10 @@ namespace Artemis.Plugins.LayerBrushes.Color
public class ColorBrush : LayerBrush<ColorBrushProperties>
{
private SKColor _color;
private float _linearGradientRotation;
private SKPaint _paint;
private SKShader _shader;
private SKRect _shaderBounds;
private float _linearGradientRotation;
public override void EnableLayerBrush()
{
@@ -44,7 +44,7 @@ namespace Artemis.Plugins.LayerBrushes.Color
if (Properties.GradientType.BaseValue == ColorType.Solid && _color != Properties.Color.CurrentValue)
CreateSolid();
// While rendering a linear gradient, if the rotation was changed since the last frame, recreate the shader
else if (Properties.GradientType.BaseValue == ColorType.LinearGradient && Math.Abs(_linearGradientRotation - Properties.LinearGradientRotation.CurrentValue) > 0.01)
else if (Properties.GradientType.BaseValue == ColorType.LinearGradient && Math.Abs(_linearGradientRotation - Properties.LinearGradientRotation.CurrentValue) > 0.01)
CreateLinearGradient();
}
src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrushProvider.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins.LayerBrushes;
using Artemis.Core.LayerBrushes;
namespace Artemis.Plugins.LayerBrushes.Color
{
src/Plugins/Artemis.Plugins.LayerBrushes.Color/PropertyGroups/ColorBrushProperties.cs
+1 -5
View File
@@ -1,9 +1,5 @@
using System.ComponentModel;
using Artemis.Core.Events;
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.Colors;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Models.Profile.LayerProperties.Types;
using Artemis.Core;
using SkiaSharp;
namespace Artemis.Plugins.LayerBrushes.Color.PropertyGroups
src/Plugins/Artemis.Plugins.LayerBrushes.Color/PropertyGroups/RadialGradientProperties.cs
+1 -4
View File
@@ -1,8 +1,5 @@
using System.ComponentModel;
using Artemis.Core.Events;
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Models.Profile.LayerProperties.Types;
using Artemis.Core;
namespace Artemis.Plugins.LayerBrushes.Color.PropertyGroups
{
src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/PropertyInput/StringPropertyInputViewModel.cs
+3 -3
View File
@@ -1,6 +1,6 @@
using Artemis.Core.Models.Profile.LayerProperties;
using Artemis.UI.Shared.PropertyInput;
using Artemis.UI.Shared.Services.Interfaces;
using Artemis.Core;
using Artemis.UI.Shared;
using Artemis.UI.Shared.Services;
namespace Artemis.Plugins.LayerBrushes.ColorRgbNet.PropertyInput
{
src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrush.cs
+2 -2
View File
@@ -1,5 +1,5 @@
using Artemis.Core.Extensions;
using Artemis.Core.Plugins.LayerBrushes;
using Artemis.Core;
using Artemis.Core.LayerBrushes;
using RGB.NET.Brushes;
using RGB.NET.Core;
src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrushProperties.cs
+1 -4
View File
@@ -1,7 +1,4 @@
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.LayerProperties;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Models.Profile.LayerProperties.Types;
using Artemis.Core;
using SkiaSharp;
namespace Artemis.Plugins.LayerBrushes.ColorRgbNet
src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrushProvider.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using Artemis.Core.Plugins.LayerBrushes;
using Artemis.Core.LayerBrushes;
using Artemis.Plugins.LayerBrushes.ColorRgbNet.PropertyInput;
using Artemis.UI.Shared.Services.Interfaces;
using Artemis.UI.Shared.Services;
namespace Artemis.Plugins.LayerBrushes.ColorRgbNet
{
src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs
+32 -34
View File
@@ -1,9 +1,8 @@
using System;
using System.ComponentModel;
using Artemis.Core.Extensions;
using Artemis.Core.Models.Surface;
using Artemis.Core.Plugins.LayerBrushes;
using Artemis.Core.Services.Interfaces;
using Artemis.Core;
using Artemis.Core.LayerBrushes;
using Artemis.Core.Services;
using Artemis.Plugins.LayerBrushes.Noise.Utilities;
using SkiaSharp;
@@ -61,6 +60,35 @@ namespace Artemis.Plugins.LayerBrushes.Noise
DetermineRenderScale();
}
public override SKColor GetColor(ArtemisLed led, SKPoint renderPoint)
{
var mainColor = Properties.MainColor.CurrentValue;
var secondColor = Properties.SecondaryColor.CurrentValue;
var gradientColor = Properties.GradientColor.CurrentValue;
var scale = Properties.Scale.CurrentValue;
var hardness = Properties.Hardness.CurrentValue / 100f;
var scrolledX = renderPoint.X + _x;
if (float.IsNaN(scrolledX))
scrolledX = 0;
var scrolledY = renderPoint.Y + _y;
if (float.IsNaN(scrolledY))
scrolledY = 0;
var evalX = scrolledX * (scale.Width * -1) / 1000f;
var evalY = scrolledY * (scale.Height * -1) / 1000f;
var v = (float) _noise.Evaluate(evalX, evalY, _z) * hardness;
var amount = Math.Max(0f, Math.Min(1f, v));
if (Properties.ColorType.BaseValue == ColorMappingType.Simple)
return mainColor.Interpolate(secondColor, amount);
if (gradientColor != null && _colorMap.Length == 101)
return _colorMap[(int) Math.Round(amount * 100, MidpointRounding.AwayFromZero)];
return SKColor.Empty;
}
// public override void Render(SKCanvas canvas, SKImageInfo canvasInfo, SKPath path, SKPaint paint)
// {
// var mainColor = Properties.MainColor.CurrentValue;
@@ -155,36 +183,6 @@ namespace Artemis.Plugins.LayerBrushes.Noise
_colorMap = colorMap;
}
public override SKColor GetColor(ArtemisLed led, SKPoint renderPoint)
{
var mainColor = Properties.MainColor.CurrentValue;
var secondColor = Properties.SecondaryColor.CurrentValue;
var gradientColor = Properties.GradientColor.CurrentValue;
var scale = Properties.Scale.CurrentValue;
var hardness = Properties.Hardness.CurrentValue / 100f;
var scrolledX = renderPoint.X + _x;
if (float.IsNaN(scrolledX))
scrolledX = 0;
var scrolledY = renderPoint.Y + _y;
if (float.IsNaN(scrolledY))
scrolledY = 0;
var evalX = scrolledX * (scale.Width *-1) / 1000f;
var evalY = scrolledY * (scale.Height*-1) / 1000f;
var v = (float) _noise.Evaluate(evalX, evalY, _z) * hardness;
var amount = Math.Max(0f, Math.Min(1f, v));
if (Properties.ColorType.BaseValue == ColorMappingType.Simple)
return mainColor.Interpolate(secondColor, amount);
else if (gradientColor != null && _colorMap.Length == 101)
return _colorMap[(int) Math.Round(amount * 100, MidpointRounding.AwayFromZero)];
else
return SKColor.Empty;
}
}
public enum ColorMappingType
src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrushProperties.cs
+3 -5
View File
@@ -1,7 +1,4 @@
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.Colors;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Models.Profile.LayerProperties.Types;
using Artemis.Core;
using SkiaSharp;
namespace Artemis.Plugins.LayerBrushes.Noise
@@ -24,7 +21,8 @@ namespace Artemis.Plugins.LayerBrushes.Noise
[PropertyDescription(Description = "The scale of the noise", MinInputValue = 0f, InputAffix = "%")]
public SKSizeLayerProperty Scale { get; set; }
[PropertyDescription(Description = "The hardness of the noise, lower means there are gradients in the noise, higher means hard lines", InputAffix = "%", MinInputValue = 0f, MaxInputValue = 400)]
[PropertyDescription(Description = "The hardness of the noise, lower means there are gradients in the noise, higher means hard lines", InputAffix = "%", MinInputValue = 0f,
MaxInputValue = 400)]
public FloatLayerProperty Hardness { get; set; }
[PropertyDescription(Description = "The speed at which the noise moves vertically and horizontally", MinInputValue = -64f, MaxInputValue = 64f)]
src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrushProvider.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins.LayerBrushes;
using Artemis.Core.LayerBrushes;
namespace Artemis.Plugins.LayerBrushes.Noise
{
src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Utilities/OpenSimplexNoise.cs
+2 -2
View File
@@ -31,7 +31,7 @@ namespace Artemis.Plugins.LayerBrushes.Noise.Utilities
-11, -4, -4, -4, -11, -4, -4, -4, -11,
11, -4, -4, 4, -11, -4, 4, -4, -11
};
private static readonly Contribution2[] lookup2D;
private static readonly Contribution3[] lookup3D;
@@ -258,7 +258,7 @@ namespace Artemis.Plugins.LayerBrushes.Noise.Utilities
return value * NORM_3D;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static int FastFloor(double x)
{
src/Plugins/Artemis.Plugins.LayerEffects.Filter/BlurEffect.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using System;
using Artemis.Core.Plugins.LayerEffects;
using Artemis.Core.LayerEffects;
using SkiaSharp;
namespace Artemis.Plugins.LayerEffects.Filter
src/Plugins/Artemis.Plugins.LayerEffects.Filter/BlurEffectProperties.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Models.Profile.LayerProperties.Types;
using Artemis.Core;
namespace Artemis.Plugins.LayerEffects.Filter
{
src/Plugins/Artemis.Plugins.LayerEffects.Filter/ColorMatrixEffect.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins.LayerEffects;
using Artemis.Core.LayerEffects;
using Artemis.Plugins.LayerEffects.Filter.ViewModels;
using SkiaSharp;
src/Plugins/Artemis.Plugins.LayerEffects.Filter/ColorMatrixEffectProperties.cs
+2 -4
View File
@@ -1,6 +1,4 @@
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.LayerProperties;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core;
namespace Artemis.Plugins.LayerEffects.Filter
{
@@ -17,7 +15,7 @@ namespace Artemis.Plugins.LayerEffects.Filter
0.21f, 0.72f, 0.07f, 0, 0,
0.21f, 0.72f, 0.07f, 0, 0,
0.21f, 0.72f, 0.07f, 0, 0,
0, 0, 0, 1, 0
0, 0, 0, 1, 0
};
}
src/Plugins/Artemis.Plugins.LayerEffects.Filter/DilateEffect.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins.LayerEffects;
using Artemis.Core.LayerEffects;
using SkiaSharp;
namespace Artemis.Plugins.LayerEffects.Filter
src/Plugins/Artemis.Plugins.LayerEffects.Filter/DilateEffectProperties.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Models.Profile.LayerProperties.Types;
using Artemis.Core;
namespace Artemis.Plugins.LayerEffects.Filter
{
src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffect.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins.LayerEffects;
using Artemis.Core.LayerEffects;
using SkiaSharp;
namespace Artemis.Plugins.LayerEffects.Filter
src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffectProperties.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Models.Profile.LayerProperties.Types;
using Artemis.Core;
namespace Artemis.Plugins.LayerEffects.Filter
{
src/Plugins/Artemis.Plugins.LayerEffects.Filter/FilterEffectProvider.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins.LayerEffects;
using Artemis.Core.LayerEffects;
namespace Artemis.Plugins.LayerEffects.Filter
{
src/Plugins/Artemis.Plugins.LayerEffects.Filter/GlowEffect.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins.LayerEffects;
using Artemis.Core.LayerEffects;
using SkiaSharp;
namespace Artemis.Plugins.LayerEffects.Filter
src/Plugins/Artemis.Plugins.LayerEffects.Filter/GlowEffectProperties.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Models.Profile.LayerProperties.Types;
using Artemis.Core;
using SkiaSharp;
namespace Artemis.Plugins.LayerEffects.Filter
src/Plugins/Artemis.Plugins.LayerEffects.Filter/GrayScaleEffect.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Artemis.Core.Plugins.LayerEffects;
using Artemis.Core.LayerEffects;
using SkiaSharp;
namespace Artemis.Plugins.LayerEffects.Filter
src/Plugins/Artemis.Plugins.LayerEffects.Filter/GrayScaleEffectProperties.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Models.Profile.LayerProperties.Types;
using Artemis.Core;
namespace Artemis.Plugins.LayerEffects.Filter
{
src/Plugins/Artemis.Plugins.LayerEffects.Filter/OpacityEffect.cs
+2 -4
View File
@@ -1,7 +1,5 @@
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Models.Profile.LayerProperties.Types;
using Artemis.Core.Plugins.LayerEffects;
using Artemis.Core;
using Artemis.Core.LayerEffects;
using SkiaSharp;
namespace Artemis.Plugins.LayerEffects.Filter
src/Plugins/Artemis.Plugins.LayerEffects.Filter/ViewModels/ColorMatrixConfigurationViewModel.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Diagnostics;
using Artemis.Core.Plugins.LayerEffects;
using Artemis.Core.LayerEffects;
namespace Artemis.Plugins.LayerEffects.Filter.ViewModels
{
src/Plugins/Artemis.Plugins.LayerEffects.Filter/Views/ColorMatrixConfigurationView.xaml
+11 -12
View File
@@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Artemis.Plugins.LayerEffects.Filter.Views"
xmlns:viewModels="clr-namespace:Artemis.Plugins.LayerEffects.Filter.ViewModels"
xmlns:s="https://github.com/canton7/Stylet"
mc:Ignorable="d"
@@ -11,12 +10,12 @@
d:DataContext="{d:DesignInstance viewModels:ColorMatrixConfigurationViewModel}">
<StackPanel Margin="15">
<TextBlock>
Below you can define the color matrix to be applied to the folder/layer. <LineBreak/>
Below you can define the color matrix to be applied to the folder/layer. <LineBreak />
Please note this is an advanced effect mainly included for the sake of completion.
</TextBlock>
<TextBlock TextWrapping="Wrap" Margin="0 25">
If you are still not deterred,
<Hyperlink NavigateUri="https://docs.microsoft.com/en-us/xamarin/xamarin-forms/user-interface/graphics/skiasharp/effects/color-filters"
<Hyperlink NavigateUri="https://docs.microsoft.com/en-us/xamarin/xamarin-forms/user-interface/graphics/skiasharp/effects/color-filters"
RequestNavigate="{s:Action OpenGuide}">
click here
</Hyperlink>
@@ -25,16 +24,16 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="50" />
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="50" />
<ColumnDefinition Width="50" />
<ColumnDefinition Width="50" />
<ColumnDefinition Width="50" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBox Grid.Row="0" Grid.Column="0" Text="{Binding Properties.ColorMatrix.CurrentValue[0]}" Margin="2" />
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Properties.ColorMatrix.CurrentValue[1]}" Margin="2" />
@@ -61,5 +60,5 @@
<TextBox Grid.Row="3" Grid.Column="4" Text="{Binding Properties.ColorMatrix.CurrentValue[19]}" Margin="2" />
</Grid>
</StackPanel>
</UserControl>
src/Plugins/Artemis.Plugins.Modules.General/DataModel/GeneralDataModel.cs
+2 -2
View File
@@ -5,7 +5,7 @@ using Artemis.Plugins.Modules.General.DataModel.Windows;
namespace Artemis.Plugins.Modules.General.DataModel
{
public class GeneralDataModel : Core.Plugins.DataModelExpansions.DataModel
public class GeneralDataModel : Core.DataModelExpansions.DataModel
{
public GeneralDataModel()
{
@@ -25,7 +25,7 @@ namespace Artemis.Plugins.Modules.General.DataModel
public List<TimeDataModel> TestTimeList { get; set; }
}
public class TimeDataModel : Core.Plugins.DataModelExpansions.DataModel
public class TimeDataModel : Core.DataModelExpansions.DataModel
{
public DateTime CurrentTime { get; set; }
public DateTime CurrentTimeUTC { get; set; }
src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowDataModel.cs
+5 -6
View File
@@ -1,15 +1,11 @@
using System.Diagnostics;
using Artemis.Core.Extensions;
using Artemis.Core.Plugins.DataModelExpansions.Attributes;
using Artemis.Plugins.Modules.General.Utilities;
using Artemis.Core;
using Artemis.Core.DataModelExpansions;
namespace Artemis.Plugins.Modules.General.DataModel.Windows
{
public class WindowDataModel
{
[DataModelIgnore]
public Process Process { get; }
public WindowDataModel(Process process)
{
Process = process;
@@ -20,6 +16,9 @@ namespace Artemis.Plugins.Modules.General.DataModel.Windows
ProgramLocation = process.GetProcessFilename();
}
[DataModelIgnore]
public Process Process { get; }
public string WindowTitle { get; set; }
public string ProcessName { get; set; }
public string ProgramLocation { get; set; }
src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowsDataModel.cs
+2 -7
View File
@@ -1,11 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Artemis.Plugins.Modules.General.DataModel.Windows
namespace Artemis.Plugins.Modules.General.DataModel.Windows
{
public class WindowsDataModel
{
}
}
}
src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using Artemis.Core.Plugins.Modules;
using Artemis.Core.Modules;
using Artemis.Plugins.Modules.General.DataModel;
using Artemis.Plugins.Modules.General.DataModel.Windows;
using Artemis.Plugins.Modules.General.Utilities;
src/Plugins/Artemis.Plugins.Modules.General/ViewModels/GeneralViewModel.cs
+3 -3
View File
@@ -1,16 +1,16 @@
using Artemis.Core.Plugins.Modules;
using Artemis.Core.Modules;
namespace Artemis.Plugins.Modules.General.ViewModels
{
public class GeneralViewModel : ModuleViewModel
{
public GeneralModule GeneralModule { get; }
public GeneralViewModel(GeneralModule module) : base(module, "General")
{
GeneralModule = module;
}
public GeneralModule GeneralModule { get; }
public void ShowUTCTimeInDataModel()
{
GeneralModule.ShowProperty(model => model.TimeDataModel.CurrentTimeUTC);
src/Plugins/Artemis.Plugins.Modules.General/Views/GeneralView.xaml
-1
View File
@@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Artemis.Plugins.Modules.General.Views"
xmlns:s="https://github.com/canton7/Stylet"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
src/Plugins/Artemis.Plugins.Modules.Overlay/OverlayModule.cs
+1 -2
View File
@@ -1,7 +1,6 @@
using System;
using System.IO;
using Artemis.Core.Plugins.Modules;
using Artemis.Core.Plugins.Modules.ActivationRequirements;
using Artemis.Core.Modules;
namespace Artemis.Plugins.Modules.Overlay
{