Improved and optimized transport layer transporter and adapter.

2 files changed, 19 insertions, 2 deletions

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 26be2d16b..a7750b39c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -19,6 +19,8 @@ using Tango.MachineStudio.UI.TFS;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Update;
 using Tango.Core.DI;
+using Tango.Settings;
+using Tango.Core;
 
 namespace Tango.MachineStudio.UI.ViewModels
 {
@@ -37,13 +39,19 @@ namespace Tango.MachineStudio.UI.ViewModels
         public IStudioApplicationManager ApplicationManager { get; set; }
 
         private bool _isLoading;
-
         public bool IsLoading
         {
             get { return _isLoading; }
             set { _isLoading = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _status;
+        public String Status
+        {
+            get { return _status; }
+            set { _status = value; RaisePropertyChangedAuto(); }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LoadingViewVM"/> class.
         /// </summary>
@@ -52,6 +60,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// <param name="notificationProvider">The notification provider.</param>
         public LoadingViewVM(IStudioApplicationManager applicationManager, INavigationManager navigationManager, IStudioModuleLoader studioModuleLoader, INotificationProvider notificationProvider, IEventLogger eventLogger, TeamFoundationServiceExtendedClient teamFoundationClient)
         {
+            Status = "Loading, please wait...";
             _tfs = teamFoundationClient;
             _eventLogger = eventLogger;
             ApplicationManager = applicationManager;
@@ -79,6 +88,8 @@ namespace Tango.MachineStudio.UI.ViewModels
                 {
                     try
                     {
+                        Status = "Checking for critical updates...";
+
                         LogManager.Log("Checking for forced update...");
                         var service = UpdateServiceHelper.GetUpdateServiceChannel();
                         var client = service.CreateChannel();
@@ -119,17 +130,23 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                     try
                     {
+                        Status = "Connecting to Team Foundation Services...";
                         _tfs.Initialize();
+                        Thread.Sleep(500);
                     }
                     catch (Exception ex)
                     {
                         LogManager.Log(ex, "Could not initialize Team Foundation Service client.");
                     }
 
+                    Status = "Loading, please wait...";
+
                     ObservablesEntitiesAdapter.Instance.Initialize();
 
                     _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!");
 
+                    Status = "Starting application...";
+
                     InvokeUI(() =>
                     {
                         _studioModuleLoader.LoadModules();
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 91fc11a22..2a63ae00f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
@@ -16,7 +16,7 @@
                 </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" IsActive="{Binding IsLoading}"></mahapps:ProgressRing>
-                <TextBlock HorizontalAlignment="Center" FontSize="18" FontStyle="Italic">Loading, please wait...</TextBlock>
+                <TextBlock HorizontalAlignment="Center" FontSize="18" FontStyle="Italic" Text="{Binding Status,TargetNullValue='Loading, please wait...'}"></TextBlock>
             </StackPanel>
         </Grid>