Free cookie consent management tool by TermsFeed Policy Generator

Changeset 11712


Ignore:
Timestamp:
12/22/14 02:20:11 (9 years ago)
Author:
swagner
Message:

#2205: Implemented review comments:

  • checked and adapted item images
Location:
branches/OptimizationNetworks
Files:
1 added
16 edited

Legend:

Unmodified
Added
Removed

  • branches/OptimizationNetworks/HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj

    r11577 r11712  
    444444    <None Include="Resources\VS2010ImageLibrary\VS2010ImageLibrary_Objects_Monitor_Large.png" />
    445445    <None Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_DisplayInColor_Vertical.png" />
     446    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_CommonElements_Objects_Arrow_Up_Down.png" />
    446447    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Paused.png" />
    447448    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Prepared.png" />

  • branches/OptimizationNetworks/HeuristicLab.Common.Resources/3.3/VSImageLibrary.Designer.cs

    r11577 r11712  
    104104        ///   Looks up a localized resource of type System.Drawing.Bitmap.
    105105        /// </summary>
     106        public static System.Drawing.Bitmap ArrowUpDown {
     107            get {
     108                object obj = ResourceManager.GetObject("ArrowUpDown", resourceCulture);
     109                return ((System.Drawing.Bitmap)(obj));
     110            }
     111        }
     112       
     113        /// <summary>
     114        ///   Looks up a localized resource of type System.Drawing.Bitmap.
     115        /// </summary>
    106116        public static System.Drawing.Bitmap Assembly {
    107117            get {

  • branches/OptimizationNetworks/HeuristicLab.Common.Resources/3.3/VSImageLibrary.resx

    r9079 r11712  
    524524    <value>Resources\VS2010ImageLibrary\camera.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    525525  </data>
     526  <data name="ArrowUpDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
     527    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_CommonElements_Objects_Arrow_Up_Down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     528  </data>
    526529</root>

  • branches/OptimizationNetworks/HeuristicLab.Core/3.3/Networks/Message.cs

    r11577 r11712  
    2929  public class Message : Item, IMessage {
    3030    public static new Image StaticItemImage {
    31       get { return HeuristicLab.Common.Resources.VSImageLibrary.Field; }
     31      get { return HeuristicLab.Common.Resources.VSImageLibrary.Comment; }
    3232    }
    3333

  • branches/OptimizationNetworks/HeuristicLab.Core/3.3/Networks/Port.cs

    r11577 r11712  
    2929  public abstract class Port : NetworkItem, IPort {
    3030    public static new Image StaticItemImage {
    31       get { return HeuristicLab.Common.Resources.VSImageLibrary.Field; }
     31      get { return HeuristicLab.Common.Resources.VSImageLibrary.Interface; }
    3232    }
    3333

  • branches/OptimizationNetworks/HeuristicLab.Core/3.3/Networks/PortParameter.cs

    r11577 r11712  
    3535      get {
    3636        if (Type.HasFlag(PortParameterType.Input) && Type.HasFlag(PortParameterType.Output))
    37           return HeuristicLab.Common.Resources.VSImageLibrary.Field;
     37          return HeuristicLab.Common.Resources.VSImageLibrary.ArrowUpDown;
    3838        else if (Type.HasFlag(PortParameterType.Input))
    3939          return HeuristicLab.Common.Resources.VSImageLibrary.ArrowDown;
    … …  
    4141          return HeuristicLab.Common.Resources.VSImageLibrary.ArrowUp;
    4242        else
    43           return base.ItemImage;
     43          return base.ItemImage; ;
    4444      }
    4545    }

  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/KSPTSPConnector.cs

    r11577 r11712  
    2424using HeuristicLab.Networks.Programmable;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using System.Drawing;
    2726
    2827namespace HeuristicLab.Networks {
    … …  
    3029  [StorableClass]
    3130  public class KSPTSPConnector : ProgrammableNode {
    32     public static new Image StaticItemImage {
    33       get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
    34     }
    35 
    3631    protected override string CodeTemplate {
    3732      get { return ReadCodeTemplate("HeuristicLab.Networks.KSPTSPConnectorCode.cs"); }

  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/KSPTSPConnectorCode.cs

    r11577 r11712  
    2727using HeuristicLab.Networks.Programmable;
    2828using HeuristicLab.Problems.TravelingSalesman;
    29 using System.Drawing;
    3029using System.Linq;
    3130using System.Threading;
    … …  
    3433  [Item("KSPTSPConnector", "A node of an optimization network which connects a KSP and a TSP.")]
    3534  public class CompiledKSPTSPConnector : ProgrammableNode.CompiledProgrammableNode {
    36     public static new Image StaticItemImage {
    37       get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
    38     }
    39 
    4035    protected CompiledKSPTSPConnector(CompiledKSPTSPConnector original, Cloner cloner) : base(original, cloner) { }
    4136    public CompiledKSPTSPConnector(ProgrammableNode context)

  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/KSPTSPNetwork.cs

    r11577 r11712  
    2424using HeuristicLab.Networks.Programmable;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using System.Drawing;
    2726
    2827namespace HeuristicLab.Networks {
    … …  
    3130  [StorableClass]
    3231  public class KSPTSPNetwork : ProgrammableNetwork {
    33     public static new Image StaticItemImage {
    34       get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
    35     }
    36 
    3732    protected override string CodeTemplate {
    3833      get { return ReadCodeTemplate("HeuristicLab.Networks.KSPTSPNetworkCode.cs"); }

  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/KSPTSPNetworkCode.cs

    r11577 r11712  
    3232using HeuristicLab.Problems.Knapsack;
    3333using HeuristicLab.Problems.TravelingSalesman;
    34 using System.Drawing;
    3534using System.Linq;
    3635
    … …  
    3837  [Item("KSPTSPNetwork", "An optimization network which connects a KSP and a TSP.")]
    3938  public class CompiledKSPTSPNetwork : ProgrammableNetwork.CompiledProgrammableNetwork {
    40     public static new Image StaticItemImage {
    41       get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
    42     }
    43 
    4439    protected CompiledKSPTSPNetwork(CompiledKSPTSPNetwork original, Cloner cloner) : base(original, cloner) { }
    4540    public CompiledKSPTSPNetwork(ProgrammableNetwork context)

  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNetwork.cs

    r11602 r11712  
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626using System.Collections.Generic;
     27using System.Drawing;
    2728using System.Linq;
    2829
    … …  
    3132  [StorableClass]
    3233  public abstract class ProgrammableNetwork : ProgrammableNode, IProgrammableNetwork, IStorableContent {
     34    public static new Image StaticItemImage {
     35      get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
     36    }
     37
    3338    #region IStorableContent Members
    3439    public string Filename { get; set; }
    … …  
    8489    [Item("CompiledProgrammableNetwork", "Abstract base class for compiled programmable networks.")]
    8590    public abstract class CompiledProgrammableNetwork : CompiledProgrammableNode, INetwork {
     91      public static new Image StaticItemImage {
     92        get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
     93      }
     94
    8695      #region Network Members
    8796      public override IEnumerable<INetworkItem> Children {

  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNetworkItem.cs

    r11602 r11712  
    4040  public abstract class ProgrammableNetworkItem : Item, IProgrammableNetworkItem {
    4141    public static new Image StaticItemImage {
    42       get { return HeuristicLab.Common.Resources.VSImageLibrary.Script; }
     42      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
    4343    }
    4444
    … …  
    292292    public abstract class CompiledProgrammableNetworkItem : Item, INetworkItem {
    293293      public static new Image StaticItemImage {
    294         get { return HeuristicLab.Common.Resources.VSImageLibrary.Script; }
     294        get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
    295295      }
    296296

  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNode.cs

    r11602 r11712  
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626using System.Collections.Generic;
     27using System.Drawing;
    2728using System.Linq;
    2829using System.Threading;
    … …  
    3233  [StorableClass]
    3334  public abstract class ProgrammableNode : ProgrammableNetworkItem, IProgrammableNode {
     35    public static new Image StaticItemImage {
     36      get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
     37    }
     38
    3439    #region Node Members
    3540    new public INetwork Parent {
    … …  
    8994    [Item("CompiledProgrammableNode", "Abstract base class for compiled programmable nodes of a network.")]
    9095    public abstract class CompiledProgrammableNode : CompiledProgrammableNetworkItem, INode {
     96      public static new Image StaticItemImage {
     97        get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
     98      }
     99
    91100      #region Node Members
    92101      new public INetwork Parent {

  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/UserDefinedNetwork.cs

    r11577 r11712  
    2424using HeuristicLab.Core.Networks;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using System.Drawing;
    2627
    2728namespace HeuristicLab.Networks.Programmable {
    … …  
    3031  [StorableClass]
    3132  public sealed class UserDefinedNetwork : ProgrammableNetwork, IUserDefinedNetwork {
     33    public static new Image StaticItemImage {
     34      get { return HeuristicLab.Common.Resources.VSImageLibrary.Script; }
     35    }
     36
    3237    new public PortCollection Ports {
    3338      get { return base.Ports; }

  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/UserDefinedNode.cs

    r11577 r11712  
    2424using HeuristicLab.Core.Networks;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using System.Drawing;
    2627
    2728namespace HeuristicLab.Networks.Programmable {
    … …  
    2930  [StorableClass]
    3031  public sealed class UserDefinedNode : ProgrammableNode, IUserDefinedNode {
     32    public static new Image StaticItemImage {
     33      get { return HeuristicLab.Common.Resources.VSImageLibrary.Script; }
     34    }
     35
    3136    new public PortCollection Ports {
    3237      get { return base.Ports; }
Note: See TracChangeset for help on using the changeset viewer.