Changeset 13338 for branches/RefactorPluginInfrastructure-2522/HeuristicLab.MainForm.WindowsForms/3.3

Timestamp:

11/23/15 16:14:30 (9 years ago)

Author:

gkronber

Message:

#2522:

• moved UI components out of HeuristicLab.PluginInfrastructure -> HeuristicLab.PluginInfrastructure.UI
• moved ErrorDialog to HeuristicLab.MainForm.WindowsForms
• moved ErrorHandling (for building an error message string) to HeuristicLab.Common
• Changed exception handlers in Views to use MainForm.ShowError()
• Changed usages for ErrorDialog in non-UI components to throw exceptions instead.

Location:

branches/RefactorPluginInfrastructure-2522/HeuristicLab.MainForm.WindowsForms/3.3

Files:

• Dialogs/ErrorDialog.Designer.cs (moved) (moved from branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/ErrorHandling/ErrorDialog.Designer.cs) (3 diffs)
• Dialogs/ErrorDialog.cs (moved) (moved from branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/ErrorHandling/ErrorDialog.cs) (1 diff)
• HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) (1 diff)
• MainForms/MainForm.cs (modified) (2 diffs)

branches/RefactorPluginInfrastructure-2522/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/ErrorDialog.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.PluginInfrastructure {
+using System.Drawing;
+
+namespace HeuristicLab.MainForm.WindowsForms {
   partial class ErrorDialog {
     /// <summary>
@@ -68 +70 @@
       // iconLabel
       // 
-      this.iconLabel.Image = global::HeuristicLab.PluginInfrastructure.Resources.Error;
+      this.iconLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Error;
       this.iconLabel.Location = new System.Drawing.Point(12, 9);
       this.iconLabel.Name = "iconLabel";
@@ -155 +157 @@
       this.Controls.Add(this.iconLabel);
       this.Controls.Add(this.okButton);
-      this.Icon = global::HeuristicLab.PluginInfrastructure.Resources.ErrorIcon;
+      // this.Icon = HeuristicLab.Common.Resources.VSImageLibrary.Error; // TODO
       this.MaximizeBox = false;
       this.MinimizeBox = false;

branches/RefactorPluginInfrastructure-2522/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/ErrorDialog.cs

@@ -22 +22 @@
 using System;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 
-namespace HeuristicLab.PluginInfrastructure {
+namespace HeuristicLab.MainForm.WindowsForms {
   public partial class ErrorDialog : Form {
     public ErrorDialog() {

branches/RefactorPluginInfrastructure-2522/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj

@@ -144 +144 @@
       <DependentUpon>DefineArithmeticProgressionDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="Dialogs\ErrorDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\ErrorDialog.Designer.cs">
+      <DependentUpon>ErrorDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="Dialogs\InfoBox.cs">
       <SubType>Form</SubType>

branches/RefactorPluginInfrastructure-2522/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -556 +556 @@
         ((IActionUserInterfaceItem)item.Tag).Execute();
       } catch (Exception ex) {
-        ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, ex);
+        ShowError(ex.Message, ex);
       }
     }
@@ -600 +600 @@
     }
     #endregion
+
+    #region Error Handling
+    public void ShowError(string message, Exception exception) {
+      ShowErrorDialog(this, message, exception);
+    }
+    private void ShowErrorDialog(Control owner, string message, Exception exception) {
+      if (owner == null) throw new ArgumentNullException("owner");
+      if (owner.InvokeRequired) {
+        owner.Invoke(new Action<Control, string, Exception>(ShowErrorDialog), owner, message, exception);
+      } else {
+        using (ErrorDialog dialog = new ErrorDialog(message, exception)) {
+          dialog.ShowDialog(owner);
+        }
+      }
+    }
+    #endregion
   }
 }