Changeset 3281 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Timestamp:

04/07/10 11:38:19 (14 years ago)

Author:

mkommend

Message:

implemented showInViewHost and moved ViewHost from Core.Views to MainForm.WindowsForm (ticket #961)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Files:

• DockForm.cs (modified) (4 diffs)
• DocumentForm.Designer.cs (modified) (1 diff)
• DocumentForm.cs (modified) (3 diffs)
• HeuristicLab.MainForm.WindowsForms-3.2.csproj (modified) (2 diffs)
• HeuristicLabMainFormWindowsFormsPlugin.cs.frame (modified) (1 diff)
• ViewHost.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/ViewHost.Designer.cs) (1 diff)
• ViewHost.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/ViewHost.cs) (3 diffs)

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

@@ -37 +37 @@
       InitializeComponent();
       this.view = view;
-      if (View != null) {
+      if (view != null) {
         if (view is UserControl) {
           switch (((UserControl)view).Dock) {
@@ -53 +53 @@
               break;
           }
-          Control control = (Control)View;
+          Type viewType = view.GetType();
+          Control control = (Control)view;
           control.Dock = DockStyle.Fill;
-          this.Size = control.Size;
-          viewPanel.Controls.Add(control);
-          View.CaptionChanged += new EventHandler(View_CaptionChanged);
+          this.view.CaptionChanged += new EventHandler(View_CaptionChanged);
           UpdateText();
+
+          ContentView contentView = view as ContentView;
+          if (ViewAttribute.GetShowInViewHost(viewType) && contentView != null) {
+            ViewHost viewHost = new ViewHost();
+            viewHost.ViewType = viewType;
+            viewHost.Content = contentView.Content;
+            viewHost.Dock = DockStyle.Fill;
+            viewPanel.Controls.Add(viewHost);
+          } else
+            viewPanel.Controls.Add(control);
         }
       } else {
@@ -69 +78 @@
       }
     }
-
     private IView view;
     public IView View {
-      get { return view; }
+      get { return this.view; }
     }
 
@@ -79 +87 @@
         Invoke(new MethodInvoker(UpdateText));
       else
-        this.Text = View.Caption;
+        this.Text = this.View.Caption;
     }
 

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/DocumentForm.Designer.cs

@@ -32 +32 @@
     /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
     protected override void Dispose(bool disposing) {
-      if (View != null)
-        View.CaptionChanged -= new System.EventHandler(View_CaptionChanged);
+      if (view != null)
+        view.CaptionChanged -= new System.EventHandler(View_CaptionChanged);
       if (disposing && (components != null)) {
         components.Dispose();

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/DocumentForm.cs

@@ -30 +30 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   internal partial class DocumentForm : Form {
-    private IView myView;
-    public IView View {
-      get { return myView; }
-    }
+    private IView view;
 
     public DocumentForm() {
@@ -40 +37 @@
     public DocumentForm(IView view)
       : this() {
-      myView = view;
-      if (View != null) {
-        Control control = (Control)View;
+      this.view = view;
+      if (view != null) {
+        Type viewType = view.GetType();
+        Control control = (Control)view;
         control.Dock = DockStyle.Fill;
-        viewPanel.Controls.Add(control);
-        View.CaptionChanged += new EventHandler(View_CaptionChanged);
+        view.CaptionChanged += new EventHandler(View_CaptionChanged);
         UpdateText();
+
+        ContentView contentView = view as ContentView;
+        if (ViewAttribute.GetShowInViewHost(viewType) && contentView != null) {
+          ViewHost viewHost = new ViewHost();
+          viewHost.ViewType = viewType;
+          viewHost.Content = contentView.Content;
+          viewHost.Dock = DockStyle.Fill;
+          viewPanel.Controls.Add(viewHost);
+        } else
+          viewPanel.Controls.Add(control);
       } else {
         Label errorLabel = new Label();
@@ -61 +68 @@
         Invoke(new MethodInvoker(UpdateText));
       else
-        Text = View.Caption;
+        Text = view.Caption;
     }
 

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/HeuristicLab.MainForm.WindowsForms-3.2.csproj

@@ -152 +152 @@
       <DependentUpon>ViewContextMenuStrip.cs</DependentUpon>
     </Compile>
+    <Compile Include="ViewHost.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ViewHost.Designer.cs">
+      <DependentUpon>ViewHost.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -158 +164 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
+      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\WinFormsUI-2.3.1\WinFormsUI-2.3.1.csproj">
       <Project>{1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}</Project>

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/HeuristicLabMainFormWindowsFormsPlugin.cs.frame

@@ -27 +27 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   [Plugin("HeuristicLab.MainForm.WindowsForms", "3.2.0.$WCREV$")]
-  [PluginFile("HeuristicLab.MainForm.WindowsForms-3.2.dll", PluginFileType.Assembly)]  
+  [PluginFile("HeuristicLab.MainForm.WindowsForms-3.2.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Common.Resources", "3.2")]
   [PluginDependency("HeuristicLab.MainForm", "3.2")]
   [PluginDependency("HeuristicLab.WinFormsUI", "2.3.1")]

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ViewHost.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Core.Views {
+namespace HeuristicLab.MainForm.WindowsForms {
   partial class ViewHost {
     /// <summary> 

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ViewHost.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Common;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Core.Views {
+namespace HeuristicLab.MainForm.WindowsForms {
   public sealed partial class ViewHost : UserControl {
     private Type viewType;
@@ -37 +35 @@
           if (value != null && !ViewCanShowContent(value, content))
             throw new ArgumentException(string.Format("View \"{0}\" cannot display content \"{1}\".",
-                                                      value.GetPrettyName(),
-                                                      content.GetType().GetPrettyName()));
+                                                      value, content.GetType()));
           viewType = value;
           UpdateView();
@@ -110 +107 @@
       if (!ViewCanShowContent(viewType, content))
         throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".",
-                                                          viewType.GetPrettyName(),
-                                                          Content.GetType().GetPrettyName()));
+                                                          viewType, Content.GetType()));
 
       UpdateActiveMenuItem();