Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/04/12 16:45:02 (13 years ago)
Author:
spimming
Message:

#1680:

  • merged changes from trunk into branch
Location:
branches/HeuristicLab.Hive.Azure
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive.Azure

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3

    • Property svn:ignore

      •  

        old new  
        11obj
        22Plugin.cs
         3*.vs10x

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskListView.cs

    r6976 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.cs

    r7215 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs

    r7215 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.designer.cs

    r7215 r7270  
    2424    /// </summary>
    2525    private void InitializeComponent() {
    26       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptimizerHiveTaskView));
    2726      this.restartButton = new System.Windows.Forms.Button();
    2827      this.pauseButton = new System.Windows.Forms.Button();
    … …  
    6261      //
    6362      this.restartButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    64       this.restartButton.Image = ((System.Drawing.Image)(resources.GetObject("restartButton.Image")));
     63      this.restartButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Restart;
    6564      this.restartButton.Location = new System.Drawing.Point(3, 348);
    6665      this.restartButton.Name = "restartButton";
    … …  
    7473      this.pauseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    7574      this.pauseButton.Enabled = false;
    76       this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
     75      this.pauseButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Pause;
    7776      this.pauseButton.Location = new System.Drawing.Point(33, 348);
    7877      this.pauseButton.Name = "pauseButton";
    … …  
    8584      //
    8685      this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    87       this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));
     86      this.stopButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Stop;
    8887      this.stopButton.Location = new System.Drawing.Point(63, 348);
    8988      this.stopButton.Name = "stopButton";
Note: See TracChangeset for help on using the changeset viewer.