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

1 files changed, 21 insertions, 1 deletions

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 ce49d805e..d1f3cc69e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -36,7 +36,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         public IExternalBridgeClient SelectedMachine
         {
             get { return _selectedMachine; }
-            set { _selectedMachine = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+            set { _selectedMachine = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(RequiresAuthentication)); InvalidateRelayCommands(); }
         }
 
         /// <summary>
@@ -57,6 +57,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
             EnableDiagnostics = true;
             UploadHardwareConfiguration = true;
+            EnableKeepAlive = true;
             ConnectCommand = new RelayCommand(Connect, (x) => SelectedMachine != null);
         }
 
@@ -130,6 +131,17 @@ namespace Tango.MachineStudio.UI.ViewModels
             set { _uploadHardwareConfiguration = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _enableApplicationLogs;
+        /// <summary>
+        /// Gets or sets a value indicating whether to enable application logs.
+        /// </summary>
+        public bool EnableApplicationLogs
+        {
+            get { return _enableApplicationLogs; }
+            set { _enableApplicationLogs = value; RaisePropertyChangedAuto(); }
+        }
+
+
         private bool _enableKeepAlive;
         /// <summary>
         /// Gets or sets a value indicating whether to use the keep alive mechanism.
@@ -140,5 +152,13 @@ namespace Tango.MachineStudio.UI.ViewModels
             set { _enableKeepAlive = value; RaisePropertyChangedAuto(); }
         }
 
+        public bool RequiresAuthentication
+        {
+            get
+            {
+                return SelectedMachine != null && SelectedMachine is IExternalBridgeSecureClient;
+            }
+        }
+
     }
 }