Changeset 3557 for trunk/sources/HeuristicLab.MainForm.WindowsForms

Timestamp:

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

Author:

mkommend

Message:

changed logic of showing new views (ticket #972)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3

Files:

• ContentView.cs (modified) (2 diffs)
• DockingMainForm.cs (modified) (2 diffs)
• MainForm.cs (modified) (10 diffs)
• MultipleDocumentMainForm.cs (modified) (2 diffs)
• SingleDocumentMainForm.cs (modified) (2 diffs)
• View.cs (modified) (1 diff)
• ViewHost.cs (modified) (7 diffs)

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

@@ -37 +37 @@
       get { return content; }
       set {
-        if ((value != null) && (!MainFormManager.ViewCanViewObject(this, value)))
+        if ((value != null) && (!MainFormManager.ViewCanViewContent(this, value)))
           throw new ArgumentException(string.Format("View \"{0}\" cannot view object \"{1}\".", this.GetType().Name, value.GetType().Name));
         if (InvokeRequired) {
@@ -57 +57 @@
       InitializeComponent();
       this.locked = false;
-    }
-    public ContentView(IContent content)
-      : this() {
-      this.content = content;
     }
 

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

@@ -40 +40 @@
       InitializeComponent();
     }
-    public DockingMainForm(Type userInterfaceItemType, bool showViewsInViewHost)
+    public DockingMainForm(Type userInterfaceItemType, bool showContentInViewHost)
       : this(userInterfaceItemType) {
-      this.ShowViewsInViewHost = showViewsInViewHost;
+      this.ShowContentInViewHost = showContentInViewHost;
     }
 
@@ -67 +67 @@
 
     protected override Form CreateForm(IView view) {
-      DockForm form;
-      IContentView contentView = view as IContentView;
-      if (ShowViewsInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
-        ViewHost viewHost = new ViewHost(contentView);
-        form = new DockForm(viewHost);
-        this.AddViewFormCombination(viewHost, form);
-      } else {
-        form = new DockForm(view);
-        this.AddViewFormCombination(view, form);
-      }
-      return form;
+      return new DockForm(view);
     }
 

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

@@ -32 +32 @@
 using System.Collections;
 using WeifenLuo.WinFormsUI.Docking;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.MainForm.WindowsForms {
@@ -43 +44 @@
       this.userInterfaceItems = new List<IUserInterfaceItem>();
       this.initialized = false;
-      this.showViewsInViewHost = false;
+      this.showContentInViewHost = false;
     }
 
@@ -52 +53 @@
 
     #region properties
-    private bool showViewsInViewHost;
-    public bool ShowViewsInViewHost {
-      get { return this.showViewsInViewHost; }
-      set { this.showViewsInViewHost = value; }
+    private bool showContentInViewHost;
+    public bool ShowContentInViewHost {
+      get { return this.showContentInViewHost; }
+      set { this.showContentInViewHost = value; }
     }
 
@@ -88 +89 @@
     public IEnumerable<IView> Views {
       get { return views.Keys; }
-    }
-    protected void AddViewFormCombination(IView view, Form form) {
-      this.views.Add(view, form);
-      view.Changed += new EventHandler(View_Changed);
     }
 
@@ -216 +213 @@
 
     internal Form GetForm(IView view) {
-      IView internalView = GetView(view);
-      if (internalView != null && views.ContainsKey(internalView))
-        return views[internalView];
+      if (views.ContainsKey(view))
+        return views[view];
       return null;
     }
@@ -224 +220 @@
       return views.Where(x => x.Value == form).Single().Key;
     }
-    private IView GetView(IView view) {
-      if (view == null || views.ContainsKey(view))
-        return view;
-      IContentView contentView = view as IContentView;
-      if (contentView != null) {
-        IView viewHost =
-          (from ViewHost v in views.Keys.OfType<ViewHost>()
-           where v.Views.Contains(contentView)
-           select v).SingleOrDefault();
-        return viewHost;
-      }
-      return contentView;
+
+    public IContentView ShowContent(IContent content) {
+      IContentView view;
+      if (this.ShowContentInViewHost)
+        view = new ViewHost();
+      else
+        view = MainFormManager.CreateDefaultView(content.GetType());
+
+      if (view != null) {
+        view.Show();
+        view.Content = content;
+      }
+      return view;
     }
 
@@ -243 +240 @@
         Form form = GetForm(view);
         bool firstTimeShown = form == null;
-        if (form == null) {
+        if (firstTimeShown) {
           form = CreateForm(view);
           form.Activated += new EventHandler(FormActivated);
           form.FormClosed += new FormClosedEventHandler(ChildFormClosed);
-        }
-        IView internalView = GetView(form);
-        this.ShowView(internalView, firstTimeShown);
-        this.OnViewShown(internalView, firstTimeShown);
+          view.Changed += new EventHandler(View_Changed);
+          views[view] = form;
+        }
+        this.ShowView(view, firstTimeShown);
+        this.OnViewShown(view, firstTimeShown);
       }
     }
@@ -267 +265 @@
       if (InvokeRequired) Invoke((Action<IView>)HideView, view);
       else {
-        IView internalView = this.GetView(view);
-        if (internalView != null && this.views.ContainsKey(internalView)) {
-          this.Hide(internalView);
-          if (this.activeView == internalView)
-            this.ActiveView = null;
-          this.OnViewHidden(internalView);
-        }
+        this.Hide(view);
+        if (this.activeView == view)
+          this.ActiveView = null;
+        this.OnViewHidden(view);
       }
     }
@@ -296 +291 @@
     internal void CloseView(IView view) {
       if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
-      else {
-        IView internalView = GetView(view);
-        if (internalView != null && this.views.ContainsKey(internalView)) {
-          this.views[internalView].Close();
-          this.OnViewClosed(internalView);
-        }
+      else if (views.ContainsKey(view)) {
+        this.views[view].Close();
+        this.OnViewClosed(view);
       }
     }
@@ -307 +299 @@
     internal void CloseView(IView view, CloseReason closeReason) {
       if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
-      else {
-        IView internalView = GetView(view);
-        if (internalView != null && this.views.ContainsKey(internalView)) {
-          ((View)internalView).CloseReason = closeReason;
-          this.CloseView(internalView);
-        }
+      else if (views.ContainsKey(view)) {
+        ((View)view).CloseReason = closeReason;
+        this.CloseView(view);
       }
     }

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

@@ -39 +39 @@
       InitializeComponent();
     }
-    public MultipleDocumentMainForm(Type userInterfaceItemType, bool showViewsInViewHost)
+    public MultipleDocumentMainForm(Type userInterfaceItemType, bool showContentInViewHost)
       : this(userInterfaceItemType) {
-      this.ShowViewsInViewHost = showViewsInViewHost;
+      this.ShowContentInViewHost = showContentInViewHost;
     }
 
@@ -76 +76 @@
 
     protected override Form CreateForm(IView view) {
-      Form form;
-      IContentView contentView = view as IContentView;
-      if (ShowViewsInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
-        ViewHost viewHost = new ViewHost(contentView);
-        form = new DocumentForm(viewHost);
-        this.AddViewFormCombination(viewHost, form);
-      } else {
-        form = new DocumentForm(view);
-        this.AddViewFormCombination(view, form);
-      }
-
+      Form form = new DocumentForm(view);
       form.MdiParent = this;
       return form;

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

@@ -40 +40 @@
       InitializeComponent();
     }
-    public SingleDocumentMainForm(Type userInterfaceItemType, bool showViewsInViewHost)
+    public SingleDocumentMainForm(Type userInterfaceItemType, bool showContentInViewHost)
       : this(userInterfaceItemType) {
-      this.ShowViewsInViewHost = showViewsInViewHost;
+      this.ShowContentInViewHost = showContentInViewHost;
     }
 
@@ -70 +70 @@
 
     protected override Form CreateForm(IView view) {
-      Form form;
-      IContentView contentView = view as IContentView;
-      if (ShowViewsInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
-        ViewHost viewHost = new ViewHost(contentView);
-        form = new DocumentForm(viewHost);
-        this.AddViewFormCombination(viewHost, form);
-      } else {
-        form = new DocumentForm(view);
-        this.AddViewFormCombination(view, form);
-      }
-
+      Form form = new DocumentForm(view);
       form.ShowInTaskbar = true;
       return form;

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

@@ -35 +35 @@
       this.closeReason = CloseReason.None;
       this.readOnly = false;
-    }
-
-    public View(bool readOnly)
-      : this() {
-      this.readOnly = readOnly;
     }
 

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) {