Changeset 2704

Timestamp:

01/28/10 19:57:39 (15 years ago)

Author:

mkommend

Message:

• new method ToolStripItemSet
• Control.Show Hide method hidden with new keyword in View class (ticket #857)

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.WindowsForms/3.2/ActionUserInterfaceItem.cs (added)
• HeuristicLab.MainForm.WindowsForms/3.2/HeuristicLab.MainForm.WindowsForms-3.2.csproj (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/MainForm.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.2/MenuItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/ToolBarItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/View.cs (modified) (2 diffs)
• HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj (modified) (1 diff)
• HeuristicLab.MainForm/3.2/MenuItem.cs (deleted)
• HeuristicLab.MainForm/3.2/ToolBarItem.cs (deleted)

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

@@ -82 +82 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ActionUserInterfaceItem.cs" />
     <Compile Include="ContentView.cs">
       <SubType>UserControl</SubType>

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

@@ -192 +192 @@
     }
 
-    internal void ShowView(IView view,bool firstTimeShown) {
-      if (InvokeRequired) Invoke((Action<IView, bool>)ShowView, view,firstTimeShown);
+    internal void ShowView(IView view, bool firstTimeShown) {
+      if (InvokeRequired) Invoke((Action<IView, bool>)ShowView, view, firstTimeShown);
       else {
         if (firstTimeShown) {
@@ -347 +347 @@
       toolStripItem.Image = userInterfaceItem.Image;
       toolStripItem.Click += new EventHandler(ToolStripItemClicked);
+      if (userInterfaceItem is ActionUserInterfaceItem)
+        ((ActionUserInterfaceItem)userInterfaceItem).OnToolStripItemSet(new EventArgs());
       this.userInterfaceItems.Add(userInterfaceItem);
     }

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

@@ -26 +26 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public abstract class MenuItem : HeuristicLab.MainForm.MenuItem{
+  public abstract class MenuItem : ActionUserInterfaceItem,IMenuItem{
     public virtual Keys ShortCutKeys {
       get { return Keys.None; }
     }
-
-    private ToolStripItem toolStripItem;
-    public virtual ToolStripItem ToolStripItem {
-      get { return this.toolStripItem; }
-      internal set { this.toolStripItem = value; }
-    }
-
-    public virtual ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
-      get { return ToolStripItemDisplayStyle.ImageAndText; }
-    }
   }
 }

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

@@ -27 +27 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public abstract class ToolBarItem : HeuristicLab.MainForm.ToolBarItem {
-    private ToolStripItem toolStripItem;
-    public virtual ToolStripItem ToolStripItem {
-      get { return this.toolStripItem; }
-      internal set { this.toolStripItem = value; }
-    }
-
+  public abstract class ToolBarItem : ActionUserInterfaceItem,IToolBarItem {
     public virtual bool IsDropDownButton {
       get { return false; }
     }
-
-    public virtual ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
-      get { return ToolStripItemDisplayStyle.Image; }
-    }
   }
 }

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

@@ -54 +54 @@
     }
 
-    public void Show() {
+    public new void Show() {
       MainForm mainform = MainFormManager.GetMainForm<MainForm>();
       bool firstTimeShown = mainform.GetForm(this) == null;
@@ -81 +81 @@
     }
 
-    public void Hide() {
+    public new void Hide() {
       MainFormManager.GetMainForm<MainForm>().HideView(this);
       this.OnHidden(new EventArgs());

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

@@ -93 +93 @@
     <Compile Include="Interfaces\IToolBarItem.cs" />
     <Compile Include="MainFormManager.cs" />
-    <Compile Include="MenuItem.cs" />
     <Compile Include="MenuSeparatorItem.cs" />
-    <Compile Include="ToolBarItem.cs" />
     <Compile Include="HeuristicLabMainFormPlugin.cs" />
     <Compile Include="Interfaces\IMainForm.cs" />