Skip to content

Commit

Permalink
Threading issue fixed. Updates to beta app.
Browse files Browse the repository at this point in the history
  • Loading branch information
EJocys committed Jun 4, 2016
1 parent 4b07c1e commit 36a7a5a
Show file tree
Hide file tree
Showing 16 changed files with 1,889 additions and 1,756 deletions.
9 changes: 9 additions & 0 deletions x360ce.App.Beta/Common/DiDevice.cs
@@ -1,6 +1,7 @@
using JocysCom.ClassLibrary.IO;
using SharpDX.DirectInput;
using System;
using x360ce.Engine;

namespace x360ce.App
{
Expand All @@ -15,6 +16,14 @@ public class DiDevice
/// <summary>Previous DInput Device Instance.</summary>
public DeviceInstance InstanceOld;

public string InstanceID
{
get
{
return EngineHelper.GetID(InstanceGuid);
}
}

public string VendorName
{
get
Expand Down
25 changes: 25 additions & 0 deletions x360ce.App.Beta/Controls/ControllersUserControl.xaml
@@ -0,0 +1,25 @@
<UserControl x:Class="x360ce.App.ControllersUserControl"
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:x360ce.App"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300" Loaded="UserControl_Loaded">
<TabControl x:Name="tabControl" Margin="10">
<TabItem Header="Available Direct Input Devices">
<Grid>
<DataGrid x:Name="ControllersDataGrid" BorderThickness="0" CanUserAddRows="False" AutoGenerateColumns="False" GridLinesVisibility="Horizontal" >
<DataGrid.HorizontalGridLinesBrush>
<SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ControlColorKey}}"/>
</DataGrid.HorizontalGridLinesBrush>
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding InstanceID}" Header="Instance ID"/>
<DataGridTextColumn Binding="{Binding VendorName}" Header="Vendor Name"/>
<DataGridTextColumn Binding="{Binding ProductName}" Header="Product Name"/>
</DataGrid.Columns>
</DataGrid>
</Grid>
</TabItem>
</TabControl>
</UserControl>
33 changes: 33 additions & 0 deletions x360ce.App.Beta/Controls/ControllersUserControl.xaml.cs
@@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
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 x360ce.App
{
/// <summary>
/// Interaction logic for ControllersUserControl.xaml
/// </summary>
public partial class ControllersUserControl : UserControl
{
public ControllersUserControl()
{
InitializeComponent();
}

private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
ControllersDataGrid.ItemsSource = SettingManager.DiDevices;
}

}
}
119 changes: 74 additions & 45 deletions x360ce.App.Beta/MainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 36a7a5a

Please sign in to comment.