Changeset 11591 for branches/Breadcrumbs/HeuristicLab.Optimization.Views/3.3

Timestamp:

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

Author:

jkarder

Message:

#2116: reverted to r10041

Location:

branches/Breadcrumbs/HeuristicLab.Optimization.Views/3.3

Files:

• ResultCollectionView.cs (modified) (3 diffs)
• RunCollectionViews/RunCollectionView.cs (modified) (3 diffs)
• RunView.cs (modified) (3 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Optimization.Views {
@@ -33 +33 @@
     public override bool ReadOnly {
       get { return true; }
-      set { /* not needed because results are always readonly */}
+      set { /*not needed because results are always readonly */}
     }
 
@@ -45 +45 @@
       return null;
     }
+
+    protected override void itemsListView_DoubleClick(object sender, EventArgs e) {
+      if (itemsListView.SelectedItems.Count == 1) {
+        IResult result = itemsListView.SelectedItems[0].Tag as IResult;
+        if (result != null) {
+          IContentView view = MainFormManager.MainForm.ShowContent(result, typeof(ResultView));
+          if (view != null) {
+            view.ReadOnly = ReadOnly;
+            view.Locked = Locked;
+          }
+        }
+      }
+    }
   }
 }

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

@@ -237 +237 @@
     #region ListView Events
     private void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
-      removeButton.Enabled = Content != null && !Content.IsReadOnly && !ReadOnly && itemsListView.SelectedItems.Count > 0;
+      removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && (Content != null) && !Content.IsReadOnly && !ReadOnly;
       // for performance reason (multiple selection fires this handler for every selected item)
       if (itemsListView.SelectedIndices.Count <= 1)
         AdjustListViewColumnSizes();
-      if (itemsListView.SelectedItems.Count == 1) {
-        var item = (IRun)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) {
+          IRun item = (IRun)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;
         }
       }
@@ -273 +266 @@
     private void itemsListView_DoubleClick(object sender, EventArgs e) {
       if (itemsListView.SelectedItems.Count == 1) {
-        var item = (IRun)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;
+        IRun item = itemsListView.SelectedItems[0].Tag as IRun;
+        if (item != null) {
+          IContentView view = MainFormManager.MainForm.ShowContent(item);
+          if (view != null) {
+            view.ReadOnly = ReadOnly;
+            view.Locked = Locked;
+          }
         }
       }
@@ -391 +385 @@
       try {
         RunCollection.Modify();
-      } finally {
+      }
+      finally {
         ReadOnly = false;
       }

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

@@ -26 +26 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Optimization.Views {
@@ -128 +127 @@
 
     private void listView_SelectedIndexChanged(object sender, EventArgs e) {
-      if (listView.SelectedItems.Count == 1) {
-        var item = (IItem)listView.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 (listView.SelectedItems.Count == 1) {
+          detailsGroupBox.Enabled = true;
+          viewHost.Content = listView.SelectedItems[0].Tag as IContent;
         } else {
-          if (showDetailsCheckBox.Checked) {
-            detailsGroupBox.Enabled = true;
-            viewHost.Content = item;
-          } else {
-            viewHost.Content = null;
-            detailsGroupBox.Enabled = false;
-          }
+          viewHost.Content = null;
+          detailsGroupBox.Enabled = false;
         }
       }
@@ -148 +139 @@
     private void listView_DoubleClick(object sender, EventArgs e) {
       if (listView.SelectedItems.Count == 1) {
-        var item = (IItem)listView.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;
+        IItem item = (IItem)listView.SelectedItems[0].Tag;
+        IContentView view = MainFormManager.MainForm.ShowContent(item);
+        if (view != null) {
+          view.ReadOnly = true;
+          view.Locked = Locked;
         }
       }