Changeset 3435 for trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.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/ItemListView.cs (modified) (6 diffs)

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

@@ -48 +48 @@
     }
 
-    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; }
@@ -125 +117 @@
         detailsGroupBox.Enabled = false;
       } else {
-        addButton.Enabled = !ReadOnly;
+        addButton.Enabled = !Content.IsReadOnly && !ReadOnly;
         moveUpButton.Enabled = itemsListView.SelectedItems.Count == 1 &&
                                itemsListView.SelectedIndices[0] != 0 &&
-                               !ReadOnly;
+                               !Content.IsReadOnly && !ReadOnly;
         moveDownButton.Enabled = itemsListView.SelectedItems.Count == 1 &&
                                  itemsListView.SelectedIndices[0] != itemsListView.Items.Count - 1 &&
-                                 !ReadOnly;
+                                 !Content.IsReadOnly && !ReadOnly;
         removeButton.Enabled = itemsListView.SelectedItems.Count > 0 &&
-                               !ReadOnly;
+                               !Content.IsReadOnly && !ReadOnly;
         itemsListView.Enabled = true;
         detailsGroupBox.Enabled = true;
@@ -202 +194 @@
       moveUpButton.Enabled = itemsListView.SelectedItems.Count == 1 &&
                              itemsListView.SelectedIndices[0] != 0 &&
-                             !ReadOnly;
+                             !Content.IsReadOnly && !ReadOnly;
       moveDownButton.Enabled = itemsListView.SelectedItems.Count == 1 &&
                                itemsListView.SelectedIndices[0] != itemsListView.Items.Count - 1 &&
-                               !ReadOnly;
+                               !Content.IsReadOnly && !ReadOnly;
       removeButton.Enabled = itemsListView.SelectedItems.Count > 0 &&
-                             !ReadOnly;
+                             !Content.IsReadOnly && !ReadOnly;
 
       if (itemsListView.SelectedItems.Count == 1) {
@@ -222 +214 @@
     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.RemoveAt(item.Index);
@@ -248 +240 @@
         data.SetData("Type", item.GetType());
         data.SetData("Value", item);
-        if (ReadOnly) {
+        if (Content.IsReadOnly || ReadOnly) {
           DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link);
         } else {
@@ -260 +252 @@
       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