Changeset 2541

Timestamp:

12/03/09 15:12:44 (15 years ago)

Author:

mkommend

Message:

adapted MainForm to fire an initialized event and renamed the event in ViewBase to Initialized (ticket #771)

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.cs (modified) (6 diffs)
• HeuristicLab.MainForm.WindowsForms/3.2/ToolBarItemBase.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/ViewBase.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IUserInterfaceItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/MenuSeparatorItemBase.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/ToolBarSeparatorItemBase.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/UserInterfaceItemBase.cs (modified) (1 diff)

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

@@ -33 +33 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   public partial class MainFormBase : Form, IMainForm {
+
+    private bool initialized;
     protected MainFormBase()
       : base() {
@@ -38 +40 @@
       this.views = new Dictionary<IView, Form>();
       this.userInterfaceItems = new List<IUserInterfaceItem>();
+      this.initialized = false;
     }
 
@@ -44 +47 @@
       this.userInterfaceItemType = userInterfaceItemType;
       CreateGUI();
-      OnMainFormChanged();
     }
 
     private void MainFormBase_Load(object sender, EventArgs e) {
-      if (!DesignMode)
+      if (!DesignMode) {
         MainFormManager.RegisterMainForm(this);
-    }
+        if (!this.initialized) {
+          this.initialized = true;
+          if (this.Initialized != null)
+            this.Initialized(this,new EventArgs());
+        }
+      }
+    }
+
+    public event EventHandler Initialized;
 
     #region IMainForm Members
@@ -239 +249 @@
         this.InsertItem(menuItem.Structure, typeof(ToolStripMenuItem), new ToolStripSeparator(), menuStrip.Items);
       }
-     }
+    }
 
     private void AddToolStripButtonItem(IToolBarItem buttonItem) {
@@ -253 +263 @@
         item.DisplayStyle = ((ToolBarItemBase)buttonItem).ToolStripItemDisplayStyle;
         ((ToolBarItemBase)buttonItem).ToolStripItem = item;
-      } else if (buttonItem is IToolBarSeparatorItem) 
+      } else if (buttonItem is IToolBarSeparatorItem)
         item = new ToolStripSeparator();
-      
+
       this.InsertItem(buttonItem.Structure, typeof(ToolStripDropDownButton), item, toolStrip.Items);
     }
@@ -281 +291 @@
       this.ActiveViewChanged += new EventHandler(userInterfaceItem.ActiveViewChanged);
       this.Changed += new EventHandler(userInterfaceItem.MainFormChanged);
+      this.Initialized += new EventHandler(userInterfaceItem.MainFormInitialized);
       toolStripItem.Click += new EventHandler(ToolStripItemClicked);
       this.userInterfaceItems.Add(userInterfaceItem);

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

@@ -24 +24 @@
 using System.Text;
 using System.Windows.Forms;
-                                                            
+
 namespace HeuristicLab.MainForm.WindowsForms {
   public abstract class ToolBarItemBase : HeuristicLab.MainForm.ToolBarItemBase {

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

@@ -69 +69 @@
     }
 
-    public event EventHandler Initialize;
+    public event EventHandler Initialized;
 
     private void ViewBase_Load(object sender, EventArgs e) {
       if (!this.initialized && !this.DesignMode) {
-        if (this.Initialize != null)
-          this.Initialize(this, new EventArgs());
+        if (this.Initialized != null)
+          this.Initialized(this, new EventArgs());
         this.initialized = true;
       }

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

@@ -38 +38 @@
     void ViewChanged(object sender, EventArgs e);
     void MainFormChanged(object sender, EventArgs e);
+    void MainFormInitialized(object sender, EventArgs e);
   }
 }

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

@@ -37 +37 @@
       throw new NotImplementedException();
     }
+
+    public void MainFormInitialized(object sender, EventArgs e) {
+      throw new NotImplementedException();
+    }
   }
 }

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

@@ -39 +39 @@
       throw new NotImplementedException();
     }
+
+    public void MainFormInitialized(object sender, EventArgs e) {
+      throw new NotImplementedException();
+    }
   }
 }

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

@@ -51 +51 @@
     public virtual void MainFormChanged(object sender, EventArgs e) {
     }
+
+    public virtual void MainFormInitialized(object sender, EventArgs e) {
+    }
   }
 }