DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Added wiki link to Overwatch

Browse Source 
Taking exclusive access on CUE SDK to fix VOID issues
Updated a few default profiles to include mousemat layers
This commit is contained in:
SpoinkyNL 2016-09-14 17:12:15 +02:00
parent 8736e5562c
commit 50623eeb07
7 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Artemis/Artemis/DeviceProviders/Corsair/CorsairHeadsets.cs
View File

@ -22,7 +22,7 @@ namespace Artemis.DeviceProviders.Corsair
{
CanUse = CanInitializeSdk();
if (CanUse && !CueSDK.IsInitialized)
CueSDK.Initialize();
CueSDK.Initialize(true);
Logger.Debug("Attempted to enable Corsair headset. CanUse: {0}", CanUse);

5
Artemis/Artemis/DeviceProviders/Corsair/CorsairKeyboards.cs
View File

@ -44,8 +44,9 @@ namespace Artemis.DeviceProviders.Corsair
public override void Enable()
{
if (!CueSDK.IsInitialized)
CueSDK.Initialize();
CueSDK.Initialize(true);
CueSDK.UpdateMode = UpdateMode.Manual;
_keyboard = CueSDK.KeyboardSDK;
switch (_keyboard.DeviceInfo.Model)
{
@ -114,7 +115,7 @@ namespace Artemis.DeviceProviders.Corsair
}
_keyboardBrush.Image = image;
_keyboard.Update();
_keyboard.Update(true);
image.Dispose();
}

2
Artemis/Artemis/DeviceProviders/Corsair/CorsairMice.cs
View File

@ -22,7 +22,7 @@ namespace Artemis.DeviceProviders.Corsair
{
CanUse = CanInitializeSdk();
if (CanUse && !CueSDK.IsInitialized)
CueSDK.Initialize();
CueSDK.Initialize(true);
Logger.Debug("Attempted to enable Corsair mice. CanUse: {0}", CanUse);

2
Artemis/Artemis/DeviceProviders/Corsair/CorsairMousemats.cs
View File

@ -23,7 +23,7 @@ namespace Artemis.DeviceProviders.Corsair
{
CanUse = CanInitializeSdk();
if (CanUse && !CueSDK.IsInitialized)
CueSDK.Initialize();
CueSDK.Initialize(true);
Logger.Debug("Attempted to enable Corsair mousemat. CanUse: {0}", CanUse);

30
Artemis/Artemis/Modules/Games/Overwatch/OverwatchView.xaml
View File

@ -19,21 +19,39 @@
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
<Label FontSize="20" HorizontalAlignment="Left">
<Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.ColumnSpan="2" FontSize="20" HorizontalAlignment="Left">
<Label.Content>
<AccessText TextWrapping="Wrap"
Text="By default colors the keyboard according to the chosen hero and shows ability cooldowns." />
</Label.Content>
</Label>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
<TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Bottom"
TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"
TextAlignment="Justify" Margin="5,0,0,10">
Note: If you're having trouble getting the profile to work, check out
<Hyperlink RequestNavigate="Hyperlink_RequestNavigate"
NavigateUri="https://github.com/SpoinkyNL/Artemis/wiki/Overwatch">
the wiki
</Hyperlink>
</TextBlock>
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Right">
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
IsChecked="{Binding Path=GameSettings.Enabled, Mode=TwoWay}"
Style="{DynamicResource MetroCircleToggleButtonStyle}"
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
</StackPanel>
</StackPanel>
</Grid>
<!-- Game directory -->
<StackPanel Grid.Row="1"
@ -52,7 +70,8 @@
</StackPanel>
<!-- Profile editor -->
<ContentControl Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" x:Name="ProfileEditor" Margin="0,0,-30,0" />
<ContentControl Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" x:Name="ProfileEditor"
Margin="0,0,-30,0" />
<!-- Buttons -->
<StackPanel Grid.Column="0" Grid.Row="3" Orientation="Horizontal" VerticalAlignment="Bottom">
@ -63,5 +82,6 @@
Style="{DynamicResource SquareButtonStyle}" />
</StackPanel>
</Grid>
</ScrollViewer>
</UserControl>

6
Artemis/Artemis/Modules/Games/Overwatch/OverwatchView.xaml.cs
View File

@ -1,4 +1,5 @@
using System.Windows.Controls;
using System.Windows.Navigation;
namespace Artemis.Modules.Games.Overwatch
{
@ -11,5 +12,10 @@ namespace Artemis.Modules.Games.Overwatch
{
InitializeComponent();
}
private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
{
System.Diagnostics.Process.Start(e.Uri.ToString());
}
}
}

BIN
Artemis/Artemis/Resources/Keyboards/default-profiles.zip
View File

Binary file not shown.