From 9c32bb6ce6ab84f220429f89d8d4b6816b6f61b8 Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Sat, 26 Mar 2016 10:20:30 +0100 Subject: [PATCH] WIP on layer properties window --- Artemis/Artemis/Artemis.csproj | 8 ++ .../Games/TheDivision/TheDivisionDataModel.cs | 4 +- .../Games/TheDivision/TheDivisionView.xaml | 94 ++++++++-------- Artemis/Artemis/Utilities/GeneralHelpers.cs | 49 +++++---- .../LayerEditor/LayerConditionViewModel.cs | 100 ++++++++++++++++++ .../ViewModels/LayerEditorViewModel.cs | 29 +++-- .../Views/LayerEditor/LayerConditionView.xaml | 41 +++++++ .../LayerEditor/LayerConditionView.xaml.cs | 28 +++++ Artemis/Artemis/Views/LayerEditorView.xaml | 48 ++------- 9 files changed, 290 insertions(+), 111 deletions(-) create mode 100644 Artemis/Artemis/ViewModels/LayerEditor/LayerConditionViewModel.cs create mode 100644 Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml create mode 100644 Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml.cs diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj index 2fcff35a3..c567444ed 100644 --- a/Artemis/Artemis/Artemis.csproj +++ b/Artemis/Artemis/Artemis.csproj @@ -411,6 +411,7 @@ + @@ -453,6 +454,9 @@ LayerEditorView.xaml + + LayerConditionView.xaml + OverlaysView.xaml @@ -606,6 +610,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionDataModel.cs b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionDataModel.cs index f42a89928..2ffc9d0e8 100644 --- a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionDataModel.cs +++ b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionDataModel.cs @@ -1,4 +1,5 @@ -using Artemis.Models.Interfaces; +using System; +using Artemis.Models.Interfaces; namespace Artemis.Modules.Games.TheDivision { @@ -20,6 +21,7 @@ namespace Artemis.Modules.Games.TheDivision public TestTest TestyTest { get; set; } } + public class TestTest { public string TestS { get; set; } diff --git a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionView.xaml b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionView.xaml index 57a5b9df0..48b9924bf 100644 --- a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionView.xaml +++ b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionView.xaml @@ -7,52 +7,52 @@ xmlns:cal="http://www.caliburnproject.org" mc:Ignorable="d" d:DesignHeight="416.495" d:DesignWidth="553.608"> - - - - - - - - - - - - - - - - - - - - - Note: For this game to work with Artemis, please open up your Division settings, navigate to 3rd Party and set LED keyboard support to Yes. (This only works if you have Artemis running before starting the game) - - - - - - - -