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 default profiles for all keyboards

Browse Source
This commit is contained in:
SpoinkyNL 2016-06-08 19:29:34 +02:00
parent a9aa9f4df6
commit feab0e3f4d
10 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Artemis/Artemis/Artemis.csproj
View File

@ -657,6 +657,7 @@
<None Include="Resources\RzChromaSDK64.dll" />
<Resource Include="Resources\Keyboards\blackwidow.png" />
<None Include="Resources\Keyboards\none.png" />
<None Include="Resources\Keyboards\demo-gif.gif" />
<Content Include="Resources\Witcher3\playerWitcher.txt" />
<Content Include="Resources\Witcher3\artemis.txt" />
<None Include="Settings\Offsets.settings">

22
Artemis/Artemis/DAL/ProfileProvider.cs
View File

@ -8,6 +8,8 @@ using System.Xml.Serialization;
using Artemis.DeviceProviders;
using Artemis.Models;
using Artemis.Models.Profiles;
using Artemis.Models.Profiles.Properties;
using Artemis.Properties;
using Artemis.Utilities;
using NLog;
@ -123,6 +125,26 @@ namespace Artemis.DAL
return;
var archive = new ZipArchive(stream);
archive.ExtractToDirectory(ProfileFolder, true);
// Extract the demo GIF file
var gifPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Artemis\demo-gif.gif";
Resources.demo_gif.Save(gifPath);
// Set the GIF path on each demo profile
var demoProfiles = GetAll().Where(d => d.Name == "Demo (Duplicate to keep changes)");
foreach (var demoProfile in demoProfiles)
{
var gifLayer = demoProfile
.Layers.FirstOrDefault(l => l.Name == "Demo - GIFs")?
.Children.FirstOrDefault(c => c.Name == "GIF");
if (gifLayer == null)
continue;
((KeyboardPropertiesModel) gifLayer.Properties).GifFile = gifPath;
AddOrUpdate(demoProfile);
}
}
/// <summary>

5
Artemis/Artemis/DeviceProviders/Logitech/Orion.cs
View File

@ -28,9 +28,8 @@ namespace Artemis.DeviceProviders.Logitech
{
//Check to see if VC++ 2012 x64 is installed.
if (
Registry.LocalMachine.OpenSubKey(
@"SOFTWARE\Classes\Installer\Dependencies\{ca67548a-5ebe-413a-b50c-4b9ceb6d66c6}") == null)
if (Registry.LocalMachine.OpenSubKey(
@"SOFTWARE\Classes\Installer\Dependencies\{ca67548a-5ebe-413a-b50c-4b9ceb6d66c6}") == null)
{
CantEnableText = "Couldn't connect to your Logitech G910.\n" +
"The Visual C 2012 Redistributable could not be found, which is required.\n" +

6
Artemis/Artemis/Managers/LoopManager.cs
View File

@ -2,7 +2,6 @@
using System.Drawing;
using System.Linq;
using System.Timers;
using Caliburn.Micro;
using Ninject.Extensions.Logging;
using Brush = System.Windows.Media.Brush;
@ -15,15 +14,12 @@ namespace Artemis.Managers
{
private readonly DeviceManager _deviceManager;
private readonly EffectManager _effectManager;
private readonly IEventAggregator _events;
private readonly ILogger _logger;
private readonly Timer _loopTimer;
public LoopManager(ILogger logger, IEventAggregator events, EffectManager effectManager,
DeviceManager deviceManager)
public LoopManager(ILogger logger, EffectManager effectManager, DeviceManager deviceManager)
{
_logger = logger;
_events = events;
_effectManager = effectManager;
_deviceManager = deviceManager;

10
Artemis/Artemis/Properties/Resources.Designer.cs generated
View File

@ -130,6 +130,16 @@ namespace Artemis.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap demo_gif {
get {
object obj = ResourceManager.GetObject("demo_gif", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized string similar to &quot;Artemis&quot;
///{

3
Artemis/Artemis/Properties/Resources.resx
View File

@ -181,4 +181,7 @@
<data name="none" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Keyboards\none.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="demo_gif" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Keyboards\demo-gif.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

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

Binary file not shown.

BIN
Artemis/Artemis/Resources/Keyboards/demo-gif.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

4
Artemis/Artemis/Utilities/Layers/AnimationUpdater.cs
View File

@ -13,13 +13,13 @@ namespace Artemis.Utilities.Layers
{
case LayerAnimation.SlideRight:
case LayerAnimation.SlideLeft:
if (progress + 1 >= properties.Width*scale)
if (progress + properties.AnimationSpeed * 2 >= properties.Width*scale)
progress = 0;
progress = progress + properties.AnimationSpeed*2;
break;
case LayerAnimation.SlideDown:
case LayerAnimation.SlideUp:
if (progress + 1 >= properties.Height*scale)
if (progress + properties.AnimationSpeed * 2 >= properties.Height*scale)
progress = 0;
progress = progress + properties.AnimationSpeed*2;
break;

10
Artemis/Artemis/ViewModels/OverlaysViewModel.cs
View File

@ -1,20 +1,14 @@
using Artemis.Managers;
using Artemis.Modules.Overlays.VolumeDisplay;
using Artemis.ViewModels.Abstract;
using Artemis.ViewModels.Abstract;
namespace Artemis.ViewModels
{
public sealed class OverlaysViewModel : BaseViewModel
{
private readonly MainManager _mainManager;
private readonly OverlayViewModel[] _overlayViewModels;
private VolumeDisplayViewModel _volumeDisplayVm;
public OverlaysViewModel(MainManager mainManager, OverlayViewModel[] overlayViewModels)
public OverlaysViewModel(OverlayViewModel[] overlayViewModels)
{
DisplayName = "Overlays";
_mainManager = mainManager;
_overlayViewModels = overlayViewModels;
}