Changeset 2696 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Timestamp:

01/28/10 16:15:21 (14 years ago)

Author:

mkommend

Message:

first version of redesigned MainForm (ticket #857)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Files:

• ContentView.Designer.cs (added)
• ContentView.cs (added)
• DockForm.cs (modified) (1 diff)
• DockingMainForm.cs (modified) (1 diff)
• DocumentForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms-3.2.csproj (modified) (4 diffs)
• MainForm.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.Designer.cs) (2 diffs)
• MainForm.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.cs) (13 diffs)
• MainForm.resx (copied) (copied from trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.resx)
• MenuItem.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MenuItemBase.cs) (1 diff)
• MultipleDocumentMainForm.cs (modified) (3 diffs)
• SingleDocumentMainForm.cs (modified) (2 diffs)
• ToolBarItem.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ToolBarItemBase.cs) (2 diffs)
• View.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ViewBase.Designer.cs) (1 diff)
• View.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ViewBase.cs) (4 diffs)
• ViewContextMenuStrip.cs (modified) (1 diff)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/DockForm.cs

@@ -33 +33 @@
   /// Displays the used view.
   /// </summary>
-  public partial class DockForm : DockContent {
+  internal partial class DockForm : DockContent {
     public DockForm(IView view) {
       InitializeComponent();

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/DockingMainForm.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public partial class DockingMainForm : MainFormBase {
+  public partial class DockingMainForm : MainForm {
     public DockingMainForm()
       : base() {

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/DocumentForm.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public partial class DocumentForm : Form {
+  internal partial class DocumentForm : Form {
     private IView myView;
     public IView View {

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/HeuristicLab.MainForm.WindowsForms-3.2.csproj

@@ -82 +82 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ContentView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ContentView.Designer.cs">
+      <DependentUpon>ContentView.cs</DependentUpon>
+    </Compile>
     <Compile Include="DockForm.cs">
       <SubType>Form</SubType>
@@ -101 +107 @@
     </Compile>
     <Compile Include="HeuristicLabMainFormWindowsFormsPlugin.cs" />
-    <Compile Include="MainFormBase.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MainFormBase.Designer.cs">
-      <DependentUpon>MainFormBase.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MenuItemBase.cs" />
+    <Compile Include="MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MenuItem.cs" />
     <Compile Include="MultipleDocumentMainForm.cs">
       <SubType>Form</SubType>
@@ -121 +127 @@
       <DependentUpon>SingleDocumentMainForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="ToolBarItemBase.cs" />
-    <Compile Include="ViewBase.cs">
+    <Compile Include="ToolBarItem.cs" />
+    <Compile Include="View.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="ViewBase.Designer.cs">
-      <DependentUpon>ViewBase.cs</DependentUpon>
+    <Compile Include="View.Designer.cs">
+      <DependentUpon>View.cs</DependentUpon>
     </Compile>
     <Compile Include="ViewContextMenuStrip.cs">
@@ -165 +171 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="MainFormBase.resx">
-      <DependentUpon>MainFormBase.cs</DependentUpon>
+    <EmbeddedResource Include="MainForm.resx">
+      <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="MultipleDocumentMainForm.resx">

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MainForm.Designer.cs

@@ -20 +20 @@
 #endregion
 namespace HeuristicLab.MainForm.WindowsForms {
-  partial class MainFormBase {
+  partial class MainForm {
     /// <summary>
     /// Required designer variable.
@@ -44 +44 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainFormBase));
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
       this.menuStrip = new System.Windows.Forms.MenuStrip();
       this.toolStrip = new System.Windows.Forms.ToolStrip();

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MainForm.cs

@@ -30 +30 @@
 
 using HeuristicLab.PluginInfrastructure;
+using System.Collections;
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public partial class MainFormBase : Form, IMainForm {
-
+  public partial class MainForm : Form, IMainForm {
     private bool initialized;
-    protected MainFormBase()
+
+    protected MainForm()
       : base() {
       InitializeComponent();
@@ -43 +44 @@
     }
 
-    protected MainFormBase(Type userInterfaceItemType)
+    protected MainForm(Type userInterfaceItemType)
       : this() {
       this.userInterfaceItemType = userInterfaceItemType;
-      CreateGUI();
-    }
-
-    private void MainFormBase_Load(object sender, EventArgs e) {
-      if (!DesignMode) {
-        MainFormManager.RegisterMainForm(this);
-        if (!this.initialized) {
-          this.initialized = true;
-          if (this.Initialized != null)
-            this.Initialized(this, new EventArgs());
-        }
-      }
-    }
-
-    public event EventHandler Initialized;
-
-    #region IMainForm Members
+    }
+
+    #region properties
     public string Title {
       get { return this.Text; }
@@ -93 +80 @@
     public IEnumerable<IView> Views {
       get { return views.Keys; }
-    }
-
-    public Form GetForm(IView view) {
-      if (views.ContainsKey(view))
-        return views[view];
-      return null;
     }
 
@@ -121 +102 @@
       get { return this.userInterfaceItems; }
     }
-
+    #endregion
+
+    #region events
     public event EventHandler ActiveViewChanged;
     protected virtual void OnActiveViewChanged() {
@@ -155 +138 @@
 
     public event EventHandler Changed;
-    public void FireMainFormChanged() {
-      OnMainFormChanged();
-    }
-    protected virtual void OnMainFormChanged() {
+    protected void FireMainFormChanged() {
       if (InvokeRequired)
-        Invoke((MethodInvoker)OnMainFormChanged);
+        Invoke((MethodInvoker)FireMainFormChanged);
       else if (Changed != null)
         Changed(this, new EventArgs());
     }
 
+    private void MainFormBase_Load(object sender, EventArgs e) {
+      if (!DesignMode) {
+        MainFormManager.RegisterMainForm(this);
+        if (!this.initialized) {
+          this.initialized = true;
+          this.OnInitialized(new EventArgs());
+        }
+        this.CreateGUI();
+      }
+    }
+
+    protected virtual void OnInitialized(EventArgs e) {
+    }
+
+    private void ChildFormClosed(object sender, FormClosedEventArgs e) {
+      Form form = (Form)sender;
+      IView view = GetView(form);
+
+      form.Activated -= new EventHandler(FormActivated);
+      form.FormClosed -= new FormClosedEventHandler(ChildFormClosed);
+
+      views.Remove(view);
+      this.OnViewClosed(view);
+      if (ActiveView == view)
+        ActiveView = null;
+    }
+
+    private void FormActivated(object sender, EventArgs e) {
+      this.ActiveView = GetView((Form)sender);
+    }
+    #endregion
+
+    #region create, get, show, hide, close views
     protected virtual Form CreateForm(IView view) {
       throw new NotImplementedException("CreateForm must be implemented in subclasses of MainFormBase.");
     }
 
-    public void ShowView(IView view) {
-      if (InvokeRequired) Invoke((Action<IView>)ShowView, view);
+    internal Form GetForm(IView view) {
+      if (views.ContainsKey(view))
+        return views[view];
+      return null;
+    }
+
+    internal IView GetView(Form form) {
+      return views.Where(x => x.Value == form).Single().Key;
+    }
+
+    internal void ShowView(IView view,bool firstTimeShown) {
+      if (InvokeRequired) Invoke((Action<IView, bool>)ShowView, view,firstTimeShown);
       else {
-        if (!views.Keys.Contains(view)) {
+        if (firstTimeShown) {
           Form form = CreateForm(view);
-          views[view] = form;
+          this.views[view] = form;
           form.Activated += new EventHandler(FormActivated);
-          form.FormClosing += new FormClosingEventHandler(view.OnClosing);
-          form.FormClosing += new FormClosingEventHandler(((ViewBase)view).OnClosingHelper);
-          form.FormClosed += new FormClosedEventHandler(view.OnClosed);
           form.FormClosed += new FormClosedEventHandler(ChildFormClosed);
-          foreach (IUserInterfaceItem item in UserInterfaceItems)
-            view.Changed += new EventHandler(item.ViewChanged);
-          this.Show(view, true);
-          this.OnViewShown(view, true);
-        } else {
-          this.Show(view, false);
-          this.OnViewShown(view, false);
-        }
+        }
+        this.Show(view, firstTimeShown);
+        this.OnViewShown(view, firstTimeShown);
       }
     }
@@ -194 +209 @@
     }
 
-    public void HideView(IView view) {
+    internal void HideView(IView view) {
       if (InvokeRequired) Invoke((Action<IView>)HideView, view);
       else {
@@ -207 +222 @@
     }
 
-    public void CloseView(IView view) {
+    internal void CloseView(IView view) {
       if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
       else {
@@ -217 +232 @@
     }
 
-    public void CloseView(IView view, CloseReason closeReason) {
+    internal void CloseView(IView view, CloseReason closeReason) {
       if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
       else {
         if (this.views.ContainsKey(view)) {
-          ((ViewBase)view).closeReason = closeReason;
+          ((View)view).closeReason = closeReason;
           this.CloseView(view);
         }
@@ -227 +242 @@
     }
 
-    public virtual void CloseAllViews() {
+    public void CloseAllViews() {
       foreach (IView view in views.Keys.ToArray())
         CloseView(view);
     }
 
-    public virtual void CloseAllViews(CloseReason closeReason) {
+    public void CloseAllViews(CloseReason closeReason) {
       foreach (IView view in views.Keys.ToArray())
         CloseView(view, closeReason);
@@ -238 +253 @@
     #endregion
 
-    #region events
-    private void ChildFormClosed(object sender, FormClosedEventArgs e) {
-      Form form = (Form)sender;
-      IView view = GetViewForForm(form);
-
-      form.Activated -= new EventHandler(FormActivated);
-      form.FormClosing -= new FormClosingEventHandler(view.OnClosing);
-      form.FormClosing -= new FormClosingEventHandler(((ViewBase)view).OnClosingHelper);
-      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);
-      this.OnViewClosed(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
-
     #region create menu and toolbar
-    protected virtual void CreateGUI() {
-      IEnumerable<IMenuItem> toolStripMenuItems =
-        from mi in ApplicationManager.Manager.GetInstances(userInterfaceItemType)
-        where mi is IMenuItem
-        orderby ((IMenuItem)mi).Position
-        select (IMenuItem)mi;
-      foreach (IMenuItem menuItem in toolStripMenuItems)
-        AddToolStripMenuItem(menuItem);
-
-      IEnumerable<IToolBarItem> toolStripButtonItems =
-        from bi in ApplicationManager.Manager.GetInstances(userInterfaceItemType)
-        where bi is IToolBarItem
-        orderby ((IToolBarItem)bi).Position
-        select (IToolBarItem)bi;
-      foreach (IToolBarItem toolStripButtonItem in toolStripButtonItems)
-        AddToolStripButtonItem(toolStripButtonItem);
+    private void CreateGUI() {
+      IEnumerable<object> allUserInterfaceItems = ApplicationManager.Manager.GetInstances(userInterfaceItemType);
+
+      IEnumerable<IPositionableUserInterfaceItem> toolStripMenuItems =
+        from mi in allUserInterfaceItems
+        where (mi is IPositionableUserInterfaceItem) &&
+              (mi is IMenuItem || mi is IMenuSeparatorItem)
+        orderby ((IPositionableUserInterfaceItem)mi).Position
+        select (IPositionableUserInterfaceItem)mi;
+
+      foreach (IPositionableUserInterfaceItem menuItem in toolStripMenuItems) {
+        if (menuItem is IMenuItem)
+          AddToolStripMenuItem((IMenuItem)menuItem);
+        else if (menuItem is IMenuSeparatorItem)
+          AddToolStripMenuItem((IMenuSeparatorItem)menuItem);
+      }
+
+      IEnumerable<IPositionableUserInterfaceItem> toolStripButtonItems =
+        from bi in allUserInterfaceItems
+        where (bi is IPositionableUserInterfaceItem) &&
+              (bi is IToolBarItem || bi is IToolBarSeparatorItem)
+        orderby ((IPositionableUserInterfaceItem)bi).Position
+        select (IPositionableUserInterfaceItem)bi;
+
+      foreach (IPositionableUserInterfaceItem toolStripButtonItem in toolStripButtonItems) {
+        if (toolStripButtonItem is IToolBarItem)
+          AddToolStripButtonItem((IToolBarItem)toolStripButtonItem);
+        else if (toolStripButtonItem is IToolBarSeparatorItem)
+          AddToolStripButtonItem((IToolBarSeparatorItem)toolStripButtonItem);
+      }
+
+      this.AdditionalCreationOfGUIElements();
+    }
+
+    protected virtual void AdditionalCreationOfGUIElements() {
     }
 
     private void AddToolStripMenuItem(IMenuItem menuItem) {
-      if (menuItem is MenuItemBase) {
-        ToolStripMenuItem item = new ToolStripMenuItem();
-        SetToolStripItemProperties(item, menuItem);
-        ((MenuItemBase)menuItem).ToolStripItem = item;
-        item.ShortcutKeys = ((MenuItemBase)menuItem).ShortCutKeys;
-        item.DisplayStyle = ((MenuItemBase)menuItem).ToolStripItemDisplayStyle;
-        this.InsertItem(menuItem.Structure, typeof(ToolStripMenuItem), item, menuStrip.Items);
-      } else if (menuItem is MenuSeparatorItemBase) {
-        this.InsertItem(menuItem.Structure, typeof(ToolStripMenuItem), new ToolStripSeparator(), menuStrip.Items);
-      }
+      ToolStripMenuItem item = new ToolStripMenuItem();
+      this.SetToolStripItemProperties(item, menuItem);
+      if (menuItem is MenuItem) {
+        MenuItem menuItemBase = (MenuItem)menuItem;
+        menuItemBase.ToolStripItem = item;
+        item.ShortcutKeys = menuItemBase.ShortCutKeys;
+        item.DisplayStyle = menuItemBase.ToolStripItemDisplayStyle;
+      }
+      this.InsertItem(menuItem.Structure, typeof(ToolStripMenuItem), item, menuStrip.Items);
+    }
+
+    private void AddToolStripMenuItem(IMenuSeparatorItem menuItem) {
+      this.InsertItem(menuItem.Structure, typeof(ToolStripMenuItem), new ToolStripSeparator(), menuStrip.Items);
     }
 
     private void AddToolStripButtonItem(IToolBarItem buttonItem) {
-      ToolStripItem item = null;
-
-      if (buttonItem is ToolBarItemBase) {
-        if (((ToolBarItemBase)buttonItem).IsDropDownButton)
+      ToolStripItem item = new ToolStripButton();
+      if (buttonItem is ToolBarItem) {
+        ToolBarItem buttonItemBase = (ToolBarItem)buttonItem;
+        if (buttonItemBase.IsDropDownButton)
           item = new ToolStripDropDownButton();
-        else
-          item = new ToolStripButton();
-
-        SetToolStripItemProperties(item, buttonItem);
-        item.DisplayStyle = ((ToolBarItemBase)buttonItem).ToolStripItemDisplayStyle;
-        ((ToolBarItemBase)buttonItem).ToolStripItem = item;
-      } else if (buttonItem is IToolBarSeparatorItem)
-        item = new ToolStripSeparator();
-
+
+        item.DisplayStyle = buttonItemBase.ToolStripItemDisplayStyle;
+        buttonItemBase.ToolStripItem = item;
+      }
+
+      this.SetToolStripItemProperties(item, buttonItem);
       this.InsertItem(buttonItem.Structure, typeof(ToolStripDropDownButton), item, toolStrip.Items);
+    }
+
+    private void AddToolStripButtonItem(IToolBarSeparatorItem buttonItem) {
+      this.InsertItem(buttonItem.Structure, typeof(ToolStripDropDownButton), new ToolStripSeparator(), toolStrip.Items);
     }
 
@@ -330 +340 @@
     }
 
-    private void SetToolStripItemProperties(ToolStripItem toolStripItem, IUserInterfaceItem userInterfaceItem) {
+    private void SetToolStripItemProperties(ToolStripItem toolStripItem, IActionUserInterfaceItem userInterfaceItem) {
       toolStripItem.Name = userInterfaceItem.Name;
       toolStripItem.Text = userInterfaceItem.Name;
@@ -336 +346 @@
       toolStripItem.Tag = userInterfaceItem;
       toolStripItem.Image = userInterfaceItem.Image;
-      this.ActiveViewChanged += new EventHandler(userInterfaceItem.ActiveViewChanged);
-      this.Changed += new EventHandler(userInterfaceItem.MainFormChanged);
-      this.Initialized += new EventHandler(userInterfaceItem.MainFormInitialized);
       toolStripItem.Click += new EventHandler(ToolStripItemClicked);
       this.userInterfaceItems.Add(userInterfaceItem);
@@ -345 +352 @@
     private void ToolStripItemClicked(object sender, EventArgs e) {
       System.Windows.Forms.ToolStripItem item = (System.Windows.Forms.ToolStripItem)sender;
-      ((IUserInterfaceItem)item.Tag).Execute();
+      ((IActionUserInterfaceItem)item.Tag).Execute();
     }
     #endregion

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MenuItem.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public abstract class MenuItemBase : HeuristicLab.MainForm.MenuItemBase{
+  public abstract class MenuItem : HeuristicLab.MainForm.MenuItem{
     public virtual Keys ShortCutKeys {
       get { return Keys.None; }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MultipleDocumentMainForm.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public partial class MultipleDocumentMainForm : MainFormBase {
+  public partial class MultipleDocumentMainForm : MainForm {
     public MultipleDocumentMainForm()
       : base() {
@@ -41 +41 @@
     }
 
-    protected override void CreateGUI() {
-      base.CreateGUI();
+    protected override void AdditionalCreationOfGUIElements() {
+      base.AdditionalCreationOfGUIElements();
       ToolStripMenuItem window = new ToolStripMenuItem("Windows");
-      base.menuStrip.MdiWindowListItem = window;
-      base.menuStrip.Items.Add(window);
+      this.menuStrip.MdiWindowListItem = window;
+      this.menuStrip.Items.Add(window);
     }
 
@@ -53 +53 @@
         base.Show(view, firstTimeShown);
         if (firstTimeShown)
-          GetForm(view).Show(this);
+          this.GetForm(view).Show();
         else {
-          GetForm(view).Visible = true;
-          GetForm(view).Activate();
+          this.GetForm(view).Visible = true;
+          this.GetForm(view).Activate();
         }
       }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/SingleDocumentMainForm.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public partial class SingleDocumentMainForm : MainFormBase {
+  public partial class SingleDocumentMainForm : MainForm {
     public SingleDocumentMainForm()
       : base() {
@@ -47 +47 @@
         base.Show(view, firstTimeShown);
         if (firstTimeShown)
-          GetForm(view).Show(this);
+          this.GetForm(view).Show(this);
         else {
-          GetForm(view).Visible = true;
-          GetForm(view).Activate();
+          this.GetForm(view).Visible = true;
+          this.GetForm(view).Activate();
         }
       }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ToolBarItem.cs

@@ -19 +19 @@
  */
 #endregion
+
 using System;
 using System.Collections.Generic;
@@ -26 +27 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public abstract class ToolBarItemBase : HeuristicLab.MainForm.ToolBarItemBase {
+  public abstract class ToolBarItem : HeuristicLab.MainForm.ToolBarItem {
     private ToolStripItem toolStripItem;
     public virtual ToolStripItem ToolStripItem {

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/View.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  partial class ViewBase {
+  partial class View {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/View.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public partial class ViewBase : UserControl, IView {
+  public partial class View : UserControl, IView {
     private bool initialized;
-    public ViewBase() {
+    public View() {
       InitializeComponent();
       this.initialized = false;
@@ -54 +54 @@
     }
 
+    public void Show() {
+      MainForm mainform = MainFormManager.GetMainForm<MainForm>();
+      bool firstTimeShown = mainform.GetForm(this) == null;
+
+      MainFormManager.GetMainForm<MainForm>().ShowView(this,firstTimeShown);
+      if (firstTimeShown) {
+        Form form = mainform.GetForm(this);
+        form.FormClosed += new FormClosedEventHandler(OnClosedHelper);
+        form.FormClosing += new FormClosingEventHandler(OnClosingHelper);
+      }
+      this.OnShown(new ViewShownEventArgs(this,firstTimeShown));
+    }
+
+    public void Close() {
+      MainForm mainform = MainFormManager.GetMainForm<MainForm>();
+      Form form = mainform.GetForm(this);
+      if (form != null)
+        mainform.CloseView(this);
+    }
+
+    public void Close(CloseReason closeReason) {
+      MainForm mainform = MainFormManager.GetMainForm<MainForm>();
+      Form form = mainform.GetForm(this);
+      if (form != null) 
+        mainform.CloseView(this,closeReason);
+    }
+
+    public void Hide() {
+      MainFormManager.GetMainForm<MainForm>().HideView(this);
+      this.OnHidden(new EventArgs());
+    }
+
     public event EventHandler CaptionChanged;
     protected virtual void OnCaptionChanged() {
@@ -68 +100 @@
     }
 
-    public virtual void OnClosing(object sender, CancelEventArgs e) {
+    protected virtual void OnShown(ViewShownEventArgs e) {
+    }
+
+    protected virtual void OnHidden(EventArgs e) {
     }
 
@@ -74 +109 @@
     internal void OnClosingHelper(object sender, FormClosingEventArgs e) {
       if (this.closeReason != CloseReason.None)
-        this.OnClosing(sender, new FormClosingEventArgs(this.closeReason, e.Cancel));
+        this.OnClosing(new FormClosingEventArgs(this.closeReason, e.Cancel));
       else
-        this.OnClosing(sender, e);
+        this.OnClosing(e);
 
       this.closeReason = CloseReason.None;
     }
 
-    public virtual void OnClosing(object sender, FormClosingEventArgs e) {
+    protected virtual void OnClosing(FormClosingEventArgs e) {
     }
 
-    public virtual void OnClosed(object sender, EventArgs e) {
+    internal void OnClosedHelper(object sender, FormClosedEventArgs e) {
+      if (this.closeReason != CloseReason.None)
+        this.OnClosed(new FormClosedEventArgs(this.closeReason));
+      else
+        this.OnClosed(e);
+
+      Form form = (Form)sender;
+      form.FormClosed -= new FormClosedEventHandler(OnClosedHelper);
+      form.FormClosing -= new FormClosingEventHandler(OnClosingHelper);
+      this.closeReason = CloseReason.None;
     }
 
-    public event EventHandler Initialized;
+    protected virtual void OnClosed(FormClosedEventArgs e) {
+    }
 
     private void ViewBase_Load(object sender, EventArgs e) {
       if (!this.initialized && !this.DesignMode) {
-        if (this.Initialized != null)
-          this.Initialized(this, new EventArgs());
+        this.OnInitialized(e);
         this.initialized = true;
       }
     }
+
+    protected virtual void OnInitialized(EventArgs e) {
+    }
   }
 }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ViewContextMenuStrip.cs

@@ -34 +34 @@
         Type viewType = e.ClickedItem.Tag as Type;
         IView view = MainFormManager.CreateView(viewType, this.item);
-        MainFormManager.MainForm.ShowView(view);
+        view.Show();
       }
     }