Changeset 2269

Timestamp:

08/10/09 12:06:45 (15 years ago)

Author:

mkommend

Message:

SingleDocumentMainForm shows open froms in taskbar
removed bool listen members from !IToolStripItem
(ticket #716)

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.Test/3.2/ButtonItems/SaveToolStripButtonItem.cs (modified) (2 diffs)
• HeuristicLab.MainForm/3.2/DockingMainForm.cs (modified) (2 diffs)
• HeuristicLab.MainForm/3.2/Interfaces/IToolStripItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/MainFormBase.cs (modified) (4 diffs)
• HeuristicLab.MainForm/3.2/MultipleDocumentMainForm.cs (modified) (2 diffs)
• HeuristicLab.MainForm/3.2/SingleDocumentMainForm.cs (modified) (2 diffs)
• HeuristicLab.MainForm/3.2/ToolStripItemBase.cs (modified) (1 diff)

trunk/sources/HeuristicLab.MainForm.Test/3.2/ButtonItems/SaveToolStripButtonItem.cs

@@ -22 +22 @@
     }
 
-    public override bool ListenActiveViewChanged {
-      get { return true; }
-    }
-
     public override void ActiveViewChanged(object sender, EventArgs e) {
       IMainForm mainform = (IMainForm)sender;
@@ -34 +30 @@
     }
 
-    public override bool ListenViewChanged {
-      get { return true; }
-    }
-
     public override void ViewChanged(object sender, EventArgs e) {
       this.ToolStripItem.Enabled = !this.ToolStripItem.Enabled;

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

@@ -50 +50 @@
         dockForm.FormClosing += new FormClosingEventHandler(view.FormClosing);
         dockForm.FormClosed += new FormClosedEventHandler(DockFormClosed);
-        foreach (IToolStripItem item in ViewChangedToolStripItems)
+        foreach (IToolStripItem item in ToolStripItems)
           view.StateChanged += new EventHandler(item.ViewChanged);
         dockForm.Show(dockPanel);
@@ -64 +64 @@
       dockForm.FormClosing -= new FormClosingEventHandler(dockForm.View.FormClosing);
       dockForm.FormClosed -= new FormClosedEventHandler(DockFormClosed);
-      foreach (IToolStripItem item in ViewChangedToolStripItems)
+      foreach (IToolStripItem item in ToolStripItems)
         dockForm.View.StateChanged -= new EventHandler(item.ViewChanged);
     }

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

@@ -38 +38 @@
     ToolStripItem ToolStripItem { get; set; }
 
-    bool ListenActiveViewChanged { get; }
-    bool ListenViewChanged { get; }
     void ActiveViewChanged(object sender, EventArgs e);
     void ViewChanged(object sender, EventArgs e);

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

@@ -37 +37 @@
       InitializeComponent();
       views = new List<IView>();
-      viewChangeToolStripItems = new List<IToolStripItem>();
+      toolStripItems = new List<IToolStripItem>();
     }
 
@@ -87 +87 @@
     }
 
-    private List<IToolStripItem> viewChangeToolStripItems;
-    protected IEnumerable<IToolStripItem> ViewChangedToolStripItems {
-      get { return this.viewChangeToolStripItems; }
+    private List<IToolStripItem> toolStripItems;
+    protected IEnumerable<IToolStripItem> ToolStripItems {
+      get { return this.toolStripItems; }
     }
 
@@ -156 +156 @@
     }
 
-    private ToolStripDropDownItem FindParent(IToolStripItem item, ToolStripItemCollection parentItems) {      
+    private ToolStripDropDownItem FindParent(IToolStripItem item, ToolStripItemCollection parentItems) {
       if (String.IsNullOrEmpty(item.Structure))
         return null;
@@ -178 +178 @@
       toolStripItem.Image = iToolStripItem.Image;
       toolStripItem.DisplayStyle = iToolStripItem.DisplayStyle;
-      if (iToolStripItem.ListenActiveViewChanged)
-        this.ActiveViewChanged += new EventHandler(iToolStripItem.ActiveViewChanged);
-      if (iToolStripItem.ListenViewChanged)
-        this.viewChangeToolStripItems.Add(iToolStripItem);
+      this.ActiveViewChanged += new EventHandler(iToolStripItem.ActiveViewChanged);    
       toolStripItem.Click += new EventHandler(ToolStripItemClicked);
+      this.toolStripItems.Add(iToolStripItem);
       iToolStripItem.ToolStripItem = toolStripItem;
     }

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

@@ -57 +57 @@
         form.FormClosed += new FormClosedEventHandler(MultipleDocumentFormClosed);
         form.MdiParent = this;
-        foreach (IToolStripItem item in ViewChangedToolStripItems)
+        foreach (IToolStripItem item in ToolStripItems)
           view.StateChanged += new EventHandler(item.ViewChanged);
         form.Show();
@@ -76 +76 @@
       form.FormClosing -= new FormClosingEventHandler(form.View.FormClosing);
       form.FormClosed -= new FormClosedEventHandler(MultipleDocumentFormClosed);
-      foreach (IToolStripItem item in ViewChangedToolStripItems)
+      foreach (IToolStripItem item in ToolStripItems)
         form.View.StateChanged -= new EventHandler(item.ViewChanged);
     }

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

@@ -47 +47 @@
         base.ShowView(view);
         DocumentForm form = new DocumentForm(view);
+        form.ShowInTaskbar = true;
         form.Activated += new EventHandler(DockFormActivated);
         form.FormClosing += new FormClosingEventHandler(view.FormClosing);
         form.FormClosed += new FormClosedEventHandler(DockFormClosed);
-        foreach (IToolStripItem item in ViewChangedToolStripItems)
+        foreach (IToolStripItem item in ToolStripItems)
           view.StateChanged += new EventHandler(item.ViewChanged);
         form.Show(this);
@@ -64 +65 @@
       form.FormClosing -= new FormClosingEventHandler(form.View.FormClosing);
       form.FormClosed -= new FormClosedEventHandler(DockFormClosed);
-      foreach (IToolStripItem item in ViewChangedToolStripItems)
+      foreach (IToolStripItem item in ToolStripItems)
         form.View.StateChanged -= new EventHandler(item.ViewChanged);
     }

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

@@ -56 +56 @@
     }
 
-    public virtual bool ListenActiveViewChanged {
-      get { return false; }
-    }
-    public virtual bool ListenViewChanged {
-      get { return false; }
-    }
-
     public virtual void ActiveViewChanged(object sender, EventArgs e) {
     }