Changeset 4453

Timestamp:

09/20/10 15:08:50 (14 years ago)

Author:

mkommend

Message:

Refactored the Clipboard to handle IExecuteables and repositioned the label in the ViewHost (ticket #1155).

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/Clipboard.cs (modified) (4 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.Designer.cs (modified) (4 diffs)

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

@@ -178 +178 @@
 
       int i = 0;
-      var query = from item in itemListViewItemTable.Keys
-                  let views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == item)
-                  where !views.Any(v => v.Locked)
-                  select item;
-      T[] items = query.ToArray();
+      T[] items = GetStorableItems(itemListViewItemTable.Keys);
 
       foreach (T item in items) {
@@ -198 +194 @@
       OnAllItemsSaved();
     }
+
     private void OnItemSaved(T item, int progress) {
       if (item != null) {
@@ -223 +220 @@
         views.ForEach(v => v.Enabled = enabled);
       }
+    }
+
+    private static T[] GetStorableItems(IEnumerable<T> items) {
+      var query = from item in items
+                  let executeable = item as IExecutable
+                  let views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == item)
+                  where executeable == null || executeable.ExecutionState != ExecutionState.Started
+                  where !views.Any(v => v.Locked)
+                  select item;
+      T[] itemArray = query.ToArray();
+      return itemArray;
     }
     #endregion
@@ -321 +329 @@
     }
     private void saveButton_Click(object sender, EventArgs e) {
-      var query = (from item in itemListViewItemTable.Keys
-                   let views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == item)
-                   where views.Any(v => v.Locked)
-                   select item.ToString()).ToArray();
-      if (query.Length != 0) {
-        string itemNames = string.Join(Environment.NewLine, query);
-        MessageBox.Show("Could not save the following items, because they are locked (e.g. used in a running algorithm). All other items will be saved." + Environment.NewLine + itemNames);
+      IEnumerable<T> items = itemListViewItemTable.Keys.Except(GetStorableItems(itemListViewItemTable.Keys));
+      if (items.Any()) {
+        string itemNames = string.Join(Environment.NewLine, items.Select(item => item.ToString()).ToArray());
+        MessageBox.Show("The following items could not be saved, because they are locked (e.g. used in a running algorithm). All other items will be saved." +
+          Environment.NewLine + itemNames, "Could not save all items", MessageBoxButtons.OK, MessageBoxIcon.Warning);
       }
       Save();

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ViewHost));
       this.messageLabel = new System.Windows.Forms.Label();
       this.viewsLabel = new System.Windows.Forms.Label();
@@ -68 +69 @@
       this.viewsLabel.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Windows;
       this.viewsLabel.Location = new System.Drawing.Point(211, 0);
-      this.viewsLabel.Margin = new System.Windows.Forms.Padding(3);
+      this.viewsLabel.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
       this.viewsLabel.Name = "viewsLabel";
       this.viewsLabel.Size = new System.Drawing.Size(16, 16);
@@ -74 +75 @@
       this.toolTip.SetToolTip(this.viewsLabel, "Double-click to open a new window of the current view.\r\nRight-click to change cur" +
               "rent view.\r\nDrag icon to copy or link content to another view.");
-      this.viewsLabel.MouseLeave += new System.EventHandler(this.viewsLabel_MouseLeave);
       this.viewsLabel.DoubleClick += new System.EventHandler(this.viewsLabel_DoubleClick);
       this.viewsLabel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.viewsLabel_MouseDown);
+      this.viewsLabel.MouseLeave += new System.EventHandler(this.viewsLabel_MouseLeave);
       // 
       // viewContextMenuStrip
       // 
+      this.viewContextMenuStrip.IgnoredViewTypes = System.Linq.Enumerable.Empty<System.Type>();
       this.viewContextMenuStrip.Item = null;
       this.viewContextMenuStrip.Name = "viewContextMenuStrip";
@@ -94 +96 @@
       this.Size = new System.Drawing.Size(227, 184);
       this.ResumeLayout(false);
+
     }