Changeset 10103 for branches/Breadcrumbs

Timestamp:

11/04/13 10:15:31 (11 years ago)

Author:

jkarder

Message:

#2116:

• fixed issues within the outermost control detection
• fixed visible property assignment of the breadcrumb control in ViewHost

Location:

branches/Breadcrumbs

Files:

• HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemListView.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ParameterCollectionView.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/BreadcrumbControl.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs (modified) (6 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.Designer.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunView.cs (modified) (2 diffs)

branches/Breadcrumbs/HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs

@@ -180 +180 @@
       this.viewHost.Caption = "View";
       this.viewHost.Content = null;
+      this.viewHost.IsValidOutermostViewhost = false;
       this.viewHost.Location = new System.Drawing.Point(6, 19);
       this.viewHost.Name = "viewHost";

branches/Breadcrumbs/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -225 +225 @@
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
         var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this, true);
-        if (!outermostViewHost.HotlinkingEnabled) {
+        if (outermostViewHost == null || !outermostViewHost.HotlinkingEnabled) {
           if (showDetailsCheckBox.Checked) {
             detailsGroupBox.Enabled = true;
@@ -252 +252 @@
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
         var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this);
-        outermostViewHost.ActiveView.ReadOnly = ReadOnly;
-        outermostViewHost.ActiveView.Locked = Locked;
+        if (outermostViewHost != null) {
+          outermostViewHost.ActiveView.ReadOnly = ReadOnly;
+          outermostViewHost.ActiveView.Locked = Locked;
+        }
       }
     }

branches/Breadcrumbs/HeuristicLab.Core.Views/3.3/ItemListView.Designer.cs

@@ -193 +193 @@
       this.viewHost.Caption = "View";
       this.viewHost.Content = null;
+      this.viewHost.IsValidOutermostViewhost = false;
       this.viewHost.Location = new System.Drawing.Point(6, 19);
       this.viewHost.Name = "viewHost";

branches/Breadcrumbs/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -246 +246 @@
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
         var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this, true);
-        if (outermostViewHost.HotlinkingEnabled) {
+        if (outermostViewHost != null && outermostViewHost.HotlinkingEnabled) {
           outermostViewHost.ActiveView.ReadOnly = ReadOnly;
           outermostViewHost.ActiveView.Locked = Locked;
@@ -275 +275 @@
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
         var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this);
-        outermostViewHost.ActiveView.ReadOnly = ReadOnly;
-        outermostViewHost.ActiveView.Locked = Locked;
+        if (outermostViewHost != null) {
+          outermostViewHost.ActiveView.ReadOnly = ReadOnly;
+          outermostViewHost.ActiveView.Locked = Locked;
+        }
       }
     }

branches/Breadcrumbs/HeuristicLab.Core.Views/3.3/ParameterCollectionView.cs

@@ -154 +154 @@
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
         var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this, true);
-        if (outermostViewHost.HotlinkingEnabled) {
+        if (outermostViewHost != null && outermostViewHost.HotlinkingEnabled) {
           outermostViewHost.ActiveView.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
           outermostViewHost.ActiveView.Locked = Locked;
@@ -173 +173 @@
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
         var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this);
-        outermostViewHost.ActiveView.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
-        outermostViewHost.ActiveView.Locked = Locked;
+        if (outermostViewHost != null) {
+          outermostViewHost.ActiveView.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
+          outermostViewHost.ActiveView.Locked = Locked;
+        }
       }
     }

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/Controls/BreadcrumbControl.cs

@@ -129 +129 @@
         breadcrumbs.RemoveLast();
       var mainForm = MainFormManager.GetMainForm<MainForm>();
-      var outermostViewHost = mainForm.GetOutermostViewOfType<ViewHost>(ViewHost);
+      var outermostViewHost = mainForm.GetOutermostControlOfType<ViewHost>(ViewHost);
       bool showBreadcrumbs = outermostViewHost.ShowBreadcrumbs;
       outermostViewHost.Content = null;

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
@@ -41 +42 @@
       viewsLabel.Visible = false;
       viewsLabelVisible = true;
+      IsValidOutermostViewhost = true;
 
       breadcrumbControl.ViewHost = this;
@@ -59 +61 @@
 
     public bool HotlinkingEnabled { get; set; }
+
+    [DefaultValue(true)]
+    public bool IsValidOutermostViewhost { get; set; }
 
     private IContentView cachedView;
@@ -132 +137 @@
     }
 
-    private bool isOutermostViewHost;
     public IEnumerable<IContent> Breadcrumbs { get { return breadcrumbControl.Breadcrumbs; } }
 
@@ -281 +285 @@
 
     private void UpdateBreadcrumbControl() {
-      breadcrumbControl.Visible = ShowBreadcrumbs;
+      breadcrumbControl.Visible = ShowBreadcrumbs && Content != null;
       if (ShowBreadcrumbs)
         UpdateBreadcrumbTrail(breadcrumbControl.Breadcrumbs, BuildBreadcrumbTrail());
@@ -378 +382 @@
 
     private void PerformOutermostViewHostDetection() {
+      if (!IsValidOutermostViewhost) return;
       var mainForm = MainFormManager.GetMainForm<MainForm>();
-      if (mainForm == null) return;
-      var outermostViewHost = mainForm.GetOutermostViewOfType<ViewHost>(this);
-      isOutermostViewHost = outermostViewHost == this;
-      viewContextMenuStrip.ShowBreadcrumbsToolStripMenuItem.Checked = isOutermostViewHost;
+      if (mainForm == null) return; // needed for designer
+      var outermostViewHost = mainForm.GetOutermostControlOfType<ViewHost>(this);
+      viewContextMenuStrip.ShowBreadcrumbsToolStripMenuItem.Checked = outermostViewHost == this;
     }
     #endregion

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -223 +223 @@
     }
 
-    public T GetOutermostViewOfType<T>(Control childControl) where T : class, IView {
+    public T GetOutermostControlOfType<T>(Control childControl) where T : Control {
       if (childControl == null) throw new ArgumentNullException("childControl", "ChildControl cannot be null.");
 
-      T outermostView = null;
+      T outermostControl = null;
       for (var control = childControl; control != null; control = control.Parent) {
-        var vh = control as T;
-        if (vh != null) outermostView = vh;
-      }
-      return outermostView;
+        var c = control as T;
+        if (c != null) outermostControl = c;
+      }
+      return outermostControl;
     }
 
@@ -279 +279 @@
       if (childControl == null) throw new ArgumentNullException("childControl", "ChildControl cannot be null.");
 
-      var outermostViewHost = GetOutermostViewOfType<ViewHost>(childControl);
-      if (outermostViewHost == null)
-        throw new ArgumentException("No outermost ViewHost could be found for the specified child control.", "childControl");
+      var outermostViewHost = GetOutermostControlOfType<ViewHost>(childControl);
+      if (outermostViewHost == null) return null;
 
       if (!requireHotlinking || outermostViewHost.HotlinkingEnabled) {

branches/Breadcrumbs/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.Designer.cs

@@ -235 +235 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.detailsViewHost.Content = null;
+      this.detailsViewHost.IsValidOutermostViewhost = false;
       this.detailsViewHost.Location = new System.Drawing.Point(3, 16);
       this.detailsViewHost.Name = "detailsViewHost";

branches/Breadcrumbs/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.cs

@@ -142 +142 @@
             var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
             var outermostViewHost = mainForm.ShowContentInOutermostViewHost(op, this);
-            outermostViewHost.ActiveView.ReadOnly = ReadOnly;
-            outermostViewHost.ActiveView.Locked = Locked;
+            if (outermostViewHost != null) {
+              outermostViewHost.ActiveView.ReadOnly = ReadOnly;
+              outermostViewHost.ActiveView.Locked = Locked;
+            }
             HandledMouseEventArgs eventArgs = e as HandledMouseEventArgs;
             if (eventArgs != null)
@@ -196 +198 @@
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
         var outermostViewHost = mainForm.ShowContentInOutermostViewHost(op, this);
-        outermostViewHost.ActiveView.ReadOnly = ReadOnly;
-        outermostViewHost.ActiveView.Locked = Locked;
+        if (outermostViewHost != null) {
+          outermostViewHost.ActiveView.ReadOnly = ReadOnly;
+          outermostViewHost.ActiveView.Locked = Locked;
+        }
       }
     }

branches/Breadcrumbs/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionView.Designer.cs

@@ -216 +216 @@
       this.viewHost.Caption = "View";
       this.viewHost.Content = null;
+      this.viewHost.IsValidOutermostViewhost = false;
       this.viewHost.Location = new System.Drawing.Point(6, 19);
       this.viewHost.Name = "viewHost";

branches/Breadcrumbs/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionView.cs

@@ -245 +245 @@
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
         var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this, true);
-        if (outermostViewHost.HotlinkingEnabled) {
+        if (outermostViewHost != null && outermostViewHost.HotlinkingEnabled) {
           outermostViewHost.ActiveView.ReadOnly = ReadOnly;
           outermostViewHost.ActiveView.Locked = Locked;
@@ -276 +276 @@
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
         var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this);
-        outermostViewHost.ActiveView.ReadOnly = ReadOnly;
-        outermostViewHost.ActiveView.Locked = Locked;
+        if (outermostViewHost != null) {
+          outermostViewHost.ActiveView.ReadOnly = ReadOnly;
+          outermostViewHost.ActiveView.Locked = Locked;
+        }
       }
     }

branches/Breadcrumbs/HeuristicLab.Optimization.Views/3.3/RunView.Designer.cs

@@ -178 +178 @@
       this.viewHost.Content = null;
       this.viewHost.Enabled = false;
+      this.viewHost.IsValidOutermostViewhost = false;
       this.viewHost.Location = new System.Drawing.Point(6, 19);
       this.viewHost.Name = "viewHost";

branches/Breadcrumbs/HeuristicLab.Optimization.Views/3.3/RunView.cs

@@ -132 +132 @@
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
         var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this, true);
-        if (outermostViewHost.HotlinkingEnabled) {
+        if (outermostViewHost != null && outermostViewHost.HotlinkingEnabled) {
           outermostViewHost.ActiveView.ReadOnly = ReadOnly;
           outermostViewHost.ActiveView.Locked = Locked;
@@ -151 +151 @@
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
         var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this);
-        outermostViewHost.ActiveView.ReadOnly = ReadOnly;
-        outermostViewHost.ActiveView.Locked = Locked;
+        if (outermostViewHost != null) {
+          outermostViewHost.ActiveView.ReadOnly = ReadOnly;
+          outermostViewHost.ActiveView.Locked = Locked;
+        }
       }
     }