merge alarm handling from remote

5 files changed, 331 insertions, 146 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 2743e5126..56b4c2283 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -23,38 +23,43 @@
     </UserControl.Resources>
 
     <Grid>
-        <touch:TouchSideMenu x:Name="menu" IsOpened="{Binding IsMenuOpened,Mode=TwoWay}" Grid.Row="1">
+        <touch:TouchSideMenu x:Name="menu" IsOpened="{Binding IsMenuOpened,Mode=TwoWay}" Grid.Row="1" >
             <touch:TouchSideMenu.MenuContent>
-                <Border Width="400" x:Name="border" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDarkForegroundBrush}" TextElement.Foreground="{StaticResource TangoDarkForegroundBrush}">
+                <Border TextElement.FontSize="{StaticResource TangoMenuItemFontSize}" TextElement.FontFamily="{StaticResource TangoFlexoFontFamily}" Width="450" x:Name="border" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDarkForegroundBrush}" TextElement.Foreground="{StaticResource TangoDarkForegroundBrush}">
                     <DockPanel LastChildFill="False" Background="{StaticResource TangoPrimaryBackgroundBrush}">
                         <StackPanel MinWidth="300" DockPanel.Dock="Top">
-                            <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1">
+                            <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1" Height="320">
                                 <Grid>
-                                    <Image Source="/Images/logo.png" Stretch="Uniform" Margin="20 50 50 50"></Image>
-                                    <touch:TouchToggleButton Style="{StaticResource TangoTouchToggleButtonHamburger}"
+                                    <Image Source="/Images/logo.png" Stretch="Uniform" HorizontalAlignment="Left" Margin="40 0 0 0" Width="320"></Image>
+                                    <touch:TouchToggleButton Width="70" Height="70" Padding="15" Style="{StaticResource TangoTouchToggleButtonHamburger}"
                                     VerticalAlignment="Top"
-                                    HorizontalAlignment="Right" Margin="16"
-                                    IsChecked="{Binding ElementName=menu,Path=IsOpened}" />
+                                    HorizontalAlignment="Right"
+                                    IsChecked="{Binding ElementName=menu,Path=IsOpened}" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
+
+                                    <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" FontSize="{StaticResource TangoSmallFontSize}" Margin="40 20 20 50" VerticalAlignment="Bottom" HorizontalAlignment="Left">
+                                        <Run>Machine S/N:</Run>
+                                        <Run FontStyle="Italic" Text="{Binding MachineProvider.Machine.SerialNumber,Mode=OneWay,IsAsync=True}"></Run>
+                                    </TextBlock>
                                 </Grid>
                             </Border>
-                            <StackPanel Margin="0 5 0 0">
-                                <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="30" Foreground="{StaticResource TangoDarkForegroundBrush}" Command="{Binding HomeCommand}" FontSize="{StaticResource TangoHeaderFontSize}">
+                            <!--<StackPanel Margin="0 5 0 0">
+                                <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="30" Foreground="{StaticResource TangoDarkForegroundBrush}" Command="{Binding HomeCommand}" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="Normal">
                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                        <Image Source="/Images/home.png" VerticalAlignment="Center" Width="48" Height="48"></Image>
-                                        <TextBlock VerticalAlignment="Center" Margin="20 0 0 0">Home</TextBlock>
+                                        <Image Source="/Images/home.png" VerticalAlignment="Center" Width="32" Height="32"></Image>
+                                        <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Foreground="{StaticResource TangoPrimaryAccentBrush}">Home</TextBlock>
                                     </StackPanel>
                                 </touch:TouchButton>
-                            </StackPanel>
+                            </StackPanel>-->
 
                             <ItemsControl ItemsSource="{Binding ModuleLoader.UserModules}">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
                                         <Border Visibility="{Binding DockToBottom,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                            <Border BorderBrush="{StaticResource TangoGrayBrush}" BorderThickness="0 1 0 0" Visibility="{Binding IsVisibleInMenu,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                <touch:TouchButton Margin="0 0 0 0" Padding="30" Foreground="{StaticResource TangoDarkForegroundBrush}" Style="{StaticResource TangoFlatButton}" FontSize="{StaticResource TangoHeaderFontSize}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}">
+                                            <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1" Visibility="{Binding IsVisibleInMenu,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                <touch:TouchButton Margin="0 0 0 0" Padding="40 25" Foreground="{StaticResource TangoDarkForegroundBrush}" Style="{StaticResource TangoFlatButton}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}">
                                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                        <Image VerticalAlignment="Center" Source="{Binding Image}" Width="48" Height="48"></Image>
-                                                        <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Text="{Binding Name}"></TextBlock>
+                                                        <Image VerticalAlignment="Center" Source="{Binding Image}" Width="32" Height="32"></Image>
+                                                        <TextBlock VerticalAlignment="Center" Margin="40 0 0 0" Text="{Binding Name}" Foreground="{StaticResource TangoPrimaryAccentBrush}"></TextBlock>
                                                     </StackPanel>
                                                 </touch:TouchButton>
                                             </Border>
@@ -64,20 +69,18 @@
                             </ItemsControl>
 
                             <StackPanel Margin="0 5 0 0">
-
-                                <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 1 0 0">
-                                    <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="30" Foreground="{StaticResource TangoDarkForegroundBrush}" Command="{Binding UpdateCommand}" FontSize="{StaticResource TangoHeaderFontSize}">
+                                <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1">
+                                    <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="40 25" Foreground="{StaticResource TangoDarkForegroundBrush}" Command="{Binding UpdateCommand}">
                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                            <Image Source="/Images/right-arrow-64.png" VerticalAlignment="Center" Width="48" Height="48"></Image>
-                                            <TextBlock VerticalAlignment="Center" Margin="20 0 0 0">Update</TextBlock>
+                                            <Image Source="/Images/Menu/update.png" VerticalAlignment="Center" Width="32" Height="32"></Image>
+                                            <TextBlock VerticalAlignment="Center" Margin="40 0 0 0" Foreground="{StaticResource TangoPrimaryAccentBrush}">Update</TextBlock>
                                         </StackPanel>
                                     </touch:TouchButton>
                                 </Border>
                             </StackPanel>
                         </StackPanel>
 
-                        <StackPanel DockPanel.Dock="Bottom">
-                            <Separator Margin="0 10 0 0" Background="{StaticResource TangoDividerBrush}" />
+                        <Grid DockPanel.Dock="Bottom">
                             <!--<touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="30" Command="{Binding SignOutCommand}" FontSize="{StaticResource TangoHeaderFontSize}" Foreground="{StaticResource TangoDarkForegroundBrush}">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                     <touch:TouchIcon VerticalAlignment="Center" Angle="180" Icon="Logout" Width="32" Height="32"></touch:TouchIcon>
@@ -85,7 +88,7 @@
                                 </StackPanel>
                             </touch:TouchButton>-->
 
-                            <ItemsControl ItemsSource="{Binding ModuleLoader.UserModules}">
+                            <!--<ItemsControl ItemsSource="{Binding ModuleLoader.UserModules}">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
                                         <Border Visibility="{Binding DockToBottom,Converter={StaticResource BooleanToVisibilityConverter}}">
@@ -100,8 +103,107 @@
                                         </Border>
                                     </DataTemplate>
                                 </ItemsControl.ItemTemplate>
-                            </ItemsControl>
-                        </StackPanel>
+                            </ItemsControl>-->
+
+                           
+                            <Border Background="{StaticResource TangoPowerMenuOpenedBackgroundBrush}" Height="350" Padding="20" RenderTransformOrigin="0.5,1" VerticalAlignment="Bottom">
+                                <Border.Style>
+                                    <Style TargetType="Border">
+                                        <Setter Property="RenderTransform">
+                                            <Setter.Value>
+                                                <ScaleTransform ScaleX="1" ScaleY="0" />
+                                            </Setter.Value>
+                                        </Setter>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding IsPowerOpened}" Value="True">
+                                                <DataTrigger.EnterActions>
+                                                    <BeginStoryboard>
+                                                        <Storyboard>
+                                                            <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" To="1" Duration="00:00:0.2" />
+                                                        </Storyboard>
+                                                    </BeginStoryboard>
+                                                </DataTrigger.EnterActions>
+                                                <DataTrigger.ExitActions>
+                                                    <BeginStoryboard>
+                                                        <Storyboard>
+                                                            <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" To="0" Duration="00:00:0.2" />
+                                                        </Storyboard>
+                                                    </BeginStoryboard>
+                                                </DataTrigger.ExitActions>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Border.Style>
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="1*"/>
+                                        <RowDefinition Height="1*"/>
+                                    </Grid.RowDefinitions>
+
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="188*"/>
+                                            <ColumnDefinition Width="261*"/>
+                                        </Grid.ColumnDefinitions>
+
+                                        <Image Source="/Images/power-machine.png" Margin="30" />
+
+                                        <UniformGrid Grid.Column="1" Rows="2">
+                                            <touch:TouchButton HorizontalAlignment="Left" VerticalAlignment="Center" Padding="50 20" Height="Auto" Style="{StaticResource TangoLinkButton}" FontSize="{StaticResource TangoTitleFontSize}" Foreground="{StaticResource TangoPrimaryBackgroundBrush}">Turn Off</touch:TouchButton>
+                                            <touch:TouchButton HorizontalAlignment="Left" VerticalAlignment="Center" Padding="50 20" Height="Auto" Style="{StaticResource TangoLinkButton}" FontSize="{StaticResource TangoTitleFontSize}" Foreground="{StaticResource TangoPrimaryBackgroundBrush}">Stand By</touch:TouchButton>
+                                        </UniformGrid>
+                                    </Grid>
+
+                                    <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="25 0" Opacity="0.3" StrokeThickness="1" Stroke="{StaticResource TangoDividerBrush}" />
+
+                                    <Grid Grid.Row="1">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="188*"/>
+                                            <ColumnDefinition Width="261*"/>
+                                        </Grid.ColumnDefinitions>
+                                        <Image Source="/Images/power-tablet.png" Margin="30" />
+
+                                        <touch:TouchButton Command="{Binding RestartApplicationCommand}" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Padding="50 20" Height="Auto" Style="{StaticResource TangoLinkButton}" Foreground="{StaticResource TangoPrimaryBackgroundBrush}" FontSize="{StaticResource TangoTitleFontSize}">Restart</touch:TouchButton>
+                                    </Grid>
+                                </Grid>
+                            </Border>
+
+                            <Border Background="{StaticResource TangoMidBackgroundBrush}" RenderTransformOrigin="0.5,1" VerticalAlignment="Bottom">
+                                <Border.Style>
+                                    <Style TargetType="Border">
+                                        <Setter Property="RenderTransform">
+                                            <Setter.Value>
+                                                <ScaleTransform ScaleX="1" ScaleY="1" />
+                                            </Setter.Value>
+                                        </Setter>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding IsPowerOpened}" Value="True">
+                                                <DataTrigger.EnterActions>
+                                                    <BeginStoryboard>
+                                                        <Storyboard>
+                                                            <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" To="0" Duration="00:00:0.2" />
+                                                        </Storyboard>
+                                                    </BeginStoryboard>
+                                                </DataTrigger.EnterActions>
+                                                <DataTrigger.ExitActions>
+                                                    <BeginStoryboard>
+                                                        <Storyboard>
+                                                            <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" To="1" Duration="00:00:0.2" />
+                                                        </Storyboard>
+                                                    </BeginStoryboard>
+                                                </DataTrigger.ExitActions>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Border.Style>
+                                <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="40 25" Foreground="{StaticResource TangoDarkForegroundBrush}" Command="{Binding PowerCommand}">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <Image Source="/Images/menu/power.png" VerticalAlignment="Center" Width="32" Height="32"></Image>
+                                        <TextBlock VerticalAlignment="Center" Margin="40 0 0 0" Foreground="{StaticResource TangoPrimaryAccentBrush}">Power</TextBlock>
+                                    </StackPanel>
+                                </touch:TouchButton>
+                            </Border>
+                        </Grid>
                     </DockPanel>
                 </Border>
             </touch:TouchSideMenu.MenuContent>
@@ -111,33 +213,36 @@
                     <DockPanel>
                         <Border BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDividerBrush}">
                             <touch:TouchHamburgerButton Width="100" Height="100" Padding="15" Command="{Binding MenuOrBackCommand}" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" IsBack="{Binding NavigationManager.CanNavigateBack}">
-                                               
+
                             </touch:TouchHamburgerButton>
                         </Border>
                         <Grid DockPanel.Dock="Right" Margin="0 0 20 0">
                             <StackPanel Orientation="Horizontal">
-                                <StackPanel VerticalAlignment="Center">
-                                    <Image Width="33" HorizontalAlignment="Center">
-                                        <Image.Style>
-                                            <Style TargetType="Image">
+                                <StackPanel x:Name="techPressElement" VerticalAlignment="Center" Background="Transparent">
+                                    <touch:TouchGifAnimation Width="36" HorizontalAlignment="Center" EnableAnimation="True">
+                                        <touch:TouchGifAnimation.Style>
+                                            <Style TargetType="touch:TouchGifAnimation">
                                                 <Setter Property="Source" Value="/Images/GlobalStatus/standby.png"></Setter>
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Disconnected}">
-                                                        <Setter Property="Source" Value="/Images/GlobalStatus/machine-off.png"></Setter>
+                                                        <Setter Property="Source" Value="/Images/GlobalStatus/machine_off_Anim.gif"></Setter>
                                                     </DataTrigger>
                                                     <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Standby}">
-                                                        <Setter Property="Source" Value="/Images/GlobalStatus/standby.png"></Setter>
+                                                        <Setter Property="Source" Value="/Images/GlobalStatus/standby_Anim.gif"></Setter>
                                                     </DataTrigger>
                                                     <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.ReadyToDye}">
-                                                        <Setter Property="Source" Value="/Images/GlobalStatus/ready-to-dye.png"></Setter>
+                                                        <Setter Property="Source" Value="/Images/GlobalStatus/Ready_Anim.gif"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.GettingReady}">
+                                                        <Setter Property="Source" Value="/Images/GlobalStatus/getting_ready_Anim.gif"></Setter>
                                                     </DataTrigger>
                                                     <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Printing}">
-                                                        <Setter Property="Source" Value="/Images/GlobalStatus/dyeing.png"></Setter>
+                                                        <Setter Property="Source" Value="/Images/GlobalStatus/dyeing_Anim.gif"></Setter>
                                                     </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
-                                        </Image.Style>
-                                    </Image>
+                                        </touch:TouchGifAnimation.Style>
+                                    </touch:TouchGifAnimation>
                                     <TextBlock Margin="0 10 0 0" Text="{Binding MachineProvider.MachineOperator.Status,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
                                 </StackPanel>
 
@@ -179,7 +284,12 @@
                         <!--MODULES GOES HERE-->
                     </controls:NavigationControl>
                 </Grid>
+                
             </DockPanel>
         </touch:TouchSideMenu>
+
+        <Grid PreviewMouseUp="Grid_PreviewMouseUp" IsHitTestVisible="True" Background="Transparent" Visibility="{Binding ApplicationManager.IsScreenLocked,Converter={StaticResource BooleanToVisibilityConverter}}">
+            <touch:TouchIcon HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="40" Icon="Lock" Width="60" Height="60" Opacity="0.5" Foreground="{StaticResource TangoSuccessBrush}" />
+        </Grid>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml.cs
index 50b9df550..883d3f893 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml.cs
@@ -14,9 +14,11 @@ using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using System.Windows.Threading;
 using Tango.Core.EventArguments;
 using Tango.Logging;
 using Tango.PPC.Common;
+using Tango.PPC.UI.ViewModels;
 using Tango.PPC.UI.ViewsContracts;
 
 namespace Tango.PPC.UI.Views
@@ -27,11 +29,65 @@ namespace Tango.PPC.UI.Views
     public partial class LayoutView : UserControl, ILayoutView
     {
         public static LayoutView Instance { get; private set; }
+        private LayoutViewVM _vm;
+        private DispatcherTimer _timer;
 
         public LayoutView()
         {
             InitializeComponent();
             Instance = this;
+            Loaded += (_, __) => _vm = DataContext as LayoutViewVM;
+            techPressElement.RegisterForPreviewMouseOrTouchDown(OnMouseOrTouchDown);
+            techPressElement.RegisterForPreviewMouseOrTouchUp(OnMouseOrTouchUp);
+            _timer = new DispatcherTimer();
+            _timer.Interval = TimeSpan.FromSeconds(10);
+            _timer.Tick += _timer_Tick;
+
+            this.PreviewMouseUp += LayoutView_PreviewMouseUp;
+        }
+
+        private void LayoutView_PreviewMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            _vm.ApplicationManager.ResetScreenLockTimer();
+        }
+
+        private void _timer_Tick(object sender, EventArgs e)
+        {
+            _timer.Stop();
+            _vm.ToggleTechnicianMode();
+        }
+
+        private void OnMouseOrTouchDown(object sender, MouseOrTouchEventArgs e)
+        {
+            //if (e.TouchDevice != null)
+            //{
+            //    techPressElement.CaptureTouch(e.TouchDevice);
+            //}
+            //else
+            //{
+            //    techPressElement.CaptureMouse();
+            //}
+
+            _timer.Start();
+        }
+
+        private void OnMouseOrTouchUp(object sender, MouseOrTouchEventArgs e)
+        {
+            //if (e.TouchDevice != null)
+            //{
+            //    techPressElement.ReleaseTouchCapture(e.TouchDevice);
+            //}
+            //else
+            //{
+            //    techPressElement.ReleaseMouseCapture();
+            //}
+
+            _timer.Stop();
+        }
+
+        private void Grid_PreviewMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            _vm.ApplicationManager.ReleaseScreenLock();
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoginView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoginView.xaml
index 179d1dde3..dee4e9c7b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoginView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoginView.xaml
@@ -27,13 +27,6 @@
 
                     <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0">Forgot password?</TextBlock>
                 </StackPanel>
-                <StackPanel>
-                    <controls:AsyncAdornerControl Height="130" Visibility="{Binding IsLoading,Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <StackPanel VerticalAlignment="Center">
-                            <touch:TouchGifAnimation Source="/Images/preloader_rectangles.gif" EnableAnimation="{Binding IsLoading}" />
-                        </StackPanel>
-                    </controls:AsyncAdornerControl>
-                </StackPanel>
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
index 0fb9d9e09..fba8a599d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
@@ -11,115 +11,127 @@
              xmlns:vm="clr-namespace:Tango.PPC.UI.ViewModels"
              xmlns:local="clr-namespace:Tango.PPC.UI.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1280" d:DesignWidth="800" Background="{StaticResource TangoPrimaryBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:MachineUpdateViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MachineUpdateViewVM}"> 
+             d:DesignHeight="1280" d:DesignWidth="800" Background="{StaticResource TangoPrimaryBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:MachineUpdateViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MachineUpdateViewVM}">
     <Grid>
         <DockPanel>
 
-            <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0 10 0 0">
-                <Image Source="/Images/machine-update.png" Stretch="None" />
+            <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0 20 0 0">
+                <Image Source="/Images/machine-update.png" Stretch="Fill" Width="700" />
             </StackPanel>
 
             <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide" KeepElementsAttached="True" Margin="0 20 0 0" SelectedIndex="0">
 
                 <Grid controls:NavigationControl.NavigationName="UpdateCheckView">
-                    <StackPanel HorizontalAlignment="Center" Margin="0 200 0 0">
-                        <touch:TouchBusyIndicator Width="250" Height="250" IsIndeterminate="{Binding IsVisible}" />
-                        <TextBlock DockPanel.Dock="Top" Margin="0 100" FontSize="{StaticResource TangoHeaderFontSize}" HorizontalAlignment="Center"  TextWrapping="Wrap" TextAlignment="Center">
+                    <DockPanel>
+                        <StackPanel DockPanel.Dock="Bottom">
+                            <touch:TouchButton Style="{StaticResource TangoFlatButton}" Margin="0 0 30 0" Padding="20" Width="300" HorizontalContentAlignment="Center" CornerRadius="35" Command="{Binding ToApplicationCommand}">Back To Application</touch:TouchButton>
+                        </StackPanel>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0 50 0 0">
+                            <touch:TouchBusyIndicator Width="250" Height="250" IsIndeterminate="{Binding IsVisible}" />
+                            <TextBlock DockPanel.Dock="Top" Margin="0 50 0 0" FontSize="{StaticResource TangoHeaderFontSize}" HorizontalAlignment="Center"  TextWrapping="Wrap" TextAlignment="Center">
                                 Checking for updates, please wait...
-                        </TextBlock>
-                    </StackPanel>
+                            </TextBlock>
+                        </StackPanel>
+                    </DockPanel>
                 </Grid>
 
                 <Grid controls:NavigationControl.NavigationName="UpdateAvailableView">
-                    <StackPanel HorizontalAlignment="Center" Margin="0 40 0 0">
-                        <ContentControl>
-                            <ContentControl.Style>
-                                <Style TargetType="ContentControl">
-                                    <Setter Property="Content">
-                                        <Setter.Value>
-                                            <TextBlock FontSize="{StaticResource TangoHeaderFontSize}">
+                    <DockPanel Margin="0 50 0 0">
+                        <StackPanel DockPanel.Dock="Bottom">
+                            <touch:TouchButton Padding="20" Width="300" CornerRadius="35" Command="{Binding UpdateCommand}">UPDATE</touch:TouchButton>
+                            <touch:TouchButton Style="{StaticResource TangoFlatButton}" Margin="0 80 0 30" Padding="20" Width="300" HorizontalContentAlignment="Center" CornerRadius="35" Command="{Binding ToApplicationCommand}">Back To Application</touch:TouchButton>
+                        </StackPanel>
+                        <StackPanel HorizontalAlignment="Center">
+                            <ContentControl>
+                                <ContentControl.Style>
+                                    <Style TargetType="ContentControl">
+                                        <Setter Property="Content">
+                                            <Setter.Value>
+                                                <TextBlock FontSize="{StaticResource TangoHeaderFontSize}">
                                                 <Run>Version</Run>
                                                 <Run Foreground="{StaticResource TangoPrimaryAccentBrush}" Text="{Binding LatestVersion}"></Run>
                                                 <Run>is available</Run>
-                                            </TextBlock>
-                                        </Setter.Value>
-                                    </Setter>
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding IsDbUpdate}" Value="True">
-                                            <Setter Property="Content">
-                                                <Setter.Value>
-                                                    <TextBlock FontSize="{StaticResource TangoHeaderFontSize}">
+                                                </TextBlock>
+                                            </Setter.Value>
+                                        </Setter>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding IsDbUpdate}" Value="True">
+                                                <Setter Property="Content">
+                                                    <Setter.Value>
+                                                        <TextBlock FontSize="{StaticResource TangoHeaderFontSize}">
                                                         Database update is available
-                                                    </TextBlock>
-                                                </Setter.Value>
-                                            </Setter>
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </ContentControl.Style>
-                        </ContentControl>
+                                                        </TextBlock>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </ContentControl.Style>
+                            </ContentControl>
 
-                        <TextBlock FontSize="{StaticResource TangoTitleFontSize}" Margin="0 40 0 0">
+                            <TextBlock FontSize="{StaticResource TangoTitleFontSize}" Margin="0 40 0 0">
                             Updating your machine can improve the following:
-                        </TextBlock>
+                            </TextBlock>
 
-                        <StackPanel Margin="0 40 0 0">
-                            <StackPanel Orientation="Horizontal" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
-                                <touch:TouchIcon Width="24" Height="24" Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
-                                <TextBlock Margin="10 0 0 0" VerticalAlignment="Center">Support for new media</TextBlock>
-                            </StackPanel>
+                            <StackPanel Margin="0 40 0 0">
+                                <StackPanel Orientation="Horizontal" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
+                                    <touch:TouchIcon Width="24" Height="24" Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
+                                    <TextBlock Margin="10 0 0 0" VerticalAlignment="Center">Support for new media</TextBlock>
+                                </StackPanel>
 
-                            <StackPanel Orientation="Horizontal" Margin="0 10 0 0" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
-                                <touch:TouchIcon Width="24" Height="24" Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
-                                <TextBlock Margin="10 0 0 0" VerticalAlignment="Center">Refined color conversion and calibration algorithms</TextBlock>
-                            </StackPanel>
+                                <StackPanel Orientation="Horizontal" Margin="0 10 0 0" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
+                                    <touch:TouchIcon Width="24" Height="24" Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
+                                    <TextBlock Margin="10 0 0 0" VerticalAlignment="Center">Refined color conversion and calibration algorithms</TextBlock>
+                                </StackPanel>
 
-                            <StackPanel Orientation="Horizontal" Margin="0 10 0 0" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
-                                <touch:TouchIcon Width="24" Height="24" Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
-                                <TextBlock Margin="10 0 0 0" VerticalAlignment="Center">Software fixes and improvements</TextBlock>
-                            </StackPanel>
+                                <StackPanel Orientation="Horizontal" Margin="0 10 0 0" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
+                                    <touch:TouchIcon Width="24" Height="24" Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
+                                    <TextBlock Margin="10 0 0 0" VerticalAlignment="Center">Software fixes and improvements</TextBlock>
+                                </StackPanel>
 
-                            <StackPanel Orientation="Horizontal" Margin="0 10 0 0" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
-                                <touch:TouchIcon Width="24" Height="24" Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
-                                <TextBlock Margin="10 0 0 0" VerticalAlignment="Center">Firmware upgrade</TextBlock>
+                                <StackPanel Orientation="Horizontal" Margin="0 10 0 0" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
+                                    <touch:TouchIcon Width="24" Height="24" Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
+                                    <TextBlock Margin="10 0 0 0" VerticalAlignment="Center">Firmware upgrade</TextBlock>
+                                </StackPanel>
                             </StackPanel>
-                        </StackPanel>
 
-                        <TextBlock Margin="0 60 0 0" FontSize="{StaticResource TangoTitleFontSize}">
+                            <TextBlock Margin="0 60 0 0" FontSize="{StaticResource TangoTitleFontSize}">
                             Tap 'UPDATE' to start updating now.
-                        </TextBlock>
-
-                        <touch:TouchButton Margin="0 200 0 0" Padding="20" Width="300" CornerRadius="35" Command="{Binding UpdateCommand}">UPDATE</touch:TouchButton>
-
-                        <touch:TouchButton Style="{StaticResource TangoFlatButton}" Margin="0 80 0 0" Padding="20" Width="300" HorizontalContentAlignment="Center" CornerRadius="35" Command="{Binding ToApplicationCommand}">Back To Application</touch:TouchButton>
-                    </StackPanel>
+                            </TextBlock>
+                        </StackPanel>
+                    </DockPanel>
                 </Grid>
 
                 <Grid controls:NavigationControl.NavigationName="UpToDateView">
-                    <StackPanel HorizontalAlignment="Center" Margin="0 50 0 0">
-                        <touch:TouchIcon Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="70" Height="70" />
-                        <TextBlock VerticalAlignment="Center" Margin="0 10 0 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoHeaderFontSize}">Your machine is up to date!</TextBlock>
-
-                        <touch:TouchButton Margin="0 200 0 0" Padding="20" Width="300" CornerRadius="35" Command="{Binding CloseCommand}">CLOSE</touch:TouchButton>
-                    </StackPanel>
+                    <DockPanel>
+                        <StackPanel DockPanel.Dock="Bottom">
+                            <touch:TouchButton Padding="20" Margin="0 0 0 140" Width="300" CornerRadius="35" Command="{Binding CloseCommand}">CLOSE</touch:TouchButton>
+                        </StackPanel>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0 50 0 0">
+                            <touch:TouchIcon Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="70" Height="70" />
+                            <TextBlock VerticalAlignment="Center" Margin="0 10 0 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoHeaderFontSize}">Your machine is up to date!</TextBlock>
+                        </StackPanel>
+                    </DockPanel>
                 </Grid>
 
                 <Grid controls:NavigationControl.NavigationName="UpdateCheckErrorView">
-                    <StackPanel HorizontalAlignment="Center" Margin="0 50 0 0">
-                        <touch:TouchIcon Icon="AlertOctagon" Foreground="{StaticResource TangoErrorBrush}" Width="70" Height="70" />
-                        <TextBlock VerticalAlignment="Center" Width="600" TextWrapping="Wrap" TextAlignment="Center" Margin="0 10 0 0" Foreground="{StaticResource TangoErrorBrush}" FontSize="{StaticResource TangoTitleFontSize}">An error occurred while trying to check for updates. Please check your internet connection and try again.</TextBlock>
-
-                        <touch:TouchButton Margin="0 200 0 0" Padding="20" Width="300" CornerRadius="35" Command="{Binding RestartCommand}">TRY AGAIN</touch:TouchButton>
-
-                        <touch:TouchButton Style="{StaticResource TangoFlatButton}" Margin="0 200 0 0" Padding="20" Width="300" HorizontalContentAlignment="Center" CornerRadius="35" Command="{Binding ToApplicationCommand}">Back To Application</touch:TouchButton>
-                    </StackPanel>
+                    <DockPanel>
+                        <StackPanel DockPanel.Dock="Bottom">
+                            <touch:TouchButton Padding="20" Width="300" CornerRadius="35" Command="{Binding RestartCommand}">TRY AGAIN</touch:TouchButton>
+                            <touch:TouchButton Style="{StaticResource TangoFlatButton}" Margin="0 80 0 30" Padding="20" Width="300" HorizontalContentAlignment="Center" CornerRadius="35" Command="{Binding ToApplicationCommand}">Back To Application</touch:TouchButton>
+                        </StackPanel>
+                        <StackPanel HorizontalAlignment="Center"  VerticalAlignment="Top" Margin="0 50 0 0">
+                            <touch:TouchIcon Icon="AlertOctagon" Foreground="{StaticResource TangoErrorBrush}" Width="70" Height="70" />
+                            <TextBlock VerticalAlignment="Center" Width="600" TextWrapping="Wrap" TextAlignment="Center" Margin="0 10 0 0" Foreground="{StaticResource TangoErrorBrush}" FontSize="{StaticResource TangoTitleFontSize}">An error occurred while trying to check for updates. Please check your internet connection and try again.</TextBlock>
+                        </StackPanel>
+                    </DockPanel>
                 </Grid>
 
                 <Grid controls:NavigationControl.NavigationName="UpdateProgressView">
                     <StackPanel>
-                        <TextBlock HorizontalAlignment="Center" Margin="0 40 0 0" FontSize="{StaticResource TangoHeaderFontSize}">Updating your machine</TextBlock>
+                        <TextBlock HorizontalAlignment="Center" Margin="0 80 0 0" FontSize="{StaticResource TangoHeaderFontSize}">Updating your machine</TextBlock>
                         <TextBlock Margin="0 10 0 0" TextAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" Foreground="{StaticResource TangoGrayBrush}">Do not turn off the machine</TextBlock>
-                        
+
                         <StackPanel Margin="0 200 0 0">
                             <TextBlock Text="{Binding MachineUpdateManager.Status.Name,FallbackValue='Download Software Package'}" HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}"></TextBlock>
                             <TextBlock HorizontalAlignment="Center" Text="{Binding MachineUpdateManager.Status.Message,FallbackValue='Connecting to machine service...'}" Margin="0 40 0 0"></TextBlock>
@@ -129,37 +141,46 @@
                 </Grid>
 
                 <Grid controls:NavigationControl.NavigationName="UpdateDbProgressView">
-                    <StackPanel HorizontalAlignment="Center" Margin="0 200 0 0">
-                        <touch:TouchBusyIndicator Width="250" Height="250" IsIndeterminate="{Binding IsVisible}" />
-                        <TextBlock DockPanel.Dock="Top" Margin="0 100" FontSize="{StaticResource TangoHeaderFontSize}" HorizontalAlignment="Center"  TextWrapping="Wrap" TextAlignment="Center">
-                                Updating database...
-                        </TextBlock>
+                    <StackPanel>
+                        <TextBlock HorizontalAlignment="Center" Margin="0 80 0 0" FontSize="{StaticResource TangoHeaderFontSize}">Updating your machine</TextBlock>
+                        <TextBlock Margin="0 10 0 0" TextAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" Foreground="{StaticResource TangoGrayBrush}">Do not turn off the machine</TextBlock>
+
+                        <StackPanel Margin="0 200 0 0">
+                            <TextBlock Text="{Binding MachineUpdateManager.Status.Name,FallbackValue='Synchronizing database'}" HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}"></TextBlock>
+                            <TextBlock HorizontalAlignment="Center" Text="{Binding MachineUpdateManager.Status.Message,FallbackValue='Retrieving data...'}" Margin="0 40 0 0"></TextBlock>
+                            <touch:TouchProgressBar Margin="50 10" Height="10" IsIndeterminate="{Binding MachineUpdateManager.Status.IsIntermediate}" Maximum="{Binding MachineUpdateManager.Status.Total}" Value="{Binding MachineUpdateManager.Status.Progress,Mode=OneWay}" />
+                        </StackPanel>
                     </StackPanel>
                 </Grid>
 
                 <Grid controls:NavigationControl.NavigationName="UpdateCompletedView">
-                    <StackPanel HorizontalAlignment="Center" Margin="0 50 0 0">
-                        <touch:TouchIcon Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="70" Height="70" />
-                        <TextBlock VerticalAlignment="Center" Margin="0 10 0 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoHeaderFontSize}">Update completed successfully !</TextBlock>
-
-                        <touch:TouchButton Margin="0 200 0 0" Padding="20" Width="300" CornerRadius="35" Command="{Binding CompleteCommand}">RESTART</touch:TouchButton>
-                    </StackPanel>
+                    <DockPanel>
+                        <StackPanel DockPanel.Dock="Bottom">
+                            <touch:TouchButton Margin="0 0 0 130" Padding="20" Width="300" CornerRadius="35" Command="{Binding CompleteCommand}">RESTART</touch:TouchButton>
+                        </StackPanel>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0 50 0 0">
+                            <touch:TouchIcon Icon="Check" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="70" Height="70" />
+                            <TextBlock VerticalAlignment="Center" Margin="0 10 0 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoHeaderFontSize}">Your machine is up to date!</TextBlock>
+                        </StackPanel>
+                    </DockPanel>
                 </Grid>
 
                 <Grid controls:NavigationControl.NavigationName="UpdateFailedView">
-                    <StackPanel HorizontalAlignment="Center" Margin="0 50 0 0">
-                        <touch:TouchIcon Icon="AlertOutline" Foreground="{StaticResource TangoErrorBrush}" Width="70" Height="70" />
-                        <TextBlock HorizontalAlignment="Center" Margin="0 10 0 0"  FontSize="{StaticResource TangoTitleFontSize}">Update Failed</TextBlock>
-                        <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" Foreground="{StaticResource TangoErrorBrush}" Text="{Binding FailedError,FallbackValue='Unexpected error'}"></TextBlock>
-
-                        <touch:TouchButton Margin="0 180 0 0" Padding="20" Width="300" CornerRadius="35" Command="{Binding RestartCommand}">TRY AGAIN</touch:TouchButton>
-
-                        <touch:TouchButton Style="{StaticResource TangoFlatButton}" Margin="0 200 0 0" Padding="20" Width="300" HorizontalContentAlignment="Center" CornerRadius="35" Command="{Binding ToApplicationCommand}">Back To Application</touch:TouchButton>
-                    </StackPanel>
+                    <DockPanel>
+                        <StackPanel DockPanel.Dock="Bottom">
+                            <touch:TouchButton Padding="20" Width="300" CornerRadius="35" Command="{Binding RestartCommand}">TRY AGAIN</touch:TouchButton>
+                            <touch:TouchButton Style="{StaticResource TangoFlatButton}" Margin="0 100 0 30" Padding="20" Width="300" HorizontalContentAlignment="Center" CornerRadius="35" Command="{Binding ToApplicationCommand}">Back To Application</touch:TouchButton>
+                        </StackPanel>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0 50 0 0">
+                            <touch:TouchIcon Icon="AlertOutline" Foreground="{StaticResource TangoErrorBrush}" Width="70" Height="70" />
+                            <TextBlock HorizontalAlignment="Center" Margin="0 10 0 0"  FontSize="{StaticResource TangoTitleFontSize}">Update Failed</TextBlock>
+                            <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" Foreground="{StaticResource TangoErrorBrush}" TextAlignment="Center" Text="{Binding FailedError,FallbackValue='Unexpected error'}"></TextBlock>
+                        </StackPanel>
+                    </DockPanel>
                 </Grid>
 
                 <Grid controls:NavigationControl.NavigationName="UpdateFromPackageView">
-                    <StackPanel HorizontalAlignment="Center" Margin="0 200 0 0">
+                    <StackPanel HorizontalAlignment="Center" Margin="0 200 0 0" VerticalAlignment="Top">
                         <touch:TouchBusyIndicator Width="250" Height="250" IsIndeterminate="{Binding IsVisible}" />
                         <TextBlock DockPanel.Dock="Top" Margin="0 100" FontSize="{StaticResource TangoHeaderFontSize}" HorizontalAlignment="Center"  TextWrapping="Wrap" TextAlignment="Center">
                                 Updating your software
@@ -168,12 +189,15 @@
                 </Grid>
 
                 <Grid controls:NavigationControl.NavigationName="UpdateFailedFromPackageView">
-                    <StackPanel HorizontalAlignment="Center" Margin="0 50 0 0">
-                        <touch:TouchIcon Icon="AlertOctagon" Foreground="{StaticResource TangoErrorBrush}" Width="70" Height="70" />
-                        <TextBlock VerticalAlignment="Center" Margin="0 10 0 0" Foreground="{StaticResource TangoErrorBrush}" FontSize="{StaticResource TangoTitleFontSize}">An error occurred while trying to update the machine.</TextBlock>
-
-                        <touch:TouchButton Style="{StaticResource TangoFlatButton}" Margin="0 200 0 0" Padding="20" Width="300" HorizontalContentAlignment="Center" CornerRadius="35" Command="{Binding ToApplicationCommand}">Back To Application</touch:TouchButton>
-                    </StackPanel>
+                    <DockPanel>
+                        <StackPanel DockPanel.Dock="Bottom">
+                            <touch:TouchButton Padding="20" Width="300" Margin="0 0 0 130" CornerRadius="35" Command="{Binding CloseCommand}">CLOSE</touch:TouchButton>
+                        </StackPanel>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0 50 0 0">
+                            <touch:TouchIcon Icon="AlertOctagon" Foreground="{StaticResource TangoErrorBrush}" Width="70" Height="70" />
+                            <TextBlock VerticalAlignment="Center" Margin="0 10 0 0" Foreground="{StaticResource TangoErrorBrush}" FontSize="{StaticResource TangoTitleFontSize}">An error occurred while trying to update the machine.</TextBlock>
+                        </StackPanel>
+                    </DockPanel>
                 </Grid>
             </controls:NavigationControl>
         </DockPanel>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
index e4c107049..604c79aeb 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
@@ -28,7 +28,9 @@
             ItemExpandedPropertyPath="IsExpanded"
             HasDialog="{Binding NotificationProvider.HasDialog}"
             CurrentDialog="{Binding NotificationProvider.CurrentDialog}"
-            NotificationBarVisibility="{Binding NotificationProvider.NotificationsVisible,Converter={StaticResource BooleanToVisibilityConverter}}">
+            NotificationBarVisibility="{Binding NotificationProvider.NotificationsVisible,Converter={StaticResource BooleanToVisibilityConverter}}"
+            IsBusy="{Binding NotificationProvider.IsInGlobalBusyState}"
+            BusyMessage="{Binding NotificationProvider.GlobalBusyMessage}">
             <touch:TouchPanel.NotificationTemplate>
                 <DataTemplate>
                     <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="0" Command="{Binding PressedCommand}" components:TransformationHelper.TransformWhenPressed="False">
@@ -59,7 +61,7 @@
                             </touch:TouchIcon.Style>
                         </touch:TouchIcon>
 
-                        <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="AccessPointNetwork" Visibility="{Binding ConnectivityProvider.IsHotspotActive,Converter={StaticResource BooleanToVisibilityConverter}}" />
+                        <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="AccessPointNetwork" Visibility="{Binding HotSpotProvider.IsEnabled,Converter={StaticResource BooleanToVisibilityConverter}}" />
 
                         <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="Bridge" Visibility="{Binding ExternalBridgeService.Enabled,Converter={StaticResource BooleanToVisibilityConverter}}" />