MERGE!

1 files changed, 12 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioModuleBase.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioModuleBase.cs
index 5c594ab70..158661309 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioModuleBase.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioModuleBase.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media.Imaging;
+using Tango.Core;
 using Tango.Integration.Observables;
 
 namespace Tango.MachineStudio.Common
@@ -13,7 +14,7 @@ namespace Tango.MachineStudio.Common
     /// Represents a base class for studio modules.
     /// </summary>
     /// <seealso cref="Tango.MachineStudio.Common.IStudioModule" />
-    public abstract class StudioModuleBase : IStudioModule
+    public abstract class StudioModuleBase : ExtendedObject, IStudioModule
     {
         private bool _isInitialized;
         private bool _isLoaded;
@@ -79,6 +80,16 @@ namespace Tango.MachineStudio.Common
             }
         }
 
+        private bool _inNewWindow;
+        /// <summary>
+        /// Gets or sets a value indicating whether this module is shown under a new window.
+        /// </summary>
+        public bool InNewWindow
+        {
+            get { return _inNewWindow; }
+            set { _inNewWindow = value; RaisePropertyChangedAuto(); }
+        }
+
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>