diff --git a/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj b/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj
index 83bc28b65..2ba17291c 100644
--- a/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj
+++ b/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj
@@ -1081,9 +1081,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/US - Copy.xml b/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/US - Copy.xml
deleted file mode 100644
index 89de14a80..000000000
--- a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/US - Copy.xml
+++ /dev/null
@@ -1,462 +0,0 @@
-
-
- Corsair K95 RGB PLATINUM - Physical US
- Physical UK-Layout of Corsairs K95 RGB PLATINUM (Logical: NA)
- Keyboard
- Key
- Corsair
- K95 RGB Platinum
- 465
- 169
- Images\Corsair\Keyboards
- K95RGBPLATINUM.png
-
-
- 91.5
- 8.333
- 14.5mm
- 12mm
-
-
- 14.5mm
- 12mm
-
-
- 382
- 8.333
- 12mm
-
-
- 30
- 32
-
-
- +12.667
-
-
-
-
-
- +12.667
-
-
-
-
-
- +12.667
-
-
-
-
-
- +5
-
-
-
-
- +5
- 31
- 17mm
-
-
- 17mm
-
-
- 17mm
-
-
- 17mm
-
-
- 30
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2
-
-
- +5
-
-
-
-
- +5
-
-
-
-
-
- 30
- +
- 1.5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.5
- 1
-
-
- +5
-
-
-
-
- +5
-
-
-
-
- 2
-
-
- 30
- ~
- 1.75
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.25
-
-
- +67
-
-
-
-
- 30
- +
- 2.25
-
-
-
-
-
-
-
-
-
-
-
-
- 2.75
-
-
- +24
-
-
- +24
-
-
-
-
- 2
-
-
- 30
- ~
- 1.5
-
-
-
- 1.25
-
-
- 6.5
-
-
- 1.25
-
-
-
-
- 1.5
-
-
- +5
-
-
-
-
- +5
- 2
-
-
-
- 7
- 32
-
-
- 7
- +
-
-
- 7
- +1
-
-
- 7
- +
-
-
- 7
- +1
-
-
- 7
- +
-
-
- 0
- 0
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
- 24.47368mm
- 4mm
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/GLAIVERGB.xml b/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/GLAIVERGB.xml
index 387c72a70..292da02c6 100644
--- a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/GLAIVERGB.xml
+++ b/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/GLAIVERGB.xml
@@ -13,10 +13,11 @@
GLAIVERGB.png
- M0.027,0.932 L0.041,0.853 L0.068,0.788 L0.176,0.641 L0.29,0.508 L0.393,0.417 L0.415,0.406 L0.428,0.417 L0.436,0.436 L0.44,0.463 L0.46,0.008 L0.002,0.038z M0.956,0.985 L0.943,0.917 L0.922,0.849 L0.842,0.724 L0.781,0.633 L0.687,0.508 L0.639,0.451 L0.624,0.451 L0.615,0.466 L0.609,0.493 L0.587,0.012 L0.998,0.016z
+ M0.031,0.869 L0.042,0.815 L0.057,0.745 L0.076,0.708 L0.115,0.63 L0.18,0.511 L0.247,0.412 L0.309,0.322 L0.361,0.264 L0.401,0.219 L0.418,0.206 L0.427,0.215 L0.435,0.235 L0.441,0.28 L0.447,0.206 L0.446,0.124 L0.438,0.079 L0.412,0.058 L0.379,0.079 L0.309,0.169 L0.25,0.252 L0.199,0.326 L0.136,0.424 L0.064,0.569 L0.032,0.634 L0.021,0.717 L0.02,0.783z M0.608,0.322 L0.615,0.285 L0.631,0.268 L0.649,0.285 L0.695,0.363 L0.746,0.449 L0.805,0.564 L0.858,0.667 L0.898,0.745 L0.927,0.82 L0.943,0.885 L0.955,0.964 L0.964,0.935 L0.968,0.873 L0.968,0.795 L0.951,0.704 L0.912,0.61 L0.863,0.515 L0.815,0.42 L0.768,0.326 L0.712,0.219 L0.659,0.149 L0.625,0.112 L0.609,0.153 L0.601,0.227z
0
+ 5
69
- 20
+ 15
M0.096,0.057 L0.097,0.2 L0.111,0.389 L0.125,0.548 L0.149,0.698 L0.152,0.738 L0.143,0.768 L0.118,0.809 L0.057,0.92 L0.038,0.955 L0.046,0.97 L0.077,0.91 L0.113,0.849 L0.157,0.772 L0.165,0.754 L0.168,0.734 L0.166,0.694 L0.135,0.478 L0.119,0.293 L0.108,0.107 L0.107,0.066z M0.911,0.051 L0.89,0.075 L0.885,0.088 L0.884,0.112 L0.879,0.219 L0.873,0.311 L0.866,0.396 L0.863,0.437 L0.864,0.457 L0.869,0.473 L0.879,0.495 L0.883,0.498 L0.881,0.484 L0.873,0.467 L0.871,0.451 L0.88,0.375 L0.89,0.256 L0.894,0.174 L0.896,0.115 L0.896,0.088z
@@ -33,13 +34,4 @@
19
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Artemis.UI/ViewModels/Controls/Editor/SurfaceEditorViewModel.cs b/src/Artemis.UI/ViewModels/Controls/Editor/SurfaceEditorViewModel.cs
index 40f4fb128..b2ec110a5 100644
--- a/src/Artemis.UI/ViewModels/Controls/Editor/SurfaceEditorViewModel.cs
+++ b/src/Artemis.UI/ViewModels/Controls/Editor/SurfaceEditorViewModel.cs
@@ -4,6 +4,7 @@ using Artemis.Core.Events;
using Artemis.Core.Services.Interfaces;
using Artemis.UI.ViewModels.Controls.RgbDevice;
using RGB.NET.Core;
+using Stylet;
namespace Artemis.UI.ViewModels.Controls.Editor
{
@@ -28,8 +29,11 @@ namespace Artemis.UI.ViewModels.Controls.Editor
private void RgbServiceOnDeviceLoaded(object sender, DeviceEventArgs e)
{
- if (Devices.All(d => d.Device != e.Device))
- Devices.Add(new RgbDeviceViewModel(e.Device));
+ Execute.OnUIThread(() =>
+ {
+ if (Devices.All(d => d.Device != e.Device))
+ Devices.Add(new RgbDeviceViewModel(e.Device));
+ });
}
private void SurfaceOnUpdated(UpdatedEventArgs args)
diff --git a/src/Artemis.UI/ViewModels/Screens/RootViewModel.cs b/src/Artemis.UI/ViewModels/Screens/RootViewModel.cs
index f360e80cb..4a7e4b70c 100644
--- a/src/Artemis.UI/ViewModels/Screens/RootViewModel.cs
+++ b/src/Artemis.UI/ViewModels/Screens/RootViewModel.cs
@@ -82,7 +82,7 @@ namespace Artemis.UI.ViewModels.Screens
private async void OnSelectedModuleChanged(object sender, PropertyChangedEventArgs e)
{
- if (e.PropertyName == "SelectedModule")
+ if (e.PropertyName == nameof(SelectedModule))
await NavigateToSelectedModule();
}
diff --git a/src/Artemis.UI/Views/Controls/RgbDevice/RgbLedView.xaml b/src/Artemis.UI/Views/Controls/RgbDevice/RgbLedView.xaml
index e782c02e2..25aa13f82 100644
--- a/src/Artemis.UI/Views/Controls/RgbDevice/RgbLedView.xaml
+++ b/src/Artemis.UI/Views/Controls/RgbDevice/RgbLedView.xaml
@@ -3,24 +3,21 @@
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.UI.Views.Controls.RgbDevice"
xmlns:rgbDevice="clr-namespace:Artemis.UI.ViewModels.Controls.RgbDevice"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance rgbDevice:RgbLedViewModel}"
d:DesignHeight="450" d:DesignWidth="800">
-
+
-
-
+
+
-
+
diff --git a/src/Artemis.UI/Views/Screens/RootView.xaml b/src/Artemis.UI/Views/Screens/RootView.xaml
index f9b49cc6b..c78ba1e17 100644
--- a/src/Artemis.UI/Views/Screens/RootView.xaml
+++ b/src/Artemis.UI/Views/Screens/RootView.xaml
@@ -6,9 +6,6 @@
xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:s="https://github.com/canton7/Stylet"
- xmlns:vms="clr-namespace:Artemis.UI.ViewModels"
- xmlns:models="clr-namespace:Artemis.Core.Plugins.Models;assembly=Artemis.Core"
- xmlns:interfaces="clr-namespace:Artemis.Core.Plugins.Interfaces;assembly=Artemis.Core"
xmlns:abstract="clr-namespace:Artemis.Core.Plugins.Abstract;assembly=Artemis.Core"
xmlns:screens="clr-namespace:Artemis.UI.ViewModels.Screens"
mc:Ignorable="d"
@@ -131,7 +128,7 @@