Changeset 2253


Ignore:
Timestamp:
08/06/09 18:11:42 (12 years ago)
Author:
mkommend
Message:

added support for multiple document mainform without docking (ticket #716)

Location:
trunk/sources
Files:
5 added
3 edited
2 copied
1 moved

Legend:

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

    r2250 r2253  
    8787    <Compile Include="ButtonItems\SaveToolStripButtonItem.cs" />
    8888    <Compile Include="ButtonItems\OpenToolStripButtonItem.cs" />
     89    <Compile Include="HeuristicLabMultipleDocumentMainFormTestApplication.cs" />
    8990    <Compile Include="EditorView.cs">
    9091      <SubType>UserControl</SubType>
     
    109110    <Compile Include="Actions\SaveAction.cs" />
    110111    <Compile Include="MenuItems\SaveToolStripMenuItem.cs" />
    111     <Compile Include="HeuristicLabMainFormTestApplication.cs" />
     112    <Compile Include="HeuristicLabDockingMainFormTestApplication.cs" />
    112113    <Compile Include="HeuristicLabMainFormTestPlugin.cs" />
    113114    <Compile Include="ITestUserInterfaceItemProvider.cs" />
  • trunk/sources/HeuristicLab.MainForm.Test/3.2/HeuristicLabDockingMainFormTestApplication.cs

    r2243 r2253  
    2828
    2929namespace HeuristicLab.MainForm.Test {
    30   [ClassInfo(Name = "MainForm Test", Description="Test application for new mainform development.")]
    31   class GridClientApplication : ApplicationBase {
     30  [ClassInfo(Name = "DockingMainForm  Test", Description = "Test application for new mainform development.")]
     31  public class HeuristicLabDockingMainFormTestApplication : ApplicationBase {
    3232    public override void Run() {
    3333      DockingMainForm mainForm = new DockingMainForm(typeof(ITestUserInterfaceItemProvider));
  • trunk/sources/HeuristicLab.MainForm.Test/3.2/HeuristicLabMultipleDocumentMainFormTestApplication.cs

    r2243 r2253  
    2828
    2929namespace HeuristicLab.MainForm.Test {
    30   [ClassInfo(Name = "MainForm Test", Description="Test application for new mainform development.")]
    31   class GridClientApplication : ApplicationBase {
     30  [ClassInfo(Name = "MultipleDocumentMainForm Test", Description="Test application for new mainform development.")]
     31  public class HeuristicLabMultipleDocumentMainFormTestApplication : ApplicationBase {
    3232    public override void Run() {
    33       DockingMainForm mainForm = new DockingMainForm(typeof(ITestUserInterfaceItemProvider));
     33      MultipleDocumentMainForm mainForm = new MultipleDocumentMainForm(typeof(ITestUserInterfaceItemProvider));
    3434      mainForm.Title = "Test new MAINFORM concept";
    3535      Application.Run(mainForm);
  • trunk/sources/HeuristicLab.MainForm/3.2/DockingMainForm.cs

    r2252 r2253  
    5959      DockForm dockForm = (DockForm)sender;
    6060      openViews.Remove(dockForm.View);
     61      if (openViews.Count == 0)
     62        activeView = null;
    6163      dockForm.Activated -= new EventHandler(DockFormActivated);
    6264      dockForm.FormClosing -= new FormClosingEventHandler(DockFormClosing);
  • trunk/sources/HeuristicLab.MainForm/3.2/HeuristicLab.MainForm.csproj

    r2243 r2253  
    8383  <ItemGroup>
    8484    <Compile Include="Interfaces\IUserInterfaceItem.cs" />
     85    <Compile Include="MultipleDocumentMainForm.cs">
     86      <SubType>Form</SubType>
     87    </Compile>
     88    <Compile Include="MultipleDocumentMainForm.Designer.cs">
     89      <DependentUpon>MultipleDocumentMainForm.cs</DependentUpon>
     90    </Compile>
    8591    <Compile Include="ToolStripMenuItemBase.cs" />
    8692    <Compile Include="ToolStripButtonItemBase.cs" />
     
    120126      <DependentUpon>DockForm.cs</DependentUpon>
    121127    </Compile>
     128    <Compile Include="MultipleDocumentForm.cs">
     129      <SubType>Form</SubType>
     130    </Compile>
     131    <Compile Include="MultipleDocumentForm.Designer.cs">
     132      <DependentUpon>MultipleDocumentForm.cs</DependentUpon>
     133    </Compile>
    122134  </ItemGroup>
    123135  <ItemGroup>
     
    143155      <SubType>Designer</SubType>
    144156    </EmbeddedResource>
     157    <EmbeddedResource Include="MultipleDocumentMainForm.resx">
     158      <DependentUpon>MultipleDocumentMainForm.cs</DependentUpon>
     159    </EmbeddedResource>
     160    <EmbeddedResource Include="MultipleDocumentForm.resx">
     161      <DependentUpon>MultipleDocumentForm.cs</DependentUpon>
     162      <SubType>Designer</SubType>
     163    </EmbeddedResource>
    145164  </ItemGroup>
    146165  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • trunk/sources/HeuristicLab.MainForm/3.2/MultipleDocumentForm.cs

    r2242 r2253  
    2727using System.Text;
    2828using System.Windows.Forms;
    29 using HeuristicLab.Core;
    3029
    31 namespace HeuristicLab.OptimizationFrontend {
    32   public partial class ViewForm : Form {
     30namespace HeuristicLab.MainForm {
     31  public partial class MultipleDocumentForm : Form {
    3332    private IView myView;
    3433    public IView View {
     
    3635    }
    3736
    38     public ViewForm() {
     37    public MultipleDocumentForm() {
    3938      InitializeComponent();
    4039    }
    41     public ViewForm(IView view)
     40    public MultipleDocumentForm(IView view)
    4241      : this() {
    4342      myView = view;
Note: See TracChangeset for help on using the changeset viewer.