2 files changed, 64 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 679ba5ff3..503532223 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -7,6 +7,9 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
 using Tango.Core.Commands;
 using Tango.Integration.Services;
 using Tango.Logging;
@@ -18,8 +21,10 @@ using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.MachineStudio.UI.SupervisingController;
 using Tango.MachineStudio.UI.Views;
+using Tango.MachineStudio.UI.Windows;
 using Tango.PMR.Stubs;
 using Tango.SharedUI;
+using Tango.SharedUI.Helpers;
 using Tango.Transport.Adapters;
 
 namespace Tango.MachineStudio.UI.ViewModels
@@ -69,6 +74,11 @@ namespace Tango.MachineStudio.UI.ViewModels
         public RelayCommand<IStudioModule> StartModuleCommand { get; set; }
 
         /// <summary>
+        /// Gets or sets the open module in window command.
+        /// </summary>
+        public RelayCommand<IStudioModule> OpenModuleInWindowCommand { get; set; }
+
+        /// <summary>
         /// Gets or sets the home command.
         /// </summary>
         public RelayCommand HomeCommand { get; set; }
@@ -157,6 +167,7 @@ namespace Tango.MachineStudio.UI.ViewModels
             ConnectCommand = new RelayCommand(ConnectToMachine);
             SignoutCommand = new RelayCommand(SignOut);
             DisconnectCommand = new RelayCommand(DisconnectFromMachine, (x) => ApplicationManager.IsMachineConnected && !_isDisconnecting);
+            OpenModuleInWindowCommand = new RelayCommand<IStudioModule>(OpenModuleInWindow);
         }
 
         /// <summary>
@@ -302,5 +313,28 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             base.OnViewAttached();
         }
+
+        private void OpenModuleInWindow(IStudioModule module)
+        {
+            module.InNewWindow = true;
+
+            var parent = (MainView.Self as MainView).TransitionControl.Controls.SingleOrDefault(x => x.Tag.ToString() == module.Name).Content as Grid;
+
+            var view = parent.Children[0] as FrameworkElement;
+            parent.Children.Remove(view);
+
+            ModuleWindowVM vm = new ModuleWindowVM(module, parent);
+            ModuleWindow window = new ModuleWindow(this, vm, view);
+
+            window.Closing += (x, y) => 
+            {
+                window.grid.Children.Remove(view);
+                parent.Children.Add(view);
+                module.InNewWindow = false;
+            };
+
+            window.Owner = MainWindow.Instance;
+            window.Show();
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ModuleWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ModuleWindowVM.cs
new file mode 100644
index 000000000..a5b737b59
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ModuleWindowVM.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using Tango.MachineStudio.Common;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.UI.ViewModels
+{
+    public class ModuleWindowVM : ViewModel
+    {
+        private IStudioModule _module;
+
+        public IStudioModule Module
+        {
+            get { return _module; }
+            set { _module = value; RaisePropertyChangedAuto(); }
+        }
+
+        public Grid Parent { get; set; }
+
+        public ModuleWindowVM(IStudioModule module, Grid parent)
+        {
+            Parent = parent;
+            Module = module;
+        }
+    }
+}