Changeset 2443 for branches/Mainform refactoring/HeuristicLab.MainForm.WindowsForms

Timestamp:

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

Author:

mkommend

Message:

refactored mainform (ticket #771)

Location:

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

Files:

• DockingMainForm.cs (modified) (1 diff)
• MainFormBase.cs (modified) (5 diffs)
• MultipleDocumentMainForm.Designer.cs (modified) (1 diff)
• MultipleDocumentMainForm.cs (modified) (1 diff)
• SingleDocumentMainForm.cs (modified) (1 diff)

branches/Mainform refactoring/HeuristicLab.MainForm.WindowsForms/3.2/DockingMainForm.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)) {
-          DockForm dockform = FindForm(view);
-          if (dockform != null)
-            dockform.Activate();
-        } else {
-          base.ShowView(view);
-          DockContent dockForm = new DockForm(view);
-          dockForm.Activated += new EventHandler(DockFormActivated);
-          dockForm.GotFocus += new EventHandler(DockFormActivated);
-          dockForm.FormClosing += new FormClosingEventHandler(view.OnClosing);
-          dockForm.FormClosed += new FormClosedEventHandler(view.OnClosed);
-          dockForm.FormClosed += new FormClosedEventHandler(DockFormClosed);
-          foreach (IUserInterfaceItem item in UserInterfaceItems)
-            view.Changed += new EventHandler(item.ViewChanged);
-          dockForm.Show(dockPanel);
-        }
+        bool ret = base.ShowView(view);
+        if (ret)
+          ((DockForm)GetForm(view)).Show(dockPanel);
+        else
+          ((DockForm)GetForm(view)).Activate();
+        return ret;
+      }
+    }
+    public override void HideView(IView view) {
+      if (InvokeRequired) Invoke((Action<IView>)HideView, view);
+      else {
+        Form form = base.GetForm(view);
+        if (form != null)
+          ((DockForm)form).Hide();
       }
     }
 
-    public override void CloseView(IView view) {
-      if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
-      else {
-        DockForm dockform = FindForm(view);
-        if (dockform != null)
-          dockform.Close();
-      }
+    protected override Form CreateForm(IView view) {
+      return new DockForm(view);
     }
 
-    private void DockFormClosed(object sender, FormClosedEventArgs e) {
-      DockForm dockForm = (DockForm)sender;
-      ViewClosed(dockForm.View);
-      dockForm.Activated -= new EventHandler(DockFormActivated);
-      dockForm.GotFocus -= new EventHandler(DockFormActivated);
-      dockForm.FormClosing -= new FormClosingEventHandler(dockForm.View.OnClosing);
-      dockForm.FormClosed -= new FormClosedEventHandler(dockForm.View.OnClosed);
-      dockForm.FormClosed -= new FormClosedEventHandler(DockFormClosed);
-      foreach (IUserInterfaceItem item in UserInterfaceItems)
-        dockForm.View.Changed -= new EventHandler(item.ViewChanged);
-    }
-
-    private void DockFormActivated(object sender, EventArgs e) {
-      base.ActiveView = ((DockForm)sender).View;
-    }
-
-    protected DockForm FindForm(IView view) {
-      IEnumerable<DockForm> dockforms;
-
-      dockforms = from df in dockPanel.Documents
-                  where ((DockForm)df).View == view
-                  select (DockForm)df;
-      if (dockforms.Count() == 1)
-        return dockforms.Single();
-
-      dockforms = from fw in dockPanel.FloatWindows
-                  from np in fw.NestedPanes
-                  from dc in np.Contents
-                  where ((DockForm)dc).View == view
-                  select (DockForm)dc;
-      if (dockforms.Count() == 1)
-        return dockforms.Single();
-
-      dockforms = from dw in dockPanel.DockWindows
-                  from np in dw.NestedPanes
-                  from dc in np.Contents
-                  where ((DockForm)dc).View == view
-                  select (DockForm)dc;
-      if (dockforms.Count() == 1)
-        return dockforms.Single();
-
-      return null;
-    }
   }
 }

branches/Mainform refactoring/HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.cs ¶

@@ -36 +36 @@
       : base() {
       InitializeComponent();
-      this.views = new List<IView>();
+      this.views = new Dictionary<IView, Form>();
       this.userInterfaceItems = new List<IUserInterfaceItem>();
       MainFormManager.RegisterMainForm(this);
@@ -77 +77 @@
     }
 
-    protected List<IView> views;
+    private Dictionary<IView, Form> views;
     public IEnumerable<IView> Views {
-      get { return views; }
+      get { return views.Keys; }
+    }
+
+    public Form GetForm(IView view) {
+      if (views.ContainsKey(view))
+        return views[view];
+      return null;
     }
 
@@ -117 +123 @@
     protected virtual void OnMainFormChanged() {
       if (InvokeRequired)
-        Invoke((MethodInvoker)FireMainFormChanged);
+        Invoke((MethodInvoker)OnMainFormChanged);
       else if (Changed != null)
         Changed(this, new EventArgs());
     }
 
-    public virtual void ShowView(IView view) {
-      if (!views.Contains(view)) {
-        views.Add(view);
-      }
-      this.ActiveView = view;
-    }
-
-    public virtual void CloseView(IView view) {
+    protected virtual Form CreateForm(IView view) {
+      throw new NotImplementedException("CreateForm must be implemented in subclasses of MainFormBase.");
+    }
+
+    public virtual bool ShowView(IView view) {
+      if (InvokeRequired) return (bool)Invoke((Func<IView, bool>)ShowView, view);
+      else {
+        if (!views.Keys.Contains(view)) {
+          Form form = CreateForm(view);
+          views[view] = form;
+          form.Activated += new EventHandler(FormActivated);
+          form.GotFocus += new EventHandler(FormActivated);
+          form.FormClosing += new FormClosingEventHandler(view.OnClosing);
+          form.FormClosed += new FormClosedEventHandler(view.OnClosed);
+          form.FormClosed += new FormClosedEventHandler(ChildFormClosed);
+          foreach (IUserInterfaceItem item in UserInterfaceItems)
+            view.Changed += new EventHandler(item.ViewChanged);
+          return true;
+        } else 
+          return false;
+      }
+    }
+
+    public virtual void HideView(IView view) {
+      if (InvokeRequired) Invoke((Action<IView>)HideView, view);
+      else {
+        if (views.ContainsKey(view))
+          views[view].Hide();
+      }
+    }
+
+    public void CloseView(IView view) {
+      if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
+      else {
+        if (views.ContainsKey(view))
+          views[view].Close();
+      }
     }
 
     public virtual void CloseAllViews() {
-      foreach (IView view in views.ToArray())
+      foreach (IView view in views.Keys.ToArray())
         CloseView(view);
     }
-
-    protected virtual void ViewClosed(IView view) {
+    #endregion
+
+    #region events
+    private void ChildFormClosed(object sender, FormClosedEventArgs e) {
+      Form form = (Form)sender;
+      IView view = GetViewForForm(form);
+
+      form.Activated -= new EventHandler(FormActivated);
+      form.GotFocus -= new EventHandler(FormActivated);
+      form.FormClosing -= new FormClosingEventHandler(view.OnClosing);
+      form.FormClosed -= new FormClosedEventHandler(view.OnClosed);
+      form.FormClosed -= new FormClosedEventHandler(ChildFormClosed);
+      foreach (IUserInterfaceItem item in UserInterfaceItems)
+        view.Changed -= new EventHandler(item.ViewChanged);
+
       views.Remove(view);
       if (ActiveView == view)
         ActiveView = null;
+    }
+
+    private void FormActivated(object sender, EventArgs e) {
+      this.ActiveView = GetViewForForm((Form)sender);
+    }
+
+    private IView GetViewForForm(Form form) {
+      return views.Where(x => x.Value == form).Single().Key;
     }
     #endregion
@@ -189 +245 @@
     }
 
-    private void InsertItem(IEnumerable<string> structure, Type t,ToolStripItem item, ToolStripItemCollection parentItems) {
+    private void InsertItem(IEnumerable<string> structure, Type t, ToolStripItem item, ToolStripItemCollection parentItems) {
       ToolStripDropDownItem parent = null;
       foreach (string s in structure) {
@@ -195 +251 @@
           parent = (ToolStripDropDownItem)parentItems[s];
         else {
-          parent = (ToolStripDropDownItem)Activator.CreateInstance(t, s,null,null,s); ;
+          parent = (ToolStripDropDownItem)Activator.CreateInstance(t, s, null, null, s); ;
           parentItems.Add(parent);
         }

branches/Mainform refactoring/HeuristicLab.MainForm.WindowsForms/3.2/MultipleDocumentMainForm.Designer.cs ¶

@@ -14 +14 @@
         components.Dispose();
       }
-      this.MdiChildActivate -= new System.EventHandler(MultipleDocumentFormActivated);
       base.Dispose(disposing);
     }

branches/Mainform refactoring/HeuristicLab.MainForm.WindowsForms/3.2/MultipleDocumentMainForm.cs ¶

@@ -48 +48 @@
     }
 
-    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.Activated += new EventHandler(MultipleDocumentFormActivated);
-          form.GotFocus += new EventHandler(MultipleDocumentFormActivated);
-          form.FormClosing += new FormClosingEventHandler(view.OnClosing);
-          form.FormClosed += new FormClosedEventHandler(view.OnClosed);
-          form.FormClosed += new FormClosedEventHandler(MultipleDocumentFormClosed);
-          form.MdiParent = this;
-          foreach (IUserInterfaceItem item in UserInterfaceItems)
-            view.Changed += new EventHandler(item.ViewChanged);
-          form.Show();
+        bool ret = base.ShowView(view);
+        if (ret)
+          GetForm(view).Show();
+        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 MultipleDocumentFormActivated(object sender, EventArgs e) {
-      base.ActiveView = ((DocumentForm)sender).View;
-    }
-
-    private void MultipleDocumentFormClosed(object sender, FormClosedEventArgs e) {
-      DocumentForm form = (DocumentForm)sender;
-      ViewClosed(form.View);
-      form.Activated -= new EventHandler(MultipleDocumentFormActivated);
-      form.GotFocus -= new EventHandler(MultipleDocumentFormActivated);
-      form.FormClosing -= new FormClosingEventHandler(form.View.OnClosing);
-      form.FormClosed -= new FormClosedEventHandler(form.View.OnClosed);
-      form.FormClosed -= new FormClosedEventHandler(MultipleDocumentFormClosed);
-      foreach (IUserInterfaceItem item in UserInterfaceItems)
-        form.View.Changed -= new EventHandler(item.ViewChanged);
-    }
-
-    protected DocumentForm FindForm(IView view) {
-      IEnumerable<DocumentForm> forms =
-        from df in MdiChildren
-        where ((DocumentForm)df).View == view
-        select (DocumentForm)df;
-      if (forms.Count() == 1)
-        return forms.Single();
-      return null;
+    protected override Form CreateForm(IView view) {
+      Form form = new DocumentForm(view);
+      form.MdiParent = this;
+      return form;
     }
   }

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;
     }
   }