Added name to ID column

This commit is contained in:
Travis Nickles 2020-03-12 08:08:38 -05:00
parent bc1a4a8b43
commit 6c17f34b3c
2 changed files with 6 additions and 1 deletions

View File

@ -46,7 +46,7 @@
<GridViewColumn x:Name="idColumn" Header="ID" Width="120"> <GridViewColumn x:Name="idColumn" Header="ID" Width="120">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<TextBlock x:Name="idColumnTxtB" Text="{Binding Device.MacAddress, Mode=OneWay}" ToolTip="{Binding TooltipIDText, Mode=OneWay}" ToolTipOpening="IdColumnTxtB_ToolTipOpening" Tag="{Binding DevIndex, Mode=OneTime}"/> <TextBlock x:Name="idColumnTxtB" Text="{Binding IdText, Mode=OneWay}" ToolTip="{Binding TooltipIDText, Mode=OneWay}" ToolTipOpening="IdColumnTxtB_ToolTipOpening" Tag="{Binding DevIndex, Mode=OneTime}"/>
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>

View File

@ -298,6 +298,11 @@ namespace DS4WinWPF.DS4Forms.ViewModels
private ContextMenu lightContext; private ContextMenu lightContext;
public ContextMenu LightContext { get => lightContext; set => lightContext = value; } public ContextMenu LightContext { get => lightContext; set => lightContext = value; }
public string IdText
{
get => $"{device.DisplayName} ({device.MacAddress})";
}
public delegate void CustomColorHandler(CompositeDeviceModel sender); public delegate void CustomColorHandler(CompositeDeviceModel sender);
public event CustomColorHandler RequestColorPicker; public event CustomColorHandler RequestColorPicker;