Changeset 3435 for trunk/sources/HeuristicLab.Optimization.Views/3.3

Timestamp:

04/20/10 05:02:52 (14 years ago)

Author:

swagner

Message:

Reverted r3433 and corrected read-only handling in RunCollectionView (#973)

File:

• trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

@@ -37 +37 @@
       get { return (IItemCollection<IRun>)base.Content; }
       set { base.Content = value; }
-    }
-
-    public override bool ReadOnly {
-      get {
-        if ((Content != null) && Content.IsReadOnly) return true;
-        else return base.ReadOnly;
-      }
-      set { base.ReadOnly = value; }
     }
 
@@ -101 +93 @@
         itemsListView.Enabled = true;
         detailsGroupBox.Enabled = true;
-        removeButton.Enabled = !ReadOnly;
+        removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && !Content.IsReadOnly && !ReadOnly;
         viewHost.Enabled = true;
         viewHost.ReadOnly = ReadOnly;
@@ -148 +140 @@
     #region ListView Events
     protected virtual void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
-      removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && !ReadOnly;
+      removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && !Content.IsReadOnly && !ReadOnly;
       if (itemsListView.SelectedItems.Count == 1) {
         IRun item = (IRun)itemsListView.SelectedItems[0].Tag;
@@ -165 +157 @@
     protected virtual void itemsListView_KeyDown(object sender, KeyEventArgs e) {
       if (e.KeyCode == Keys.Delete) {
-        if ((itemsListView.SelectedItems.Count > 0) && !ReadOnly) {
+        if ((itemsListView.SelectedItems.Count > 0) && !Content.IsReadOnly && !ReadOnly) {
           foreach (ListViewItem item in itemsListView.SelectedItems)
             Content.Remove((IRun)item.Tag);
@@ -189 +181 @@
         data.SetData("Type", item.GetType());
         data.SetData("Value", item);
-        if (ReadOnly) {
+        if (Content.IsReadOnly || ReadOnly) {
           DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link);
         } else {
@@ -200 +192 @@
     protected virtual void itemsListView_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      if (ReadOnly) return;
       Type type = e.Data.GetData("Type") as Type;
-      if ((!ReadOnly) && (type != null) && (typeof(IRun).IsAssignableFrom(type))) {
+      if (!Content.IsReadOnly && !ReadOnly && (type != null) && (typeof(IRun).IsAssignableFrom(type))) {
         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key