Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/10 16:15:21 (15 years ago)
Author:
mkommend
Message:

first version of redesigned MainForm (ticket #857)

Location:
trunk/sources/HeuristicLab.MainForm.Test/3.2
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/Actions/NewEditorAction.cs

    r2636 r2696  
    1111      EditorView view = new EditorView();
    1212      view.Caption = "Editor View " + mainform.Views.Count();
    13       mainform.ShowView(view);
     13      view.Show();
    1414    }
    1515  }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/Actions/NewFormAction.cs

    r2458 r2696  
    1010      FormView1 x = new FormView1();
    1111      x.Caption = "FormView";
    12       mainform.ShowView(x);
     12      x.Show();
    1313    }
    1414  }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/ButtonItems/NewEditorToolStripButtonItem.cs

    r2458 r2696  
    66
    77namespace HeuristicLab.MainForm.Test {
    8   public class NewEditorToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, ITestUserInterfaceItemProvider {
     8  public class NewEditorToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItem, ITestUserInterfaceItemProvider {
    99    public override int Position {
    1010      get { return 12; }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/ButtonItems/NewFormToolStripButtonItem.cs

    r2458 r2696  
    66
    77namespace HeuristicLab.MainForm.Test {
    8   public class NewFormToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, ITestUserInterfaceItemProvider {
     8  public class NewFormToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItem, ITestUserInterfaceItemProvider {
    99    public override int Position {
    1010      get { return 11; }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/ButtonItems/NewToolStripButtonItem.cs

    r2458 r2696  
    66
    77namespace HeuristicLab.MainForm.Test {
    8   public class NewToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, ITestUserInterfaceItemProvider {
     8  public class NewToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItem, ITestUserInterfaceItemProvider {
    99    public override int Position {
    1010      get { return 10; }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/ButtonItems/OpenToolStripButtonItem.cs

    r2636 r2696  
    66
    77namespace HeuristicLab.MainForm.Test {
    8   public class OpenToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, ITestUserInterfaceItemProvider {
     8  public class OpenToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItem, ITestUserInterfaceItemProvider {
     9
     10    public OpenToolStripButtonItem()
     11      : base() {
     12      System.Console.Out.Write("test");
     13    }
    914    public override int Position {
    1015      get { return 20; }
    … …  
    2328    }
    2429
    25     public override void ActiveViewChanged(object sender, EventArgs e) {
     30    protected override void OnActiveViewChanged(object sender, EventArgs e) {
    2631      this.ToolStripItem.Enabled = !this.ToolStripItem.Enabled;
    27       MainFormManager.MainForm.Title =
    28         MainFormManager.MainForm.ActiveView == null ? "null" : MainFormManager.MainForm.ActiveView.Caption;
     32      //MainFormManager.MainForm.Title =
     33      //  MainFormManager.MainForm.ActiveView == null ? "null" : MainFormManager.MainForm.ActiveView.Caption;
    2934    }
    3035  }

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

    r2458 r2696  
    66
    77namespace HeuristicLab.MainForm.Test {
    8   public class SaveToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, ITestUserInterfaceItemProvider {
     8  public class SaveToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItem, ITestUserInterfaceItemProvider {
    99    public override int Position {
    1010      get { return 30; }
    … …  
    2323    }
    2424
    25     public override void ActiveViewChanged(object sender, EventArgs e) {
     25    protected override void OnActiveViewChanged(object sender, EventArgs e) {
    2626      IMainForm mainform = MainFormManager.MainForm;
    2727      if (mainform.ActiveView == null)
    … …  
    3131    }
    3232
    33     public override void ViewChanged(object sender, EventArgs e) {
     33    protected override void OnViewChanged(object sender, EventArgs e) {
    3434      this.ToolStripItem.Enabled = !this.ToolStripItem.Enabled;
    3535    }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/ButtonItems/SeparatorToolStripButtonItem.cs

    r2514 r2696  
    66
    77namespace HeuristicLab.MainForm.Test {
    8   public class SeparatorToolStripButtonItem : ToolBarSeparatorItemBase, ITestUserInterfaceItemProvider {
     8  public class SeparatorToolStripButtonItem : ToolBarSeparatorItem, ITestUserInterfaceItemProvider {
    99    public override int Position {
    1010      get { return 15; }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/EditorView.Designer.cs

    r2254 r2696  
    5656      this.ForeColor = System.Drawing.SystemColors.ControlText;
    5757      this.Name = "EditorView";
     58      this.VisibleChanged += new System.EventHandler(this.EditorView_VisibleChanged);
    5859      this.ResumeLayout(false);
    5960      this.PerformLayout();

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/EditorView.cs

    r2466 r2696  
    66using System.Linq;
    77using System.Text;
    8 using System.Windows.Forms;
    98using HeuristicLab.MainForm.WindowsForms;
    109using System.Collections;
     10using System.Windows.Forms;
    1111
    1212namespace HeuristicLab.MainForm.Test {
    13   [Content(typeof(ArrayList),IsDefaultView=true)]
    14   public partial class EditorView : ViewBase {
     13  [Content(typeof(ArrayList), IsDefaultView = true)]
     14  public partial class EditorView : HeuristicLab.MainForm.WindowsForms.View {
    1515    public EditorView()
    1616      : base() {
    … …  
    2525      IEnumerable<Type> views = MainFormManager.GetViewTypes(typeof(ArrayList));
    2626      views.ToString();
    27       IEnumerable<Type> views1 = MainFormManager.GetViewTypes(typeof(IList));
     27      IEnumerable<Type> views1 = MainFormManager.GetViewTypes(typeof(List<string>));
    2828      views1.ToString();
    29       IEnumerable<Type> views2 = MainFormManager.GetViewTypes(typeof(IEnumerable));
     29      IEnumerable<Type> views2 = MainFormManager.GetViewTypes(typeof(List<>));
    3030      views2.ToString();
     31      IEnumerable<Type> views3 = MainFormManager.GetViewTypes(typeof(ICollection<>));
     32      views3.ToString();
    3133
    32       ArrayList list = new ArrayList();
    33       IView defaultView = MainFormManager.CreateDefaultView(list);
    34       MainFormManager.MainForm.ShowView(defaultView);
     34      List<MenuItem> ilist = new List<MenuItem>();
     35      IView defaultView = MainFormManager.CreateDefaultView(ilist);
     36      defaultView.Show();
     37
     38      List<object> list = new List<object>();
     39      IView dView = MainFormManager.CreateDefaultView(list);
     40      if (dView != null)
     41        dView.Show();
    3542      this.OnChanged();
    3643    }
    3744
    38     public override void OnClosing(object sender, CancelEventArgs e) {
     45    protected override void OnClosing(FormClosingEventArgs e) {
    3946      if (DialogResult.Yes != MessageBox.Show(
    4047             "Recent changes have not been saved. Close the editor anyway?", "Close editor?",
    … …  
    4653      }
    4754    }
     55
     56    private void EditorView_VisibleChanged(object sender, EventArgs e) {
     57      MainFormManager.MainForm.Title = "visible: " + this.Visible;
     58    }
    4859  }
    4960}

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/FormView.cs

    r2466 r2696  
    1111
    1212namespace HeuristicLab.MainForm.Test {
    13   [Content(typeof(IList),true)]
    14   public partial class FormView1 : FormView2 {
     13  [Content(typeof(List<string>), true)]
     14  public partial class FormView1 : FormView2<MenuItem> {
    1515    public FormView1() {
    1616      InitializeComponent();
    1717    }
     18
     19    public FormView1(List<string> list)
     20      : this() {
     21    }
    1822  }
    1923}

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/FormView2.Designer.cs

    r2458 r2696  
    11namespace HeuristicLab.MainForm.Test {
    2   partial class FormView2 {
     2  partial class FormView2<T> {
    33    /// <summary>
    44    /// Required designer variable.

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/FormView2.cs

    r2466 r2696  
    11using System;
    2 using System.Collections;
     2using System.Collections.Generic;
    33using System.ComponentModel;
    44using System.Drawing;
    … …  
    66using System.Linq;
    77using System.Text;
    8 using System.Windows.Forms;
    98using HeuristicLab.MainForm.WindowsForms;
    109
    1110namespace HeuristicLab.MainForm.Test {
    12   [Content(typeof(IEnumerable))]
    13   public partial class FormView2 : ViewBase {
     11  [Content(typeof(ICollection<>),true)]
     12  public partial class FormView2<T> : View where T: IMenuItem {
    1413    public FormView2() {
     14      InitializeComponent();
     15    }
     16    public FormView2(ICollection<T> x) {
    1517      InitializeComponent();
    1618    }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/MenuItems/ExitToolStripMenuItem.cs

    r2458 r2696  
    99
    1010namespace HeuristicLab.MainForm.Test {
    11   public class CloseToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, ITestUserInterfaceItemProvider {
     11  public class CloseToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, ITestUserInterfaceItemProvider {
    1212    public override string Name {
    1313      get { return "Exit"; }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/MenuItems/NewEditorToolStripMenuItem.cs

    r2458 r2696  
    99
    1010namespace HeuristicLab.MainForm.Test {
    11   public class NewEditorToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, ITestUserInterfaceItemProvider {
     11  public class NewEditorToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, ITestUserInterfaceItemProvider {
    1212    public override string Name {
    1313      get { return "Editor"; }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/MenuItems/NewFormToolStripMenuItem.cs

    r2458 r2696  
    99
    1010namespace HeuristicLab.MainForm.Test {
    11   public class NewFormToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, ITestUserInterfaceItemProvider {
     11  public class NewFormToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, ITestUserInterfaceItemProvider {
    1212    public override string Name {
    1313      get { return "Form"; }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/MenuItems/OpenToolStripMenuItem.cs

    r2458 r2696  
    88
    99namespace HeuristicLab.MainForm.Test {
    10   public class OpenToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, ITestUserInterfaceItemProvider {
     10  public class OpenToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, ITestUserInterfaceItemProvider {
    1111    public override string Name {
    1212      get { return "Open"; }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/MenuItems/SaveToolStripMenuItem.cs

    r2458 r2696  
    99
    1010namespace HeuristicLab.MainForm.Test {
    11   public class SaveToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, ITestUserInterfaceItemProvider {
     11  public class SaveToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, ITestUserInterfaceItemProvider {
    1212    public override string Name {
    1313      get { return "Save"; }

  • trunk/sources/HeuristicLab.MainForm.Test/3.2/MenuItems/SeparatorMenuItem.cs

    r2514 r2696  
    99
    1010namespace HeuristicLab.MainForm.Test {
    11   public class SeparatorMenuItem : MenuSeparatorItemBase, ITestUserInterfaceItemProvider {
     11  public class SeparatorMenuItem : MenuSeparatorItem, ITestUserInterfaceItemProvider {
    1212    public override IEnumerable<string> Structure {
    1313      get { return new string[] { "File" }; }
Note: See TracChangeset for help on using the changeset viewer.