Changeset 11591 for branches/Breadcrumbs/HeuristicLab.Core.Views

Timestamp:

11/27/14 09:35:43 (10 years ago)

Author:

jkarder

Message:

#2116: reverted to r10041

Location:

branches/Breadcrumbs/HeuristicLab.Core.Views/3.3

Files:

• ItemCollectionView.cs (modified) (3 diffs)
• ItemListView.cs (modified) (3 diffs)
• ParameterCollectionView.cs (modified) (2 diffs)

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

@@ -140 +140 @@
         try {
           return (T)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           ErrorHandling.ShowErrorDialog(this, ex);
         }
@@ -219 +220 @@
     #region ListView Events
     protected virtual void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
-      removeButton.Enabled = Content != null && !Content.IsReadOnly && !ReadOnly && itemsListView.SelectedItems.Count > 0;
+      removeButton.Enabled = (Content != null) && !Content.IsReadOnly && !ReadOnly && itemsListView.SelectedItems.Count > 0;
       AdjustListViewColumnSizes();
-      if (itemsListView.SelectedItems.Count == 1) {
-        var item = (T)itemsListView.SelectedItems[0].Tag;
-        var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
-        var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this, true);
-        if (outermostViewHost == null || !outermostViewHost.HotlinkingEnabled) {
-          if (showDetailsCheckBox.Checked) {
-            detailsGroupBox.Enabled = true;
-            viewHost.Content = item;
-          } else {
-            viewHost.Content = null;
-            detailsGroupBox.Enabled = false;
-          }
+      if (showDetailsCheckBox.Checked) {
+        if (itemsListView.SelectedItems.Count == 1) {
+          T item = (T)itemsListView.SelectedItems[0].Tag;
+          detailsGroupBox.Enabled = true;
+          viewHost.Content = item;
+        } else {
+          viewHost.Content = null;
+          detailsGroupBox.Enabled = false;
         }
       }
@@ -249 +246 @@
     protected virtual void itemsListView_DoubleClick(object sender, EventArgs e) {
       if (itemsListView.SelectedItems.Count == 1) {
-        var item = (T)itemsListView.SelectedItems[0].Tag;
-        var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
-        var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this);
-        if (outermostViewHost != null) {
-          outermostViewHost.ActiveView.ReadOnly = ReadOnly;
-          outermostViewHost.ActiveView.Locked = Locked;
+        T item = itemsListView.SelectedItems[0].Tag as T;
+        if (item != null) {
+          IContentView view = MainFormManager.MainForm.ShowContent(item);
+          if (view != null) {
+            view.ReadOnly = ReadOnly;
+            view.Locked = Locked;
+          }
         }
       }

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

@@ -146 +146 @@
         try {
           return (T)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           ErrorHandling.ShowErrorDialog(this, ex);
         }
@@ -242 +243 @@
                              (Content != null) && !Content.IsReadOnly && !ReadOnly;
       AdjustListViewColumnSizes();
-      if (itemsListView.SelectedItems.Count == 1) {
-        var item = (T)itemsListView.SelectedItems[0].Tag;
-        var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
-        var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this, true);
-        if (outermostViewHost != null && outermostViewHost.HotlinkingEnabled) {
-          outermostViewHost.ActiveView.ReadOnly = ReadOnly;
-          outermostViewHost.ActiveView.Locked = Locked;
+
+      if (showDetailsCheckBox.Checked) {
+        if (itemsListView.SelectedItems.Count == 1) {
+          T item = (T)itemsListView.SelectedItems[0].Tag;
+          detailsGroupBox.Enabled = true;
+          viewHost.Content = item;
         } else {
-          if (showDetailsCheckBox.Checked) {
-            detailsGroupBox.Enabled = true;
-            viewHost.Content = item;
-          } else {
-            viewHost.Content = null;
-            detailsGroupBox.Enabled = false;
-          }
+          viewHost.Content = null;
+          detailsGroupBox.Enabled = false;
         }
       }
@@ -272 +267 @@
     protected virtual void itemsListView_DoubleClick(object sender, EventArgs e) {
       if (itemsListView.SelectedItems.Count == 1) {
-        var item = (T)itemsListView.SelectedItems[0].Tag;
-        var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
-        var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this);
-        if (outermostViewHost != null) {
-          outermostViewHost.ActiveView.ReadOnly = ReadOnly;
-          outermostViewHost.ActiveView.Locked = Locked;
+        T item = itemsListView.SelectedItems[0].Tag as T;
+        if (item != null) {
+          IContentView view = MainFormManager.MainForm.ShowContent(item);
+          if (view != null) {
+            view.ReadOnly = ReadOnly;
+            view.Locked = Locked;
+          }
         }
       }

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

@@ -27 +27 @@
 using HeuristicLab.Collections;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Core.Views {
@@ -147 +146 @@
       }
     }
-    protected virtual void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
-      removeButton.Enabled = Content != null && !Content.IsReadOnly && !ReadOnly && itemsListView.SelectedItems.Count > 0;
-      AdjustListViewColumnSizes();
-      if (itemsListView.SelectedItems.Count == 1) {
-        var item = (IParameter)itemsListView.SelectedItems[0].Tag;
-        var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
-        var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this, true);
-        if (outermostViewHost != null && outermostViewHost.HotlinkingEnabled) {
-          outermostViewHost.ActiveView.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
-          outermostViewHost.ActiveView.Locked = Locked;
-        } else {
-          if (showDetailsCheckBox.Checked) {
-            detailsGroupBox.Enabled = true;
-            viewHost.Content = item;
-          } else {
-            viewHost.Content = null;
-            detailsGroupBox.Enabled = false;
-          }
-        }
-      }
+    protected override void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
+      base.itemsListView_SelectedIndexChanged(sender, e);
+      SetEnabledStateOfControls();
     }
     protected override void itemsListView_DoubleClick(object sender, EventArgs e) {
       if (itemsListView.SelectedItems.Count == 1) {
-        var item = (IParameter)itemsListView.SelectedItems[0].Tag;
-        var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
-        var outermostViewHost = mainForm.ShowContentInOutermostViewHost(item, this);
-        if (outermostViewHost != null) {
-          outermostViewHost.ActiveView.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
-          outermostViewHost.ActiveView.Locked = Locked;
+        IParameter item = itemsListView.SelectedItems[0].Tag as IParameter;
+        if (item != null) {
+          IContentView view = MainFormManager.MainForm.ShowContent(item);
+          if (view != null) {
+            view.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
+            view.Locked = Locked;
+          }
         }
       }