Changeset 3557 for trunk/sources/HeuristicLab.Core.Views/3.3

Timestamp:

04/29/10 15:10:17 (14 years ago)

Author:

mkommend

Message:

changed logic of showing new views (ticket #972)

Location:

trunk/sources/HeuristicLab.Core.Views/3.3

Files:

• Clipboard.cs (modified) (1 diff)
• ItemArrayView.cs (modified) (1 diff)
• ItemCollectionView.cs (modified) (1 diff)
• ItemListView.cs (modified) (1 diff)
• OperatorTreeView.cs (modified) (2 diffs)

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

@@ -231 +231 @@
       if (listView.SelectedItems.Count == 1) {
         T item = (T)listView.SelectedItems[0].Tag;
-        IView view = MainFormManager.CreateDefaultView(item);
+        IView view = MainFormManager.MainForm.ShowContent(item);
         if (view != null) {
           view.ReadOnly = this.ReadOnly;
-          view.Show();
         }
       }

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

@@ -229 +229 @@
         T item = itemsListView.SelectedItems[0].Tag as T;
         if (item != null) {
-          IContentView view = MainFormManager.CreateDefaultView(item);
+          IContentView view = MainFormManager.MainForm.ShowContent(item);
           if (view != null) {
             view.ReadOnly = ReadOnly;
             view.Locked = Locked;
-            view.Show();
           }
         }

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

@@ -189 +189 @@
       if (itemsListView.SelectedItems.Count == 1) {
         T item = (T)itemsListView.SelectedItems[0].Tag;
-        IContentView view = MainFormManager.CreateDefaultView(item);
+        IContentView view = MainFormManager.MainForm.ShowContent(item);
         if (view != null) {
           view.ReadOnly = ReadOnly;
           view.Locked = Locked;
-          view.Show();
         }
       }

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

@@ -223 +223 @@
       if (itemsListView.SelectedItems.Count == 1) {
         T item = (T)itemsListView.SelectedItems[0].Tag;
-        IContentView view = MainFormManager.CreateDefaultView(item);
+        IContentView view = MainFormManager.MainForm.ShowContent(item);
         if (view != null) {
           view.ReadOnly = ReadOnly;
           view.Locked = Locked;
-          view.Show();
         }
       }

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

@@ -355 +355 @@
         IOperator op = GetOperatorTag(graphTreeView.SelectedNode);
         if (op != null) {
-          IContentView view = MainFormManager.CreateDefaultView(op);
-          if (view != null) {
-            view.ReadOnly = this.ReadOnly;
-            view.Locked = this.Locked;
+          Type viewType = MainFormManager.GetDefaultViewType(op.GetType());
+          if (viewType != null) {
             viewToolStripMenuItem.Enabled = true;
-            viewToolStripMenuItem.Tag = view;
+            viewToolStripMenuItem.Tag = op;
           }
           breakpointToolStripMenuItem.Enabled = true;
@@ -414 +412 @@
     #region Context Menu Events
     private void viewToolStripMenuItem_Click(object sender, EventArgs e) {
-      IView view = ((ToolStripMenuItem)sender).Tag as IView;
-      if (view != null) view.Show();
+      IOperator op = ((ToolStripMenuItem)sender).Tag as IOperator;
+      IContentView view = MainFormManager.MainForm.ShowContent(op);
+      if (view != null) {
+        view.ReadOnly = this.ReadOnly;
+        view.Locked = this.Locked;
+      }
     }
     private void breakpointToolStripMenuItem_Click(object sender, EventArgs e) {