Changeset 3526


Ignore:
Timestamp:
04/26/10 00:56:59 (12 years ago)
Author:
swagner
Message:

Implemented reviewers' comments (#893)

Location:
trunk/sources
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Core.Views/3.3/Clipboard.cs

    r3416 r3526  
    257257      T item = e.Data.GetData("Value") as T;
    258258      if (!ReadOnly && (type != null) && (item != null)) {
    259         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
     259        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
    260260        else if (((e.KeyState & 4) == 4) && !itemListViewItemTable.ContainsKey(item)) e.Effect = DragDropEffects.Move;  // SHIFT key
    261         else if (((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) && !itemListViewItemTable.ContainsKey(item)) e.Effect = DragDropEffects.Link;
    262261        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
    263262        else if (((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) && !itemListViewItemTable.ContainsKey(item)) e.Effect = DragDropEffects.Move;
     263        else if (((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) && !itemListViewItemTable.ContainsKey(item)) e.Effect = DragDropEffects.Link;
    264264      }
    265265    }
  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemArrayView.cs

    r3483 r3526  
    264264        ListViewItem listViewItem = itemsListView.GetItemAt(p.X, p.Y);
    265265        if (listViewItem != null) {
    266           if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
     266          if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
    267267          else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    268           else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    269268          else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
    270269          else if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) e.Effect = DragDropEffects.Move;
     270          else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    271271        }
    272272      }
  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

    r3483 r3526  
    217217      Type type = e.Data.GetData("Type") as Type;
    218218      if (!Content.IsReadOnly && !ReadOnly && (type != null) && (typeof(T).IsAssignableFrom(type))) {
    219         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
     219        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
    220220        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    221         else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    222221        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
    223222        else if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) e.Effect = DragDropEffects.Move;
     223        else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    224224      }
    225225    }
  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

    r3483 r3526  
    252252      Type type = e.Data.GetData("Type") as Type;
    253253      if (!Content.IsReadOnly && !ReadOnly && (type != null) && (typeof(T).IsAssignableFrom(type))) {
    254         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
     254        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
    255255        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    256         else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    257256        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
    258257        else if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) e.Effect = DragDropEffects.Move;
     258        else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    259259      }
    260260    }
  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableValueView.cs

    r3455 r3526  
    113113      Type type = e.Data.GetData("Type") as Type;
    114114      if (!ReadOnly && (type != null) && (typeof(IItem).IsAssignableFrom(type))) {
    115         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
     115        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
    116116        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    117         else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    118117        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
    119118        else if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) e.Effect = DragDropEffects.Move;
     119        else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    120120      }
    121121    }
  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.cs

    r3455 r3526  
    141141      Type type = e.Data.GetData("Type") as Type;
    142142      if (!ReadOnly && (type != null) && (typeof(IItem).IsAssignableFrom(type))) {
    143         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
     143        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
    144144        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    145         else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    146145        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
    147146        else if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) e.Effect = DragDropEffects.Move;
     147        else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    148148      }
    149149    }
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

    r3500 r3526  
    236236      Type type = e.Data.GetData("Type") as Type;
    237237      if ((type != null) && (Content.ProblemType.IsAssignableFrom(type))) {
    238         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
     238        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
    239239        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    240         else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    241240        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
    242241        else if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) e.Effect = DragDropEffects.Move;
     242        else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    243243      }
    244244    }
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.cs

    r3500 r3526  
    223223      Type type = e.Data.GetData("Type") as Type;
    224224      if ((type != null) && (typeof(IAlgorithm).IsAssignableFrom(type))) {
    225         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
     225        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
    226226        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    227         else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    228227        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
    229228        else if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) e.Effect = DragDropEffects.Move;
     229        else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    230230      }
    231231    }
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

    r3507 r3526  
    223223      Type type = e.Data.GetData("Type") as Type;
    224224      if (!Content.IsReadOnly && !ReadOnly && (type != null) && (typeof(IRun).IsAssignableFrom(type))) {
    225         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
     225        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
    226226        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    227         else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    228227        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
    229228        else if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) e.Effect = DragDropEffects.Move;
     229        else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    230230      }
    231231    }
  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.cs

    r3455 r3526  
    153153      Type type = e.Data.GetData("Type") as Type;
    154154      if (!ReadOnly && (type != null) && (Content.DataType.IsAssignableFrom(type))) {
    155         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
     155        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
    156156        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    157         else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    158157        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
    159158        else if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) e.Effect = DragDropEffects.Move;
     159        else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    160160      }
    161161    }
  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs

    r3455 r3526  
    141141      Type type = e.Data.GetData("Type") as Type;
    142142      if (!ReadOnly && (type != null) && (Content.DataType.IsAssignableFrom(type))) {
    143         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
     143        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
    144144        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    145         else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    146145        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
    147146        else if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) e.Effect = DragDropEffects.Move;
     147        else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
    148148      }
    149149    }
Note: See TracChangeset for help on using the changeset viewer.