Changeset 2443 for branches/Mainform refactoring/HeuristicLab.MainForm.WindowsForms/3.2/SingleDocumentMainForm.cs

Timestamp:

10/20/09 15:34:02 (15 years ago)

Author:

mkommend

Message:

refactored mainform (ticket #771)

File:

• branches/Mainform refactoring/HeuristicLab.MainForm.WindowsForms/3.2/SingleDocumentMainForm.cs (modified) (1 diff)

branches/Mainform refactoring/HeuristicLab.MainForm.WindowsForms/3.2/SingleDocumentMainForm.cs

@@ -42 +42 @@
     }
 
-    public override void ShowView(IView view) {
-      if (InvokeRequired) Invoke((Action<IView>)ShowView, view);
+    public override bool ShowView(IView view) {
+      if (InvokeRequired) return (bool)Invoke((Func<IView, bool>)ShowView, view);
       else {
-        if (views.Contains(view)) {
-          DocumentForm documentForm = FindForm(view);
-          if (documentForm != null)
-            documentForm.Focus();
-        } else {
-          base.ShowView(view);
-          DocumentForm form = new DocumentForm(view);
-          form.ShowInTaskbar = true;
-          form.Activated += new EventHandler(DocumentFormActivated);
-          form.GotFocus += new EventHandler(DocumentFormActivated);
-          form.FormClosing += new FormClosingEventHandler(view.OnClosing);
-          form.FormClosed += new FormClosedEventHandler(view.OnClosed);
-          form.FormClosed += new FormClosedEventHandler(DocumentFormClosed);
-          foreach (IUserInterfaceItem item in UserInterfaceItems)
-            view.Changed += new EventHandler(item.ViewChanged);
-          form.Show(this);
+        bool ret = base.ShowView(view);
+        if (ret)
+          GetForm(view).Show(this);
+        else {
+          GetForm(view).Visible = true;
+          GetForm(view).Activate();
         }
+        return ret;
       }
     }
 
-    public override void CloseView(IView view) {
-      if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
-      else {
-        DocumentForm documentForm = FindForm(view);
-        if (documentForm != null)
-          documentForm.Close();
-      }
-    }
-
-    private void DocumentFormClosed(object sender, FormClosedEventArgs e) {
-      DocumentForm form = (DocumentForm)sender;
-      ViewClosed(form.View);
-      form.Activated -= new EventHandler(DocumentFormActivated);
-      form.GotFocus -= new EventHandler(DocumentFormActivated);
-      form.FormClosing -= new FormClosingEventHandler(form.View.OnClosing);
-      form.FormClosed -= new FormClosedEventHandler(form.View.OnClosed);
-      form.FormClosed -= new FormClosedEventHandler(DocumentFormClosed);
-      foreach (IUserInterfaceItem item in UserInterfaceItems)
-        form.View.Changed -= new EventHandler(item.ViewChanged);
-    }
-
-    private void DocumentFormActivated(object sender, EventArgs e) {
-      base.ActiveView = ((DocumentForm)sender).View;
-    }
-
-    protected DocumentForm FindForm(IView view) {
-      IEnumerable<DocumentForm> forms =
-        from df in OwnedForms
-        where ((DocumentForm)df).View == view
-        select (DocumentForm)df;
-      if (forms.Count() == 1)
-        return forms.Single();
-      return null;
+    protected override Form CreateForm(IView view) {
+      DocumentForm form = new DocumentForm(view);
+      form.ShowInTaskbar = true;
+      return form;
     }
   }