1 files changed, 21 insertions, 5 deletions
diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
index f553ec588..c0c4b7b97 100644
--- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
@@ -11,13 +11,15 @@
              xmlns:vm="clr-namespace:Tango.MachineEM.UI.ViewModels"
              xmlns:pmr="clr-namespace:Tango.PMR.MachineStatus;assembly=Tango.PMR"
              xmlns:threadLoading="clr-namespace:Tango.PMR.ThreadLoading;assembly=Tango.PMR"
+             xmlns:localConverters="clr-namespace:Tango.MachineEM.UI.Converters"
              xmlns:local="clr-namespace:Tango.MachineEM.UI.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1300" Foreground="Gainsboro" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" >
+             d:DesignHeight="780" d:DesignWidth="1300" Foreground="Gainsboro" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" >
 
     <UserControl.Resources>
         <converters:BooleanInverseConverter x:Key="BooleanInverseConverter"></converters:BooleanInverseConverter>
         <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
+        <localConverters:EventTypeToStringConverter x:Key="EventTypeToStringConverter" />
     </UserControl.Resources>
     <Grid>
         <Grid.Background>
@@ -150,14 +152,28 @@
                                 <Button Padding="10 0 0 0" Margin="5" Height="45" HorizontalContentAlignment="Left" Style="{StaticResource AccentedSquareButtonStyle}" mahapps:ButtonHelper.PreserveTextCase="True" BorderThickness="0" Command="{Binding AbortJobCommand}">
                                     <DockPanel>
                                         <fa:ImageAwesome Icon="ExclamationTriangle" Width="16"></fa:ImageAwesome>
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">ABORT JOB</TextBlock>
+                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Center">ABORT JOB</TextBlock>
                                     </DockPanel>
                                 </Button>
 
-                                <Button Padding="10 0 0 0" Margin="5" Height="45" HorizontalContentAlignment="Left" Style="{StaticResource AccentedSquareButtonStyle}" mahapps:ButtonHelper.PreserveTextCase="True" BorderThickness="0" Command="{Binding PerformDataStoreTestCommand}">
+                                <Button Padding="10 0 0 0" Margin="5" HorizontalContentAlignment="Left" Height="45" Style="{StaticResource AccentedSquareButtonStyle}" mahapps:ButtonHelper.PreserveTextCase="True" BorderThickness="0" Command="{Binding PerformDataStoreTestCommand}">
                                     <DockPanel>
                                         <fa:ImageAwesome Icon="Database" Width="16"></fa:ImageAwesome>
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">DATASTORE TEST</TextBlock>
+                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Center">DATASTORE TEST</TextBlock>
+                                    </DockPanel>
+                                </Button>
+
+                                <Button Padding="10 0 0 0" Margin="5" HorizontalContentAlignment="Left" Height="45" Style="{StaticResource AccentedSquareButtonStyle}" mahapps:ButtonHelper.PreserveTextCase="True" BorderThickness="0" Command="{Binding GetDataStoreItemCommand}">
+                                    <DockPanel>
+                                        <fa:ImageAwesome Icon="Download" Width="16"></fa:ImageAwesome>
+                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Center">GET DATA STORE ITEM</TextBlock>
+                                    </DockPanel>
+                                </Button>
+
+                                <Button HorizontalContentAlignment="Left" Padding="10 0 0 0" Margin="5" Height="45" Style="{StaticResource AccentedSquareButtonStyle}" mahapps:ButtonHelper.PreserveTextCase="True" BorderThickness="0" Command="{Binding PutDataStoreItemCommand}">
+                                    <DockPanel>
+                                        <fa:ImageAwesome Icon="Upload" Width="16"></fa:ImageAwesome>
+                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Center">PUT DATA STORE ITEM</TextBlock>
                                     </DockPanel>
                                 </Button>
                                 <!--BUTTONS HERE-->
@@ -183,7 +199,7 @@
                                     </ListBox.ItemContainerStyle>
                                     <ListBox.ItemTemplate>
                                         <DataTemplate>
-                                            <CheckBox FontSize="11" Content="{Binding EventType}" IsChecked="{Binding IsActive}" Margin="5"></CheckBox>
+                                            <CheckBox FontSize="11" Content="{Binding EventType,Converter={StaticResource EventTypeToStringConverter}}" IsChecked="{Binding IsActive}" Margin="5"></CheckBox>
                                         </DataTemplate>
                                     </ListBox.ItemTemplate>
                                 </ListBox>