From ca4ae8344d905862c342f74e6acd26b010b56ec9 Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Wed, 16 Mar 2016 21:21:13 +0100 Subject: [PATCH] Added Corsair-yellow color profile. --- Artemis/Artemis/Artemis.csproj | 12 +++++ .../KeyboardProviders/Logitech/Orion.cs | 1 + .../Games/TheDivision/TheDivisionModel.cs | 12 ----- .../Artemis/Styles/Accents/CorsairYellow.xaml | 53 +++++++++++++++++++ .../ViewModels/ProfileEditorViewModel.cs | 21 ++++++++ Artemis/Artemis/Views/ProfileEditorView.xaml | 30 +++++++++++ .../Artemis/Views/ProfileEditorView.xaml.cs | 28 ++++++++++ 7 files changed, 145 insertions(+), 12 deletions(-) create mode 100644 Artemis/Artemis/Styles/Accents/CorsairYellow.xaml create mode 100644 Artemis/Artemis/ViewModels/ProfileEditorViewModel.cs create mode 100644 Artemis/Artemis/Views/ProfileEditorView.xaml create mode 100644 Artemis/Artemis/Views/ProfileEditorView.xaml.cs diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj index 51dec2bf7..73659ecc9 100644 --- a/Artemis/Artemis/Artemis.csproj +++ b/Artemis/Artemis/Artemis.csproj @@ -399,6 +399,7 @@ + @@ -441,6 +442,9 @@ VolumeDisplayView.xaml + + ProfileEditorView.xaml + ShellView.xaml @@ -532,6 +536,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -584,6 +592,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs b/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs index eaeae906e..e72086e84 100644 --- a/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs +++ b/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs @@ -30,6 +30,7 @@ namespace Artemis.KeyboardProviders.Logitech public override bool CanEnable() { + return true; if (DllManager.RestoreDll()) RestoreDll(); int majorNum = 0, minorNum = 0, buildNum = 0; diff --git a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionModel.cs b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionModel.cs index 3c65d41c2..28caad6f6 100644 --- a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionModel.cs +++ b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionModel.cs @@ -202,18 +202,6 @@ namespace Artemis.Modules.Games.TheDivision _p4.Colors = new List { Color.FromArgb(10, 255, 0), Color.FromArgb(80, 255, 45) }; else _p4.Colors = new List {Color.Red, Color.Orange}; - - if (!_dataModel.LowAmmo) - { - foreach (var corsairLed in CueSDK.MouseSDK.Leds) - corsairLed.Color = Color.Green; - } - else - { - foreach (var corsairLed in CueSDK.MouseSDK.Leds) - corsairLed.Color = Color.Red; - } - CueSDK.MouseSDK.Update(); } public override Bitmap GenerateBitmap() diff --git a/Artemis/Artemis/Styles/Accents/CorsairYellow.xaml b/Artemis/Artemis/Styles/Accents/CorsairYellow.xaml new file mode 100644 index 000000000..ceb3cd5d1 --- /dev/null +++ b/Artemis/Artemis/Styles/Accents/CorsairYellow.xaml @@ -0,0 +1,53 @@ + + + #C0A200 + + #FFF0CF1E + + #FFF0CF1E + + #FFF0CF1E + + #FFF0CF1E + + #FFF0CF1E + + + + + + + + + + + + + + + + + + + + White + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Artemis/Artemis/ViewModels/ProfileEditorViewModel.cs b/Artemis/Artemis/ViewModels/ProfileEditorViewModel.cs new file mode 100644 index 000000000..b5bd81d5d --- /dev/null +++ b/Artemis/Artemis/ViewModels/ProfileEditorViewModel.cs @@ -0,0 +1,21 @@ +using System.Windows.Media; +using Artemis.KeyboardProviders; +using Caliburn.Micro; + +namespace Artemis.ViewModels +{ + internal class ProfileEditorViewModel : Screen + { + private readonly KeyboardProvider _keyboard; + + public ProfileEditorViewModel(KeyboardProvider keyboard) + { + _keyboard = keyboard; + } + + private ImageSource GenerateKeyboardImage() + { + return null; + } + } +} \ No newline at end of file diff --git a/Artemis/Artemis/Views/ProfileEditorView.xaml b/Artemis/Artemis/Views/ProfileEditorView.xaml new file mode 100644 index 000000000..ead4e1cfd --- /dev/null +++ b/Artemis/Artemis/Views/ProfileEditorView.xaml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Artemis/Artemis/Views/ProfileEditorView.xaml.cs b/Artemis/Artemis/Views/ProfileEditorView.xaml.cs new file mode 100644 index 000000000..5cfcb4102 --- /dev/null +++ b/Artemis/Artemis/Views/ProfileEditorView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Artemis.Views +{ + /// + /// Interaction logic for ProfileEditorView.xaml + /// + public partial class ProfileEditorView : UserControl + { + public ProfileEditorView() + { + InitializeComponent(); + } + } +}