From de3279201f9fd0aea3dc4a4af3b916b0778f538f Mon Sep 17 00:00:00 2001
From: Michael Becker <alcexhim@gmail.com>
Date: Sat, 28 Dec 2019 21:15:51 -0500
Subject: [PATCH] show the DataFormat custom options dialog when selecting a
 DataFormat

---
 .../Dialogs/DocumentPropertiesDialog.cs       | 60 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
index f014cd82..3fba2572 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
@@ -27,6 +27,7 @@ using MBS.Framework.UserInterface.Controls;
 using MBS.Framework.UserInterface.Drawing;
 
 using MBS.Framework.Drawing;
+using System.ComponentModel;
 
 namespace UniversalEditor.UserInterface.Dialogs
 {
@@ -313,10 +314,41 @@ namespace UniversalEditor.UserInterface.Dialogs
 			dlg.ShowDialog();
 		}
 
+		protected override void OnClosing(CancelEventArgs e)
+		{
+			base.OnClosing(e);
+
+		}
+
 		private void dlgDataFormat_SelectionChanged(object sender, EventArgs e)
 		{
 			GenericBrowserPopup<DataFormat, DataFormatReference> dlg = (sender as GenericBrowserPopup<DataFormat, DataFormatReference>);
-			DataFormat = dlg.SelectedObject;
+
+			DataFormat df = dlg.SelectedObject;
+			if (df != null)
+			{
+				switch (Mode)
+				{
+					case DocumentPropertiesDialogMode.Open:
+					{
+						if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref df, CustomOptionDialogType.Import))
+						{
+							return;
+						}
+						break;
+					}
+					case DocumentPropertiesDialogMode.Save:
+					{
+						if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref df, CustomOptionDialogType.Export))
+						{
+							return;
+						}
+						break;
+					}
+				}
+			}
+			DataFormat = df;
+
 			RefreshButtons();
 		}
 		private void dlgAccessor_SelectionChanged(object sender, EventArgs e)
@@ -362,6 +394,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 
 			Accessor = acc;
 
+			DataFormat df = null;
 			// pro feature: if we find a better OM/DF, maybe ask the user "do you wish to change object model to ___ ?" before doing so
 			if (Mode == DocumentPropertiesDialogMode.Open)
 			{
@@ -380,7 +413,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 					{
 						if (dfrs.Count > 0)
 						{
-							DataFormat = dfrs[0].Create();
+							df = dfrs[0].Create();
 						}
 					}
 					else
@@ -389,8 +422,29 @@ namespace UniversalEditor.UserInterface.Dialogs
 				}
 				if (ObjectModel == null)
 				{
-					if (DataFormat != null)
+					if (df != null)
 					{
+						switch (Mode)
+						{
+							case DocumentPropertiesDialogMode.Open:
+							{
+								if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref df, CustomOptionDialogType.Import))
+								{
+									return;
+								}
+								break;
+							}
+							case DocumentPropertiesDialogMode.Save:
+							{
+								if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref df, CustomOptionDialogType.Export))
+								{
+									return;
+								}
+								break;
+							}
+						}
+						DataFormat = df;
+
 						ObjectModelReference[] omrs = UniversalEditor.Common.Reflection.GetAvailableObjectModels(DataFormat.MakeReference());
 						if (omrs.Length > 0)
 						{