Changeset 2548 for trunk/sources

Timestamp:

12/10/09 10:11:28 (15 years ago)

Author:

mkommend

Message:

added ViewShown, ViewHidden and ViewClosed events in MainForm (ticket #771)

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.WindowsForms/3.2/DockingMainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.cs (modified) (7 diffs)
• HeuristicLab.MainForm.WindowsForms/3.2/MultipleDocumentMainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/SingleDocumentMainForm.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.2/ViewBase.cs (modified) (3 diffs)
• HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj (modified) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IMainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/ViewEventArgs.cs (added)
• HeuristicLab.MainForm/3.2/ViewShownEventArgs.cs (added)

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

@@ -42 +42 @@
     }
 
-    public override bool ShowView(IView view) {
-      if (InvokeRequired) return (bool)Invoke((Func<IView, bool>)ShowView, view);
+    protected override void Show(IView view, bool firstTimeShown) {
+      if (InvokeRequired) Invoke((Action<IView, bool>)Show, view, firstTimeShown);
       else {
-        bool ret = base.ShowView(view);
-        if (ret)
+        base.Show(view, firstTimeShown);
+        if (firstTimeShown)
           ((DockForm)GetForm(view)).Show(dockPanel);
         else
           ((DockForm)GetForm(view)).Activate();
-        return ret;
       }
     }
-    public override void HideView(IView view) {
+
+    protected override void Hide(IView view) {
       if (InvokeRequired) Invoke((Action<IView>)HideView, view);
       else {
         Form form = base.GetForm(view);
-        if (form != null)
+        if (form != null) {
           ((DockForm)form).Hide();
+        }
       }
     }

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

@@ -130 +130 @@
     }
 
+    public event EventHandler<ViewEventArgs> ViewClosed;
+    protected virtual void OnViewClosed(IView view) {
+      if (InvokeRequired) Invoke((Action<IView>)OnViewClosed, view);
+      else if (this.ViewClosed != null) {
+        this.ViewClosed(this, new ViewEventArgs(view));
+      }
+    }
+
+    public event EventHandler<ViewShownEventArgs> ViewShown;
+    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));
+      }
+    }
+
+    public event EventHandler<ViewEventArgs> ViewHidden;
+    protected virtual void OnViewHidden(IView view) {
+      if (InvokeRequired) Invoke((Action<IView>)OnViewHidden, view);
+      else if (this.ViewHidden != null) {
+        this.ViewHidden(this, new ViewEventArgs(view));
+      }
+    }
+
     public event EventHandler Changed;
     public void FireMainFormChanged() {
@@ -145 +169 @@
     }
 
-    public virtual bool ShowView(IView view) {
-      if (InvokeRequired) return (bool)Invoke((Func<IView, bool>)ShowView, view);
+    public void ShowView(IView view) {
+      if (InvokeRequired) Invoke((Action<IView>)ShowView, view);
       else {
         if (!views.Keys.Contains(view)) {
@@ -159 +183 @@
           foreach (IUserInterfaceItem item in UserInterfaceItems)
             view.Changed += new EventHandler(item.ViewChanged);
-          return true;
-        } else
-          return false;
-      }
-    }
-
-    public virtual void HideView(IView view) {
+          this.Show(view, true);
+          this.OnViewShown(view, true);
+        } else {
+          this.Show(view, false);
+          this.OnViewShown(view, false);
+        }
+      }
+    }
+
+    protected virtual void Show(IView view, bool firstTimeShown) {      
+    }
+
+    public void HideView(IView view) {
       if (InvokeRequired) Invoke((Action<IView>)HideView, view);
       else {
-        if (views.ContainsKey(view))
-          views[view].Hide();
-      }
+        if (this.views.ContainsKey(view)) {
+          this.Hide(view);
+          this.OnViewHidden(view);
+        }
+      }
+    }
+
+    protected virtual void Hide(IView view) {
     }
 
@@ -176 +211 @@
       if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
       else {
-        if (views.ContainsKey(view))
-          views[view].Close();
+        if (this.views.ContainsKey(view)) {
+          this.views[view].Close();
+          this.OnViewClosed(view);
+        }
       }
     }
@@ -184 +221 @@
       if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
       else {
-        if (views.ContainsKey(view)) {
+        if (this.views.ContainsKey(view)) {
           ((ViewBase)view).closeReason = closeReason;
-          views[view].Close();
+          this.CloseView(view);
         }
       }
@@ -198 +235 @@
     public virtual void CloseAllViews(CloseReason closeReason) {
       foreach (IView view in views.Keys.ToArray())
-        CloseView(view,closeReason);
+        CloseView(view, closeReason);
     }
     #endregion
@@ -217 +254 @@
 
       views.Remove(view);
+      this.OnViewClosed(view);
       if (ActiveView == view)
         ActiveView = null;

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

@@ -48 +48 @@
     }
 
-    public override bool ShowView(IView view) {
-      if (InvokeRequired) return (bool)Invoke((Func<IView, bool>)ShowView, view);
+    protected override void Show(IView view, bool firstTimeShown) {
+      if (InvokeRequired) Invoke((Action<IView, bool>)Show, view, firstTimeShown);
       else {
-        bool ret = base.ShowView(view);
-        if (ret)
-          GetForm(view).Show();
+        base.Show(view, firstTimeShown);
+        if (firstTimeShown)
+          GetForm(view).Show(this);
         else {
           GetForm(view).Visible = true;
           GetForm(view).Activate();
         }
-        return ret;
+      }
+    }
+
+    protected override void Hide(IView view) {
+      if (InvokeRequired) Invoke((Action<IView>)Hide, view);
+      else {
+        base.Hide(view);
+        this.GetForm(view).Hide();
       }
     }

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

@@ -42 +42 @@
     }
 
-    public override bool ShowView(IView view) {
-      if (InvokeRequired) return (bool)Invoke((Func<IView, bool>)ShowView, view);
+    protected override void Show(IView view, bool firstTimeShown) {
+      if (InvokeRequired) Invoke((Action<IView, bool>)Show, view, firstTimeShown);
       else {
-        bool ret = base.ShowView(view);
-        if (ret)
+        base.Show(view, firstTimeShown);
+        if (firstTimeShown)
           GetForm(view).Show(this);
         else {
@@ -52 +52 @@
           GetForm(view).Activate();
         }
-        return ret;
+      }
+    }
+
+    protected override void Hide(IView view) {
+      if (InvokeRequired) Invoke((Action<IView>)Hide, view);
+      else {
+        base.Hide(view);
+        this.GetForm(view).Hide();
       }
     }

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

@@ -42 +42 @@
       get { return myCaption; }
       set {
-        if (value != myCaption) {
-          myCaption = value;
-          OnCaptionChanged();
+        if (InvokeRequired) {
+          Action<string> action = delegate(string s) { this.Caption = s; };
+          Invoke(action, value);
+        } else {
+          if (value != myCaption) {
+            myCaption = value;
+            OnCaptionChanged();
+          }
         }
       }
@@ -57 +62 @@
     public event EventHandler Changed;
     protected virtual void OnChanged() {
-      if (Changed != null)
+      if (InvokeRequired)
+        Invoke((MethodInvoker)OnChanged);
+      else if (Changed != null)
         Changed(this, new EventArgs());
     }
 
-    public virtual void OnClosing(object sender, CancelEventArgs e) {     
+    public virtual void OnClosing(object sender, CancelEventArgs e) {
     }
 
@@ -67 +74 @@
     internal void OnClosingHelper(object sender, FormClosingEventArgs e) {
       if (this.closeReason != CloseReason.None)
-        this.OnClosing(sender, new FormClosingEventArgs(this.closeReason,e.Cancel));
+        this.OnClosing(sender, new FormClosingEventArgs(this.closeReason, e.Cancel));
       else
         this.OnClosing(sender, e);
-      
+
       this.closeReason = CloseReason.None;
     }
 
-    public virtual void OnClosing(object sender, FormClosingEventArgs e) {      
+    public virtual void OnClosing(object sender, FormClosingEventArgs e) {
     }
 

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

@@ -81 +81 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ViewShownEventArgs.cs" />
+    <Compile Include="ViewEventArgs.cs" />
     <Compile Include="ToolBarSeparatorItemBase.cs" />
     <Compile Include="Interfaces\IToolBarSeparatorItem.cs" />

trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IMainForm.cs

@@ -31 +31 @@
 
     IView ActiveView { get; }
+    IEnumerable<IView> Views { get; }
+
     event EventHandler ActiveViewChanged;
     event EventHandler Changed;
-    IEnumerable<IView> Views { get; }
+    
+    event EventHandler<ViewEventArgs> ViewClosed;
+    event EventHandler<ViewShownEventArgs> ViewShown;
+    event EventHandler<ViewEventArgs> ViewHidden;
 
     Type UserInterfaceItemType { get; }
-    bool ShowView(IView view);  //return value indicates if a new form for the view is created
+    void ShowView(IView view); 
     void HideView(IView view);
     void CloseView(IView view);