diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index 9f5c4f4ab..814ddc2dd 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -1,7 +1,102 @@ - - + + + - netstandard2.0 + Debug + AnyCPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36} + Library + Properties + Artemis.Core + Artemis.Core + v4.6 + 512 + + - - + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\RGB.NET.Brushes.0.0.1.10\lib\net45\RGB.NET.Brushes.dll + + + ..\packages\RGB.NET.Core.0.0.1.10\lib\net45\RGB.NET.Core.dll + + + ..\packages\RGB.NET.Decorators.0.0.1.10\lib\net45\RGB.NET.Decorators.dll + + + ..\packages\RGB.NET.Devices.Asus.0.0.1.10\lib\net45\RGB.NET.Devices.Asus.dll + + + ..\packages\RGB.NET.Devices.CoolerMaster.0.0.1.10\lib\net45\RGB.NET.Devices.CoolerMaster.dll + + + ..\packages\RGB.NET.Devices.Corsair.0.0.1.10\lib\net45\RGB.NET.Devices.Corsair.dll + + + ..\packages\RGB.NET.Devices.Logitech.0.0.1.10\lib\net45\RGB.NET.Devices.Logitech.dll + + + ..\packages\RGB.NET.Devices.Msi.0.0.1.10\lib\net45\RGB.NET.Devices.Msi.dll + + + ..\packages\RGB.NET.Devices.Novation.0.0.1.10\lib\net45\RGB.NET.Devices.Novation.dll + + + ..\packages\RGB.NET.Groups.0.0.1.10\lib\net45\RGB.NET.Groups.dll + + + ..\packages\Sanford.Multimedia.Midi.6.4.1\lib\net20\Sanford.Multimedia.Midi.dll + + + + + ..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll + + + + + + + + + + + + + + + + + + + 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}. + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.Core/Class1.cs b/src/Artemis.Core/Class1.cs deleted file mode 100644 index e41c7fe7f..000000000 --- a/src/Artemis.Core/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace Artemis.Core -{ - public class Class1 - { - } -} diff --git a/src/Artemis.Core/Properties/AssemblyInfo.cs b/src/Artemis.Core/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..bdb7eb11d --- /dev/null +++ b/src/Artemis.Core/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Artemis.Core")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Artemis.Core")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("9b811f9b-86b9-4771-87af-72bae7078a36")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Artemis.Core/packages.config b/src/Artemis.Core/packages.config new file mode 100644 index 000000000..cf5495b0c --- /dev/null +++ b/src/Artemis.Core/packages.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj index c80daee57..d595d73b6 100644 --- a/src/Artemis.Storage/Artemis.Storage.csproj +++ b/src/Artemis.Storage/Artemis.Storage.csproj @@ -1,11 +1,13 @@ - netstandard2.0 - - + net461 + - + + + + diff --git a/src/Artemis.Storage/Entities/Condition.cs b/src/Artemis.Storage/Entities/Condition.cs deleted file mode 100644 index 051e5b487..000000000 --- a/src/Artemis.Storage/Entities/Condition.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Artemis.Storage.Entities -{ - class Condition - { - } -} diff --git a/src/Artemis.Storage/Entities/Layer.cs b/src/Artemis.Storage/Entities/Layer.cs index 26713cad1..f29e308db 100644 --- a/src/Artemis.Storage/Entities/Layer.cs +++ b/src/Artemis.Storage/Entities/Layer.cs @@ -1,10 +1,18 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; namespace Artemis.Storage.Entities { - class Layer + internal class Layer + { + public int ProfileId { get; set; } + public string Name { get; set; } + public LayerType LayerType { get; set; } + + public virtual Profile Profile { get; set; } + public virtual ICollection Layers { get; set; } + } + + internal enum LayerType { } } diff --git a/src/Artemis.Storage/Entities/Profile.cs b/src/Artemis.Storage/Entities/Profile.cs index c67e5f0a2..f0f2cda90 100644 --- a/src/Artemis.Storage/Entities/Profile.cs +++ b/src/Artemis.Storage/Entities/Profile.cs @@ -1,10 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; namespace Artemis.Storage.Entities { - class Profile + internal class Profile { + [Key] + public int Id { get; set; } + public string Name { get; set; } + public virtual ICollection Layers { get; set; } } } diff --git a/src/Artemis.Storage/Entities/Setting.cs b/src/Artemis.Storage/Entities/Setting.cs new file mode 100644 index 000000000..bb1fe6c92 --- /dev/null +++ b/src/Artemis.Storage/Entities/Setting.cs @@ -0,0 +1,11 @@ +using System.ComponentModel.DataAnnotations; + +namespace Artemis.Storage.Entities +{ + internal class Setting + { + [Key] + public string Name { get; set; } + public string Value { get; set; } + } +} diff --git a/src/Artemis.Storage/Migrations/20171208203331_InitialCreate.Designer.cs b/src/Artemis.Storage/Migrations/20171208203331_InitialCreate.Designer.cs new file mode 100644 index 000000000..96b5c0139 --- /dev/null +++ b/src/Artemis.Storage/Migrations/20171208203331_InitialCreate.Designer.cs @@ -0,0 +1,67 @@ +// +using Artemis.Storage; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage; +using System; + +namespace Artemis.Storage.Migrations +{ + [DbContext(typeof(StorageContext))] + [Migration("20171208203331_InitialCreate")] + partial class InitialCreate + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.0.1-rtm-125"); + + modelBuilder.Entity("Artemis.Storage.Entities.Layer", b => + { + b.Property("ProfileId"); + + b.Property("Name"); + + b.HasKey("ProfileId", "Name"); + + b.ToTable("Layer"); + }); + + modelBuilder.Entity("Artemis.Storage.Entities.Profile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("Profiles"); + }); + + modelBuilder.Entity("Artemis.Storage.Entities.Setting", b => + { + b.Property("Name") + .ValueGeneratedOnAdd(); + + b.Property("Value"); + + b.HasKey("Name"); + + b.ToTable("Settings"); + }); + + modelBuilder.Entity("Artemis.Storage.Entities.Layer", b => + { + b.HasOne("Artemis.Storage.Entities.Profile", "Profile") + .WithMany("Layers") + .HasForeignKey("ProfileId") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Artemis.Storage/Migrations/20171208203331_InitialCreate.cs b/src/Artemis.Storage/Migrations/20171208203331_InitialCreate.cs new file mode 100644 index 000000000..70ab38b44 --- /dev/null +++ b/src/Artemis.Storage/Migrations/20171208203331_InitialCreate.cs @@ -0,0 +1,67 @@ +using Microsoft.EntityFrameworkCore.Migrations; +using System; +using System.Collections.Generic; + +namespace Artemis.Storage.Migrations +{ + public partial class InitialCreate : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Profiles", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Name = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Profiles", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Settings", + columns: table => new + { + Name = table.Column(nullable: false), + Value = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Settings", x => x.Name); + }); + + migrationBuilder.CreateTable( + name: "Layer", + columns: table => new + { + ProfileId = table.Column(nullable: false), + Name = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Layer", x => new { x.ProfileId, x.Name }); + table.ForeignKey( + name: "FK_Layer_Profiles_ProfileId", + column: x => x.ProfileId, + principalTable: "Profiles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Layer"); + + migrationBuilder.DropTable( + name: "Settings"); + + migrationBuilder.DropTable( + name: "Profiles"); + } + } +} diff --git a/src/Artemis.Storage/Migrations/StorageContextModelSnapshot.cs b/src/Artemis.Storage/Migrations/StorageContextModelSnapshot.cs new file mode 100644 index 000000000..80d83b4db --- /dev/null +++ b/src/Artemis.Storage/Migrations/StorageContextModelSnapshot.cs @@ -0,0 +1,66 @@ +// +using Artemis.Storage; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage; +using System; + +namespace Artemis.Storage.Migrations +{ + [DbContext(typeof(StorageContext))] + partial class StorageContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.0.1-rtm-125"); + + modelBuilder.Entity("Artemis.Storage.Entities.Layer", b => + { + b.Property("ProfileId"); + + b.Property("Name"); + + b.HasKey("ProfileId", "Name"); + + b.ToTable("Layer"); + }); + + modelBuilder.Entity("Artemis.Storage.Entities.Profile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("Profiles"); + }); + + modelBuilder.Entity("Artemis.Storage.Entities.Setting", b => + { + b.Property("Name") + .ValueGeneratedOnAdd(); + + b.Property("Value"); + + b.HasKey("Name"); + + b.ToTable("Settings"); + }); + + modelBuilder.Entity("Artemis.Storage.Entities.Layer", b => + { + b.HasOne("Artemis.Storage.Entities.Profile", "Profile") + .WithMany("Layers") + .HasForeignKey("ProfileId") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Artemis.Storage/Storage.db b/src/Artemis.Storage/Storage.db new file mode 100644 index 000000000..923747c3f Binary files /dev/null and b/src/Artemis.Storage/Storage.db differ diff --git a/src/Artemis.Storage/StorageContext.cs b/src/Artemis.Storage/StorageContext.cs new file mode 100644 index 000000000..b9a356e45 --- /dev/null +++ b/src/Artemis.Storage/StorageContext.cs @@ -0,0 +1,28 @@ +using Artemis.Storage.Entities; +using Microsoft.EntityFrameworkCore; + +namespace Artemis.Storage +{ + internal class StorageContext : DbContext + { + internal DbSet Profiles { get; set; } + internal DbSet Settings { get; set; } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + optionsBuilder.UseSqlite("Data Source=Storage.db"); + } + + #region Overrides of DbContext + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + // Composite keys must be configured with fluent API in Core + modelBuilder.Entity().HasKey(l => new {l.ProfileId, l.Name}); + + base.OnModelCreating(modelBuilder); + } + + #endregion + } +} diff --git a/src/Artemis.UI/App.xaml b/src/Artemis.UI/App.xaml index 2de256fae..80121ce34 100644 --- a/src/Artemis.UI/App.xaml +++ b/src/Artemis.UI/App.xaml @@ -3,7 +3,51 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:Artemis.UI" StartupUri="MainWindow.xaml"> + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index a02f00a9f..65e0f0f74 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -34,8 +34,45 @@ 4 + + ..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll + + + ..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll + + + ..\packages\MaterialDesignThemes.MahApps.0.0.11\lib\net45\MaterialDesignThemes.MahApps.dll + + + ..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll + + + ..\packages\reactiveui-core.7.4.0\lib\Net45\ReactiveUI.dll + + + ..\packages\Splat.1.4.0\lib\Net45\Splat.dll + + + + ..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll + + + ..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll + + + ..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll + + + ..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll + + + ..\packages\Rx-XAML.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll + + + ..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll + @@ -54,6 +91,10 @@ MSBuild:Compile Designer + + + MainView.xaml + MSBuild:Compile Designer @@ -66,6 +107,10 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + @@ -85,6 +130,7 @@ ResXFileCodeGenerator Resources.Designer.cs + SettingsSingleFileGenerator Settings.Designer.cs @@ -93,5 +139,14 @@ + + + {e489e5e3-1a65-4af5-a1ea-f9805fd19a65} + Artemis.Storage + + + + + \ No newline at end of file diff --git a/src/Artemis.UI/MainWindow.xaml b/src/Artemis.UI/MainWindow.xaml index d353ffd89..eb3c79412 100644 --- a/src/Artemis.UI/MainWindow.xaml +++ b/src/Artemis.UI/MainWindow.xaml @@ -1,12 +1,63 @@ - - - - - + GlowBrush="{DynamicResource AccentColorBrush}" + FontFamily="{StaticResource DefaultFont}" + Title="" d:DesignHeight="589.868"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Have a chat + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Open Source + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Artemis.UI/Views/MainView.xaml.cs b/src/Artemis.UI/Views/MainView.xaml.cs new file mode 100644 index 000000000..a18f3ea4c --- /dev/null +++ b/src/Artemis.UI/Views/MainView.xaml.cs @@ -0,0 +1,20 @@ +using System.Windows.Controls; +using Artemis.UI.ViewModels; + +namespace Artemis.UI.Views +{ + /// + /// Interaction logic for MainView.xaml + /// + public partial class MainView : UserControl + { + public MainView() + { + ViewModel = new MainViewModel(); + InitializeComponent(); + DataContext = ViewModel; + } + + public MainViewModel ViewModel { get; set; } + } +} diff --git a/src/Artemis.UI/packages.config b/src/Artemis.UI/packages.config new file mode 100644 index 000000000..a7e9bf853 --- /dev/null +++ b/src/Artemis.UI/packages.config @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.sln b/src/Artemis.sln index aa50acd42..0e7c29e6f 100644 --- a/src/Artemis.sln +++ b/src/Artemis.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.0 +VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.UI", "Artemis.UI\Artemis.UI.csproj", "{46B74153-77CF-4489-BDF9-D53FDB1F7ACB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Core", "Artemis.Core\Artemis.Core.csproj", "{60E079AE-4490-415C-A4C7-9190F28F20E1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Storage", "Artemis.Storage\Artemis.Storage.csproj", "{E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Storage", "Artemis.Storage\Artemis.Storage.csproj", "{711C1CDD-AB2C-4D6C-89DE-58B59596E63F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Core", "Artemis.Core\Artemis.Core.csproj", "{9B811F9B-86B9-4771-87AF-72BAE7078A36}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,14 +19,14 @@ Global {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Debug|Any CPU.Build.0 = Debug|Any CPU {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Release|Any CPU.ActiveCfg = Release|Any CPU {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Release|Any CPU.Build.0 = Release|Any CPU - {60E079AE-4490-415C-A4C7-9190F28F20E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60E079AE-4490-415C-A4C7-9190F28F20E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60E079AE-4490-415C-A4C7-9190F28F20E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60E079AE-4490-415C-A4C7-9190F28F20E1}.Release|Any CPU.Build.0 = Release|Any CPU - {711C1CDD-AB2C-4D6C-89DE-58B59596E63F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {711C1CDD-AB2C-4D6C-89DE-58B59596E63F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {711C1CDD-AB2C-4D6C-89DE-58B59596E63F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {711C1CDD-AB2C-4D6C-89DE-58B59596E63F}.Release|Any CPU.Build.0 = Release|Any CPU + {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|Any CPU.Build.0 = Release|Any CPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE