Changeset 3557 for trunk/sources/HeuristicLab.Optimizer

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.Optimizer/3.3

Files:

• FileManager.cs (modified) (2 diffs)
• HeuristicLabOptimizerPlugin.cs.frame (modified) (1 diff)
• OptimizerMainForm.cs (modified) (1 diff)
• StartPage.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

@@ -42 +42 @@
       if (newItemDialog == null) newItemDialog = new NewItemDialog();
       if (newItemDialog.ShowDialog() == DialogResult.OK) {
-        IView view = MainFormManager.CreateDefaultView(newItemDialog.Item);
+        IView view = MainFormManager.MainForm.ShowContent(newItemDialog.Item);
         if (view == null) MessageBox.Show("There is no view for the new item. It cannot be displayed.", "No View Available", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        else view.Show();
       }
     }
@@ -69 +68 @@
         if (error != null) throw error;
         Invoke(delegate() {
-          IView view = MainFormManager.CreateDefaultView(content);
+          IView view = MainFormManager.MainForm.ShowContent(content);
           if (view == null) MessageBox.Show("There is no view for the loaded item. It cannot be displayed.", "No View Available", MessageBoxButtons.OK, MessageBoxIcon.Error);
-          else view.Show();
         });
       }

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs.frame

@@ -40 +40 @@
     public override void Run() {
       OptimizerMainForm mainForm = new OptimizerMainForm(typeof(IOptimizerUserInterfaceItemProvider));
-      mainForm.ShowViewsInViewHost = true;
+      mainForm.ShowContentInViewHost = true;
       Application.Run(mainForm);
     }

trunk/sources/HeuristicLab.Optimizer/3.3/OptimizerMainForm.cs

@@ -53 +53 @@
       waitingCursors = 0;
     }
-    public OptimizerMainForm(Type userInterfaceItemType, bool showViewsInViewHost)
+    public OptimizerMainForm(Type userInterfaceItemType, bool showContentInViewHost)
       : this(userInterfaceItemType) {
-      this.ShowViewsInViewHost = showViewsInViewHost;
+      this.ShowContentInViewHost = showContentInViewHost;
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -118 +118 @@
     private void samplesListView_DoubleClick(object sender, EventArgs e) {
       if (samplesListView.SelectedItems.Count == 1)
-        MainFormManager.CreateDefaultView(((IItem)samplesListView.SelectedItems[0].Tag).Clone()).Show();
+        MainFormManager.MainForm.ShowContent((IContent)((IItem)samplesListView.SelectedItems[0].Tag).Clone());
     }
     private void samplesListView_ItemDrag(object sender, ItemDragEventArgs e) {