Changeset 13244 for trunk/sources/HeuristicLab.Core.Views

Timestamp:

11/18/15 12:30:56 (8 years ago)

Author:

jkarder

Message:

#2116: worked on breadcrumb navigation

• OperatorGraphView now checks for IOperatorGraphOperator instead of AlgorithmOperator
• removed breadcrumbs from collection views

Location:

trunk/sources/HeuristicLab.Core.Views/3.3

Files:

• ItemListView.cs (modified) (1 diff)
• ParameterCollectionView.cs (modified) (2 diffs)
• ParameterizedNamedItemView.Designer.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -277 +277 @@
         T item = itemsListView.SelectedItems[0].Tag as T;
         if (item != null) {
-          Control c = this;
-          BreadcrumbViewHost bcvh;
-
-          do {
-            c = c.Parent;
-            bcvh = c as BreadcrumbViewHost;
-          } while ((bcvh == null || !bcvh.EnableBreadcrumbs) && c != null);
-
-          if (bcvh != null) {
-            bcvh.AddBreadcrumbs(bcvh.Content);
-            bcvh.AddBreadcrumbs(item);
-            bcvh.Content = item;
-            bcvh.ReadOnly = ReadOnly;
-            bcvh.Locked = Locked;
-          } else {
-            IContentView view = MainFormManager.MainForm.ShowContent(item);
-            if (view != null) {
-              view.ReadOnly = ReadOnly;
-              view.Locked = Locked;
-            }
+          IContentView view = MainFormManager.MainForm.ShowContent(item);
+          if (view != null) {
+            view.ReadOnly = ReadOnly;
+            view.Locked = Locked;
           }
         }

trunk/sources/HeuristicLab.Core.Views/3.3/ParameterCollectionView.cs

@@ -27 +27 @@
 using HeuristicLab.Collections;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Core.Views {
@@ -155 +154 @@
         IParameter item = itemsListView.SelectedItems[0].Tag as IParameter;
         if (item != null) {
-          Control c = this;
-          BreadcrumbViewHost bcvh;
-
-          do {
-            c = c.Parent;
-            bcvh = c as BreadcrumbViewHost;
-          } while ((bcvh == null || !bcvh.EnableBreadcrumbs) && c != null);
-
-          if (bcvh != null) {
-            bcvh.AddBreadcrumbs(bcvh.Content);
-            bcvh.AddBreadcrumbs(item);
-            bcvh.Content = item;
-            bcvh.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
-            bcvh.Locked = Locked;
-          } else {
-            IContentView view = MainFormManager.MainForm.ShowContent(item);
-            if (view != null) {
-              view.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
-              view.Locked = Locked;
-            }
+          IContentView view = MainFormManager.MainForm.ShowContent(item);
+          if (view != null) {
+            view.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
+            view.Locked = Locked;
           }
         }

trunk/sources/HeuristicLab.Core.Views/3.3/ParameterizedNamedItemView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.parameterCollectionView = new HeuristicLab.Core.Views.BreadcrumbViewHost();
+      this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -72 +72 @@
       this.parameterCollectionView.Size = new System.Drawing.Size(490, 327);
       this.parameterCollectionView.TabIndex = 3;
-      this.parameterCollectionView.ViewsLabelVisible = false;
       // 
       // ParameterizedNamedItemView
@@ -93 +92 @@
     #endregion
 
-    protected HeuristicLab.Core.Views.BreadcrumbViewHost parameterCollectionView;
+    protected ParameterCollectionView parameterCollectionView;
 
   }