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

Pushed development on top of master to get rid of annoying Git issues. This'll give us a fresh start

Browse Source
This commit is contained in:
SpoinkyNL 2016-04-27 20:38:35 +02:00
commit c52be47e9f
3 changed files with 139 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Artemis/Artemis/Managers/KeyboardManager.cs
View File

@ -75,6 +75,8 @@ namespace Artemis.Managers
if (!keyboardProvider.CanEnable()) if (!keyboardProvider.CanEnable())
{ {
_mainManager.DialogService.ShowErrorMessageBox(keyboardProvider.CantEnableText); _mainManager.DialogService.ShowErrorMessageBox(keyboardProvider.CantEnableText);
General.Default.LastKeyboard = null;
General.Default.Save();
return; return;
} }

264
Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs
View File

@ -1,133 +1,133 @@
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using Artemis.Events; using Artemis.Events;
using Artemis.Managers; using Artemis.Managers;
using Artemis.Settings; using Artemis.Settings;
using Caliburn.Micro; using Caliburn.Micro;
using MahApps.Metro.Controls; using MahApps.Metro.Controls;
namespace Artemis.ViewModels.Flyouts namespace Artemis.ViewModels.Flyouts
{ {
public class FlyoutSettingsViewModel : FlyoutBaseViewModel, IHandle<ToggleEnabled>, IHandle<ActiveEffectChanged> public class FlyoutSettingsViewModel : FlyoutBaseViewModel, IHandle<ToggleEnabled>, IHandle<ActiveEffectChanged>
{ {
private string _activeEffectName; private string _activeEffectName;
private GeneralSettings _generalSettings; private GeneralSettings _generalSettings;
private string _selectedKeyboardProvider; private string _selectedKeyboardProvider;
public FlyoutSettingsViewModel(MainManager mainManager) public FlyoutSettingsViewModel(MainManager mainManager)
{ {
MainManager = mainManager; MainManager = mainManager;
Header = "Settings"; Header = "Settings";
Position = Position.Right; Position = Position.Right;
GeneralSettings = new GeneralSettings(); GeneralSettings = new GeneralSettings();
MainManager.Events.Subscribe(this); MainManager.Events.Subscribe(this);
} }
public GeneralSettings GeneralSettings public GeneralSettings GeneralSettings
{ {
get { return _generalSettings; } get { return _generalSettings; }
set set
{ {
if (Equals(value, _generalSettings)) return; if (Equals(value, _generalSettings)) return;
_generalSettings = value; _generalSettings = value;
NotifyOfPropertyChange(() => GeneralSettings); NotifyOfPropertyChange(() => GeneralSettings);
} }
} }
public MainManager MainManager { get; set; } public MainManager MainManager { get; set; }
public BindableCollection<string> KeyboardProviders public BindableCollection<string> KeyboardProviders
{ {
get get
{ {
var collection = new BindableCollection<string>(MainManager.KeyboardManager.KeyboardProviders var collection = new BindableCollection<string>(MainManager.KeyboardManager.KeyboardProviders
.Select(k => k.Name)); .Select(k => k.Name));
collection.Insert(0, "None"); collection.Insert(0, "None");
return collection; return collection;
} }
} }
public string SelectedKeyboardProvider public string SelectedKeyboardProvider
{ {
get { return _selectedKeyboardProvider; } get { return _selectedKeyboardProvider; }
set set
{ {
if (value == _selectedKeyboardProvider) return; if (value == _selectedKeyboardProvider) return;
_selectedKeyboardProvider = value; _selectedKeyboardProvider = value;
NotifyOfPropertyChange(() => SelectedKeyboardProvider); NotifyOfPropertyChange(() => SelectedKeyboardProvider);
if (value == null) if (value == null)
return; return;
MainManager.KeyboardManager.ChangeKeyboard( MainManager.KeyboardManager.ChangeKeyboard(
MainManager.KeyboardManager.KeyboardProviders.FirstOrDefault( MainManager.KeyboardManager.KeyboardProviders.FirstOrDefault(
k => k.Name == _selectedKeyboardProvider)); k => k.Name == _selectedKeyboardProvider));
} }
} }
public bool Enabled public bool Enabled
{ {
get { return MainManager.ProgramEnabled; } get { return MainManager.ProgramEnabled; }
set set
{ {
if (value) if (value)
MainManager.EnableProgram(); MainManager.EnableProgram();
else else
MainManager.DisableProgram(); MainManager.DisableProgram();
} }
} }
public string ActiveEffectName public string ActiveEffectName
{ {
get { return _activeEffectName; } get { return _activeEffectName; }
set set
{ {
if (value == _activeEffectName) return; if (value == _activeEffectName) return;
_activeEffectName = value; _activeEffectName = value;
NotifyOfPropertyChange(() => ActiveEffectName); NotifyOfPropertyChange(() => ActiveEffectName);
} }
} }
public void Handle(ActiveEffectChanged message) public void Handle(ActiveEffectChanged message)
{ {
var effectDisplay = string.IsNullOrEmpty(message.ActiveEffect) ? message.ActiveEffect : "none"; var effectDisplay = string.IsNullOrEmpty(message.ActiveEffect) ? message.ActiveEffect : "none";
ActiveEffectName = $"Active effect: {effectDisplay}"; ActiveEffectName = $"Active effect: {effectDisplay}";
} }
public void Handle(ToggleEnabled message) public void Handle(ToggleEnabled message)
{ {
NotifyOfPropertyChange(() => Enabled); NotifyOfPropertyChange(() => Enabled);
} }
public void ToggleEnabled() public void ToggleEnabled()
{ {
if (Enabled) if (Enabled)
MainManager.DisableProgram(); MainManager.DisableProgram();
else else
MainManager.EnableProgram(); MainManager.EnableProgram();
} }
public void ResetSettings() public void ResetSettings()
{ {
GeneralSettings.ResetSettings(); GeneralSettings.ResetSettings();
NotifyOfPropertyChange(() => GeneralSettings); NotifyOfPropertyChange(() => GeneralSettings);
} }
public void SaveSettings() public void SaveSettings()
{ {
GeneralSettings.SaveSettings(); GeneralSettings.SaveSettings();
} }
public void NavigateTo(string url) public void NavigateTo(string url)
{ {
Process.Start(new ProcessStartInfo(url)); Process.Start(new ProcessStartInfo(url));
} }
protected override void HandleOpen() protected override void HandleOpen()
{ {
SelectedKeyboardProvider = General.Default.LastKeyboard.Length > 0 SelectedKeyboardProvider = string.IsNullOrEmpty(General.Default.LastKeyboard)
? General.Default.LastKeyboard ? "None"
: "None"; : General.Default.LastKeyboard;
} }
} }
} }

10
pointers.json
View File

@ -2,18 +2,18 @@
[ [
{ {
"Game":"RocketLeague", "Game":"RocketLeague",
"GameVersion":"1.16", "GameVersion":"1.17",
"GameAddresses":[ "GameAddresses":[
{ {
"Description":"Boost", "Description":"Boost",
"BasePointer":{ "BasePointer":{
"value":22411984 "value":22531104
}, },
"Offsets":[ "Offsets":[
1632, 1648,
64, 64,
1636, 484,
1800, 1828,
540 540
] ]
} }