Working static colour
This commit is contained in:
parent
ec12e34823
commit
a6904ecb34
Binary file not shown.
Binary file not shown.
|
@ -2,8 +2,18 @@
|
|||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:RGBController2"
|
||||
xmlns:views="clr-namespace:RGBController2.Views.LightingModes"
|
||||
xmlns:viewmodels="clr-namespace:RGBController2.ViewModels.LightingModes"
|
||||
StartupUri="Views/MainWindow.xaml">
|
||||
<Application.Resources>
|
||||
|
||||
<DataTemplate DataType="{x:Type viewmodels:InformationViewModel}">
|
||||
<views:InformationView/>
|
||||
</DataTemplate>
|
||||
<DataTemplate DataType="{x:Type viewmodels:StaticViewModel}">
|
||||
<views:StaticView/>
|
||||
</DataTemplate>
|
||||
<DataTemplate DataType="{x:Type viewmodels:AnimationViewModel}">
|
||||
<views:AnimationView/>
|
||||
</DataTemplate>
|
||||
</Application.Resources>
|
||||
</Application>
|
||||
|
|
|
@ -6,6 +6,14 @@
|
|||
<UseWPF>true</UseWPF>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="LightingModes\**" />
|
||||
<EmbeddedResource Remove="LightingModes\**" />
|
||||
|
@ -14,6 +22,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.1" />
|
||||
<PackageReference Include="System.IO.Ports" Version="4.7.0" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
@ -7,11 +7,29 @@
|
|||
</ApplicationDefinition>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Update="Views\LightingModes\AnimationView.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="Views\LightingModes\InformationView.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="Views\LightingModes\StaticView.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="Views\Tabs\ArduinoTabView.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Page Update="Views\LightingModes\AnimationView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="Views\LightingModes\InformationView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="Views\LightingModes\StaticView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="Views\Tabs\ArduinoTabView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
|
|
|
@ -1,10 +1,19 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Text;
|
||||
|
||||
namespace RGBController2.ViewModels
|
||||
{
|
||||
class BaseViewModel
|
||||
public class BaseViewModel : INotifyPropertyChanged
|
||||
{
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
protected void OnPropertyChanged(string propertyName)
|
||||
{
|
||||
if (PropertyChanged != null)
|
||||
{
|
||||
PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace RGBController2.ViewModels.LightingModes
|
||||
{
|
||||
public class AnimationViewModel : BaseViewModel
|
||||
{
|
||||
}
|
||||
}
|
|
@ -0,0 +1,10 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace RGBController2.ViewModels.LightingModes
|
||||
{
|
||||
public class InformationViewModel : BaseViewModel
|
||||
{
|
||||
}
|
||||
}
|
|
@ -0,0 +1,134 @@
|
|||
using RGBController2.Commands;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Windows;
|
||||
using System.Windows.Input;
|
||||
using RGBController2.Boards;
|
||||
using System.Windows.Media;
|
||||
|
||||
namespace RGBController2.ViewModels.LightingModes
|
||||
{
|
||||
public class StaticViewModel : BaseViewModel
|
||||
{
|
||||
private int _redColourSend;
|
||||
public int RedColourSend
|
||||
{
|
||||
get { return _redColourSend; }
|
||||
set
|
||||
{
|
||||
_redColourSend = value;
|
||||
UpdateSendColour();
|
||||
}
|
||||
}
|
||||
|
||||
private int _greenColourSend;
|
||||
public int GreenColourSend
|
||||
{
|
||||
get { return _greenColourSend; }
|
||||
set
|
||||
{
|
||||
_greenColourSend = value;
|
||||
UpdateSendColour();
|
||||
}
|
||||
}
|
||||
|
||||
private int _blueColourSend;
|
||||
public int BlueColourSend
|
||||
{
|
||||
get { return _blueColourSend; }
|
||||
set
|
||||
{
|
||||
_blueColourSend = value;
|
||||
UpdateSendColour();
|
||||
}
|
||||
}
|
||||
|
||||
private int _redColourCurrent;
|
||||
public int RedColourCurrent
|
||||
{
|
||||
get { return _redColourCurrent; }
|
||||
set { _redColourCurrent = value; }
|
||||
}
|
||||
|
||||
private int _blueColourCurrent;
|
||||
public int BlueColourCurrent
|
||||
{
|
||||
get { return _blueColourCurrent; }
|
||||
set { _blueColourCurrent = value; }
|
||||
}
|
||||
|
||||
private int _greenColourCurrent;
|
||||
|
||||
public int GreenColourCurrent
|
||||
{
|
||||
get { return _greenColourCurrent; }
|
||||
set { _greenColourCurrent = value; }
|
||||
}
|
||||
|
||||
private SolidColorBrush _colourCurrent;
|
||||
public SolidColorBrush ColourCurrent
|
||||
{
|
||||
get { return _colourCurrent; }
|
||||
set { _colourCurrent = value; }
|
||||
}
|
||||
|
||||
private SolidColorBrush _colourSend;
|
||||
public SolidColorBrush ColourSend
|
||||
{
|
||||
get { return _colourSend; }
|
||||
set { _colourSend = value; }
|
||||
}
|
||||
|
||||
public ICommand SendCommand { get; set; }
|
||||
|
||||
private ArduinoBoard _arduinoBoard;
|
||||
public StaticViewModel(ArduinoBoard arduinoBoard)
|
||||
{
|
||||
SendCommand = new ActionCommand(o => SendButtonClick("SenderButton"));
|
||||
|
||||
// Default values
|
||||
RedColourSend = 0;
|
||||
GreenColourSend = 255;
|
||||
BlueColourSend = 255;
|
||||
RedColourCurrent = RedColourSend;
|
||||
GreenColourCurrent = GreenColourSend;
|
||||
BlueColourCurrent = BlueColourSend;
|
||||
ColourCurrent = new SolidColorBrush(Color.FromRgb((byte)RedColourSend, (byte)GreenColourSend, (byte)BlueColourSend));
|
||||
ColourSend = new SolidColorBrush(Color.FromRgb((byte)RedColourSend, (byte)GreenColourSend, (byte)BlueColourSend));
|
||||
// This is here to allow us to interface with the board stored in the MainViewModel
|
||||
// ideally this would involved pointers but C# does not seem to like pointers
|
||||
_arduinoBoard = arduinoBoard;
|
||||
|
||||
// ToDo load from previous values
|
||||
}
|
||||
|
||||
private void UpdateSendColour()
|
||||
{
|
||||
ColourSend = new SolidColorBrush(Color.FromRgb((byte)RedColourSend, (byte)GreenColourSend, (byte)BlueColourSend));
|
||||
OnPropertyChanged(nameof(ColourSend));
|
||||
}
|
||||
|
||||
private void SendButtonClick(object sender)
|
||||
{
|
||||
if (_arduinoBoard != null)
|
||||
if (_arduinoBoard.Conected)
|
||||
{
|
||||
_arduinoBoard.SetAllLeds((byte)RedColourSend, (byte)GreenColourSend, (byte)BlueColourSend);
|
||||
RedColourCurrent = RedColourSend;
|
||||
GreenColourCurrent = GreenColourSend;
|
||||
BlueColourCurrent = BlueColourSend;
|
||||
ColourCurrent = new SolidColorBrush(Color.FromRgb((byte)RedColourSend, (byte)GreenColourSend, (byte)BlueColourSend));
|
||||
OnPropertyChanged(nameof(RedColourCurrent));
|
||||
OnPropertyChanged(nameof(GreenColourCurrent));
|
||||
OnPropertyChanged(nameof(BlueColourCurrent));
|
||||
OnPropertyChanged(nameof(ColourCurrent));
|
||||
}
|
||||
else
|
||||
MessageBox.Show("Error - The device has disconnected");
|
||||
else
|
||||
MessageBox.Show("Error - No device is connected");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
|
@ -13,7 +13,7 @@ namespace RGBController2.ViewModels
|
|||
{
|
||||
private readonly ObservableCollection<ITab> _tabs;
|
||||
public ICommand NewTabCommand { get; }
|
||||
public ICollection<ITab> Tabs { get; }
|
||||
public static ICollection<ITab> Tabs { get; set; }
|
||||
|
||||
public MainViewModel()
|
||||
{
|
||||
|
|
|
@ -4,6 +4,7 @@ using System.Text;
|
|||
using System.IO.Ports;
|
||||
using RGBController2.Boards;
|
||||
using System.ComponentModel;
|
||||
using RGBController2.ViewModels.LightingModes;
|
||||
|
||||
namespace RGBController2.ViewModels.Tabs
|
||||
{
|
||||
|
@ -45,10 +46,17 @@ namespace RGBController2.ViewModels.Tabs
|
|||
// Connect to the port here
|
||||
_arduinoBoard = new ArduinoBoard(_selectedPort);
|
||||
if (_arduinoBoard.Conected)
|
||||
{
|
||||
ConnectionStatus = "Device Connected";
|
||||
// Set the page to static lighting mode to allow the user to change the
|
||||
// lighting mode now that we are connected to the arduino
|
||||
_selectedLightingMode = new StaticViewModel(_arduinoBoard);
|
||||
OnPropertyChanged(nameof(SelectedLightingMode));
|
||||
}
|
||||
else
|
||||
ConnectionStatus = "Device Disconnected";
|
||||
ConnectionStatus = "Failed to Connect";
|
||||
OnPropertyChanged(nameof(ConnectionStatus));
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -60,6 +68,13 @@ namespace RGBController2.ViewModels.Tabs
|
|||
set { _lightingMode = (LightingModes) value; }
|
||||
}
|
||||
|
||||
private BaseViewModel _selectedLightingMode;
|
||||
public BaseViewModel SelectedLightingMode
|
||||
{
|
||||
get { return _selectedLightingMode; }
|
||||
set { _selectedLightingMode = value; }
|
||||
}
|
||||
|
||||
public ArduinoTab(string name)
|
||||
{
|
||||
Name = name;
|
||||
|
@ -69,6 +84,9 @@ namespace RGBController2.ViewModels.Tabs
|
|||
// Get a list of the available com ports
|
||||
string[] ports = SerialPort.GetPortNames();
|
||||
_availablePorts = ports;
|
||||
|
||||
// This is a temporary viewmodel that is used before the user has connected to a device
|
||||
_selectedLightingMode = new InformationViewModel();
|
||||
}
|
||||
|
||||
protected void OnPropertyChanged(string propertyName)
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
<UserControl x:Class="RGBController2.Views.LightingModes.AnimationView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:RGBController2.Views.LightingModes"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="250" d:DesignWidth="700">
|
||||
<Grid>
|
||||
<TextBlock>animation</TextBlock>
|
||||
</Grid>
|
||||
</UserControl>
|
|
@ -0,0 +1,26 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
|
||||
namespace RGBController2.Views.LightingModes
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for AnimationView.xaml
|
||||
/// </summary>
|
||||
public partial class AnimationView : UserControl
|
||||
{
|
||||
public AnimationView()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,13 @@
|
|||
<UserControl x:Class="RGBController2.Views.LightingModes.InformationView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:RGBController2.Views.LightingModes"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="250" d:DesignWidth="700"
|
||||
Background="White">
|
||||
<Grid>
|
||||
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Connected to a device</TextBlock>
|
||||
</Grid>
|
||||
</UserControl>
|
|
@ -0,0 +1,26 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
|
||||
namespace RGBController2.Views.LightingModes
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for InformationView.xaml
|
||||
/// </summary>
|
||||
public partial class InformationView : UserControl
|
||||
{
|
||||
public InformationView()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,40 @@
|
|||
<UserControl x:Class="RGBController2.Views.LightingModes.StaticView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:RGBController2.Views.LightingModes"
|
||||
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="250" d:DesignWidth="700"
|
||||
Background="White">
|
||||
<Grid>
|
||||
<Grid Background="White">
|
||||
<GroupBox HorizontalAlignment="Left" Header="Current Colour" VerticalAlignment="Top" Margin="5,5,0,0">
|
||||
<Grid Width="270" Height="180">
|
||||
<Frame Name="frameCurrentColour" Background="{Binding ColourCurrent}" Width="150" Height="100" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="100,10,0,0"/>
|
||||
<Label Content="Red" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,0,0"/>
|
||||
<Label Name="lblRedCurrent" Content="{Binding RedColourCurrent}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="70,10,0,0"/>
|
||||
<Label Content="Green" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,50,0,0"/>
|
||||
<Label Name="lblGreenCurrent" Content="{Binding GreenColourCurrent}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="70,50,0,0"/>
|
||||
<Label Content="Blue" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,90,0,0"/>
|
||||
<Label Name="lblBlueCurrent" Content="{Binding BlueColourCurrent}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="70,90,0,0"/>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
<GroupBox HorizontalAlignment="Right" VerticalAlignment="Top" Header="Current To Send" Margin="0,5,5,0">
|
||||
<Grid Width="350" Height="180">
|
||||
<Frame Background="{Binding ColourSend}" Width="150" Height="100" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="150,10,0,0"/>
|
||||
<Label Content="Red" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,0,0"/>
|
||||
<xctk:IntegerUpDown VerticalAlignment="Top" HorizontalAlignment="Left" Margin="70,10,0,0" Width="50" Minimum="0" Maximum="255" Value="{Binding RedColourSend}"/>
|
||||
<Label Content="Green" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,50,0,0"/>
|
||||
<xctk:IntegerUpDown VerticalAlignment="Top" HorizontalAlignment="Left" Margin="70,50,0,0" Width="50" Minimum="0" Maximum="255" Value="{Binding GreenColourSend}"/>
|
||||
<Label Content="Blue" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,90,0,0"/>
|
||||
<xctk:IntegerUpDown VerticalAlignment="Top" HorizontalAlignment="Left" Margin="70,90,0,0" Width="50" Minimum="0" Maximum="255" Value="{Binding BlueColourSend}"/>
|
||||
<Button Content="Colour Picker" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="140,130,0,0" Width="80" />
|
||||
<Button Content="Send" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="230,130,0,0" Width="80" Command="{Binding SendCommand}"/>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</UserControl>
|
|
@ -0,0 +1,36 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
using RGBController2.ViewModels.LightingModes;
|
||||
using RGBController2.ViewModels;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using RGBController2.ViewModels.Tabs;
|
||||
|
||||
namespace RGBController2.Views.LightingModes
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for StaticView.xaml
|
||||
/// </summary>
|
||||
public partial class StaticView : UserControl
|
||||
{
|
||||
public StaticView()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
// This is a bit hacky but ensure we are only creating one ArduinoTab object and using
|
||||
// that in both the MainViewModel and here
|
||||
var test = (ArduinoTab)MainViewModel.Tabs.Last();
|
||||
DataContext = test.SelectedLightingMode;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -28,7 +28,7 @@
|
|||
</Menu>
|
||||
</DockPanel>
|
||||
|
||||
<TabControl Name="tabcontrol" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,20,0,0" Width="715" Height="324" ItemsSource="{Binding Tabs}">
|
||||
<TabControl Name="tabcontrol" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="10,20,0,0" Width="715" Height="324" ItemsSource="{Binding Tabs}">
|
||||
<TabControl.Resources>
|
||||
<DataTemplate DataType="{x:Type tabsviewmodels:ArduinoTab}">
|
||||
<tabsviews:ArduinoTabView/>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
Background="White">
|
||||
<Grid>
|
||||
<Label Content="Lighting Mode" Margin="0,5,0,0"/>
|
||||
<ComboBox VerticalAlignment="top" HorizontalAlignment="left" Margin="100,5,0,0" Width="150" x:Name="lightingModeSelectionComboBox" SelectedIndex="{Binding LightingMode}">
|
||||
<ComboBox VerticalAlignment="top" HorizontalAlignment="left" Margin="100,5,0,0" Width="150" x:Name="lightingModeSelectionComboBox" SelectedIndex="{Binding LightingMode}" IsEnabled="False">
|
||||
<ComboBoxItem Content="Static Colour"></ComboBoxItem>
|
||||
<ComboBoxItem Content="Animations"></ComboBoxItem>
|
||||
<ComboBoxItem Content="Quake Live"></ComboBoxItem>
|
||||
|
@ -18,6 +18,6 @@
|
|||
<ComboBox VerticalAlignment="top" HorizontalAlignment="left" Margin="320,5,0,0" Width="70" ItemsSource="{Binding AvailablePorts}" SelectedItem="{Binding SelectedPort}">
|
||||
</ComboBox>
|
||||
<Label Content="{Binding ConnectionStatus}" VerticalAlignment="top" HorizontalAlignment="left" Margin="400,5,0,0"/>
|
||||
<!--<Frame Name="LightingModeFrame" VerticalAlignment="top" HorizontalAlignment="left" Margin="0,30,0,0" Width="700" Height="240" NavigationUIVisibility="Hidden"/>-->
|
||||
<ContentControl Content="{Binding SelectedLightingMode}" VerticalAlignment="top" HorizontalAlignment="left" Margin="0,30,0,0" Width="700" Height="250"/>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3EE2700C6B6204B7E9DA83258C64087CDEFFF848"
|
||||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "098E03E73B6E8D6196EBE55F4FAB0CCAAD03FF88"
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
|
@ -10,6 +10,8 @@
|
|||
//------------------------------------------------------------------------------
|
||||
|
||||
using RGBController2;
|
||||
using RGBController2.ViewModels.LightingModes;
|
||||
using RGBController2.Views.LightingModes;
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Windows;
|
||||
|
@ -41,16 +43,29 @@ namespace RGBController2 {
|
|||
/// </summary>
|
||||
public partial class App : System.Windows.Application {
|
||||
|
||||
private bool _contentLoaded;
|
||||
|
||||
/// <summary>
|
||||
/// InitializeComponent
|
||||
/// </summary>
|
||||
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.8.1.0")]
|
||||
public void InitializeComponent() {
|
||||
if (_contentLoaded) {
|
||||
return;
|
||||
}
|
||||
_contentLoaded = true;
|
||||
|
||||
#line 5 "..\..\..\App.xaml"
|
||||
#line 7 "..\..\..\App.xaml"
|
||||
this.StartupUri = new System.Uri("Views/MainWindow.xaml", System.UriKind.Relative);
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
System.Uri resourceLocater = new System.Uri("/RGBController2;component/app.xaml", System.UriKind.Relative);
|
||||
|
||||
#line 1 "..\..\..\App.xaml"
|
||||
System.Windows.Application.LoadComponent(this, resourceLocater);
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
}
|
||||
|
|
Binary file not shown.
|
@ -29,3 +29,26 @@ C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\obj
|
|||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\obj\Debug\netcoreapp3.1\RGBController2.csproj.CopyComplete
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\obj\Debug\netcoreapp3.1\Views\MainWindow.g.cs
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\obj\Debug\netcoreapp3.1\Views\MainWindow.baml
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\obj\Debug\netcoreapp3.1\Views\LightingModes\AnimationView.g.cs
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\obj\Debug\netcoreapp3.1\Views\LightingModes\StaticView.g.cs
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\obj\Debug\netcoreapp3.1\App.baml
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\obj\Debug\netcoreapp3.1\Views\LightingModes\AnimationView.baml
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\obj\Debug\netcoreapp3.1\Views\LightingModes\StaticView.baml
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\Xceed.Wpf.AvalonDock.Themes.Aero.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\Xceed.Wpf.AvalonDock.Themes.Metro.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\Xceed.Wpf.AvalonDock.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\Xceed.Wpf.Toolkit.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\cs-CZ\Xceed.Wpf.AvalonDock.resources.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\de\Xceed.Wpf.AvalonDock.resources.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\es\Xceed.Wpf.AvalonDock.resources.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\fr\Xceed.Wpf.AvalonDock.resources.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\hu\Xceed.Wpf.AvalonDock.resources.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\it\Xceed.Wpf.AvalonDock.resources.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\ro\Xceed.Wpf.AvalonDock.resources.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\ru\Xceed.Wpf.AvalonDock.resources.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\sv\Xceed.Wpf.AvalonDock.resources.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\bin\Debug\netcoreapp3.1\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\obj\Debug\netcoreapp3.1\Views\LightingModes\InformationView.g.cs
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\obj\Debug\netcoreapp3.1\Views\LightingModes\InformationView.baml
|
||||
|
|
Binary file not shown.
|
@ -6,6 +6,65 @@
|
|||
"compilationOptions": {},
|
||||
"targets": {
|
||||
".NETCoreApp,Version=v3.1": {
|
||||
"Extended.Wpf.Toolkit/4.0.1": {
|
||||
"runtime": {
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Aero.dll": {
|
||||
"assemblyVersion": "4.0.0.0",
|
||||
"fileVersion": "4.0.0.0"
|
||||
},
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Metro.dll": {
|
||||
"assemblyVersion": "4.0.0.0",
|
||||
"fileVersion": "4.0.0.0"
|
||||
},
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.VS2010.dll": {
|
||||
"assemblyVersion": "4.0.0.0",
|
||||
"fileVersion": "4.0.0.0"
|
||||
},
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.dll": {
|
||||
"assemblyVersion": "4.0.0.0",
|
||||
"fileVersion": "4.0.0.0"
|
||||
},
|
||||
"lib/net40/Xceed.Wpf.Toolkit.dll": {
|
||||
"assemblyVersion": "4.0.0.0",
|
||||
"fileVersion": "4.0.0.0"
|
||||
}
|
||||
},
|
||||
"resources": {
|
||||
"lib/net40/cs-CZ/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "cs-CZ"
|
||||
},
|
||||
"lib/net40/de/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "de"
|
||||
},
|
||||
"lib/net40/es/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "es"
|
||||
},
|
||||
"lib/net40/fr/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "fr"
|
||||
},
|
||||
"lib/net40/hu/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "hu"
|
||||
},
|
||||
"lib/net40/it/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "it"
|
||||
},
|
||||
"lib/net40/pt-BR/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "pt-BR"
|
||||
},
|
||||
"lib/net40/ro/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "ro"
|
||||
},
|
||||
"lib/net40/ru/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "ru"
|
||||
},
|
||||
"lib/net40/sv/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "sv"
|
||||
},
|
||||
"lib/net40/zh-Hans/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "zh-Hans"
|
||||
}
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.Platforms/3.1.0": {},
|
||||
"Microsoft.Win32.Registry/4.7.0": {
|
||||
"dependencies": {
|
||||
|
@ -154,6 +213,13 @@
|
|||
}
|
||||
},
|
||||
"libraries": {
|
||||
"Extended.Wpf.Toolkit/4.0.1": {
|
||||
"type": "package",
|
||||
"serviceable": true,
|
||||
"sha512": "sha512-K8BoXvwokEJTiVkOH4L8FGeWaT0TptzgXJsFI/FlfPA1TSzhgNcrHJtxDFecAYwHNU3wnUjSGZ/YMq5gR5TGag==",
|
||||
"path": "extended.wpf.toolkit/4.0.1",
|
||||
"hashPath": "extended.wpf.toolkit.4.0.1.nupkg.sha512"
|
||||
},
|
||||
"Microsoft.NETCore.Platforms/3.1.0": {
|
||||
"type": "package",
|
||||
"serviceable": true,
|
||||
|
|
|
@ -10,11 +10,11 @@ none
|
|||
false
|
||||
TRACE;DEBUG;NETCOREAPP;NETCOREAPP3_1
|
||||
C:\Users\Conor\Desktop\RGB Contorller Tabs Test\RGBController\RGBController2\App.xaml
|
||||
2-624371512
|
||||
51005650093
|
||||
|
||||
15-1701520287
|
||||
1931775029747
|
||||
Views\MainWindow.xaml;Views\Tabs\ArduinoTabView.xaml;
|
||||
211693773004
|
||||
198942953170
|
||||
Views\LightingModes\AnimationView.xaml;Views\LightingModes\InformationView.xaml;Views\LightingModes\StaticView.xaml;Views\MainWindow.xaml;Views\Tabs\ArduinoTabView.xaml;
|
||||
|
||||
False
|
||||
|
||||
|
|
|
@ -38,6 +38,10 @@
|
|||
"frameworks": {
|
||||
"netcoreapp3.1": {
|
||||
"dependencies": {
|
||||
"Extended.Wpf.Toolkit": {
|
||||
"target": "Package",
|
||||
"version": "[4.0.1, )"
|
||||
},
|
||||
"System.IO.Ports": {
|
||||
"target": "Package",
|
||||
"version": "[4.7.0, )"
|
||||
|
|
|
@ -12,4 +12,7 @@
|
|||
<PropertyGroup>
|
||||
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||
<PkgExtended_Wpf_Toolkit Condition=" '$(PkgExtended_Wpf_Toolkit)' == '' ">C:\Users\Conor\.nuget\packages\extended.wpf.toolkit\4.0.1</PkgExtended_Wpf_Toolkit>
|
||||
</PropertyGroup>
|
||||
</Project>
|
|
@ -2,6 +2,58 @@
|
|||
"version": 3,
|
||||
"targets": {
|
||||
".NETCoreApp,Version=v3.1": {
|
||||
"Extended.Wpf.Toolkit/4.0.1": {
|
||||
"type": "package",
|
||||
"compile": {
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Aero.dll": {},
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Metro.dll": {},
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.VS2010.dll": {},
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.dll": {},
|
||||
"lib/net40/Xceed.Wpf.Toolkit.dll": {}
|
||||
},
|
||||
"runtime": {
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Aero.dll": {},
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Metro.dll": {},
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.VS2010.dll": {},
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.dll": {},
|
||||
"lib/net40/Xceed.Wpf.Toolkit.dll": {}
|
||||
},
|
||||
"resource": {
|
||||
"lib/net40/cs-CZ/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "cs-CZ"
|
||||
},
|
||||
"lib/net40/de/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "de"
|
||||
},
|
||||
"lib/net40/es/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "es"
|
||||
},
|
||||
"lib/net40/fr/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "fr"
|
||||
},
|
||||
"lib/net40/hu/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "hu"
|
||||
},
|
||||
"lib/net40/it/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "it"
|
||||
},
|
||||
"lib/net40/pt-BR/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "pt-BR"
|
||||
},
|
||||
"lib/net40/ro/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "ro"
|
||||
},
|
||||
"lib/net40/ru/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "ru"
|
||||
},
|
||||
"lib/net40/sv/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "sv"
|
||||
},
|
||||
"lib/net40/zh-Hans/Xceed.Wpf.AvalonDock.resources.dll": {
|
||||
"locale": "zh-Hans"
|
||||
}
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.Platforms/3.1.0": {
|
||||
"type": "package",
|
||||
"compile": {
|
||||
|
@ -147,6 +199,36 @@
|
|||
}
|
||||
},
|
||||
"libraries": {
|
||||
"Extended.Wpf.Toolkit/4.0.1": {
|
||||
"sha512": "K8BoXvwokEJTiVkOH4L8FGeWaT0TptzgXJsFI/FlfPA1TSzhgNcrHJtxDFecAYwHNU3wnUjSGZ/YMq5gR5TGag==",
|
||||
"type": "package",
|
||||
"path": "extended.wpf.toolkit/4.0.1",
|
||||
"hasTools": true,
|
||||
"files": [
|
||||
".nupkg.metadata",
|
||||
".signature.p7s",
|
||||
"LICENSE.txt",
|
||||
"extended.wpf.toolkit.4.0.1.nupkg.sha512",
|
||||
"extended.wpf.toolkit.nuspec",
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Aero.dll",
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Metro.dll",
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.Themes.VS2010.dll",
|
||||
"lib/net40/Xceed.Wpf.AvalonDock.dll",
|
||||
"lib/net40/Xceed.Wpf.Toolkit.dll",
|
||||
"lib/net40/cs-CZ/Xceed.Wpf.AvalonDock.resources.dll",
|
||||
"lib/net40/de/Xceed.Wpf.AvalonDock.resources.dll",
|
||||
"lib/net40/es/Xceed.Wpf.AvalonDock.resources.dll",
|
||||
"lib/net40/fr/Xceed.Wpf.AvalonDock.resources.dll",
|
||||
"lib/net40/hu/Xceed.Wpf.AvalonDock.resources.dll",
|
||||
"lib/net40/it/Xceed.Wpf.AvalonDock.resources.dll",
|
||||
"lib/net40/pt-BR/Xceed.Wpf.AvalonDock.resources.dll",
|
||||
"lib/net40/ro/Xceed.Wpf.AvalonDock.resources.dll",
|
||||
"lib/net40/ru/Xceed.Wpf.AvalonDock.resources.dll",
|
||||
"lib/net40/sv/Xceed.Wpf.AvalonDock.resources.dll",
|
||||
"lib/net40/zh-Hans/Xceed.Wpf.AvalonDock.resources.dll",
|
||||
"tools/install.ps1"
|
||||
]
|
||||
},
|
||||
"Microsoft.NETCore.Platforms/3.1.0": {
|
||||
"sha512": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w==",
|
||||
"type": "package",
|
||||
|
@ -427,6 +509,7 @@
|
|||
},
|
||||
"projectFileDependencyGroups": {
|
||||
".NETCoreApp,Version=v3.1": [
|
||||
"Extended.Wpf.Toolkit >= 4.0.1",
|
||||
"System.IO.Ports >= 4.7.0"
|
||||
]
|
||||
},
|
||||
|
@ -467,6 +550,10 @@
|
|||
"frameworks": {
|
||||
"netcoreapp3.1": {
|
||||
"dependencies": {
|
||||
"Extended.Wpf.Toolkit": {
|
||||
"target": "Package",
|
||||
"version": "[4.0.1, )"
|
||||
},
|
||||
"System.IO.Ports": {
|
||||
"target": "Package",
|
||||
"version": "[4.7.0, )"
|
||||
|
@ -493,5 +580,17 @@
|
|||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.301\\RuntimeIdentifierGraph.json"
|
||||
}
|
||||
}
|
||||
},
|
||||
"logs": [
|
||||
{
|
||||
"code": "NU1701",
|
||||
"level": "Warning",
|
||||
"warningLevel": 1,
|
||||
"message": "Package 'Extended.Wpf.Toolkit 4.0.1' was restored using '.NETFramework,Version=v4.6.1, .NETFramework,Version=v4.6.2, .NETFramework,Version=v4.7, .NETFramework,Version=v4.7.1, .NETFramework,Version=v4.7.2, .NETFramework,Version=v4.8' instead of the project target framework '.NETCoreApp,Version=v3.1'. This package may not be fully compatible with your project.",
|
||||
"libraryId": "Extended.Wpf.Toolkit",
|
||||
"targetGraphs": [
|
||||
".NETCoreApp,Version=v3.1"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
Loading…
Reference in New Issue