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

5 files changed, 29 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/ExtensionMethods/CommonDialogExtensions.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/ExtensionMethods/CommonDialogExtensions.cs
new file mode 100644
index 000000000..886ccdd1e
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/ExtensionMethods/CommonDialogExtensions.cs
@@ -0,0 +1,15 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+public static class CommonDialogExtensions
+{
+    public static bool ShowDialogCenter(this CommonDialog dialog)
+    {
+        return dialog.ShowDialog(Application.Current.MainWindow).Value;
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioModule.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioModule.cs
index 1107222ef..ee01def9e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioModule.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media.Imaging;
 using Tango.BL.Entities;
+using Tango.BL.Enumerations;
 
 namespace Tango.MachineStudio.Common
 {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs
index 79bcc9bf9..ce60715a8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs
@@ -102,6 +102,17 @@ namespace Tango.MachineStudio.Common.Notifications
         void ShowModalDialog<VM, View>(VM vm, Action<VM> onAccept, Action onCancel) where View : FrameworkElement where VM : DialogViewVM;
 
         /// <summary>
+        ///  Shows the specified view with the specified view model as it's data context.
+        /// </summary>
+        /// <typeparam name="VM">The type of the mm.</typeparam>
+        /// <typeparam name="View">The type of the view.</typeparam>
+        /// <param name="vm">The view model.</param>
+        /// <param name="view">The view.</param>
+        /// <param name="onAccept">The accept action.</param>
+        /// <param name="onCancel">The cancel action.</param>
+        void ShowModalDialog<VM, View>(VM vm, View view, Action<VM> onAccept, Action onCancel) where View : FrameworkElement where VM : DialogViewVM;
+
+        /// <summary>
         /// Creates a new view by a naming convention of the specified view model type.
         /// </summary>
         /// <typeparam name="VM">The type of the view model.</typeparam>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioModuleBase.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioModuleBase.cs
index 3d17b245f..11da53c6c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioModuleBase.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioModuleBase.cs
@@ -7,6 +7,7 @@ using System.Windows;
 using System.Windows.Media.Imaging;
 using Tango.Core;
 using Tango.BL.Entities;
+using Tango.BL.Enumerations;
 
 namespace Tango.MachineStudio.Common
 {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index bc102a017..457646223 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -87,6 +87,7 @@
     <Compile Include="Converters\SecondsToGraphPointsConverter.cs" />
     <Compile Include="Diagnostics\DefaultDiagnosticsFrameProvider.cs" />
     <Compile Include="Diagnostics\IDiagnosticsFrameProvider.cs" />
+    <Compile Include="ExtensionMethods\CommonDialogExtensions.cs" />
     <Compile Include="Helpers\GraphsHelper.cs" />
     <Compile Include="Notifications\BarItem.cs" />
     <Compile Include="Notifications\DialogViewVM.cs" />