Changeset 3557 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs

Timestamp:

04/29/10 15:10:17 (14 years ago)

Author:

mkommend

Message:

changed logic of showing new views (ticket #972)

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  [Content(typeof(object))]
+  [Content(typeof(IContent))]
   public sealed partial class ViewHost : AsynchronousContentView {
     public ViewHost() {
@@ -39 +39 @@
       Content = null;
       OnContentChanged();
-    }
-    public ViewHost(IContent content)
-      : this() {
-      this.Content = content;
-    }
-
-    public ViewHost(IContentView contentView)
-      : this() {
-      this.viewType = contentView.GetType();
-      this.Content = contentView.Content;
-      this.cachedViews.Add(contentView.GetType(), contentView);
-      this.activeView = contentView;
-      this.RegisterActiveViewEvents();
-      this.OnViewTypeChanged();
-      this.ActiveViewChanged();
     }
 
@@ -117 +102 @@
     }
 
-
-
     protected override void OnContentChanged() {
       messageLabel.Visible = false;
@@ -133 +116 @@
         }
 
-
         if (!ViewCanShowContent(viewType, Content)) {
           ViewType = MainFormManager.GetDefaultViewType(Content.GetType());
@@ -148 +130 @@
       }
     }
-
 
     private void OnViewTypeChanged() {
@@ -176 +157 @@
     }
 
-
-
     private void RegisterActiveViewEvents() {
       activeView.Changed += new EventHandler(activeView_Changed);
@@ -256 +235 @@
 
     private void viewsLabel_DoubleClick(object sender, EventArgs e) {
-      IContentView view = MainFormManager.CreateView(viewType, Content);
+      IContentView view = MainFormManager.MainForm.ShowContent(this.Content);
       view.ReadOnly = this.ReadOnly;
       view.Locked = this.Locked;
-      view.Show();
     }
     private void viewContextMenuStrip_ItemClicked(object sender, ToolStripItemClickedEventArgs e) {