Changeset 11875

Timestamp:

02/03/15 14:31:34 (10 years ago)

Author:

mkommend

Message:

#2265: Merged r11467, r11469 and r11470 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.cs (modified) (1 diff)

stable/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.Designer.cs

@@ -87 +87 @@
       this.ResumeLayout(false);
       this.PerformLayout();
-
     }
 

stable/HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.Designer.cs

@@ -58 +58 @@
       this.ResumeLayout(false);
       this.PerformLayout();
-
+      //
+      // toolStrip
+      //
+      this.toolStrip.AllowDrop = true;
+      this.toolStrip.DragEnter += optimizerMainForm_DragEnter;
+      this.toolStrip.DragDrop += optimizerMainForm_DragDrop;
+      //
+      // menuStrip
+      //
+      this.menuStrip.AllowDrop = true;
+      this.menuStrip.DragEnter += optimizerMainForm_DragEnter;
+      this.menuStrip.DragDrop += optimizerMainForm_DragDrop;
     }
 

stable/HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.cs

@@ -86 +86 @@
     protected override void OnClosing(CancelEventArgs e) {
       base.OnClosing(e);
-      if (MainFormManager.MainForm.Views.OfType<IContentView>().Any(v=>v.Content is IStorableContent)) {
+      if (MainFormManager.MainForm.Views.OfType<IContentView>().Any(v => v.Content is IStorableContent)) {
         if (MessageBox.Show(this, "Some views are still opened. If their content has not been saved, it will be lost after closing. Do you really want to close HeuristicLab Optimizer?", "Close Optimizer", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1) == DialogResult.No)
           e.Cancel = true;
@@ -118 +118 @@
       }
     }
+
+    private void optimizerMainForm_DragEnter(object sender, DragEventArgs e) {
+      // perform type checking to ensure that the data being dragged is of an acceptable type
+      e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;
+
+    }
+
+    private void optimizerMainForm_DragDrop(object sender, DragEventArgs e) {
+      if (e.Data.GetDataPresent(DataFormats.FileDrop)) {
+        string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
+        FileManager.OpenFiles(files);
+      }
+    }
   }
 }

stable/HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.Designer.cs

@@ -58 +58 @@
       this.ResumeLayout(false);
       this.PerformLayout();
-
+      //
+      // toolStrip
+      //
+      this.toolStrip.AllowDrop = true;
+      this.toolStrip.DragEnter += optimizerMainForm_DragEnter;
+      this.toolStrip.DragDrop += optimizerMainForm_DragDrop;
+      //
+      // menuStrip
+      //
+      this.menuStrip.AllowDrop = true;
+      this.menuStrip.DragEnter += optimizerMainForm_DragEnter;
+      this.menuStrip.DragDrop += optimizerMainForm_DragDrop;
     }
 

stable/HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.cs

@@ -118 +118 @@
       }
     }
+
+    private void optimizerMainForm_DragEnter(object sender, DragEventArgs e) {
+      // perform type checking to ensure that the data being dragged is of an acceptable type
+      e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;
+
+    }
+
+    private void optimizerMainForm_DragDrop(object sender, DragEventArgs e) {
+      if (e.Data.GetDataPresent(DataFormats.FileDrop)) {
+        string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
+        FileManager.OpenFiles(files);
+      }
+    }
   }
 }

stable/HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.Designer.cs

@@ -58 +58 @@
       this.ResumeLayout(false);
       this.PerformLayout();
-
+      //
+      // toolStrip
+      //
+      this.toolStrip.AllowDrop = true;
+      this.toolStrip.DragEnter += optimizerMainForm_DragEnter;
+      this.toolStrip.DragDrop += optimizerMainForm_DragDrop;
+      //
+      // menuStrip
+      //
+      this.menuStrip.AllowDrop = true;
+      this.menuStrip.DragEnter += optimizerMainForm_DragEnter;
+      this.menuStrip.DragDrop += optimizerMainForm_DragDrop;
     }
 

stable/HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.cs

@@ -118 +118 @@
       }
     }
+
+    private void optimizerMainForm_DragEnter(object sender, DragEventArgs e) {
+      // perform type checking to ensure that the data being dragged is of an acceptable type
+      e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;
+
+    }
+
+    private void optimizerMainForm_DragDrop(object sender, DragEventArgs e) {
+      if (e.Data.GetDataPresent(DataFormats.FileDrop)) {
+        string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
+        FileManager.OpenFiles(files);
+      }
+    }
   }
 }