Changeset 3435 for trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

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.Core.Views/3.3/ItemCollectionView.cs (modified) (6 diffs)

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

@@ -40 +40 @@
     }
 
-    public override bool ReadOnly {
-      get {
-        if ((Content != null) && Content.IsReadOnly) return true;
-        else return base.ReadOnly;
-      }
-      set { base.ReadOnly = value; }
-    }
-
     public ListView ItemsListView {
       get { return itemsListView; }
@@ -102 +94 @@
         detailsGroupBox.Enabled = false;
       } else {
-        addButton.Enabled = !ReadOnly;
+        addButton.Enabled = !Content.IsReadOnly && !ReadOnly;
         sortAscendingButton.Enabled = itemsListView.Items.Count > 1;
         sortDescendingButton.Enabled = itemsListView.Items.Count > 1;
-        removeButton.Enabled = !ReadOnly && itemsListView.SelectedItems.Count > 0;
+        removeButton.Enabled = !Content.IsReadOnly && !ReadOnly && itemsListView.SelectedItems.Count > 0;
         itemsListView.Enabled = true;
         detailsGroupBox.Enabled = true;
@@ -176 +168 @@
     #region ListView Events
     protected virtual void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
-      removeButton.Enabled = !ReadOnly && itemsListView.SelectedItems.Count > 0;
+      removeButton.Enabled = !Content.IsReadOnly && !ReadOnly && itemsListView.SelectedItems.Count > 0;
       if (itemsListView.SelectedItems.Count == 1) {
         T item = (T)itemsListView.SelectedItems[0].Tag;
@@ -189 +181 @@
     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((T)item.Tag);
@@ -213 +205 @@
         data.SetData("Type", item.GetType());
         data.SetData("Value", item);
-        if (ReadOnly) {
+        if (Content.IsReadOnly || ReadOnly) {
           DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link);
         } else {
@@ -225 +217 @@
       e.Effect = DragDropEffects.None;
       Type type = e.Data.GetData("Type") as Type;
-      if (!ReadOnly && (type != null) && (typeof(T).IsAssignableFrom(type))) {
+      if (!Content.IsReadOnly && !ReadOnly && (type != null) && (typeof(T).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