Changeset 3403

Timestamp:

04/19/10 00:09:19 (14 years ago)

Author:

mkommend

Message:

enhanced viewHost (forwarding of view events, activeView property,...) (ticket #972)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Files:

• DockingMainForm.cs (modified) (3 diffs)
• MainForm.cs (modified) (11 diffs)
• MultipleDocumentMainForm.cs (modified) (3 diffs)
• SingleDocumentMainForm.cs (modified) (3 diffs)
• View.cs (modified) (5 diffs)
• ViewHost.Designer.cs (modified) (1 diff)
• ViewHost.cs (modified) (11 diffs)

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

@@ -45 +45 @@
     }
 
-    protected override void Show(IView view, bool firstTimeShown) {
-      if (InvokeRequired) Invoke((Action<IView, bool>)Show, view, firstTimeShown);
+    protected override void ShowView(IView view, bool firstTimeShown) {
+      if (InvokeRequired) Invoke((Action<IView, bool>)ShowView, view, firstTimeShown);
       else {
-        base.Show(view, firstTimeShown);
+        base.ShowView(view, firstTimeShown);
         if (firstTimeShown)
           ((DockForm)GetForm(view)).Show(dockPanel);
@@ -59 +59 @@
       if (InvokeRequired) Invoke((Action<IView>)HideView, view);
       else {
-        Form form = base.GetForm(view);
+        Form form = this.GetForm(view);
         if (form != null) {
           ((DockForm)form).Hide();
@@ -72 +72 @@
         ViewHost viewHost = new ViewHost(contentView);
         form = new DockForm(viewHost);
-      } else
+        this.AddViewFormCombination(viewHost, form);
+      } else {
         form = new DockForm(view);
+        this.AddViewFormCombination(view, form);
+      }
       return form;
     }

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

@@ -89 +89 @@
       get { return views.Keys; }
     }
+    protected void AddViewFormCombination(IView view, Form form) {
+      this.views.Add(view, form);
+      view.Changed += new EventHandler(ViewChanged);
+    }
 
     private IView activeView;
@@ -124 +128 @@
     protected virtual void OnViewClosed(IView view) {
       if (InvokeRequired) Invoke((Action<IView>)OnViewClosed, view);
-      else if (this.ViewClosed != null) {
-        this.ViewClosed(this, new ViewEventArgs(view));
+      else {
+        EventHandler<ViewEventArgs> handler = ViewClosed;
+        if (handler != null)
+          handler(this, new ViewEventArgs(view));
       }
     }
@@ -132 +138 @@
     protected virtual void OnViewShown(IView view, bool firstTimeShown) {
       if (InvokeRequired) Invoke((Action<IView, bool>)OnViewShown, view, firstTimeShown);
-      else if (this.ViewShown != null) {
-        this.ViewShown(this, new ViewShownEventArgs(view, firstTimeShown));
+      else {
+        EventHandler<ViewShownEventArgs> handler = ViewShown;
+        if (handler != null)
+          handler(this, new ViewShownEventArgs(view, firstTimeShown));
       }
     }
@@ -140 +148 @@
     protected virtual void OnViewHidden(IView view) {
       if (InvokeRequired) Invoke((Action<IView>)OnViewHidden, view);
-      else if (this.ViewHidden != null) {
-        this.ViewHidden(this, new ViewEventArgs(view));
+      else {
+        EventHandler<ViewEventArgs> handler = ViewHidden;
+        if (handler != null)
+          handler(this, new ViewEventArgs(view));
       }
     }
@@ -149 +159 @@
       if (InvokeRequired)
         Invoke((MethodInvoker)FireMainFormChanged);
-      else if (Changed != null)
-        Changed(this, EventArgs.Empty);
+      else {
+        EventHandler handler = Changed;
+        if (handler != null)
+          Changed(this, EventArgs.Empty);
+      }
     }
 
@@ -172 +185 @@
 
     protected override void OnFormClosing(FormClosingEventArgs e) {
-      foreach (KeyValuePair<IView,Form > pair in this.views) {
+      foreach (KeyValuePair<IView, Form> pair in this.views) {
         DockForm dockForm = pair.Value as DockForm;
         View view = pair.Key as View;
@@ -203 +216 @@
 
     internal Form GetForm(IView view) {
-      if (views.ContainsKey(view))
-        return views[view];
+      IView internalView = GetView(view);
+      if (internalView != null && views.ContainsKey(internalView))
+        return views[internalView];
       return null;
     }
-
-    internal IView GetView(Form form) {
+    protected 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 (firstTimeShown) {
-          Form form = CreateForm(view);
-          view.Changed += new EventHandler(ViewChanged);
-          this.views[view] = form;
+    private IView GetView(IView view) {
+      if (view == null || views.ContainsKey(view))
+        return view;
+      IView viewHost =
+        (from ViewHost v in views.Keys.OfType<ViewHost>()
+         where v.Views.Contains(((IContentView)view))
+         select v).SingleOrDefault();
+      return viewHost;
+    }
+
+
+    internal void ShowView(IView view) {
+      if (InvokeRequired) Invoke((Action<IView>)ShowView, view);
+      else {
+        Form form = GetForm(view);
+        bool firstTimeShown = form == null;
+        if (form == null) {
+          form = CreateForm(view);
           form.Activated += new EventHandler(FormActivated);
           form.FormClosed += new FormClosedEventHandler(ChildFormClosed);
-
-        }
-        this.Show(view, firstTimeShown);
-        this.OnViewShown(view, firstTimeShown);
+        }
+        IView internalView = GetView(form);
+        this.ShowView(internalView, firstTimeShown);
+        this.OnViewShown(internalView, firstTimeShown);
       }
     }
@@ -234 +257 @@
     }
 
-    protected virtual void Show(IView view, bool firstTimeShown) {
+    protected virtual void ShowView(IView view, bool firstTimeShown) {
     }
 
@@ -240 +263 @@
       if (InvokeRequired) Invoke((Action<IView>)HideView, view);
       else {
-        if (this.views.ContainsKey(view)) {
-          this.Hide(view);
-          if (this.activeView == view)
+        IView internalView = this.GetView(view);
+        if (internalView != null && this.views.ContainsKey(internalView)) {
+          this.Hide(internalView);
+          if (this.activeView == internalView)
             this.ActiveView = null;
-          this.OnViewHidden(view);
+          this.OnViewHidden(internalView);
         }
       }
@@ -269 +293 @@
       if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
       else {
-        if (this.views.ContainsKey(view)) {
-          this.views[view].Close();
-          this.OnViewClosed(view);
+        IView internalView = GetView(view);
+        if (internalView != null && this.views.ContainsKey(internalView)) {
+          this.views[internalView].Close();
+          this.OnViewClosed(internalView);
         }
       }
@@ -279 +304 @@
       if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
       else {
-        if (this.views.ContainsKey(view)) {
-          ((View)view).CloseReason = closeReason;
-          this.CloseView(view);
+        IView internalView = GetView(view);
+        if (internalView != null && this.views.ContainsKey(internalView)) {
+          ((View)internalView).CloseReason = closeReason;
+          this.CloseView(internalView);
         }
       }

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

@@ -51 +51 @@
     }
 
-    protected override void Show(IView view, bool firstTimeShown) {
-      if (InvokeRequired) Invoke((Action<IView, bool>)Show, view, firstTimeShown);
+    protected override void ShowView(IView view, bool firstTimeShown) {
+      if (InvokeRequired) Invoke((Action<IView, bool>)ShowView, view, firstTimeShown);
       else {
-        base.Show(view, firstTimeShown);
+        base.ShowView(view, firstTimeShown);
         if (firstTimeShown)
           this.GetForm(view).Show();
@@ -68 +68 @@
       else {
         base.Hide(view);
-        this.GetForm(view).Hide();
+        Form form = this.GetForm(view);
+        if (form != null) {
+          form.Hide();
+        }
       }
     }
@@ -78 +81 @@
         ViewHost viewHost = new ViewHost(contentView);
         form = new DocumentForm(viewHost);
-      } else
+        this.AddViewFormCombination(viewHost, form);
+      } else {
         form = new DocumentForm(view);
+        this.AddViewFormCombination(view, form);
+      }
 
       form.MdiParent = this;

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

@@ -45 +45 @@
     }
 
-    protected override void Show(IView view, bool firstTimeShown) {
-      if (InvokeRequired) Invoke((Action<IView, bool>)Show, view, firstTimeShown);
+    protected override void ShowView(IView view, bool firstTimeShown) {
+      if (InvokeRequired) Invoke((Action<IView, bool>)ShowView, view, firstTimeShown);
       else {
-        base.Show(view, firstTimeShown);
+        base.ShowView(view, firstTimeShown);
         if (firstTimeShown)
           this.GetForm(view).Show(this);
@@ -62 +62 @@
       else {
         base.Hide(view);
-        this.GetForm(view).Hide();
+        Form form = this.GetForm(view);
+        if (form != null) {
+          form.Hide();
+        }
       }
     }
@@ -72 +75 @@
         ViewHost viewHost = new ViewHost(contentView);
         form = new DocumentForm(viewHost);
-      } else
+        this.AddViewFormCombination(viewHost, form);
+      } else {
         form = new DocumentForm(view);
+        this.AddViewFormCombination(view, form);
+      }
 
       form.ShowInTaskbar = true;

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

@@ -82 +82 @@
 
       this.IsShown = true;
-      mainform.ShowView(this, firstTimeShown);
+      mainform.ShowView(this);
       if (firstTimeShown) {
         Form form = mainform.GetForm(this);
@@ -146 +146 @@
     }
 
-    protected virtual void OnShown(ViewShownEventArgs e) {
-    }
-
-    protected virtual void OnHidden(EventArgs e) {
+    internal protected virtual void OnShown(ViewShownEventArgs e) {
+    }
+
+    internal protected virtual void OnHidden(EventArgs e) {
     }
 
@@ -170 +170 @@
     }
 
-    protected virtual void OnClosing(FormClosingEventArgs e) {
+    internal protected virtual void OnClosing(FormClosingEventArgs e) {
     }
 
@@ -185 +185 @@
     }
 
-    protected virtual void OnClosed(FormClosedEventArgs e) {
+    internal protected virtual void OnClosed(FormClosedEventArgs e) {
     }
 
@@ -215 +215 @@
     public void ResumeRepaint(bool refresh) {
       if (InvokeRequired)
-        Invoke((Action<bool>)ResumeRepaint,refresh);
-      else
-      ((Control)this).ResumeRepaint(refresh);
+        Invoke((Action<bool>)ResumeRepaint, refresh);
+      else
+        ((Control)this).ResumeRepaint(refresh);
     }
   }

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

@@ -84 +84 @@
       this.viewsLabel.TabIndex = 0;
       this.toolTip.SetToolTip(this.viewsLabel, "Double-click to open a new window of the current view.\r\nRight-click to change cur" +
-              "rent view.");
+              "rent view. \r\n Drag icon to copy or link content in another view.");
       this.viewsLabel.MouseLeave += new System.EventHandler(this.viewsLabel_MouseLeave);
       this.viewsLabel.DoubleClick += new System.EventHandler(this.viewsLabel_DoubleClick);

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

@@ -29 +29 @@
   [Content(typeof(object))]
   public sealed partial class ViewHost : AsynchronousContentView {
-    private Dictionary<Type, IContentView> cachedViews;
     public ViewHost() {
       InitializeComponent();
@@ -37 +36 @@
       startDragAndDrop = false;
       viewContextMenuStrip.IgnoredViewTypes = new List<Type>() { typeof(ViewHost) };
+      activeView = null;
     }
     public ViewHost(object content)
@@ -43 +43 @@
     }
 
-    public ViewHost(IContentView contentView) :this(){
+    public ViewHost(IContentView contentView)
+      : this() {
       this.viewType = contentView.GetType();
       this.Content = contentView.Content;
       this.cachedViews.Add(contentView.GetType(), contentView);
-      this.UpdateView();
-    }
-
+      this.activeView = contentView;
+      this.RegisterActiveViewEvents();
+      this.OnViewTypeChanged();
+      this.ActiveViewChanged();
+    }
+
+    private Dictionary<Type, IContentView> cachedViews;
+    public IEnumerable<IContentView> Views {
+      get { return cachedViews.Values; }
+    }
+
+    private IContentView activeView;
+    public IContentView ActiveView {
+      get { return this.activeView; }
+      private set {
+        if (activeView != value) {
+          if (activeView != null) {
+            DeregisterActiveViewEvents();
+            View view = activeView as View;
+            if (view != null)
+              view.OnHidden(EventArgs.Empty);
+          }
+          activeView = value;
+          if (activeView != null) {
+            RegisterActiveViewEvents();
+            View view = activeView as View;
+            if (view != null)
+              view.OnShown(new ViewShownEventArgs(view,false));
+          }
+          ActiveViewChanged();
+          OnViewTypeChanged();
+        }
+      }
+    }
     private Type viewType;
     public Type ViewType {
@@ -59 +91 @@
                                                       value, Content.GetType()));
           viewType = value;
-          UpdateView();
-        }
-      }
-    }
-
+          OnViewTypeChanged();
+        }
+      }
+    }
     public new object Content {
       get { return base.Content; }
@@ -107 +138 @@
             ViewType = (Type)viewContextMenuStrip.Items[0].Tag;
         }
+
         foreach (IContentView view in cachedViews.Values)
           view.Content = this.Content;
@@ -117 +149 @@
 
 
-    private void UpdateView() {
+    private void OnViewTypeChanged() {
       viewPanel.Controls.Clear();
-
       if (viewType == null || Content == null)
         return;
-
       if (!ViewCanShowContent(viewType, Content))
         throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".",
@@ -135 +165 @@
         cachedViews.Add(viewType, view);
       }
-      this.Caption = view.Caption;
-      this.SaveEnabled = view.SaveEnabled;
+      this.ActiveView = view;
 
       Control control = (Control)view;
@@ -144 +173 @@
     }
 
+
+
+    private void RegisterActiveViewEvents() {
+      activeView.Changed += new EventHandler(activeView_Changed);
+      activeView.CaptionChanged += new EventHandler(activeView_CaptionChanged);
+    }
+    private void DeregisterActiveViewEvents() {
+      activeView.Changed -= new EventHandler(activeView_Changed);
+      activeView.CaptionChanged -= new EventHandler(activeView_CaptionChanged);
+    }
+    private void activeView_CaptionChanged(object sender, EventArgs e) {
+      this.ActiveViewChanged();
+    }
+    private void activeView_Changed(object sender, EventArgs e) {
+      this.ActiveViewChanged();
+    }
+    private void ActiveViewChanged() {
+      if (ActiveView != null) {
+        this.Caption = this.ActiveView.Caption;
+        this.SaveEnabled = this.ActiveView.SaveEnabled;
+      }
+    }
+
+    #region forwarding of view events
+    internal protected override void OnShown(ViewShownEventArgs e) {
+      base.OnShown(e);
+      View view = this.ActiveView as View;
+      if (view != null)
+        view.OnShown(e);
+    }
+
+    internal protected override void OnHidden(EventArgs e) {
+      base.OnHidden(e);
+      View view = this.ActiveView as View;
+      if (view != null)
+        view.OnHidden(e);
+    }
+
+    internal protected override void OnClosing(FormClosingEventArgs e) {
+      base.OnClosing(e);
+      foreach (View view in this.Views.OfType<View>())
+        view.OnClosing(e);
+    }
+
+    internal protected override void OnClosed(FormClosedEventArgs e) {
+      base.OnClosed(e);
+      foreach (View view in this.Views.OfType<View>())
+        view.OnClosed(e);
+    }
+    #endregion
+
+    #region GUI actions
     private void UpdateActiveMenuItem() {
       foreach (KeyValuePair<Type, ToolStripMenuItem> item in viewContextMenuStrip.MenuItems) {
@@ -167 +248 @@
       MainFormManager.CreateView(viewType, Content, ReadOnly).Show();
     }
-
     private void viewContextMenuStrip_ItemClicked(object sender, ToolStripItemClickedEventArgs e) {
       Type viewType = (Type)e.ClickedItem.Tag;
@@ -178 +258 @@
       viewsLabel.Capture = false;
     }
-
     private void viewsLabel_MouseLeave(object sender, EventArgs e) {
       if ((Control.MouseButtons & MouseButtons.Left) == MouseButtons.Left && startDragAndDrop) {
@@ -188 +267 @@
         startDragAndDrop = false;
     }
+    #endregion
   }
 }