- Timestamp:
- 01/02/12 11:40:31 (13 years ago)
- Location:
- branches/RegressionBenchmarks
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/RegressionBenchmarks
-
branches/RegressionBenchmarks/HeuristicLab.Core.Views/3.3/CheckedItemListView.cs
r6233 r7255 20 20 #endregion 21 21 22 using System.Linq; 22 23 using System.Drawing; 23 24 using System.Windows.Forms; … … 54 55 private Color backupColor = Color.Empty; 55 56 protected override void SetEnabledStateOfControls() { 56 if (backupColor == Color.Empty) backupColor = base.itemsListView.BackColor;57 if (backupColor == Color.Empty) backupColor = base.itemsListView.BackColor; 57 58 base.SetEnabledStateOfControls(); 58 59 if (ReadOnly || Locked) … … 88 89 doubleClick = true; 89 90 } 91 92 protected override void itemsListView_DragEnter(object sender, DragEventArgs e) { 93 validDragOperation = false; 94 if (Locked || ReadOnly) return; 95 96 var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as ICheckedItemList<T>; 97 if (data != null) 98 validDragOperation = Content.Select(x => x.ToString()).SequenceEqual(data.Select(x => x.ToString())); 99 else 100 base.itemsListView_DragEnter(sender, e); 101 } 102 103 protected override void itemsListView_DragOver(object sender, DragEventArgs e) { 104 e.Effect = DragDropEffects.None; 105 if (!validDragOperation) return; 106 107 var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as ICheckedItemList<T>; 108 if (data != null) 109 e.Effect = DragDropEffects.Copy; 110 else 111 base.itemsListView_DragOver(sender, e); 112 } 113 114 protected override void itemsListView_DragDrop(object sender, DragEventArgs e) { 115 if (e.Effect == DragDropEffects.None) return; 116 var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as ICheckedItemList<T>; 117 if (data != null) { 118 for (int i = 0; i < Content.Count; i++) { 119 Content.SetItemCheckedState(Content[i], data.ItemChecked(data[i])); 120 } 121 } else 122 base.itemsListView_DragDrop(sender, e); 123 } 90 124 #endregion 91 125 -
branches/RegressionBenchmarks/HeuristicLab.Core.Views/3.3/ItemArrayView.cs
r5928 r7255 400 400 foreach (IndexedItem<T> item in e.Items) { 401 401 ListViewItem listViewItem = itemsListView.Items[item.Index]; 402 if (listViewItem.Tag != null) 403 itemListViewItemMapping[(T)listViewItem.Tag].Remove(listViewItem); 402 404 listViewItem.Tag = item.Value; 405 if (listViewItem.Tag != null) 406 itemListViewItemMapping[item.Value].Add(listViewItem); 403 407 UpdateListViewItemImage(listViewItem); 404 408 UpdateListViewItemText(listViewItem); -
branches/RegressionBenchmarks/HeuristicLab.Core.Views/3.3/ItemListView.cs
r6527 r7255 441 441 foreach (IndexedItem<T> item in e.Items) { 442 442 ListViewItem listViewItem = itemsListView.Items[item.Index]; 443 if (listViewItem.Tag != null) 444 itemListViewItemMapping[(T)listViewItem.Tag].Remove(listViewItem); 443 445 listViewItem.Tag = item.Value; 446 if (listViewItem.Tag != null) 447 itemListViewItemMapping[item.Value].Add(listViewItem); 444 448 UpdateListViewItemImage(listViewItem); 445 449 UpdateListViewItemText(listViewItem); -
branches/RegressionBenchmarks/HeuristicLab.Core.Views/3.3/TypeSelector.cs
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs (added) merged: 7111,7123,7201
r6954 r7255 128 128 pluginNode.Tag = plugin; 129 129 130 var types = from t in ApplicationManager.Manager.GetTypes(BaseTypes, plugin, !ShowNotInstantiableTypes, assignableToAllTypes)130 var types = from t in ApplicationManager.Manager.GetTypes(BaseTypes, plugin, !ShowNotInstantiableTypes, ShowGenericTypes, assignableToAllTypes) 131 131 where typeCondition(t) 132 132 orderby t.Name ascending 133 133 select t; 134 134 foreach (Type type in types) { 135 bool valid = true; 136 valid = valid && (ShowGenericTypes || !type.ContainsGenericParameters); 137 valid = valid && (ShowNotInstantiableTypes || type.GetConstructor(Type.EmptyTypes) != null); //check for public default ctor 135 bool valid = (ShowNotInstantiableTypes || type.GetConstructor(Type.EmptyTypes) != null); //check for public default ctor 138 136 if (valid) { 139 137 TreeNode typeNode = new TreeNode(); … … 144 142 else if (type.ContainsGenericParameters) typeNode.ImageIndex = 3; 145 143 else if (imageList.Images.ContainsKey(type.FullName)) typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName); 146 else if (typeof(IItem).IsAssignableFrom(type) && !type.IsInterface && !type.IsAbstract && type.GetConstructor(Type.EmptyTypes) != null) { 147 IItem item = (IItem)Activator.CreateInstance(type); 148 imageList.Images.Add(type.FullName, item.ItemImage); 149 typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName); 144 else { 145 var image = ItemAttribute.GetImage(type); 146 if (image != null) { 147 imageList.Images.Add(type.FullName, image); 148 typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName); 149 } 150 150 } 151 151 typeNode.SelectedImageIndex = typeNode.ImageIndex; - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.