Removing ErrorDetail - using from XTB instead

rappen · Feb 24, 2022 · 51852d0 · 51852d0
1 parent b637163
commit 51852d0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 673 deletions.
diff --git a/FetchXmlBuilder/FetchXmlBuilder.cs b/FetchXmlBuilder/FetchXmlBuilder.cs
@@ -118,7 +118,7 @@ private void Error_UnhandledException(object sender, UnhandledExceptionEventArgs
             if (e.ExceptionObject is Exception ex)
             {
                 LogError($"Unhandling error: {ex}");
-                ErrorDetail.ShowDialog(this, e.ExceptionObject as Exception);
+                ShowErrorDialog(e.ExceptionObject as Exception);
             }
             else
             {
@@ -818,7 +818,7 @@ internal void LoadViews(Action viewsLoaded)
                     EnableControls(true);
                     if (completedargs.Error != null)
                     {
-                        ErrorDetail.ShowDialog(this, completedargs.Error, "Loading Views");
+                        ShowErrorDialog(completedargs.Error, "Loading Views");
                     }
                     else
                     {
@@ -930,7 +930,7 @@ internal void QueryExpressionToFetchXml(string query)
                 {
                     if (completedargs.Error != null)
                     {
-                        ErrorDetail.ShowDialog(this, completedargs.Error, "Parse QueryExpression");
+                        ShowErrorDialog(completedargs.Error, "Parse QueryExpression");
                     }
                     else if (completedargs.Result is string)
                     {
@@ -1075,7 +1075,7 @@ private void ExecuteFetch(string fetch)
                     working = false;
                     if (completedargs.Error != null)
                     {
-                        ErrorDetail.ShowDialog(this, completedargs.Error, "Execute Fetch", fetch);
+                        ShowErrorDialog(completedargs.Error, "Execute Fetch", fetch);
                     }
                     else if (completedargs.Result is string)
                     {
@@ -1254,7 +1254,7 @@ private void LoadEntities()
                 {
                     if (completedargs.Error != null)
                     {
-                        ErrorDetail.ShowDialog(this, completedargs.Error, "Load Entities");
+                        ShowErrorDialog(completedargs.Error, "Load Entities");
                     }
                     else
                     {
@@ -1616,7 +1616,7 @@ private void RetrieveMultiple(string fetch)
                     if (completedargs.Error != null)
                     {
                         LogError("RetrieveMultiple error: {0}", completedargs.Error);
-                        ErrorDetail.ShowDialog(this, completedargs.Error, "Executing FetchXML", fetch);
+                        ShowErrorDialog(completedargs.Error, "Executing FetchXML", fetch);
                     }
                     else if (completedargs.Cancelled)
                     {
@@ -1821,7 +1821,7 @@ private void SaveML()
                 {
                     if (completedargs.Error != null)
                     {
-                        ErrorDetail.ShowDialog(this, completedargs.Error, "Save Marketing List");
+                        ShowErrorDialog(completedargs.Error, "Save Marketing List");
                     }
                     else
                     {
@@ -1925,7 +1925,7 @@ private void SaveView(bool saveas)
                 {
                     if (completedargs.Error != null)
                     {
-                        ErrorDetail.ShowDialog(this, completedargs.Error, "Save view");
+                        ShowErrorDialog(completedargs.Error, "Save view");
                     }
                     else
                     {

diff --git a/FetchXmlBuilder/FetchXmlBuilder.csproj b/FetchXmlBuilder/FetchXmlBuilder.csproj
@@ -352,12 +352,6 @@
     <Compile Include="DockControls\ResultGrid.Designer.cs">
       <DependentUpon>ResultGrid.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\ErrorDetail.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\ErrorDetail.Designer.cs">
-      <DependentUpon>ErrorDetail.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\SelectAttributesDialog.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -469,9 +463,6 @@
     <EmbeddedResource Include="DockControls\ResultGrid.resx">
       <DependentUpon>ResultGrid.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\ErrorDetail.resx">
-      <DependentUpon>ErrorDetail.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\SelectAttributesDialog.resx">
       <DependentUpon>SelectAttributesDialog.cs</DependentUpon>
     </EmbeddedResource>