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

1 files changed, 18 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/ViewModels/MainViewVM.cs
index 3df46ba6f..90644cf1a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/ViewModels/MainViewVM.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
+using Tango.Core.DI;
 using Tango.Core.IO;
 using Tango.Integration.ExternalBridge;
 using Tango.Integration.Storage;
@@ -79,6 +80,14 @@ namespace Tango.MachineStudio.Storage.ViewModels
 
         public RelayCommand ActivateVersionCommand { get; set; }
 
+        public RelayCommand GenerateTfpCommand { get; set; }
+
+        public MainViewVM()
+        {
+
+        }
+
+        [TangoInject]
         public MainViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IFirmwareUpgrader firmwareUpgrader)
         {
             _applicationManager = applicationManager;
@@ -102,6 +111,7 @@ namespace Tango.MachineStudio.Storage.ViewModels
             UploadVersionCommand = new RelayCommand(UploadVersion, () => StorageManager != null && StorageManager.CurrentFolder != null);
             ValidateVersionCommand = new RelayCommand(ValidateVersion, () => StorageManager != null && StorageManager.CurrentFolder != null);
             ActivateVersionCommand = new RelayCommand(ActivateVersion, () => StorageManager != null && StorageManager.CurrentFolder != null);
+            GenerateTfpCommand = new RelayCommand(GenerateTFP);
         }
 
         private void UploadFile()
@@ -398,5 +408,13 @@ namespace Tango.MachineStudio.Storage.ViewModels
                 }
             }
         }
+
+        private void GenerateTFP()
+        {
+            Tango.FirmwarePackageGenerator.MainWindow fWindow = new FirmwarePackageGenerator.MainWindow();
+            fWindow.Topmost = true;
+            fWindow.Show();
+            _applicationManager.RegisterOpenedWindow(fWindow);
+        }
     }
 }