Changeset 2250 for trunk/sources/HeuristicLab.MainForm/3.2

Timestamp:

08/06/09 15:24:11 (15 years ago)

Author:

mkommend

Message:

tried to add docking views - not working right now (ticket #716)

Location:

trunk/sources/HeuristicLab.MainForm/3.2

Files:

• DockForm.Designer.cs (modified) (2 diffs)
• DockForm.cs (modified) (2 diffs)
• DockingMainForm.cs (modified) (2 diffs)
• Interfaces/IMainForm.cs (modified) (1 diff)
• MainFormBase.cs (modified) (2 diffs)
• ViewBase.cs (modified) (1 diff)

trunk/sources/HeuristicLab.MainForm/3.2/DockForm.Designer.cs

@@ -67 +67 @@
       this.ClientSize = new System.Drawing.Size(632, 446);
       this.Controls.Add(this.viewPanel);
-      this.DockAreas = ((WeifenLuo.WinFormsUI.Docking.DockAreas)((WeifenLuo.WinFormsUI.Docking.DockAreas.Float | WeifenLuo.WinFormsUI.Docking.DockAreas.Document)));
+      this.DockAreas = ((WeifenLuo.WinFormsUI.Docking.DockAreas)(((((WeifenLuo.WinFormsUI.Docking.DockAreas.Float | WeifenLuo.WinFormsUI.Docking.DockAreas.DockLeft)
+            | WeifenLuo.WinFormsUI.Docking.DockAreas.DockRight)
+            | WeifenLuo.WinFormsUI.Docking.DockAreas.DockTop)
+            | WeifenLuo.WinFormsUI.Docking.DockAreas.DockBottom
+            | WeifenLuo.WinFormsUI.Docking.DockAreas.Document)));
       this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
       this.Name = "ViewForm";
@@ -75 +79 @@
       this.TabText = "View";
       this.Text = "View";
-      this.TextChanged += new System.EventHandler(this.ViewForm_TextChanged);
       this.ResumeLayout(false);
-
     }
 

trunk/sources/HeuristicLab.MainForm/3.2/DockForm.cs

@@ -36 +36 @@
     public DockForm(IView view) {
       InitializeComponent();
-      this.view = view;
+      this.view = view;      
       if (View != null) {
         Control control = (Control)View;
@@ -62 +62 @@
         Invoke(new MethodInvoker(UpdateText));
       else
-        Text = View.Caption;
-    }
-
-    private void ViewForm_TextChanged(object sender, EventArgs e) {
-      TabText = Text;
+        TabText = View.Caption;
     }
 

trunk/sources/HeuristicLab.MainForm/3.2/DockingMainForm.cs

@@ -48 +48 @@
         DockContent content = new DockForm(view);
         content.TabText = content.Text;
-        content.Show(dockPanel);
         content.Activated += new EventHandler(DockFormActivated);
         content.FormClosing += new FormClosingEventHandler(DockFormClosing);
+        content.Show(dockPanel, DockState.Document);
       }
     }
@@ -91 +91 @@
       this.dockPanel.RightToLeftLayout = true;
       this.dockPanel.Size = new Size(1016, 663);
+      this.dockPanel.DocumentStyle = DocumentStyle.DockingWindow;
       dockPanelGradient1.EndColor = SystemColors.ControlLight;
       dockPanelGradient1.StartColor = SystemColors.ControlLight;

trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IMainForm.cs

@@ -37 +37 @@
     Type UserInterfaceItemType { get; }
     void ShowView(IView view);
+
+    void Close();
   }
 }

trunk/sources/HeuristicLab.MainForm/3.2/MainFormBase.cs

@@ -72 +72 @@
       openViews.Add(view);
     }
+
+    public void Close() {
+      ((Form)this).Close();
+    }
     #endregion
 
@@ -90 +94 @@
       foreach (IToolStripButtonItem toolStripButtonItem in toolStripItems) {
         AddToolStripButtonItem(toolStripButtonItem);
-      }
+      }      
     }
 

trunk/sources/HeuristicLab.MainForm/3.2/ViewBase.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.MainForm {
-  public partial class ViewBase : UserControl {
+  public partial class ViewBase : UserControl,IView {
     public ViewBase() {
       InitializeComponent();