Changeset 3298 for trunk/sources/HeuristicLab.Optimizer

Timestamp:

04/11/10 03:16:07 (14 years ago)

Author:

swagner

Message:

Implemented clipboard control (#965).

Location:

trunk/sources/HeuristicLab.Optimizer/3.3

Files:

• HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)
• MenuItems/ClipboardMenuItem.cs (modified) (4 diffs)
• MenuItems/CopyToClipboardMenuItem.cs (added)
• MenuItems/OperatorsMenuItem.cs (modified) (1 diff)
• MenuItems/StartPageMenuItem.cs (modified) (1 diff)
• OptimizerMainForm.cs (modified) (3 diffs)
• StartPage.Designer.cs (modified) (1 diff)
• StartPage.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -88 +88 @@
     <Compile Include="FileManager.cs" />
     <Compile Include="MenuItems\ClipboardMenuItem.cs" />
+    <Compile Include="MenuItems\CopyToClipboardMenuItem.cs" />
     <Compile Include="MenuItems\StartPageMenuItem.cs" />
     <Compile Include="Properties\Settings.Designer.cs">

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/ClipboardMenuItem.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -38 +39 @@
     }
     public override int Position {
-      get { return 2200; }
+      get { return 3200; }
     }
 
@@ -53 +54 @@
 
     private void MainForm_ViewShown(object sender, ViewShownEventArgs e) {
-      if ((e.View is HeuristicLab.Core.Views.Clipboard) && (menuItem != null)) {
+      if ((e.View is Clipboard<IItem>) && (menuItem != null)) {
         menuItem.Checked = true;
         Properties.Settings.Default.ShowClipboard = true;
@@ -60 +61 @@
     }
     private void MainForm_ViewHidden(object sender, ViewEventArgs e) {
-      if ((e.View is HeuristicLab.Core.Views.Clipboard) && (menuItem != null)) {
+      if ((e.View is Clipboard<IItem>) && (menuItem != null)) {
         menuItem.Checked = false;
         Properties.Settings.Default.ShowClipboard = false;

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/OperatorsMenuItem.cs

@@ -38 +38 @@
     }
     public override int Position {
-      get { return 2300; }
+      get { return 3300; }
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/StartPageMenuItem.cs

@@ -38 +38 @@
     }
     public override int Position {
-      get { return 2100; }
+      get { return 3100; }
     }
 

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

@@ -24 +24 @@
 using System.Reflection;
 using System.Windows.Forms;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -30 +31 @@
 namespace HeuristicLab.Optimizer {
   internal partial class OptimizerMainForm : DockingMainForm {
-    private HeuristicLab.Core.Views.Clipboard clipboard;
-    public HeuristicLab.Core.Views.Clipboard Clipboard {
+    private Clipboard<IItem> clipboard;
+    public Clipboard<IItem> Clipboard {
       get { return clipboard; }
     }
@@ -53 +54 @@
       ViewClosed += new EventHandler<ViewEventArgs>(FileManager.ViewClosed);
 
-      clipboard = new HeuristicLab.Core.Views.Clipboard();
+      clipboard = new Clipboard<IItem>();
       clipboard.Dock = DockStyle.Left;
       if (Properties.Settings.Default.ShowClipboard) {

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

@@ -164 +164 @@
       this.samplesListView.View = System.Windows.Forms.View.Details;
       this.samplesListView.DoubleClick += new System.EventHandler(this.samplesListView_DoubleClick);
+      this.samplesListView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.samplesListView_ItemDrag);
       // 
       // nameColumnHeader

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

@@ -70 +70 @@
       Assembly assembly = Assembly.GetExecutingAssembly();
       var samples = assembly.GetManifestResourceNames().Where(x => x.EndsWith(".hl"));
+      int count = samples.Count();
       string path = Path.GetTempFileName();
-      int progress = loadingProgressBar.Maximum / samples.Count();
 
       foreach (string name in samples) {
@@ -77 +77 @@
           using (Stream stream = assembly.GetManifestResourceStream(name)) {
             WriteStreamToTempFile(stream, path);
-            IItem item = XmlParser.Deserialize<IItem>(path);
-            OnSampleLoaded(item as INamedItem, progress);
+            INamedItem item = XmlParser.Deserialize<INamedItem>(path);
+            OnSampleLoaded(item, loadingProgressBar.Maximum / count);
           }
         }
@@ -86 +86 @@
     }
     private void OnSampleLoaded(INamedItem sample, int progress) {
-      if (sample != null) {
-        if (InvokeRequired)
-          Invoke(new Action<INamedItem, int>(OnSampleLoaded), sample, progress);
-        else {
-          ListViewItem item = new ListViewItem(new string[] { sample.Name, sample.Description });
-          item.ToolTipText = sample.ItemName + " (" + sample.ItemDescription + ")";
-          samplesListView.SmallImageList.Images.Add(sample.ItemImage);
-          item.ImageIndex = samplesListView.SmallImageList.Images.Count - 1;
-          item.Tag = sample;
-          samplesListView.Items.Add(item);
-          loadingProgressBar.Value += progress;
-        }
+      if (InvokeRequired)
+        Invoke(new Action<INamedItem, int>(OnSampleLoaded), sample, progress);
+      else {
+        ListViewItem item = new ListViewItem(new string[] { sample.Name, sample.Description });
+        item.ToolTipText = sample.ItemName + ": " + sample.ItemDescription;
+        samplesListView.SmallImageList.Images.Add(sample.ItemImage);
+        item.ImageIndex = samplesListView.SmallImageList.Images.Count - 1;
+        item.Tag = sample;
+        samplesListView.Items.Add(item);
+        loadingProgressBar.Value += progress;
       }
     }
@@ -121 +119 @@
         MainFormManager.CreateDefaultView(((IItem)samplesListView.SelectedItems[0].Tag).Clone()).Show();
     }
+    private void samplesListView_ItemDrag(object sender, ItemDragEventArgs e) {
+      ListViewItem listViewItem = (ListViewItem)e.Item;
+      IItem item = (IItem)listViewItem.Tag;
+      DataObject data = new DataObject();
+      data.SetData("Type", item.GetType());
+      data.SetData("Value", item);
+      DragDropEffects result = DoDragDrop(data, DragDropEffects.Copy);
+    }
 
     private void showStartPageCheckBox_CheckedChanged(object sender, EventArgs e) {