Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/07/09 16:31:55 (15 years ago)
Author:
mkommend
Message:

first part of changes after discussion with SWA (ticket #716)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.MainForm/3.2/MainFormBase.cs

    r2254 r2256  
    3636      : base() {
    3737      InitializeComponent();
    38       openViews = new List<IView>();
    39       viewStateChangeToolStripItems = new List<IToolStripItem>();
     38      views = new List<IView>();
     39      viewChangeToolStripItems = new List<IToolStripItem>();
    4040      this.userInterfaceItemType = userInterfaceItemType;
    4141      CreateGUI();
     
    4646    public string Title {
    4747      get { return this.Text; }
    48       set { this.Text = value; }
     48      set {
     49        if (InvokeRequired) {
     50          Action<string> action = delegate(string s) { this.Title = s; };
     51          Invoke(action, new object[] { value });
     52        } else
     53          this.Text = value;
     54      }
    4955    }
    5056
    5157    public string StatusStripText {
    5258      get { return this.statusStripLabel.Text; }
    53       set { this.statusStripLabel.Text = value; }
     59      set {
     60        if (InvokeRequired) {
     61          Action<string> action = delegate(string s) { this.statusStripLabel.Text = s; };
     62          Invoke(action, new object[] { value });
     63        } else
     64          this.statusStripLabel.Text = value;
     65      }
    5466    }
    5567
    56     protected Type userInterfaceItemType;
     68    private Type userInterfaceItemType;
    5769    public Type UserInterfaceItemType {
    5870      get { return this.userInterfaceItemType; }
     71      protected set { this.userInterfaceItemType = value; }
    5972    }
    6073
     
    7083    }
    7184
    72     protected List<IToolStripItem> viewStateChangeToolStripItems;
     85    private List<IToolStripItem> viewChangeToolStripItems;
     86    protected IEnumerable<IToolStripItem> ViewChangedToolStripItems {
     87      get { return this.viewChangeToolStripItems; }
     88    }
    7389
    7490    public event EventHandler ActiveViewChanged;
    7591    protected virtual void OnActiveViewChanged() {
    76       if(ActiveViewChanged != null)
    77         ActiveViewChanged(this,new EventArgs());
     92      if (ActiveViewChanged != null)
     93        ActiveViewChanged(this, new EventArgs());
    7894    }
    7995
    80     protected List<IView> openViews;
    81     public IEnumerable<IView> OpenViews {
    82       get { return openViews; }
     96    protected List<IView> views;
     97    public IEnumerable<IView> Views {
     98      get { return views; }
    8399    }
    84100
    85101    public virtual void ShowView(IView view) {
    86       view.MainForm = this;     
    87       openViews.Add(view);
     102      view.MainForm = this;
     103      views.Add(view);
    88104      ActiveView = view;
    89     }
    90 
    91     public void CloseForm() {
    92       this.Close();
    93105    }
    94106    #endregion
     
    160172      if (iToolStripItem.ListenActiveViewChanged)
    161173        this.ActiveViewChanged += new EventHandler(iToolStripItem.ActiveViewChanged);
    162       if (iToolStripItem.ListenViewStateChanged)
    163         this.viewStateChangeToolStripItems.Add(iToolStripItem);
     174      if (iToolStripItem.ListenViewChanged)
     175        this.viewChangeToolStripItems.Add(iToolStripItem);
    164176      toolStripItem.Click += new EventHandler(ToolStripItemClicked);
    165177      iToolStripItem.ToolStripItem = toolStripItem;
Note: See TracChangeset for help on using the changeset viewer.