diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj index 08a80f95e..d9384595c 100644 --- a/Artemis/Artemis/Artemis.csproj +++ b/Artemis/Artemis/Artemis.csproj @@ -635,6 +635,7 @@ + diff --git a/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs b/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs index a59430fb6..d2736dcac 100644 --- a/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs +++ b/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs @@ -69,17 +69,17 @@ namespace Artemis.DeviceProviders.Corsair case "K70 RGB": Height = 7; Width = 21; - PreviewSettings = new PreviewSettings(676, 195, new Thickness(0, -25, 0, 0), Resources.k70); + PreviewSettings = new PreviewSettings(676, 210, new Thickness(0, -25, 0, 0), Resources.k70); break; case "K65 RGB": Height = 7; Width = 18; - PreviewSettings = new PreviewSettings(660, 240, new Thickness(0, -30, 0, 0), Resources.k65); + PreviewSettings = new PreviewSettings(610, 240, new Thickness(0, -30, 0, 0), Resources.k65); break; case "STRAFE RGB": - Height = 6; + Height = 7; Width = 22; - PreviewSettings = new PreviewSettings(670, 215, new Thickness(0, -15, 0, 0), Resources.strafe); + PreviewSettings = new PreviewSettings(665, 215, new Thickness(0, -5, 0, 0), Resources.strafe); break; } } diff --git a/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs b/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs index 501b5917f..752c2081b 100644 --- a/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs +++ b/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs @@ -1,5 +1,7 @@ using System.Drawing; +using System.Windows; using Artemis.DeviceProviders.Razer.Utilities; +using Artemis.Properties; using Corale.Colore.Core; using Corale.Colore.Razer; using Corale.Colore.Razer.Keyboard; @@ -15,10 +17,16 @@ namespace Artemis.DeviceProviders.Razer CantEnableText = "Couldn't connect to your Razer BlackWidow Chroma.\n" + "Please check your cables and try updating Razer Synapse.\n\n" + "If needed, you can select a different keyboard in Artemis under settings."; + + Height = Constants.MaxRows; + Width = Constants.MaxColumns; + PreviewSettings = new PreviewSettings(665, 175, new Thickness(0, -15, 0, 0), Resources.blackwidow); } public override bool CanEnable() { + return true; + if (!Chroma.IsSdkAvailable()) return false; @@ -30,18 +38,19 @@ namespace Artemis.DeviceProviders.Razer public override void Enable() { + return; Chroma.Instance.Initialize(); - Height = Constants.MaxRows; - Width = Constants.MaxColumns; } public override void Disable() { + return; Chroma.Instance.Uninitialize(); } public override void DrawBitmap(Bitmap bitmap) { + return; var razerArray = RazerUtilities.BitmapColorArray(bitmap, Height, Width); Chroma.Instance.Keyboard.SetCustom(razerArray); } diff --git a/Artemis/Artemis/Properties/Resources.Designer.cs b/Artemis/Artemis/Properties/Resources.Designer.cs index 854923b20..50e5d22e3 100644 --- a/Artemis/Artemis/Properties/Resources.Designer.cs +++ b/Artemis/Artemis/Properties/Resources.Designer.cs @@ -77,6 +77,16 @@ namespace Artemis.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap blackwidow { + get { + object obj = ResourceManager.GetObject("blackwidow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Artemis/Artemis/Properties/Resources.resx b/Artemis/Artemis/Properties/Resources.resx index 8b55c4b15..29d7d58bc 100644 --- a/Artemis/Artemis/Properties/Resources.resx +++ b/Artemis/Artemis/Properties/Resources.resx @@ -172,4 +172,7 @@ ..\Resources\RzChromaSDK64.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\Keyboards\blackwidow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Artemis/Artemis/Resources/Keyboards/blackwidow.png b/Artemis/Artemis/Resources/Keyboards/blackwidow.png new file mode 100644 index 000000000..c51c7c0c0 Binary files /dev/null and b/Artemis/Artemis/Resources/Keyboards/blackwidow.png differ