From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
index a231e92a3..35b578b6a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
@@ -15,7 +15,6 @@
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <UserControl.Resources>
         <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
-        <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -74,8 +73,7 @@
                         <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
                         <DataGridTextColumn Header="ORGANIZATION" Binding="{Binding Organization.Name}" Width="Auto" />
                         <DataGridTextColumn Header="VERSION" Binding="{Binding MachineVersion.Name}" Width="Auto" />
-                        <DataGridTextColumn Header="REGISTERED" Binding="{Binding IsDeviceRegistered,Converter={StaticResource BooleanToYesNoConverter}}" Width="Auto" />
-                        <DataGridTextColumn Header="DEMO MACHINE" Binding="{Binding IsDemo,Converter={StaticResource BooleanToYesNoConverter}}" Width="Auto" />
+                        <DataGridTextColumn Header="DEMO MACHINE" Binding="{Binding IsDemo}" Width="Auto" />
                         <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
                     </DataGrid.Columns>
                 </controls:DoubleClickDataGrid>
-- 
cgit v1.3.1