diff --git a/NuGet/RGB.NET.WPF.nuspec b/NuGet/RGB.NET.WPF.nuspec
deleted file mode 100644
index cc58702..0000000
--- a/NuGet/RGB.NET.WPF.nuspec
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
- RGB.NET.WPF
- RGB.NET.WPF
- 0.0.1
- Darth Affe
- Darth Affe
- https://github.com/DarthAffe/RGB.NET
- https://raw.githubusercontent.com/DarthAffe/RGB.NET/master/LICENSE
- true
- WPF-Controls of RGB.NET
-
- WPF-Controls of RGB.NET, a C# (.NET) library for accessing various RGB-peripherals
- Copyright © Wyrez 2017
- en-US
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/RGB.NET.WPF/Controls/LedVisualizer.cs b/RGB.NET.WPF/Controls/LedVisualizer.cs
deleted file mode 100644
index e681025..0000000
--- a/RGB.NET.WPF/Controls/LedVisualizer.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using RGB.NET.Core;
-
-namespace RGB.NET.WPF.Controls
-{
- ///
- ///
- /// Visualizes a in an wpf-application.
- ///
- public class LedVisualizer : Control
- {
- #region DependencyProperties
- // ReSharper disable InconsistentNaming
-
- ///
- /// Backing-property for the -property.
- ///
- public static readonly DependencyProperty LedProperty = DependencyProperty.Register(
- "Led", typeof(Led), typeof(LedVisualizer), new PropertyMetadata(default(Led)));
-
- ///
- /// Gets or sets the to visualize.
- ///
- public Led Led
- {
- get => (Led)GetValue(LedProperty);
- set => SetValue(LedProperty, value);
- }
-
- // ReSharper restore InconsistentNaming
- #endregion
- }
-}
diff --git a/RGB.NET.WPF/Controls/RGBDeviceVisualizer.cs b/RGB.NET.WPF/Controls/RGBDeviceVisualizer.cs
deleted file mode 100644
index 6c0c1cc..0000000
--- a/RGB.NET.WPF/Controls/RGBDeviceVisualizer.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using RGB.NET.Core;
-
-namespace RGB.NET.WPF.Controls
-{
- ///
- ///
- /// Visualizes a in an wpf-application.
- ///
- [TemplatePart(Name = PART_CANVAS, Type = typeof(Canvas))]
- public class RGBDeviceVisualizer : Control
- {
- #region Constants
-
- private const string PART_CANVAS = "PART_Canvas";
-
- #endregion
-
- #region Properties & Fields
-
- private Canvas _canvas;
-
- #endregion
-
- #region DependencyProperties
- // ReSharper disable InconsistentNaming
-
- ///
- /// Backing-property for the -property.
- ///
- public static readonly DependencyProperty DeviceProperty = DependencyProperty.Register(
- "Device", typeof(IRGBDevice), typeof(RGBDeviceVisualizer), new PropertyMetadata(default(IRGBDevice), DeviceChanged));
-
- ///
- /// Gets or sets the to visualize.
- ///
- public IRGBDevice Device
- {
- get => (IRGBDevice)GetValue(DeviceProperty);
- set => SetValue(DeviceProperty, value);
- }
-
- // ReSharper restore InconsistentNaming
- #endregion
-
- #region Methods
-
- ///
- public override void OnApplyTemplate()
- {
- _canvas = (Canvas)GetTemplateChild(PART_CANVAS);
-
- LayoutLeds();
- }
-
- private static void DeviceChanged(DependencyObject dependencyObject,
- DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
- {
- ((RGBDeviceVisualizer)dependencyObject).LayoutLeds();
- }
-
- private void LayoutLeds()
- {
- if (_canvas == null) return;
-
- _canvas.Children.Clear();
-
- if (Device == null) return;
-
- foreach (Led led in Device)
- _canvas.Children.Add(new LedVisualizer { Led = led });
- }
-
- #endregion
- }
-}
diff --git a/RGB.NET.WPF/Controls/RGBSurfaceVisualizer.cs b/RGB.NET.WPF/Controls/RGBSurfaceVisualizer.cs
deleted file mode 100644
index fc4d8b1..0000000
--- a/RGB.NET.WPF/Controls/RGBSurfaceVisualizer.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using RGB.NET.Core;
-
-namespace RGB.NET.WPF.Controls
-{
- ///
- ///
- /// Visualizes the in an wpf-application.
- ///
- [TemplatePart(Name = PART_CANVAS, Type = typeof(Canvas))]
- public class RGBSurfaceVisualizer : Control
- {
- #region Constants
-
- private const string PART_CANVAS = "PART_Canvas";
-
- #endregion
-
- #region Properties & Fields
-
- private RGBSurface _surface;
- private Canvas _canvas;
-
- //TODO DarthAffe 17.06.2017: This is ugly - redesign how device connect/disconnect is generally handled!
- private readonly List _newDevices = new List();
-
- #endregion
-
- #region Constructors
-
- ///
- ///
- /// Initializes a new instance of the class.
- ///
- public RGBSurfaceVisualizer()
- {
- this.Loaded += OnLoaded;
- this.Unloaded += OnUnloaded;
- }
-
- private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
- {
- _surface = RGBSurface.Instance;
-
- _surface.SurfaceLayoutChanged += RGBSurfaceOnSurfaceLayoutChanged;
- foreach (IRGBDevice device in _surface.Devices)
- _newDevices.Add(device);
-
- UpdateSurface();
- }
-
- private void OnUnloaded(object sender, RoutedEventArgs routedEventArgs)
- {
- _surface.SurfaceLayoutChanged -= RGBSurfaceOnSurfaceLayoutChanged;
- _canvas?.Children.Clear();
- _newDevices.Clear();
- }
-
- private void RGBSurfaceOnSurfaceLayoutChanged(SurfaceLayoutChangedEventArgs args)
- {
- if (args.DeviceAdded)
- foreach (IRGBDevice device in args.Devices)
- _newDevices.Add(device);
-
- UpdateSurface();
- }
-
- #endregion
-
- #region Methods
-
- ///
- public override void OnApplyTemplate()
- {
- _canvas?.Children.Clear();
- _canvas = (Canvas)GetTemplateChild(PART_CANVAS);
- UpdateSurface();
- }
-
- private void UpdateSurface()
- {
- if ((_canvas == null) || (_surface == null)) return;
-
- if (_newDevices.Count > 0)
- {
- foreach (IRGBDevice device in _newDevices)
- _canvas.Children.Add(new RGBDeviceVisualizer { Device = device });
- _newDevices.Clear();
- }
-
- _canvas.Width = _surface.SurfaceRectangle.Size.Width;
- _canvas.Height = _surface.SurfaceRectangle.Size.Height;
- }
-
- #endregion
- }
-}
diff --git a/RGB.NET.WPF/Converter/ColorToSolidColorBrushConverter.cs b/RGB.NET.WPF/Converter/ColorToSolidColorBrushConverter.cs
deleted file mode 100644
index 4dea27d..0000000
--- a/RGB.NET.WPF/Converter/ColorToSolidColorBrushConverter.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace RGB.NET.WPF.Converter
-{
- ///
- ///
- /// Converts into .
- ///
- [ValueConversion(typeof(Core.Color), typeof(SolidColorBrush))]
- public class ColorToSolidColorBrushConverter : IValueConverter
- {
- ///
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return new SolidColorBrush(!(value is Core.Color color)
- ? Color.FromArgb(0, 0, 0, 0)
- : Color.FromArgb(color.A, color.R, color.G, color.B));
- }
-
- ///
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return !(value is SolidColorBrush brush)
- ? Core.Color.Transparent
- : new Core.Color(brush.Color.A, brush.Color.R, brush.Color.G, brush.Color.B);
- }
- }
-}
diff --git a/RGB.NET.WPF/Properties/AssemblyInfo.cs b/RGB.NET.WPF/Properties/AssemblyInfo.cs
deleted file mode 100644
index aaa37ef..0000000
--- a/RGB.NET.WPF/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-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("RGB.NET.WPF")]
-[assembly: AssemblyDescription("WPF-Controls of RGB.NET")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Wyrez")]
-[assembly: AssemblyProduct("RGB.NET.WPF")]
-[assembly: AssemblyCopyright("Copyright © Wyrez 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("347c5f0f-f490-4dec-9c1c-6e84750d838d")]
-
-// 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/RGB.NET.WPF/RGB.NET.WPF.csproj b/RGB.NET.WPF/RGB.NET.WPF.csproj
deleted file mode 100644
index cf689a2..0000000
--- a/RGB.NET.WPF/RGB.NET.WPF.csproj
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {8D6C4FE6-0046-4E98-876F-4C0B87249989}
- Library
- Properties
- RGB.NET.WPF
- RGB.NET.WPF
- v4.5
- 512
-
-
- true
- full
- false
- ..\bin\
- DEBUG;TRACE
- prompt
- 4
- ..\bin\RGB.NET.WPF.XML
-
-
- pdbonly
- true
- ..\bin\
- TRACE
- prompt
- 4
- ..\bin\RGB.NET.WPF.XML
-
-
-
-
-
-
-
- ..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {5a4f9a75-75fe-47cd-90e5-914d5b20d232}
- RGB.NET.Core
-
-
-
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/RGB.NET.WPF/Styles/LedVisualizer.xaml b/RGB.NET.WPF/Styles/LedVisualizer.xaml
deleted file mode 100644
index 0ad5a21..0000000
--- a/RGB.NET.WPF/Styles/LedVisualizer.xaml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/RGB.NET.WPF/Styles/RGBDeviceVisualizer.xaml b/RGB.NET.WPF/Styles/RGBDeviceVisualizer.xaml
deleted file mode 100644
index 555dcee..0000000
--- a/RGB.NET.WPF/Styles/RGBDeviceVisualizer.xaml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/RGB.NET.WPF/Styles/RGBSurfaceVisualizer.xaml b/RGB.NET.WPF/Styles/RGBSurfaceVisualizer.xaml
deleted file mode 100644
index 7bd53c1..0000000
--- a/RGB.NET.WPF/Styles/RGBSurfaceVisualizer.xaml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/RGB.NET.WPF/packages.config b/RGB.NET.WPF/packages.config
deleted file mode 100644
index d352211..0000000
--- a/RGB.NET.WPF/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/RGB.NET.sln b/RGB.NET.sln
index 1869c69..932876d 100644
--- a/RGB.NET.sln
+++ b/RGB.NET.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.27130.0
+VisualStudioVersion = 15.0.27130.2010
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RGB.NET.Core", "RGB.NET.Core\RGB.NET.Core.csproj", "{5A4F9A75-75FE-47CD-90E5-914D5B20D232}"
EndProject
@@ -38,13 +38,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{06416566
NuGet\RGB.NET.Groups.nuspec = NuGet\RGB.NET.Groups.nuspec
NuGet\RGB.NET.Input.Corsair.nuspec = NuGet\RGB.NET.Input.Corsair.nuspec
NuGet\RGB.NET.Input.nuspec = NuGet\RGB.NET.Input.nuspec
- NuGet\RGB.NET.WPF.nuspec = NuGet\RGB.NET.WPF.nuspec
EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{BD7C9994-1747-4595-9C21-298E8FDCB657}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RGB.NET.WPF", "RGB.NET.WPF\RGB.NET.WPF.csproj", "{8D6C4FE6-0046-4E98-876F-4C0B87249989}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RGB.NET.Devices.Logitech", "RGB.NET.Devices.Logitech\RGB.NET.Devices.Logitech.csproj", "{E7B2F174-FCC6-4FC7-9970-3138B5F4C921}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RGB.NET.Devices.CoolerMaster", "RGB.NET.Devices.CoolerMaster\RGB.NET.Devices.CoolerMaster.csproj", "{85609427-D433-44E2-A249-CE890B66D845}"
@@ -100,10 +95,6 @@ Global
{2A39F859-AAD0-4C16-94F8-78057820B376}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A39F859-AAD0-4C16-94F8-78057820B376}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2A39F859-AAD0-4C16-94F8-78057820B376}.Release|Any CPU.Build.0 = Release|Any CPU
- {8D6C4FE6-0046-4E98-876F-4C0B87249989}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8D6C4FE6-0046-4E98-876F-4C0B87249989}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8D6C4FE6-0046-4E98-876F-4C0B87249989}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8D6C4FE6-0046-4E98-876F-4C0B87249989}.Release|Any CPU.Build.0 = Release|Any CPU
{E7B2F174-FCC6-4FC7-9970-3138B5F4C921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E7B2F174-FCC6-4FC7-9970-3138B5F4C921}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E7B2F174-FCC6-4FC7-9970-3138B5F4C921}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -142,7 +133,6 @@ Global
{C854766D-9C1D-474B-B5B8-249DF4A9E552} = {33D5E279-1C4E-4AB6-9D1E-6D18109A6C25}
{F905C418-76BB-4BA6-88AB-0793BC2681D3} = {C854766D-9C1D-474B-B5B8-249DF4A9E552}
{2A39F859-AAD0-4C16-94F8-78057820B376} = {FFBCAF88-6646-43EC-9F24-2D719D3779C8}
- {8D6C4FE6-0046-4E98-876F-4C0B87249989} = {BD7C9994-1747-4595-9C21-298E8FDCB657}
{E7B2F174-FCC6-4FC7-9970-3138B5F4C921} = {33D5E279-1C4E-4AB6-9D1E-6D18109A6C25}
{85609427-D433-44E2-A249-CE890B66D845} = {33D5E279-1C4E-4AB6-9D1E-6D18109A6C25}
{DB2911F6-404C-4BC8-B35F-232A7450755F} = {33D5E279-1C4E-4AB6-9D1E-6D18109A6C25}