Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

12 files changed, 64 insertions, 17 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
index 63b2b3f6a..6b2bbaaec 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
@@ -14,7 +14,7 @@
         <Grid.Background>
             <ImageBrush ImageSource="/Images/White-Abstract.png" Stretch="Fill"></ImageBrush>
         </Grid.Background>
-        <Viewbox Stretch="Fill" UseLayoutRounding="True" SnapsToDevicePixels="True">
+        <Viewbox Stretch="Fill">
             <Grid Width="1920" Height="1145">
                 <Grid>
                     <sharedControls:MultiTransitionControl AlwaysFade="True" TransitionType="Zoom" x:Name="TransitionControl" x:FieldModifier="public">
@@ -22,16 +22,16 @@
                             <ContentControl Tag="LoadingView">
                                 <views:LoadingView></views:LoadingView>
                             </ContentControl>
-                            <ContentControl Tag="LoginView">
+                            <ContentControl Tag="LoginView" Visibility="Hidden">
                                 <views:LoginView></views:LoginView>
                             </ContentControl>
-                            <ContentControl Tag="MainView">
+                            <ContentControl Tag="MainView" Visibility="Hidden">
                                 <views:MainView></views:MainView>
                             </ContentControl>
-                            <ContentControl Tag="ShutdownView">
+                            <ContentControl Tag="ShutdownView" Visibility="Hidden">
                                 <views:ShutdownView></views:ShutdownView>
                             </ContentControl>
-                            <ContentControl Tag="UpdateView">
+                            <ContentControl Tag="UpdateView" Visibility="Hidden">
                                 <views:UpdateView></views:UpdateView>
                             </ContentControl>
                         </sharedControls:MultiTransitionControl.Controls>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
index 36ee95f10..c4d9b4a28 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
@@ -10,7 +10,9 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Media;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
@@ -30,6 +32,8 @@ namespace Tango.MachineStudio.UI
 
         public MainWindow()
         {
+            //Timeline.DesiredFrameRateProperty.OverrideMetadata(typeof(Timeline), new FrameworkPropertyMetadata { DefaultValue = 40 });
+
             try
             {
                 InitializeComponent();
@@ -42,6 +46,15 @@ namespace Tango.MachineStudio.UI
             {
                 LogManager.Log(ex);
             }
+
+            this.Loaded += MainWindow_Loaded;
+        }
+
+        private void MainWindow_Loaded(object sender, RoutedEventArgs e)
+        {
+            //HwndSource hwndSource = PresentationSource.FromVisual(this) as HwndSource;
+            //HwndTarget hwndTarget = hwndSource.CompositionTarget;
+            //hwndTarget.RenderMode = RenderMode.SoftwareOnly;
         }
 
         private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 52bd44239..6fc530627 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -30,7 +30,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -371,6 +371,10 @@
       <Project>{5d39c1e1-3ecd-4634-bd1b-2bcf71c54a15}</Project>
       <Name>Tango.MachineStudio.Technician</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules\Tango.MachineStudio.UsersAndRoles\Tango.MachineStudio.UsersAndRoles.csproj">
+      <Project>{88028f14-0028-4ded-b119-19b8ee23cf32}</Project>
+      <Name>Tango.MachineStudio.UsersAndRoles</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Tango.MachineStudio.Common\Tango.MachineStudio.Common.csproj">
       <Project>{cb0b0aa2-bb24-4bca-a720-45e397684e12}</Project>
       <Name>Tango.MachineStudio.Common</Name>
@@ -407,7 +411,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>$(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Machine Studio.lnk"
+    <PostBuildEvent>if $(ConfigurationName) == Debug $(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Machine Studio.lnk"
 
 RD /S /Q "$(TargetDir)cs\"
 RD /S /Q "$(TargetDir)da\"
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
index 7d83fa032..9ee8471ec 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -28,6 +28,14 @@ namespace Tango.MachineStudio.UI.ViewModels
         private LogManager logManager = LogManager.Default;
         public IStudioApplicationManager ApplicationManager { get; set; }
 
+        private bool _isLoading;
+
+        public bool IsLoading
+        {
+            get { return _isLoading; }
+            set { _isLoading = value; RaisePropertyChangedAuto(); }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LoadingViewVM"/> class.
         /// </summary>
@@ -48,6 +56,8 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// </summary>
         private void Load()
         {
+            IsLoading = true;
+
             ThreadsHelper.StartStaThread(() =>
             {
                 try
@@ -57,6 +67,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                     {
                         _studioModuleLoader.LoadModules();
                         _navigationManager.NavigateTo(NavigationView.LoginView);
+                        IsLoading = false;
                     });
                 }
                 catch (Exception ex)
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
index 23be8d274..4fcebe3dd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -49,7 +49,6 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             Scanner = scanner;
             ConnectCommand = new RelayCommand(Connect,(x) => SelectedMachine != null);
-            Scanner.Start();
         }
 
         /// <summary>
@@ -59,10 +58,17 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             if (SelectedMachine != null)
             {
+                Scanner.Stop();
                 Accept();
             }
         }
 
+        protected override void Cancel()
+        {
+            Scanner.Stop();
+            base.Cancel();
+        }
+
         /// <summary>
         /// Called when the dialog has been shown.
         /// </summary>
@@ -70,6 +76,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             base.OnShow();
             Scanner.AvailableMachines.Clear();
+            Scanner.Start();
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ShutdownViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ShutdownViewVM.cs
index ed771f00a..92e0eb9b5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ShutdownViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ShutdownViewVM.cs
@@ -3,13 +3,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.SharedUI;
 
 namespace Tango.MachineStudio.UI.ViewModels
 {
     /// <summary>
     /// Represents the Machine Studio shutdown view, view model.
     /// </summary>
-    public class ShutdownViewVM
+    public class ShutdownViewVM : ViewModel
     {
+
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
index 5f65100df..91fc11a22 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
@@ -15,7 +15,7 @@
                     <TextBlock FontSize="70" Foreground="{StaticResource AccentColorBrush}">Machine Studio</TextBlock>
                 </StackPanel>
                 <TextBlock HorizontalAlignment="Right" FontSize="18" Margin="0 0 -50 0" Foreground="{StaticResource AccentColorBrush}">Twine Solutions</TextBlock>
-                <mahapps:ProgressRing Margin="20 60 20 40" Width="80" Height="80"></mahapps:ProgressRing>
+                <mahapps:ProgressRing Margin="20 60 20 40" Width="80" Height="80" IsActive="{Binding IsLoading}"></mahapps:ProgressRing>
                 <TextBlock HorizontalAlignment="Center" FontSize="18" FontStyle="Italic">Loading, please wait...</TextBlock>
             </StackPanel>
         </Grid>
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 a4256436c..8e6fa36f5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -48,16 +48,19 @@
                             <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="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 Text="{Binding AuthenticationProvider.CurrentUser.Roles[0].Name}">
                                             <Run.ToolTip>
                                                 <ItemsControl ItemsSource="{Binding AuthenticationProvider.CurrentUser.Roles}">
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
-                                                            <TextBlock Text="{Binding Name}"></TextBlock>
+                                                            <StackPanel Orientation="Horizontal" Margin="2">
+                                                                <materialDesign:PackIcon Kind="AccountKey" Width="16" Height="16" />
+                                                                <TextBlock Margin="5 0 0 0" Text="{Binding Name}"></TextBlock>
+                                                             </StackPanel>
                                                         </DataTemplate>
                                                     </ItemsControl.ItemTemplate>
                                                 </ItemsControl>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
index c40904173..e0ae60b87 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
@@ -76,6 +76,7 @@ namespace Tango.MachineStudio.UI.Views
                         {
                             Tag = module.Name,
                             Content = grid,
+                            Visibility = Visibility.Hidden,
                         });
 
                         _loader.UserModules.Add(module);
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml
index dd86238ce..cc1060b2a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml
@@ -15,7 +15,7 @@
                     <TextBlock FontSize="70" Foreground="Gray">Machine Studio</TextBlock>
                 </StackPanel>
                 <TextBlock HorizontalAlignment="Right" FontSize="18" Margin="0 0 -50 0" Foreground="Gray">Twine Solutions</TextBlock>
-                <mahapps:ProgressRing Margin="20 60 20 40" Width="80" Height="80" Foreground="Gray"></mahapps:ProgressRing>
+                <mahapps:ProgressRing x:Name="progressRing" IsActive="False" Margin="20 60 20 40" Width="80" Height="80" Foreground="Gray"></mahapps:ProgressRing>
                 <TextBlock HorizontalAlignment="Center" FontSize="18" FontStyle="Italic" Foreground="Gray">Shutting Down, please wait...</TextBlock>
             </StackPanel>
         </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs
index e1d49aec0..afe6d3800 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs
@@ -12,17 +12,23 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using static Tango.SharedUI.Controls.MultiTransitionControl;
 
 namespace Tango.MachineStudio.UI.Views
 {
     /// <summary>
     /// Interaction logic for ShutdownView.xaml
     /// </summary>
-    public partial class ShutdownView : UserControl
+    public partial class ShutdownView : UserControl, ITransitionView
     {
         public ShutdownView()
         {
             InitializeComponent();
         }
+
+        public void OnTransitionCompleted()
+        {
+            progressRing.IsActive = true;
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
index dabbaab94..e34cdb83b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
@@ -16,9 +16,9 @@
         <Grid MaxWidth="1200" MaxHeight="700">
             <DockPanel>
                 <Grid DockPanel.Dock="Top" HorizontalAlignment="Center">
-                    <Grid.Effect>
+                    <!--<Grid.Effect>
                         <DropShadowEffect BlurRadius="200" ShadowDepth="0" Opacity="0.5" />
-                    </Grid.Effect>
+                    </Grid.Effect>-->
                     <StackPanel Orientation="Horizontal">
                         <Image Source="/Images/update.png" Width="100" />
                         <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="70">Update Center</TextBlock>