From 51797c15f6d492d57667e9bea4b92af8c94bffd2 Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Wed, 20 Jan 2016 19:39:22 +0100 Subject: [PATCH] Experimental Corsair support --- Artemis/Artemis/App.config | 2 +- Artemis/Artemis/AppBootStrapper.cs | 1 - Artemis/Artemis/Artemis.csproj | 29 ++++++++-- .../Artemis/KeyboardProviders/Corsair/K70.cs | 23 ++++++-- .../Artemis/KeyboardProviders/Corsair/K95.cs | 24 +++++++-- .../KeyboardProviders/Logitech/Orion.cs | 3 +- Artemis/Artemis/Settings/General.Designer.cs | 2 +- Artemis/Artemis/Settings/General.settings | 6 ++- .../Artemis/ViewModels/SettingsViewModel.cs | 53 +++++++++++++++++++ Artemis/Artemis/ViewModels/ShellViewModel.cs | 49 ++--------------- Artemis/Artemis/Views/SettingsView.xaml | 13 +++++ Artemis/Artemis/Views/SettingsView.xaml.cs | 27 ++++++++++ Artemis/Artemis/packages.config | 2 + 13 files changed, 172 insertions(+), 62 deletions(-) create mode 100644 Artemis/Artemis/ViewModels/SettingsViewModel.cs create mode 100644 Artemis/Artemis/Views/SettingsView.xaml create mode 100644 Artemis/Artemis/Views/SettingsView.xaml.cs diff --git a/Artemis/Artemis/App.config b/Artemis/Artemis/App.config index 822069f5f..d4dc18237 100644 --- a/Artemis/Artemis/App.config +++ b/Artemis/Artemis/App.config @@ -204,7 +204,7 @@ TypeWave - Logitech G910 Orion Spark + Razer BlackWidow Chroma True diff --git a/Artemis/Artemis/AppBootStrapper.cs b/Artemis/Artemis/AppBootStrapper.cs index 88f600375..a34e4aac7 100644 --- a/Artemis/Artemis/AppBootStrapper.cs +++ b/Artemis/Artemis/AppBootStrapper.cs @@ -24,7 +24,6 @@ namespace Artemis MessageBox.Show("Startup failed :c \n" + ex.InnerException.Message); throw; } - } } } \ No newline at end of file diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj index 70a3ee97b..7e8f704db 100644 --- a/Artemis/Artemis/Artemis.csproj +++ b/Artemis/Artemis/Artemis.csproj @@ -38,6 +38,8 @@ false true true + + x64 @@ -87,6 +89,10 @@ ..\packages\Colore.3.0.2\lib\net35\Corale.Colore.dll True + + ..\packages\CUE.NET.1.0.0\lib\net45\CUE.NET.dll + True + ..\packages\log4net.2.0.4\lib\net45-full\log4net.dll True @@ -134,6 +140,10 @@ 4.0 + + ..\packages\WpfExceptionViewer.1.0.0.0\lib\VioletTape.WpfExceptionViewer.dll + True + @@ -269,6 +279,7 @@ + EffectsView.xaml @@ -306,6 +317,9 @@ VolumeDisplayView.xaml + + SettingsView.xaml + ShellView.xaml @@ -347,6 +361,7 @@ SettingsSingleFileGenerator VolumeDisplay.Designer.cs + @@ -415,6 +430,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -429,9 +448,6 @@ PreserveNewest - - PreserveNewest - @@ -449,6 +465,13 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + +