Free cookie consent management tool by TermsFeed Policy Generator

Changeset 2704


Ignore:
Timestamp:
01/28/10 19:57:39 (14 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:
1 added
2 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/HeuristicLab.MainForm.WindowsForms-3.2.csproj

    r2696 r2704  
    8282  </ItemGroup>
    8383  <ItemGroup>
     84    <Compile Include="ActionUserInterfaceItem.cs" />
    8485    <Compile Include="ContentView.cs">
    8586      <SubType>UserControl</SubType>
  • trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MainForm.cs

    r2703 r2704  
    192192    }
    193193
    194     internal void ShowView(IView view,bool firstTimeShown) {
    195       if (InvokeRequired) Invoke((Action<IView, bool>)ShowView, view,firstTimeShown);
     194    internal void ShowView(IView view, bool firstTimeShown) {
     195      if (InvokeRequired) Invoke((Action<IView, bool>)ShowView, view, firstTimeShown);
    196196      else {
    197197        if (firstTimeShown) {
     
    347347      toolStripItem.Image = userInterfaceItem.Image;
    348348      toolStripItem.Click += new EventHandler(ToolStripItemClicked);
     349      if (userInterfaceItem is ActionUserInterfaceItem)
     350        ((ActionUserInterfaceItem)userInterfaceItem).OnToolStripItemSet(new EventArgs());
    349351      this.userInterfaceItems.Add(userInterfaceItem);
    350352    }
  • trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MenuItem.cs

    r2696 r2704  
    2626
    2727namespace HeuristicLab.MainForm.WindowsForms {
    28   public abstract class MenuItem : HeuristicLab.MainForm.MenuItem{
     28  public abstract class MenuItem : ActionUserInterfaceItem,IMenuItem{
    2929    public virtual Keys ShortCutKeys {
    3030      get { return Keys.None; }
    3131    }
    32 
    33     private ToolStripItem toolStripItem;
    34     public virtual ToolStripItem ToolStripItem {
    35       get { return this.toolStripItem; }
    36       internal set { this.toolStripItem = value; }
    37     }
    38 
    39     public virtual ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
    40       get { return ToolStripItemDisplayStyle.ImageAndText; }
    41     }
    4232  }
    4333}
  • trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ToolBarItem.cs

    r2696 r2704  
    2727
    2828namespace HeuristicLab.MainForm.WindowsForms {
    29   public abstract class ToolBarItem : HeuristicLab.MainForm.ToolBarItem {
    30     private ToolStripItem toolStripItem;
    31     public virtual ToolStripItem ToolStripItem {
    32       get { return this.toolStripItem; }
    33       internal set { this.toolStripItem = value; }
    34     }
    35 
     29  public abstract class ToolBarItem : ActionUserInterfaceItem,IToolBarItem {
    3630    public virtual bool IsDropDownButton {
    3731      get { return false; }
    3832    }
    39 
    40     public virtual ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
    41       get { return ToolStripItemDisplayStyle.Image; }
    42     }
    4333  }
    4434}
  • trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/View.cs

    r2696 r2704  
    5454    }
    5555
    56     public void Show() {
     56    public new void Show() {
    5757      MainForm mainform = MainFormManager.GetMainForm<MainForm>();
    5858      bool firstTimeShown = mainform.GetForm(this) == null;
     
    8181    }
    8282
    83     public void Hide() {
     83    public new void Hide() {
    8484      MainFormManager.GetMainForm<MainForm>().HideView(this);
    8585      this.OnHidden(new EventArgs());
  • trunk/sources/HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj

    r2696 r2704  
    9393    <Compile Include="Interfaces\IToolBarItem.cs" />
    9494    <Compile Include="MainFormManager.cs" />
    95     <Compile Include="MenuItem.cs" />
    9695    <Compile Include="MenuSeparatorItem.cs" />
    97     <Compile Include="ToolBarItem.cs" />
    9896    <Compile Include="HeuristicLabMainFormPlugin.cs" />
    9997    <Compile Include="Interfaces\IMainForm.cs" />
Note: See TracChangeset for help on using the changeset viewer.