diff --git a/Artemis/Artemis.sln b/Artemis/Artemis.sln index d48581c3b..6c8abbab3 100644 --- a/Artemis/Artemis.sln +++ b/Artemis/Artemis.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis", "Artemis\Artemis.csproj", "{ED9997A2-E54C-4E9F-9350-62BE672C3ABE}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Razer2Artemis", "Razer2Artemis\Razer2Artemis.vcxproj", "{39711909-C1D5-46CE-A9EA-2D561692EA47}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CD_ROM|Any CPU = CD_ROM|Any CPU @@ -54,6 +56,34 @@ Global {ED9997A2-E54C-4E9F-9350-62BE672C3ABE}.SingleImage|x64.Build.0 = Release|x64 {ED9997A2-E54C-4E9F-9350-62BE672C3ABE}.SingleImage|x86.ActiveCfg = Release|x86 {ED9997A2-E54C-4E9F-9350-62BE672C3ABE}.SingleImage|x86.Build.0 = Release|x86 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.CD_ROM|Any CPU.ActiveCfg = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.CD_ROM|Any CPU.Build.0 = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.CD_ROM|x64.ActiveCfg = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.CD_ROM|x64.Build.0 = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.CD_ROM|x86.ActiveCfg = Release|Win32 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.CD_ROM|x86.Build.0 = Release|Win32 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.Debug|x64.ActiveCfg = Debug|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.Debug|x64.Build.0 = Debug|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.Debug|x86.ActiveCfg = Debug|Win32 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.Debug|x86.Build.0 = Debug|Win32 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.DVD-5|Any CPU.ActiveCfg = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.DVD-5|Any CPU.Build.0 = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.DVD-5|x64.ActiveCfg = Debug|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.DVD-5|x64.Build.0 = Debug|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.DVD-5|x86.ActiveCfg = Debug|Win32 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.DVD-5|x86.Build.0 = Debug|Win32 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.Release|Any CPU.ActiveCfg = Release|Win32 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.Release|x64.ActiveCfg = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.Release|x64.Build.0 = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.Release|x86.ActiveCfg = Release|Win32 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.Release|x86.Build.0 = Release|Win32 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.SingleImage|Any CPU.ActiveCfg = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.SingleImage|Any CPU.Build.0 = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.SingleImage|x64.ActiveCfg = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.SingleImage|x64.Build.0 = Release|x64 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.SingleImage|x86.ActiveCfg = Release|Win32 + {39711909-C1D5-46CE-A9EA-2D561692EA47}.SingleImage|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Artemis/Artemis/App.config b/Artemis/Artemis/App.config index 9c4523b0b..4abfc6fbb 100644 --- a/Artemis/Artemis/App.config +++ b/Artemis/Artemis/App.config @@ -4,6 +4,12 @@ +
+
@@ -53,6 +59,22 @@ + + + Demo (Duplicate to keep changes) + + + + + True + + + Default + + + + + True @@ -111,14 +133,8 @@ True - - #FFFF5000 - - - #FFFF0000 - - - False + + Default @@ -185,6 +201,9 @@ True + + Default + @@ -293,6 +312,9 @@ True + + Light + @@ -321,6 +343,10 @@ + + + + diff --git a/Artemis/Artemis/App.xaml.cs b/Artemis/Artemis/App.xaml.cs index f68067c70..5ca4b1c47 100644 --- a/Artemis/Artemis/App.xaml.cs +++ b/Artemis/Artemis/App.xaml.cs @@ -1,7 +1,8 @@ using System; +using System.Security.Principal; using System.Windows; using System.Windows.Threading; -using Artemis.Utilities; +using NLog; using WpfExceptionViewer; namespace Artemis @@ -13,14 +14,22 @@ namespace Artemis { public App() { - if (!GeneralHelpers.IsRunAsAdministrator()) - GeneralHelpers.RunAsAdministrator(); + //if (!IsRunAsAdministrator()) + // GeneralHelpers.RunAsAdministrator(); InitializeComponent(); } public bool DoHandle { get; set; } + private static bool IsRunAsAdministrator() + { + var wi = WindowsIdentity.GetCurrent(); + var wp = new WindowsPrincipal(wi); + + return wp.IsInRole(WindowsBuiltInRole.Administrator); + } + private void Application_Startup(object sender, StartupEventArgs e) { AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; @@ -40,7 +49,6 @@ namespace Artemis } } - private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) { var ex = e.ExceptionObject as Exception; @@ -49,6 +57,8 @@ namespace Artemis private static ExceptionViewer GetArtemisExceptionViewer(Exception e) { + var logger = LogManager.GetCurrentClassLogger(); + logger.Fatal(e, "Unhandled exception, showing dialog and shutting down."); return new ExceptionViewer("An unexpected error occurred in Artemis.", e) { Title = "Artemis - Exception :c", diff --git a/Artemis/Artemis/Artemis base layout.png b/Artemis/Artemis/Artemis base layout.png new file mode 100644 index 000000000..62a7a4972 Binary files /dev/null and b/Artemis/Artemis/Artemis base layout.png differ diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj index cc6511ec3..a41efdf9e 100644 --- a/Artemis/Artemis/Artemis.csproj +++ b/Artemis/Artemis/Artemis.csproj @@ -120,20 +120,20 @@ - - ..\packages\Autofac.4.0.0-rc1-177\lib\net45\Autofac.dll + + ..\packages\Caliburn.Micro.Core.3.0.1\lib\net45\Caliburn.Micro.dll True - - ..\packages\Caliburn.Micro.Core.2.0.2\lib\net45\Caliburn.Micro.dll + + ..\packages\Caliburn.Micro.3.0.1\lib\net45\Caliburn.Micro.Platform.dll True - - ..\packages\Caliburn.Micro.AutofacBootstrap.2.0.9-beta\lib\net40\Caliburn.Micro.Autofac.dll + + ..\packages\Caliburn.Micro.3.0.1\lib\net45\Caliburn.Micro.Platform.Core.dll True - - ..\packages\Caliburn.Micro.2.0.2\lib\net45\Caliburn.Micro.Platform.dll + + ..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll True @@ -144,8 +144,12 @@ ..\packages\Colore.4.0.0\lib\net35\Corale.Colore.dll True - - ..\packages\CUE.NET.1.0.2.2\lib\net45\CUE.NET.dll + + ..\packages\CUE.NET.1.0.3\lib\net45\CUE.NET.dll + True + + + ..\packages\gong-wpf-dragdrop.0.1.4.3\lib\net40\GongSolutions.Wpf.DragDrop.dll True @@ -175,8 +179,24 @@ ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll True + + ..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll + True + + + ..\packages\Ninject.Extensions.Factory.3.2.1.0\lib\net45-full\Ninject.Extensions.Factory.dll + True + + + ..\packages\Ninject.Extensions.Logging.3.2.3.0\lib\net45-full\Ninject.Extensions.Logging.dll + True + + + ..\packages\Ninject.Extensions.Logging.nlog4.3.2.3.0\lib\net45-full\Ninject.Extensions.Logging.NLog4.dll + True + - ..\packages\NLog.4.3.2\lib\net45\NLog.dll + ..\packages\NLog.4.3.4\lib\net45\NLog.dll True @@ -191,10 +211,16 @@ ..\packages\SharpDX.DXGI.3.0.2\lib\net45\SharpDX.DXGI.dll True + + ..\packages\SpotifyAPI-NET.2.9.0\lib\SpotifyAPI.dll + True + + + ..\packages\System.Linq.Dynamic.1.0.6\lib\net40\System.Linq.Dynamic.dll True @@ -202,7 +228,10 @@ - + + ..\packages\Caliburn.Micro.3.0.1\lib\net45\System.Windows.Interactivity.dll + True + @@ -259,34 +288,44 @@ + + + + + - - - - - - - - - - - + + + + + + + + + - + + + + - - + + + + + + @@ -302,9 +341,19 @@ - + + True + True + WindowsProfile.settings + + + + WindowsProfileView.xaml + + + + - TypeWave.settings True @@ -328,6 +377,9 @@ + + OverwatchView.xaml + RocketLeague.settings True @@ -347,6 +399,16 @@ TheDivisionView.xaml + + + Overwatch.settings + True + True + + + + + True @@ -363,10 +425,12 @@ - + + + True @@ -386,14 +450,19 @@ True Offsets.settings + + + + - + + @@ -409,12 +478,12 @@ + + - - @@ -423,12 +492,18 @@ - - - + + + + + + + + + - + @@ -438,15 +513,9 @@ FlyoutSettingsView.xaml - - DebugEffectView.xaml - AudioVisualizerView.xaml - - TypeHoleView.xaml - TypeWaveView.xaml @@ -465,22 +534,34 @@ Witcher3View.xaml - + + FolderPropertiesView.xaml + + + HeadsetPropertiesView.xaml + + + KeyboardPropertiesView.xaml + + LayerConditionView.xaml - + LayerDynamicPropertiesView.xaml - + LayerEditorView.xaml + + MousePropertiesView.xaml + OverlaysView.xaml VolumeDisplayView.xaml - + ProfileEditorView.xaml @@ -510,6 +591,10 @@ SettingsSingleFileGenerator TypeWave.Designer.cs + + SettingsSingleFileGenerator + WindowsProfile.Designer.cs + SettingsSingleFileGenerator CounterStrike.Designer.cs @@ -526,6 +611,10 @@ SettingsSingleFileGenerator TheDivision.Designer.cs + + SettingsSingleFileGenerator + Overwatch.Designer.cs + SettingsSingleFileGenerator Witcher3.Designer.cs @@ -540,7 +629,9 @@ Designer - + + Designer + @@ -550,15 +641,23 @@ + - + + + + + + + + @@ -578,6 +677,14 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -586,10 +693,14 @@ MSBuild:Compile Designer - + + MSBuild:Compile + Designer + + Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -598,18 +709,10 @@ Designer MSBuild:Compile - - MSBuild:Compile - Designer - Designer MSBuild:Compile - - Designer - MSBuild:Compile - Designer MSBuild:Compile @@ -638,18 +741,34 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + MSBuild:Compile Designer + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -658,7 +777,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -695,12 +814,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - - Bars amount (less bars means thicker bars) - - - - Volume sensitivity multiplier - - Bar fade-out speed - - + - - - - \ No newline at end of file diff --git a/Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml b/Artemis/Artemis/Views/Profiles/LayerConditionView.xaml similarity index 90% rename from Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml rename to Artemis/Artemis/Views/Profiles/LayerConditionView.xaml index cfbef9477..a0c19cad6 100644 --- a/Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml +++ b/Artemis/Artemis/Views/Profiles/LayerConditionView.xaml @@ -1,72 +1,75 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml.cs b/Artemis/Artemis/Views/Profiles/LayerConditionView.xaml.cs similarity index 85% rename from Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml.cs rename to Artemis/Artemis/Views/Profiles/LayerConditionView.xaml.cs index ef50d2c49..61fb53029 100644 --- a/Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml.cs +++ b/Artemis/Artemis/Views/Profiles/LayerConditionView.xaml.cs @@ -1,15 +1,15 @@ -using System.Windows.Controls; - -namespace Artemis.Views.LayerEditor -{ - /// - /// Interaction logic for LayerConditionView.xaml - /// - public partial class LayerConditionView : UserControl - { - public LayerConditionView() - { - InitializeComponent(); - } - } +using System.Windows.Controls; + +namespace Artemis.Views.Profiles +{ + /// + /// Interaction logic for LayerConditionView.xaml + /// + public partial class LayerConditionView : UserControl + { + public LayerConditionView() + { + InitializeComponent(); + } + } } \ No newline at end of file diff --git a/Artemis/Artemis/Views/LayerEditor/LayerDynamicPropertiesView.xaml b/Artemis/Artemis/Views/Profiles/LayerDynamicPropertiesView.xaml similarity index 74% rename from Artemis/Artemis/Views/LayerEditor/LayerDynamicPropertiesView.xaml rename to Artemis/Artemis/Views/Profiles/LayerDynamicPropertiesView.xaml index 301e3695c..500c6ae18 100644 --- a/Artemis/Artemis/Views/LayerEditor/LayerDynamicPropertiesView.xaml +++ b/Artemis/Artemis/Views/Profiles/LayerDynamicPropertiesView.xaml @@ -1,33 +1,31 @@ - - + - + - + + @@ -52,7 +50,8 @@ + Margin="10,0" VerticalAlignment="Center" Height="22" + IsEnabled="{Binding Path=ControlsEnabled}"> @@ -62,7 +61,8 @@ - + @@ -82,7 +82,20 @@ + Value="{Binding Path=Proposed.PercentageSource, Mode=TwoWay}" + IsEnabled="{Binding Path=ControlsEnabled}" /> + + + + + + + + + \ No newline at end of file diff --git a/Artemis/Artemis/Views/LayerEditor/LayerDynamicPropertiesView.xaml.cs b/Artemis/Artemis/Views/Profiles/LayerDynamicPropertiesView.xaml.cs similarity index 89% rename from Artemis/Artemis/Views/LayerEditor/LayerDynamicPropertiesView.xaml.cs rename to Artemis/Artemis/Views/Profiles/LayerDynamicPropertiesView.xaml.cs index c63f6ba31..57fef8b32 100644 --- a/Artemis/Artemis/Views/LayerEditor/LayerDynamicPropertiesView.xaml.cs +++ b/Artemis/Artemis/Views/Profiles/LayerDynamicPropertiesView.xaml.cs @@ -1,6 +1,6 @@ using System.Windows.Controls; -namespace Artemis.Views.LayerEditor +namespace Artemis.Views.Profiles { /// /// Interaction logic for LayerDynamicPropertiesView.xaml diff --git a/Artemis/Artemis/Views/LayerEditor/LayerEditorView.xaml b/Artemis/Artemis/Views/Profiles/LayerEditorView.xaml similarity index 53% rename from Artemis/Artemis/Views/LayerEditor/LayerEditorView.xaml rename to Artemis/Artemis/Views/Profiles/LayerEditorView.xaml index 1e5fbe2e2..a6655937f 100644 --- a/Artemis/Artemis/Views/LayerEditor/LayerEditorView.xaml +++ b/Artemis/Artemis/Views/Profiles/LayerEditorView.xaml @@ -1,4 +1,4 @@ - + x:Key="LayerEnumValues"> - - - - - - + @@ -44,12 +36,6 @@ - - - - - - @@ -59,9 +45,20 @@ - + + + + + + + + + +