DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-11 19:36:28 +00:00
Code Issues Releases Wiki Activity

Rely on CS-Script includes for modules view model matching

Browse Source
This commit is contained in:
SpoinkyNL committed 2018-03-04 22:27:57 +01:00
1 parent 36b8ddc023
commit 2f72cdb1d9
21 files changed
+301 -81
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.Plugins.BuiltIn/Artemis.Plugins.BuiltIn.csproj
+6 -4
View File
@@ -20,6 +20,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>5</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -47,15 +48,16 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<None Include="Modules\General\GeneralModule.cs" />
<None Include="Modules\General\GeneralViewModel.cs" />
<Compile Include="Modules\General\GeneralModule.cs" />
<Compile Include="Modules\General\GeneralViewModel.cs" />
<Compile Include="Modules\General\GeneralDataModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Modules\General\GeneralView.xaml">
<Page Include="Modules\General\GeneralView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
</Page>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
src/Artemis.Plugins.BuiltIn/Modules/General/GeneralDataModel.cs
+12
View File
@@ -0,0 +1,12 @@
using System;
using Artemis.Core.Attributes;
using Artemis.Plugins.Interfaces;
namespace Artemis.Plugins.BuiltIn.Modules.General
{
public class GeneralDataModel : IModuleDataModel
{
[DataModelProperty(DisplayName = "Unique boolean")]
public bool PropertyUniqueToThisDm { get; set; }
}
}
src/Artemis.Plugins.BuiltIn/Modules/General/GeneralModule.cs
+11 -23
View File
@@ -1,34 +1,22 @@
using System.Diagnostics;
using Artemis.Core.Services.Interfaces;
using Artemis.Plugins.Interfaces;
//css_inc GeneralViewModel.cs;
//css_inc GeneralDataModel.cs;
using System;
using Artemis.Plugins.Abstract;
namespace Artemis.Plugins.BuiltIn.Modules.General
{
public class GeneralModule : IModule
public class GeneralModule : ProfileModule
{
private readonly ICoreService _coreService;
public GeneralModule(ICoreService coreService)
public override Type ViewModelType
{
_coreService = coreService;
Debugger.Break();
get { return typeof(GeneralViewModel); }
}
public void LoadPlugin()
{
}
public void UnloadPlugin()
{
}
public void Update(double deltaTime)
{
}
public void Render(double deltaTime)
// True since the main data model is all this module shows
public override bool ExpandsMainDataModel
{
get { return true; }
}
}
}
src/Artemis.Plugins.BuiltIn/Modules/General/plugin.json
+1 -2
View File
@@ -1,6 +1,5 @@
{
"Name": "Default",
"Version": "1.0.0",
"Main": "GeneralModule.cs",
"ViewModel": "GeneralViewModel.cs"
"Main": "GeneralModule.cs"
}
src/Artemis.Plugins.BuiltIn/app.config
+25 -1
View File
@@ -32,7 +32,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
<bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
@@ -40,6 +40,30 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
</assemblyBinding>