Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/30/09 17:17:53 (15 years ago)
Author:
mkommend
Message:

integrated branch MainForm refactoring into trunk (ticket #771)

Location:
trunk/sources/HeuristicLab.MainForm.Test/3.2
Files:
2 deleted
22 edited
3 copied

Legend:

Unmodified
Added
Removed

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

    r2252 r2458  
    66
    77namespace HeuristicLab.MainForm.Test {
    8   public class NewEditorAction : IAction{
    9     #region IAction Members
    10 
    11     public void Execute(IMainForm mainform) {
    12       mainform.StatusStripText = "New Editor action called";
    13       EditorView x = new EditorView();
    14       x.Caption = "Editor View";
    15       mainform.ShowView(x);
     8  public static class NewEditorAction{
     9    private static IView view;
     10    public static void Execute(IMainForm mainform) {
     11      if (view == null)
     12        view = new EditorView();
     13      view.Caption = "Editor View";
     14      mainform.ShowView(view);
    1615    }
    17 
    18     #endregion
    1916  }
    2017

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

    r2252 r2458  
    66
    77namespace HeuristicLab.MainForm.Test {
    8   public class NewFormAction : IAction{
    9     #region IAction Members
    10 
     8  public class NewFormAction {
    119    public void Execute(IMainForm mainform) {
    12       mainform.StatusStripText = "New form called";
    13       FormView x = new FormView();
     10      FormView1 x = new FormView1();
    1411      x.Caption = "FormView";
    1512      mainform.ShowView(x);
    1613    }
    17 
    18     #endregion
    1914  }
    2015

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

    r2249 r2458  
    66
    77namespace HeuristicLab.MainForm.Test {
    8   public class OpenAction : IAction {
    9     #region IAction Members
    10 
     8  public class OpenAction  {
    119    public void Execute(IMainForm mainform) {
    12       mainform.StatusStripText = "Open action called";
     10      MessageBox.Show("Open action called");
    1311    }
    14 
    15     #endregion
    1612  }
    1713}

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

    r2249 r2458  
    66
    77namespace HeuristicLab.MainForm.Test {
    8   public class SaveAction : IAction{
    9     #region IAction Members
     8  public class SaveAction {
    109    public void Execute(IMainForm mainform) {
    11       mainform.StatusStripText = "Save action called";
     10      MessageBox.Show("Save action called");
    1211    }
    13     #endregion
    1412  }
    1513}

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

    r2249 r2458  
    33using System.Linq;
    44using System.Text;
     5using HeuristicLab.MainForm.WindowsForms;
    56
    67namespace HeuristicLab.MainForm.Test {
    7   public class NewEditorToolStripButtonItem : ToolStripButtonItemBase, ITestUserInterfaceItemProvider {
     8  public class NewEditorToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, ITestUserInterfaceItemProvider {
    89    public override int Position {
    910      get { return 12; }
    … …  
    1415    }
    1516
    16     public override string Structure {
    17       get { return "New"; }
     17    public override IEnumerable<string> Structure {
     18      get { return new string []{"New"}; }
    1819    }
    1920
    20     public override void Execute(IMainForm mainform) {
    21       new NewEditorAction().Execute(mainform);
     21    public override System.Windows.Forms.ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
     22      get { return System.Windows.Forms.ToolStripItemDisplayStyle.ImageAndText; }
     23    }
     24
     25    public override void Execute() {
     26      NewEditorAction.Execute(MainFormManager.MainForm);
    2227    }
    2328  }

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

    r2249 r2458  
    33using System.Linq;
    44using System.Text;
     5using HeuristicLab.MainForm.WindowsForms;
    56
    67namespace HeuristicLab.MainForm.Test {
    7   public class NewFormToolStripButtonItem : ToolStripButtonItemBase, ITestUserInterfaceItemProvider {
     8  public class NewFormToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, ITestUserInterfaceItemProvider {
    89    public override int Position {
    910      get { return 11; }
    … …  
    1415    }
    1516
    16     public override string Structure {
    17       get { return "New"; }
     17    public override IEnumerable<string> Structure {
     18      get { return new string[] { "New" }; }
    1819    }
    1920
    20     public override void Execute(IMainForm mainform) {
    21       new NewFormAction().Execute(mainform);
     21    public override System.Windows.Forms.ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
     22      get { return System.Windows.Forms.ToolStripItemDisplayStyle.ImageAndText; }
     23    }
     24
     25    public override void Execute() {
     26      new NewFormAction().Execute(MainFormManager.MainForm);
    2227    }
    2328  }

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

    r2249 r2458  
    33using System.Linq;
    44using System.Text;
     5using HeuristicLab.MainForm.WindowsForms;
    56
    67namespace HeuristicLab.MainForm.Test {
    7   public class NewToolStripButtonItem : ToolStripButtonItemBase, ITestUserInterfaceItemProvider {
     8  public class NewToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, ITestUserInterfaceItemProvider {
    89    public override int Position {
    910      get { return 10; }
    … …  
    2223    }
    2324
    24     public override void Execute(IMainForm mainform) {
     25    public override void Execute() {
    2526    }
    2627  }

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

    r2249 r2458  
    33using System.Linq;
    44using System.Text;
     5using HeuristicLab.MainForm.WindowsForms;
    56
    67namespace HeuristicLab.MainForm.Test {
    7   public class OpenToolStripButtonItem : ToolStripButtonItemBase, ITestUserInterfaceItemProvider {
     8  public class OpenToolStripButtonItem : ToolBarItemBase, ITestUserInterfaceItemProvider {
    89    public override int Position {
    910      get { return 20; }
    … …  
    1819    }
    1920
    20     public override void Execute(IMainForm mainform) {
    21       new OpenAction().Execute(mainform);
     21    public override void Execute() {
     22      new OpenAction().Execute(MainFormManager.MainForm);
    2223    }
    2324  }

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

    r2269 r2458  
    33using System.Linq;
    44using System.Text;
     5using HeuristicLab.MainForm.WindowsForms;
    56
    67namespace HeuristicLab.MainForm.Test {
    7   public class SaveToolStripButtonItem : ToolStripButtonItemBase, ITestUserInterfaceItemProvider {
     8  public class SaveToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, ITestUserInterfaceItemProvider {
    89    public override int Position {
    910      get { return 30; }
    … …  
    1819    }
    1920
    20     public override void Execute(IMainForm mainform) {
    21       new SaveAction().Execute(mainform);
     21    public override void Execute() {
     22      new SaveAction().Execute(MainFormManager.MainForm);
    2223    }
    2324
    2425    public override void ActiveViewChanged(object sender, EventArgs e) {
    25       IMainForm mainform = (IMainForm)sender;
     26      IMainForm mainform = MainFormManager.MainForm;
    2627      if (mainform.ActiveView == null)
    2728        this.ToolStripItem.Enabled = false;
    2829      else
    29         this.ToolStripItem.Enabled = !(mainform.ActiveView is FormView);
     30        this.ToolStripItem.Enabled = !(mainform.ActiveView is FormView1);
    3031    }
    3132

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

    r2266 r2458  
    77using System.Text;
    88using System.Windows.Forms;
     9using HeuristicLab.MainForm.WindowsForms;
     10using System.Collections;
    911
    1012namespace HeuristicLab.MainForm.Test {
    11   public partial class EditorView : ViewBase {
     13  [DefaultViewAttribute]
     14  public partial class EditorView : ViewBase<ArrayList> {
    1215    public EditorView() {
    1316      InitializeComponent();
    1417    }
    1518
    16     public EditorView(IMainForm mainform)
    17       : base(mainform) {
     19    private void ChangeStateButton_Click(object sender, EventArgs e) {
     20      IEnumerable<Type> views = MainFormManager.GetViewTypes(typeof(ArrayList));
     21      views.ToString();
     22      IEnumerable<Type> views1 = MainFormManager.GetViewTypes(typeof(IList));
     23      views1.ToString();
     24      //IEnumerable<Type> views2 = MainFormManager.GetViewTypes(typeof(object));
     25      //views2.ToString();
     26      Type def2 = MainFormManager.GetDefaultViewType(typeof(IList));
     27      def2.ToString();
     28      Type def1 = MainFormManager.GetDefaultViewType(typeof(ArrayList));
     29      def1.ToString();
     30      //Type def3 = MainFormManager.GetDefaultViewType(typeof(object));
     31      //def3.ToString();
     32
     33      MainFormManager.MainForm.HideView(this);
     34      this.OnChanged();
    1835    }
    1936
    20     private void ChangeStateButton_Click(object sender, EventArgs e) {
    21       this.OnStateChanged();
    22     }
    23 
    24     public override void FormClosing(object sender, FormClosingEventArgs e) {
     37    public override void OnClosing(object sender, CancelEventArgs e) {
    2538      if (DialogResult.Yes != MessageBox.Show(
    2639             "Recent changes have not been saved. Close the editor anyway?", "Close editor?",

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

    r2250 r2458  
    11namespace HeuristicLab.MainForm.Test {
    2   partial class FormView {
     2  partial class FormView1 {
    33    /// <summary>
    44    /// Required designer variable.

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

    r2252 r2458  
    77using System.Text;
    88using System.Windows.Forms;
     9using HeuristicLab.MainForm.WindowsForms;
     10using System.Collections;
    911
    1012namespace HeuristicLab.MainForm.Test {
    11   public partial class FormView : ViewBase {
     13  [DefaultViewAttribute]
     14  public partial class FormView1 : ViewBase<ICollection> {
    1215    private int[] array;
    13     public FormView() {
     16    public FormView1() {
    1417      InitializeComponent();
    15     }
    16 
    17     public FormView(IMainForm mainform)
    18       : base(mainform) {
    1918    }
    2019  }

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

    r2276 r2458  
    8787    <Compile Include="ButtonItems\SaveToolStripButtonItem.cs" />
    8888    <Compile Include="ButtonItems\OpenToolStripButtonItem.cs" />
     89    <Compile Include="FormView2.cs">
     90      <SubType>UserControl</SubType>
     91    </Compile>
     92    <Compile Include="FormView2.Designer.cs">
     93      <DependentUpon>FormView2.cs</DependentUpon>
     94    </Compile>
    8995    <Compile Include="HeuristicLabSingleDocumentMainFormTestApplication.cs" />
    9096    <Compile Include="HeuristicLabMultipleDocumentMainFormTestApplication.cs" />
    … …  
    104110    <Compile Include="MenuItems\NewFormToolStripMenuItem.cs" />
    105111    <Compile Include="MenuItems\NewEditorToolStripMenuItem.cs" />
    106     <Compile Include="MenuItems\FileToolStripMenuItem.cs" />
    107     <Compile Include="MenuItems\NewToolStripMenuItem.cs" />
    108112    <Compile Include="Actions\NewFormAction.cs" />
    109113    <Compile Include="Actions\OpenAction.cs" />
    … …  
    125129      <Name>HeuristicLab.Common.Resources-3.2</Name>
    126130    </ProjectReference>
     131    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.2\HeuristicLab.MainForm.WindowsForms.csproj">
     132      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     133      <Name>HeuristicLab.MainForm.WindowsForms</Name>
     134    </ProjectReference>
    127135    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.2\HeuristicLab.MainForm-3.2.csproj">
    128136      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    … …  
    138146  </ItemGroup>
    139147  <ItemGroup>
     148    <EmbeddedResource Include="FormView2.resx">
     149      <DependentUpon>FormView2.cs</DependentUpon>
     150    </EmbeddedResource>
    140151    <EmbeddedResource Include="EditorView.resx">
    141152      <DependentUpon>EditorView.cs</DependentUpon>

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

    r2253 r2458  
    2525using System.Windows.Forms;
    2626using HeuristicLab.PluginInfrastructure;
    27 using HeuristicLab.MainForm;
     27using HeuristicLab.MainForm.WindowsForms;
    2828
    2929namespace HeuristicLab.MainForm.Test {

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

    r2247 r2458  
    2525using HeuristicLab.PluginInfrastructure;
    2626
    27 namespace HeuristicLab.Modeling.Database {
     27namespace HeuristicLab.MainForm.Test {
    2828  [ClassInfo(Name = "HeuristicLab.MainForm.Test-3.2")]
    29   [PluginFile(Filename = "HeuristicLab.MainForm.Test-3.2.dll", Filetype = PluginFileType.Assembly)] 
    30   [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
     29  [PluginFile(Filename = "HeuristicLab.MainForm.Test-3.2.dll", Filetype = PluginFileType.Assembly)]
     30  [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]
    3131  [Dependency(Dependency = "HeuristicLab.Common.Resources-3.2")]
    3232  public class HeuristicLabMainFormTestPlugin : PluginBase {

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

    r2253 r2458  
    2525using System.Windows.Forms;
    2626using HeuristicLab.PluginInfrastructure;
    27 using HeuristicLab.MainForm;
     27using HeuristicLab.MainForm.WindowsForms;
    2828
    2929namespace HeuristicLab.MainForm.Test {

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

    r2268 r2458  
    2525using System.Windows.Forms;
    2626using HeuristicLab.PluginInfrastructure;
    27 using HeuristicLab.MainForm;
     27using HeuristicLab.MainForm.WindowsForms;
    2828
    2929namespace HeuristicLab.MainForm.Test {

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

    r2256 r2458  
    55using System.Windows.Forms;
    66
    7 using HeuristicLab.MainForm;
     7using HeuristicLab.MainForm.WindowsForms;
    88using HeuristicLab.Common.Resources;
    99
    1010namespace HeuristicLab.MainForm.Test {
    11   public class CloseToolStripMenuItem : ToolStripMenuItemBase, ITestUserInterfaceItemProvider {
     11  public class CloseToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, ITestUserInterfaceItemProvider {
    1212    public override string Name {
    1313      get { return "Exit"; }
    1414    }
    1515
    16     public override string Structure {
    17       get { return "File"; }
     16    public override IEnumerable<string> Structure {
     17      get { return new string[] { "File" }; }
    1818    }
    1919
    … …  
    2222    }
    2323
    24     public override void Execute(IMainForm mainform) {
    25       mainform.Close();
     24    public override void Execute() {
     25      MainFormManager.MainForm.Close();
    2626    }
    2727  }

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

    r2249 r2458  
    55using System.Windows.Forms;
    66
    7 using HeuristicLab.MainForm;
    87using HeuristicLab.Common.Resources;
     8using HeuristicLab.MainForm.WindowsForms;
    99
    1010namespace HeuristicLab.MainForm.Test {
    11   public class NewEditorToolStripMenuItem : ToolStripMenuItemBase, ITestUserInterfaceItemProvider {
     11  public class NewEditorToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, ITestUserInterfaceItemProvider {
    1212    public override string Name {
    1313      get { return "Editor"; }
    1414    }
    1515
    16     public override string Structure {
    17       get { return "File/New"; }
     16    public override IEnumerable<string> Structure {
     17      get { return "File/New".Split('/'); }
    1818    }
    1919
    … …  
    2222    }
    2323
    24     public override void Execute(IMainForm mainform) {
    25       new NewEditorAction().Execute(mainform);
     24    public override void Execute() {
     25      NewEditorAction.Execute(MainFormManager.MainForm);
    2626    }
    2727  }

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

    r2249 r2458  
    55using System.Windows.Forms;
    66
    7 using HeuristicLab.MainForm;
     7using HeuristicLab.MainForm.WindowsForms;
    88using HeuristicLab.Common.Resources;
    99
    1010namespace HeuristicLab.MainForm.Test {
    11   public class NewFormToolStripMenuItem : ToolStripMenuItemBase, ITestUserInterfaceItemProvider {
     11  public class NewFormToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, ITestUserInterfaceItemProvider {
    1212    public override string Name {
    1313      get { return "Form"; }
    1414    }
    1515
    16     public override string Structure {
    17       get { return "File/New"; }
     16    public override IEnumerable<string> Structure {
     17      get { return "File/New".Split('/'); }
    1818    }
    1919
    2020    public override int Position {
    2121      get { return 1110; }
     22   
    2223    }
    2324
    24     public override void Execute(IMainForm mainform) {
    25       new NewFormAction().Execute(mainform);
     25    public override void Execute() {
     26      new NewFormAction().Execute(MainFormManager.MainForm);
    2627    }
    2728  }

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

    r2249 r2458  
    44using System.Text;
    55using System.Windows.Forms;
    6 using HeuristicLab.MainForm;
     6using HeuristicLab.MainForm.WindowsForms;
    77using HeuristicLab.Common.Resources;
    88
    99namespace HeuristicLab.MainForm.Test {
    10   public class OpenToolStripMenuItem : ToolStripMenuItemBase, ITestUserInterfaceItemProvider {
     10  public class OpenToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, ITestUserInterfaceItemProvider {
    1111    public override string Name {
    1212      get { return "Open"; }
    13     }   
     13    }
    1414
    15     public override string Structure {
    16       get { return "File"; }
     15    public override IEnumerable<string> Structure {
     16      get { return new string[] { "File" }; }
    1717    }
    1818
    … …  
    2929    }
    3030
    31     public override void Execute(IMainForm mainform) {
    32       new OpenAction().Execute(mainform);
     31    public override void Execute() {
     32      new OpenAction().Execute(MainFormManager.MainForm);
    3333    }
    3434  }

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

    r2249 r2458  
    55using System.Windows.Forms;
    66
    7 using HeuristicLab.MainForm;
     7using HeuristicLab.MainForm.WindowsForms;
    88using HeuristicLab.Common.Resources;
    99
    1010namespace HeuristicLab.MainForm.Test {
    11   public class SaveToolStripMenuItem : ToolStripMenuItemBase, ITestUserInterfaceItemProvider {
     11  public class SaveToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, ITestUserInterfaceItemProvider {
    1212    public override string Name {
    1313      get { return "Save"; }
    1414    }
    1515
    16     public override string Structure {
    17       get { return "File"; }
     16    public override IEnumerable<string> Structure {
     17      get { return new string[]{"File"}; }
    1818    }
    1919
    … …  
    3030    }
    3131
    32     public override void Execute(IMainForm mainform) {
    33       new SaveAction().Execute(mainform);
     32    public override void Execute() {
     33      new SaveAction().Execute(MainFormManager.MainForm);
    3434    }
    3535  }
Note: See TracChangeset for help on using the changeset viewer.