Improved data capturing seeking.

Fixed possible issue in diagnostics file recorder.
Some design improvement.

1 files changed, 62 insertions, 9 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
index 19c0c47df..f2c9ddba5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -47,7 +47,25 @@
 
                             <StackPanel Margin="5 0 0 0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
                                 <Image Source="/Images/account.png" RenderOptions.BitmapScalingMode="Fant" VerticalAlignment="Center" Width="50" Height="50"></Image>
+                                <StackPanel Margin="0 5 0 0">
                                 <TextBlock FontSize="16" TextTrimming="CharacterEllipsis" MaxWidth="170" FontStyle="Italic" FontWeight="Bold" Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding AuthenticationProvider.CurrentUser.Contact.FullName}"></TextBlock>
+                                    <TextBlock FontSize="12" TextTrimming="CharacterEllipsis" MaxWidth="170" FontStyle="Italic" Margin="10 5 0 0" VerticalAlignment="Center">
+                                        <Run Text="{Binding AuthenticationProvider.CurrentUser.Organization.Name}"></Run>
+                                        ,
+                                        <Run Text="{Binding AuthenticationProvider.CurrentUser.Roles[0]}">
+                                            <Run.ToolTip>
+                                                <ItemsControl ItemsSource="{Binding AuthenticationProvider.CurrentUser.Roles}">
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <TextBlock Text="{Binding Name}"></TextBlock>
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+                                                </ItemsControl>
+                                            </Run.ToolTip>
+                                        </Run>
+                                        <Run>...</Run>
+                                    </TextBlock>
+                                </StackPanel>
                             </StackPanel>
                         </Grid>
                         <StackPanel Margin="0 16 0 0">
@@ -122,14 +140,39 @@
                                         x:Name="MenuToggleButton"/>
                         <materialDesign:PopupBox DockPanel.Dock="Right" PlacementMode="BottomAndAlignRightEdges" StaysOpen="False">
                             <StackPanel>
-                                <Button Content="Machine Connection" Command="{Binding ConnectCommand}" />
-                                <Button Content="Disconnect Machine" Command="{Binding DisconnectCommand}" />
+                                <Button Command="{Binding ConnectCommand}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <materialDesign:PackIcon Kind="LanConnect" Width="24" Height="24" />
+                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Machine Connection</TextBlock>
+                                    </StackPanel>
+                                </Button>
+                                <Button Command="{Binding DisconnectCommand}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <materialDesign:PackIcon Kind="LanDisconnect" Width="24" Height="24" />
+                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Disconnect Machine</TextBlock>
+                                    </StackPanel>
+                                </Button>
                                 <Separator/>
-                                <Button Content="Open Module In New Window" IsEnabled="{Binding IsModuleLoaded}" Command="{Binding OpenModuleInWindowCommand}" CommandParameter="{Binding CurrentModule}" />
+                                <Button IsEnabled="{Binding IsModuleLoaded}" Command="{Binding OpenModuleInWindowCommand}" CommandParameter="{Binding CurrentModule}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <materialDesign:PackIcon Kind="ArrowTopRight" Width="24" Height="24" />
+                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Open Module In New Window</TextBlock>
+                                    </StackPanel>
+                                </Button>
                                 <Separator/>
-                                <Button Content="Update Center" Command="{Binding UpdateCenterCommand}" />
+                                <Button Command="{Binding UpdateCenterCommand}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <materialDesign:PackIcon Kind="Download" Width="24" Height="24" />
+                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Update Center</TextBlock>
+                                    </StackPanel>
+                                </Button>
                                 <Separator/>
-                                <Button Content="Exit" Command="{Binding ExitCommand}" />
+                                <Button Command="{Binding ExitCommand}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <materialDesign:PackIcon Kind="CloseCircleOutline" Width="24" Height="24" />
+                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Exit</TextBlock>
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
                         </materialDesign:PopupBox>
                         <Grid>
@@ -233,8 +276,8 @@
                                             </Grid.RowDefinitions>
                                             <Grid>
                                                 <StackPanel Margin="30 20" HorizontalAlignment="Left">
-                                                    <TextBlock Style="{StaticResource MaterialDesignDisplay1TextBlock}">Welcome to Machine Studio</TextBlock>
-                                                    <TextBlock HorizontalAlignment="Right" Margin="0 5 -130 0" FontStyle="Italic" Style="{StaticResource MaterialDesignSubheadingTextBlock}" Foreground="{StaticResource AccentColorBrush}">Select Your Studio Module...</TextBlock>
+                                                    <TextBlock FontSize="35">Welcome to Machine Studio</TextBlock>
+                                                    <TextBlock HorizontalAlignment="Left" Margin="350 5 0 0" FontStyle="Italic" FontSize="16">The below modules are displayed according to your user roles and permissions.</TextBlock>
                                                 </StackPanel>
                                             </Grid>
 
@@ -267,8 +310,18 @@
                                                                         <StackPanel Grid.Row="2" Margin="8" HorizontalAlignment="Right" Orientation="Horizontal">
                                                                             <materialDesign:PopupBox Padding="2,0,2,0" Style="{StaticResource MaterialDesignToolPopupBox}">
                                                                                 <StackPanel>
-                                                                                    <Button Content="Open in new window" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.OpenModuleInWindowCommand}" CommandParameter="{Binding}" />
-                                                                                    <Button Content="Settings" />
+                                                                                    <Button Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.OpenModuleInWindowCommand}" CommandParameter="{Binding}">
+                                                                                        <StackPanel Orientation="Horizontal">
+                                                                                            <materialDesign:PackIcon Kind="ArrowTopRight" Width="24" Height="24" />
+                                                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Start in new window</TextBlock>
+                                                                                        </StackPanel>
+                                                                                    </Button>
+                                                                                    <Button>
+                                                                                        <StackPanel Orientation="Horizontal">
+                                                                                            <materialDesign:PackIcon Kind="Settings" Width="24" Height="24" />
+                                                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Settings</TextBlock>
+                                                                                        </StackPanel>
+                                                                                    </Button>
                                                                                 </StackPanel>
                                                                             </materialDesign:PopupBox>
                                                                         </StackPanel>