mirror of
https://github.com/Artemis-RGB/Artemis
synced 2025-12-13 05:48:35 +00:00
Added default profiles for all keyboards
This commit is contained in:
parent
a9aa9f4df6
commit
feab0e3f4d
@ -657,6 +657,7 @@
|
|||||||
<None Include="Resources\RzChromaSDK64.dll" />
|
<None Include="Resources\RzChromaSDK64.dll" />
|
||||||
<Resource Include="Resources\Keyboards\blackwidow.png" />
|
<Resource Include="Resources\Keyboards\blackwidow.png" />
|
||||||
<None Include="Resources\Keyboards\none.png" />
|
<None Include="Resources\Keyboards\none.png" />
|
||||||
|
<None Include="Resources\Keyboards\demo-gif.gif" />
|
||||||
<Content Include="Resources\Witcher3\playerWitcher.txt" />
|
<Content Include="Resources\Witcher3\playerWitcher.txt" />
|
||||||
<Content Include="Resources\Witcher3\artemis.txt" />
|
<Content Include="Resources\Witcher3\artemis.txt" />
|
||||||
<None Include="Settings\Offsets.settings">
|
<None Include="Settings\Offsets.settings">
|
||||||
|
|||||||
@ -8,6 +8,8 @@ using System.Xml.Serialization;
|
|||||||
using Artemis.DeviceProviders;
|
using Artemis.DeviceProviders;
|
||||||
using Artemis.Models;
|
using Artemis.Models;
|
||||||
using Artemis.Models.Profiles;
|
using Artemis.Models.Profiles;
|
||||||
|
using Artemis.Models.Profiles.Properties;
|
||||||
|
using Artemis.Properties;
|
||||||
using Artemis.Utilities;
|
using Artemis.Utilities;
|
||||||
using NLog;
|
using NLog;
|
||||||
|
|
||||||
@ -123,6 +125,26 @@ namespace Artemis.DAL
|
|||||||
return;
|
return;
|
||||||
var archive = new ZipArchive(stream);
|
var archive = new ZipArchive(stream);
|
||||||
archive.ExtractToDirectory(ProfileFolder, true);
|
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>
|
/// <summary>
|
||||||
|
|||||||
@ -28,9 +28,8 @@ namespace Artemis.DeviceProviders.Logitech
|
|||||||
{
|
{
|
||||||
//Check to see if VC++ 2012 x64 is installed.
|
//Check to see if VC++ 2012 x64 is installed.
|
||||||
|
|
||||||
if (
|
if (Registry.LocalMachine.OpenSubKey(
|
||||||
Registry.LocalMachine.OpenSubKey(
|
@"SOFTWARE\Classes\Installer\Dependencies\{ca67548a-5ebe-413a-b50c-4b9ceb6d66c6}") == null)
|
||||||
@"SOFTWARE\Classes\Installer\Dependencies\{ca67548a-5ebe-413a-b50c-4b9ceb6d66c6}") == null)
|
|
||||||
{
|
{
|
||||||
CantEnableText = "Couldn't connect to your Logitech G910.\n" +
|
CantEnableText = "Couldn't connect to your Logitech G910.\n" +
|
||||||
"The Visual C 2012 Redistributable could not be found, which is required.\n" +
|
"The Visual C 2012 Redistributable could not be found, which is required.\n" +
|
||||||
|
|||||||
@ -2,7 +2,6 @@
|
|||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Timers;
|
using System.Timers;
|
||||||
using Caliburn.Micro;
|
|
||||||
using Ninject.Extensions.Logging;
|
using Ninject.Extensions.Logging;
|
||||||
using Brush = System.Windows.Media.Brush;
|
using Brush = System.Windows.Media.Brush;
|
||||||
|
|
||||||
@ -15,15 +14,12 @@ namespace Artemis.Managers
|
|||||||
{
|
{
|
||||||
private readonly DeviceManager _deviceManager;
|
private readonly DeviceManager _deviceManager;
|
||||||
private readonly EffectManager _effectManager;
|
private readonly EffectManager _effectManager;
|
||||||
private readonly IEventAggregator _events;
|
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
private readonly Timer _loopTimer;
|
private readonly Timer _loopTimer;
|
||||||
|
|
||||||
public LoopManager(ILogger logger, IEventAggregator events, EffectManager effectManager,
|
public LoopManager(ILogger logger, EffectManager effectManager, DeviceManager deviceManager)
|
||||||
DeviceManager deviceManager)
|
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_events = events;
|
|
||||||
_effectManager = effectManager;
|
_effectManager = effectManager;
|
||||||
_deviceManager = deviceManager;
|
_deviceManager = deviceManager;
|
||||||
|
|
||||||
|
|||||||
10
Artemis/Artemis/Properties/Resources.Designer.cs
generated
10
Artemis/Artemis/Properties/Resources.Designer.cs
generated
@ -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>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to "Artemis"
|
/// Looks up a localized string similar to "Artemis"
|
||||||
///{
|
///{
|
||||||
|
|||||||
@ -181,4 +181,7 @@
|
|||||||
<data name="none" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<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>
|
<value>..\Resources\Keyboards\none.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</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>
|
</root>
|
||||||
Binary file not shown.
BIN
Artemis/Artemis/Resources/Keyboards/demo-gif.gif
Normal file
BIN
Artemis/Artemis/Resources/Keyboards/demo-gif.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.9 KiB |
@ -13,13 +13,13 @@ namespace Artemis.Utilities.Layers
|
|||||||
{
|
{
|
||||||
case LayerAnimation.SlideRight:
|
case LayerAnimation.SlideRight:
|
||||||
case LayerAnimation.SlideLeft:
|
case LayerAnimation.SlideLeft:
|
||||||
if (progress + 1 >= properties.Width*scale)
|
if (progress + properties.AnimationSpeed * 2 >= properties.Width*scale)
|
||||||
progress = 0;
|
progress = 0;
|
||||||
progress = progress + properties.AnimationSpeed*2;
|
progress = progress + properties.AnimationSpeed*2;
|
||||||
break;
|
break;
|
||||||
case LayerAnimation.SlideDown:
|
case LayerAnimation.SlideDown:
|
||||||
case LayerAnimation.SlideUp:
|
case LayerAnimation.SlideUp:
|
||||||
if (progress + 1 >= properties.Height*scale)
|
if (progress + properties.AnimationSpeed * 2 >= properties.Height*scale)
|
||||||
progress = 0;
|
progress = 0;
|
||||||
progress = progress + properties.AnimationSpeed*2;
|
progress = progress + properties.AnimationSpeed*2;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -1,20 +1,14 @@
|
|||||||
using Artemis.Managers;
|
using Artemis.ViewModels.Abstract;
|
||||||
using Artemis.Modules.Overlays.VolumeDisplay;
|
|
||||||
using Artemis.ViewModels.Abstract;
|
|
||||||
|
|
||||||
namespace Artemis.ViewModels
|
namespace Artemis.ViewModels
|
||||||
{
|
{
|
||||||
public sealed class OverlaysViewModel : BaseViewModel
|
public sealed class OverlaysViewModel : BaseViewModel
|
||||||
{
|
{
|
||||||
private readonly MainManager _mainManager;
|
|
||||||
private readonly OverlayViewModel[] _overlayViewModels;
|
private readonly OverlayViewModel[] _overlayViewModels;
|
||||||
private VolumeDisplayViewModel _volumeDisplayVm;
|
|
||||||
|
|
||||||
public OverlaysViewModel(MainManager mainManager, OverlayViewModel[] overlayViewModels)
|
public OverlaysViewModel(OverlayViewModel[] overlayViewModels)
|
||||||
{
|
{
|
||||||
DisplayName = "Overlays";
|
DisplayName = "Overlays";
|
||||||
|
|
||||||
_mainManager = mainManager;
|
|
||||||
_overlayViewModels = overlayViewModels;
|
_overlayViewModels = overlayViewModels;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user