merge

1 files changed, 46 insertions, 2 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 86723479b..8417c70c8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -10,9 +10,11 @@
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:db="clr-namespace:Tango.MachineStudio.DB.Views;assembly=Tango.MachineStudio.DB"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
+             xmlns:commonConverters="clr-namespace:Tango.MachineStudio.Common.Converters;assembly=Tango.MachineStudio.Common"
              mc:Ignorable="d" 
              d:DesignHeight="720" d:DesignWidth="1270" Background="Transparent" DataContext="{Binding MainViewVM, Source={StaticResource Locator}}">
 
@@ -22,6 +24,7 @@
         <converters:NullObjectToBooleanConverter x:Key="NullObjectToBooleanConverter" />
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         <converters:StringToWordsConverter x:Key="StringToWordsConverter" />
+        <commonConverters:PermissionToVisibilityConverter x:Key="PermissionToVisibilityConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -189,7 +192,16 @@
                                         <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Speech</TextBlock>
                                     </StackPanel>
                                 </Button>
-                                <Separator/>
+                                <StackPanel Visibility="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource PermissionToVisibilityConverter},ConverterParameter={x:Static enumerations:Permissions.RunDeveloperConsole}}">
+                                    <Separator/>
+                                    <Button Command="{Binding OpenDeveloperConsoleCommand}">
+                                        <StackPanel Orientation="Horizontal">
+                                            <materialDesign:PackIcon Kind="Console" Width="24" Height="24" />
+                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Developer Console</TextBlock>
+                                        </StackPanel>
+                                    </Button>
+                                    <Separator/>
+                                </StackPanel>
                                 <Button Command="{Binding ExitCommand}">
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon Kind="CloseCircleOutline" Width="24" Height="24" />
@@ -320,7 +332,7 @@
                                     <Button Cursor="Hand" Command="{Binding ReportIssueCommand}" IsEnabled="{Binding TFSClient.IsInitialized}">
                                         <Button.Style>
                                             <Style TargetType="Button" BasedOn="{StaticResource emptyButton}">
-                                                <Setter Property="ToolTip" Value="Report and issue"></Setter>
+                                                <Setter Property="ToolTip" Value="Report issue"></Setter>
                                                 <Setter Property="Opacity" Value="1"></Setter>
                                                 <Style.Triggers>
                                                     <Trigger Property="IsEnabled" Value="False">
@@ -332,6 +344,38 @@
                                         </Button.Style>
                                         <Image Margin="10 0 0 0" Source="/Images/bug.png" Width="24" RenderOptions.BitmapScalingMode="Fant" />
                                     </Button>
+                                    <Button Cursor="Hand" Command="{Binding OpenResolvedBugsCommand}">
+                                        <Button.Style>
+                                            <Style TargetType="Button" BasedOn="{StaticResource emptyButton}">
+                                                <Setter Property="Visibility"  Value="Visible"></Setter>
+                                                <Style.Triggers>
+                                                    <EventTrigger RoutedEvent="Loaded">
+                                                        <EventTrigger.Actions>
+                                                            <BeginStoryboard>
+                                                                <Storyboard>
+                                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Duration="00:00:01" RepeatBehavior="Forever">
+                                                                        <DiscreteDoubleKeyFrame KeyTime="00:00:00" Value="1" />
+                                                                        <DiscreteDoubleKeyFrame KeyTime="00:00:0.5" Value="0" />
+                                                                    </DoubleAnimationUsingKeyFrames>
+                                                                </Storyboard>
+                                                            </BeginStoryboard>
+                                                        </EventTrigger.Actions>
+                                                    </EventTrigger>
+                                                    <DataTrigger Binding="{Binding TFSClient.ResolvedWorkItems.Count}" Value="0">
+                                                        <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </Button.Style>
+                                        <Button.ToolTip>
+                                            <TextBlock>
+                                                <Run>There are</Run>
+                                                <Run Text="{Binding TFSClient.ResolvedWorkItems.Count,Mode=OneWay}"></Run>
+                                                <Run>issues waiting for your approval</Run>
+                                            </TextBlock>
+                                        </Button.ToolTip>
+                                        <Image Margin="10 0 0 0" Source="/Images/bug-resolved.png" Width="24" RenderOptions.BitmapScalingMode="Fant" />
+                                    </Button>
                                 </StackPanel>
                             </Grid>
                         </Grid>