Changeset 10106

Timestamp:

11/05/13 10:52:45 (11 years ago)

Author:

jkarder

Message:

#2116:

• refactored outermost view host detection
• fixed update logic of breadcrumb trail
• fixed some views

Location:

branches/Breadcrumbs

Files:

• HeuristicLab.Clients.Access.Administration/3.3/Views/RoleView.cs (modified) (1 diff)
• HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.cs (modified) (1 diff)
• HeuristicLab.Clients.Access.Administration/3.3/Views/UserView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs (modified) (5 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/View.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunView.Designer.cs (modified) (1 diff)

branches/Breadcrumbs/HeuristicLab.Clients.Access.Administration/3.3/Views/RoleView.cs

@@ -47 +47 @@
 
     private void roleNameTextBox_TextChanged(object sender, System.EventArgs e) {
-      if (Content.Name != roleNameTextBox.Text)
+      if (Content != null && Content.Name != roleNameTextBox.Text)
         Content.Name = roleNameTextBox.Text;
     }

branches/Breadcrumbs/HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.cs

@@ -69 +69 @@
 
     private void groupNameTextBox_TextChanged(object sender, System.EventArgs e) {
-      if (Content.Name != this.groupNameTextBox.Text)
+      if (Content != null && Content.Name != this.groupNameTextBox.Text)
         Content.Name = this.groupNameTextBox.Text;
     }

branches/Breadcrumbs/HeuristicLab.Clients.Access.Administration/3.3/Views/UserView.cs

@@ -72 +72 @@
 
     private void fullNameTextBox_TextChanged(object sender, System.EventArgs e) {
-      if (Content.FullName != fullNameTextBox.Text)
+      if (Content != null && Content.FullName != fullNameTextBox.Text)
         Content.FullName = fullNameTextBox.Text;
     }
 
     private void userNameTextBox_TextChanged(object sender, System.EventArgs e) {
-      if (Content.UserName != userNameTextBox.Text)
+      if (Content != null && Content.UserName != userNameTextBox.Text)
         Content.UserName = userNameTextBox.Text;
     }
 
     private void emailTextBox_TextChanged(object sender, System.EventArgs e) {
-      if (Content.Email != emailTextBox.Text)
+      if (Content != null && Content.Email != emailTextBox.Text)
         Content.Email = emailTextBox.Text;
     }

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/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.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
@@ -42 +41 @@
       viewsLabel.Visible = false;
       viewsLabelVisible = true;
-      IsValidOutermostViewhost = true;
 
       breadcrumbControl.ViewHost = this;
@@ -61 +59 @@
 
     public bool HotlinkingEnabled { get; set; }
-
-    [DefaultValue(true)]
-    public bool IsValidOutermostViewhost { get; set; }
 
     private IContentView cachedView;
@@ -371 +366 @@
       if (!newCrumbs.Any()) return;
       var ll = new LinkedList<IContent>();
-      foreach (var c in oldCrumbs) {
-        if (c != newCrumbs.First())
-          ll.AddLast(c);
-        else break;
+      if (newCrumbs.Contains(oldCrumbs.LastOrDefault())) {
+        foreach (var c in oldCrumbs) {
+          if (c != newCrumbs.First())
+            ll.AddLast(c);
+          else break;
+        }
       }
       foreach (var c in newCrumbs)
@@ -382 +379 @@
 
     private void PerformOutermostViewHostDetection() {
-      if (!IsValidOutermostViewhost) return;
-      var mainForm = MainFormManager.GetMainForm<MainForm>();
-      if (mainForm == null) return; // needed for designer
-      var outermostViewHost = mainForm.GetOutermostControlOfType<ViewHost>(this);
-      viewContextMenuStrip.ShowBreadcrumbsToolStripMenuItem.Checked = outermostViewHost == this;
+      var parentContentViews = GetParentViewsOfType<ContentView>();
+      viewContextMenuStrip.ShowBreadcrumbsToolStripMenuItem.Checked = !parentContentViews.Any();
     }
     #endregion

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/Views/View.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -261 +262 @@
         ((Control)this).ResumeRepaint(refresh);
     }
+
+    public IEnumerable<T> GetParentViewsOfType<T>() where T : View {
+      for (var view = Parent; view != null; view = view.Parent)
+        if (view is View) yield return view as T;
+    }
   }
 }

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.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/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";