Merge pull request #190 from CoraleStudios/develop

[RELEASE] v5.0

Corale.Colore.Tester/App.config

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <system.diagnostics>
+        <sources>
+            <source name="Default" switchName="DefaultSwitch" switchType="System.Diagnostics.SourceSwitch">
+                <listeners>
+                    <add name="console" type="System.Diagnostics.ConsoleTraceListener">
+                        <filter type="System.Diagnostics.EventTypeFilter" initializeData="Verbose" />
+                    </add>
+                    <add name="FileListener" />
+                    <remove name="Default" />
+                </listeners>
+            </source>
+        </sources>
+        <switches>
+            <add name="DefaultSwitch" value="Verbose" />
+        </switches>
+        <sharedListeners>
+            <add name="FileListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="Corale.Colore.Tester.log">
+                <filter type="System.Diagnostics.EventTypeFilter" initializeData="Verbose" />
+            </add>
+        </sharedListeners>
+    </system.diagnostics>
+</configuration>

Corale.Colore.Tester/App.xaml.cs

@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------------------------
 // <copyright file="App.xaml.cs" company="Corale">
-//     Copyright © 2015 by Adam Hellberg and Brandon Scott.
+//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
 //
 //     Permission is hereby granted, free of charge, to any person obtaining a copy of
 //     this software and associated documentation files (the "Software"), to deal in
@@ -25,10 +25,16 @@
 
 namespace Corale.Colore.Tester
 {
+    using System.Diagnostics;
+
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
     public partial class App
     {
+        public App()
+        {
+            Trace.AutoFlush = true;
+        }
     }
 }

Corale.Colore.Tester/Classes/DelegateCommand.cs

@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------------------------
 // <copyright file="DelegateCommand.cs" company="Corale">
-//     Copyright © 2015 by Adam Hellberg and Brandon Scott.
+//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
 //
 //     Permission is hereby granted, free of charge, to any person obtaining a copy of
 //     this software and associated documentation files (the "Software"), to deal in

Corale.Colore.Tester/Corale.Colore.Tester.csproj

@@ -85,8 +85,28 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.Toolkit, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Xceed.Wpf.DataGrid, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -132,6 +152,7 @@
     <AdditionalFiles Include="..\stylecop.json">
       <Link>stylecop.json</Link>
     </AdditionalFiles>
+    <None Include="App.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -146,15 +167,19 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Corale.Colore.Wpf\Corale.Colore.Wpf.csproj">
+      <Project>{8ee8578b-53a7-40d9-9470-e562dde15786}</Project>
+      <Name>Corale.Colore.Wpf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Corale.Colore\Corale.Colore.csproj">
       <Project>{5fe57efb-ef8f-4c1b-8c13-0f85f3befffa}</Project>
       <Name>Corale.Colore</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Corale.Colore.Tester/GlobalSuppressions.cs

@@ -1,5 +1,6 @@
-// <copyright file="GlobalSuppressions.cs" company="Corale">
-//     Copyright © 2015 by Adam Hellberg and Brandon Scott.
+// ---------------------------------------------------------------------------------------
+// <copyright file="GlobalSuppressions.cs" company="Corale">
+//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
 //
 //     Permission is hereby granted, free of charge, to any person obtaining a copy of
 //     this software and associated documentation files (the "Software"), to deal in
@@ -20,5 +21,10 @@
 //
 //     "Razer" is a trademark of Razer USA Ltd.
 // </copyright>
+// ---------------------------------------------------------------------------------------
 
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1652:Enable XML documentation output", Justification = "Tests don't need docs")]
+[assembly:
+    System.Diagnostics.CodeAnalysis.SuppressMessage(
+        "StyleCop.CSharp.DocumentationRules",
+        "SA1652:Enable XML documentation output",
+        Justification = "Tests don't need docs")]

Corale.Colore.Tester/MainWindow.xaml

@@ -19,10 +19,10 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="40*" />
                         <ColumnDefinition Width="24*" />
-                        <ColumnDefinition Width="10*" />
+                        <ColumnDefinition Width="5*" />
                     </Grid.ColumnDefinitions>
                     <StackPanel HorizontalAlignment="Left" Height="241" VerticalAlignment="Top" Grid.Column="0"
-                                Width="243">
+                                Width="350">
                         <Label Content="Simple Effects" HorizontalAlignment="Center" FontSize="16px" />
                         <Button x:Name="SetAllButton" Content="SetAll" VerticalAlignment="Top" Width="75"
                                 Margin="0,6,0,0" Command="{Binding AllCommand, Mode=OneWay}" />
@@ -42,10 +42,20 @@
                                       ItemsSource="{Binding WaveDirectionValues}"
                                       SelectedItem="{Binding SelectedWaveDirection, Mode=TwoWay}" />
                         </StackPanel>
+                        <StackPanel Orientation="Horizontal" Margin="0,6,0,0" HorizontalAlignment="Center">
+                            <Button x:Name="SetStarlightButton" Content="SetStarlight" VerticalAlignment="Top" Width="75"
+                                    Command="{Binding StarlightCommand, Mode=OneWay}" />
+                            <ComboBox Height="22" Margin="8,0,0,0" Width="98"
+                                      ItemsSource="{Binding StarlightTypeValues}"
+                                      SelectedItem="{Binding SelectedStarlightType, Mode=TwoWay}" />
+                            <ComboBox Height="22" Margin="8,0,0,0" Width="98"
+                                      ItemsSource="{Binding StarlightDurationValues}"
+                                      SelectedItem="{Binding SelectedStarlightDuration, Mode=TwoWay}" />
+                        </StackPanel>
                         <Button x:Name="SetKeyboarsStaticButton" Content="SetStatic" VerticalAlignment="Top" Width="75"
-                                Margin="0,6,0,0" Command="{Binding StaticCommand, Mode=OneWay}" />
+                                Margin="84,6,84,0" Command="{Binding StaticCommand, Mode=OneWay}" />
                         <Button x:Name="ClearButton" Content="Clear" VerticalAlignment="Top" Width="75"
-                                Margin="0,6,0,0" Command="{Binding ClearCommand, Mode=OneWay}" />
+                                Margin="84,6,84,0" Command="{Binding ClearCommand, Mode=OneWay}" />
                     </StackPanel>
                     <StackPanel Height="241" VerticalAlignment="Top" Margin="10,0" Grid.Column="1"
                                 Orientation="Vertical">
@@ -154,7 +164,7 @@
                                                   SelectedColor="{Binding ColorTwo.Color}" ShowAvailableColors="False"
                                                   ShowRecentColors="True" />
                             </StackPanel>
-                           
+
                             <Label Content="Led/Position Effects" HorizontalAlignment="Center" FontSize="16px" />
                             <StackPanel Height="40" VerticalAlignment="Top" Margin="10,0"
                                         Orientation="Horizontal">
@@ -400,4 +410,4 @@
         </TabControl>
 
     </Grid>
-</Window>
+</Window>

Corale.Colore.Tester/MainWindow.xaml.cs

@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------------------------
 // <copyright file="MainWindow.xaml.cs" company="Corale">
-//     Copyright © 2015 by Adam Hellberg and Brandon Scott.
+//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
 //
 //     Permission is hereby granted, free of charge, to any person obtaining a copy of
 //     this software and associated documentation files (the "Software"), to deal in
@@ -28,6 +28,8 @@ namespace Corale.Colore.Tester
     using System.Text.RegularExpressions;
     using System.Windows.Input;
 
+    using Corale.Colore.Core;
+
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
@@ -36,6 +38,9 @@ public partial class MainWindow
         public MainWindow()
         {
             InitializeComponent();
+
+            // Update the window title to include SDK version
+            Title = $"{Title} | SDK v{Chroma.Instance.SdkVersion}";
         }
 
         private void TextValidation(object sender, TextCompositionEventArgs e)

Corale.Colore.Tester/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------------------------
 // <copyright file="AssemblyInfo.cs" company="Corale">
-//     Copyright © 2015 by Adam Hellberg and Brandon Scott.
+//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
 //
 //     Permission is hereby granted, free of charge, to any person obtaining a copy of
 //     this software and associated documentation files (the "Software"), to deal in
@@ -26,50 +26,17 @@
 using System.Reflection;
 using System.Windows;
 
-/* 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("Corale.Colore.Tester")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Corale.Colore.Tester")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCopyright("Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.")]
 [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)]
- */
-
-/* In order to begin building localizable applications, set
- * <UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
- * inside a <PropertyGroup>.  For example, if you are using US english
- * in your source files, set the <UICulture> to en-US.  Then uncomment
- * the NeutralResourceLanguage attribute below.  Update the "en-US" in
- * the line below to match the UICulture setting in the project file.
- */
-
-// [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None,
     ResourceDictionaryLocation.SourceAssembly)
 ]
-
-/* 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")]

Corale.Colore.Tester/ViewModels/HeadsetViewModel.cs

@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------------------------
 // <copyright file="HeadsetViewModel.cs" company="Corale">
-//     Copyright © 2015 by Adam Hellberg and Brandon Scott.
+//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
 //
 //     Permission is hereby granted, free of charge, to any person obtaining a copy of
 //     this software and associated documentation files (the "Software"), to deal in
@@ -28,26 +28,32 @@ namespace Corale.Colore.Tester.ViewModels
     using System.ComponentModel;
     using System.Windows.Input;
     using System.Windows.Media;
+
     using Annotations;
+
     using Classes;
 
+    using Wpf;
+
     public class HeadsetViewModel : INotifyPropertyChanged
     {
         public HeadsetViewModel()
         {
-            ColorOne.Color = Core.Color.Red;
+            ColorOne.Color = Core.Color.Red.ToWpfColor();
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
 
         public SolidColorBrush ColorOne { get; set; } = new SolidColorBrush();
 
-        public ICommand AllCommand => new DelegateCommand(() => Core.Headset.Instance.SetAll(ColorOne.Color));
+        public ICommand AllCommand
+            => new DelegateCommand(() => Core.Headset.Instance.SetAll(ColorOne.Color.ToColoreColor()));
 
         public ICommand BreathingCommand
-            => new DelegateCommand(() => Core.Headset.Instance.SetBreathing(ColorOne.Color));
+            => new DelegateCommand(() => Core.Headset.Instance.SetBreathing(ColorOne.Color.ToColoreColor()));
 
-        public ICommand StaticCommand => new DelegateCommand(() => Core.Headset.Instance.SetStatic(ColorOne.Color));
+        public ICommand StaticCommand
+            => new DelegateCommand(() => Core.Headset.Instance.SetStatic(ColorOne.Color.ToColoreColor()));
 
         public ICommand ClearCommand => new DelegateCommand(() => Core.Headset.Instance.Clear());