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:
11 deleted
22 edited
3 copied

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/GanttChart/GanttChart.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/HeuristicLab.Clients.Hive.Views-3.3.csproj

    r6977 r7270  
    9595  </ItemGroup>
    9696  <ItemGroup>
     97    <Compile Include="HiveInformationDialog.cs">
     98      <SubType>Form</SubType>
     99    </Compile>
     100    <Compile Include="HiveInformationDialog.Designer.cs">
     101      <DependentUpon>HiveInformationDialog.cs</DependentUpon>
     102    </Compile>
    97103    <Compile Include="HiveTasks\OptimizerHiveTaskView.cs">
    98104      <SubType>UserControl</SubType>
    … …  
    163169      <DependentUpon>StateLogView.cs</DependentUpon>
    164170    </Compile>
    165     <Compile Include="HiveImageLibrary.Designer.cs">
    166       <AutoGen>True</AutoGen>
    167       <DesignTime>True</DesignTime>
    168       <DependentUpon>HiveImageLibrary.resx</DependentUpon>
    169     </Compile>
    170171    <None Include="Plugin.cs.frame" />
    171172    <Compile Include="Plugin.cs" />
    … …  
    183184  </ItemGroup>
    184185  <ItemGroup>
    185     <EmbeddedResource Include="HiveTasks\OptimizerHiveTaskView.resx">
    186       <DependentUpon>OptimizerHiveTaskView.cs</DependentUpon>
     186    <EmbeddedResource Include="HiveInformationDialog.resx">
     187      <DependentUpon>HiveInformationDialog.cs</DependentUpon>
    187188    </EmbeddedResource>
    188     <EmbeddedResource Include="HiveTasks\HiveTaskView.resx">
    189       <DependentUpon>HiveTaskView.cs</DependentUpon>
    190     </EmbeddedResource>
    191     <EmbeddedResource Include="TreeView\ItemTreeView.resx">
    192       <DependentUpon>ItemTreeView.cs</DependentUpon>
    193     </EmbeddedResource>
    194     <EmbeddedResource Include="StateLog\StateLogGanttChartListView.resx">
    195       <DependentUpon>StateLogGanttChartListView.cs</DependentUpon>
    196     </EmbeddedResource>
    197     <EmbeddedResource Include="GanttChart\GanttChart.resx">
    198       <DependentUpon>GanttChart.cs</DependentUpon>
    199     </EmbeddedResource>
    200     <EmbeddedResource Include="StateLog\StateLogGanttChartView.resx">
    201       <DependentUpon>StateLogGanttChartView.cs</DependentUpon>
    202     </EmbeddedResource>
    203     <EmbeddedResource Include="StateLog\StateLogView.resx">
    204       <DependentUpon>StateLogView.cs</DependentUpon>
    205     </EmbeddedResource>
    206     <EmbeddedResource Include="HiveImageLibrary.resx">
    207       <Generator>PublicResXFileCodeGenerator</Generator>
    208       <LastGenOutput>HiveImageLibrary.Designer.cs</LastGenOutput>
    209     </EmbeddedResource>
    210     <EmbeddedResource Include="Progress\ProgressView.resx">
    211       <DependentUpon>ProgressView.cs</DependentUpon>
    212     </EmbeddedResource>
    213   </ItemGroup>
    214   <ItemGroup>
    215     <None Include="Images\Monitor.ico" />
    216   </ItemGroup>
    217   <ItemGroup>
    218     <None Include="Images\network_center.ico" />
    219189  </ItemGroup>
    220190  <ItemGroup>

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3/HiveItemView.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/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";

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3/Plugin.cs.frame

    r6979 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.
    … …  
    2727
    2828namespace HeuristicLab.Clients.Hive.Views {
    29   [Plugin("HeuristicLab.Clients.Hive.Views", "3.3.5.$WCREV$")]
     29  [Plugin("HeuristicLab.Clients.Hive.Views", "3.3.6.$WCREV$")]
    3030  [PluginFile("HeuristicLab.Clients.Hive.Views-3.3.dll", PluginFileType.Assembly)]
    3131  [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3/Progress/ProgressView.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/Properties/AssemblyInfo.cs.frame

    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.
    … …  
    3232[assembly: AssemblyCompany("")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
    … …  
    5454// by using the '*' as shown below:
    5555// [assembly: AssemblyVersion("1.0.*")]
    56 [assembly: AssemblyVersion("3.3.5.0")]
    57 [assembly: AssemblyFileVersion("3.3.5.$WCREV$")]
     56[assembly: AssemblyVersion("3.3.0.0")]
     57[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.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/StateLog/StateLogGanttChartView.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/StateLog/StateLogListView.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/StateLog/StateLogView.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/TreeView/DeleteTaskTreeNodeAction.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/TreeView/HiveTaskItemTreeView.Designer.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/TreeView/HiveTaskItemTreeView.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/TreeView/ItemTreeView.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.
    … …  
    345345
    346346    protected virtual void contextMenuStrip_Opening(object sender, CancelEventArgs e) {
    347       if (treeView.SelectedNode != null) {
     347      if (treeView.SelectedNode == null) {
     348        e.Cancel = true;
     349      } else {
    348350        T selectedItem = treeView.SelectedNode.Tag as T;
    349351        T parentItem = GetParentItem(selectedItem);
    … …  
    353355          contextMenuStrip.Items.Add(new DelegateMenuItem<T>(action.Name, action.Image, new Action<T, T>(action.Execute), selectedItem, parentItem));
    354356        }
     357        e.Cancel = contextMenuStrip.Items.Count == 0;
    355358      }
    356359    }

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.designer.cs

    r6976 r7270  
    2626    private void InitializeComponent() {
    2727      this.components = new System.ComponentModel.Container();
    28       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ItemTreeView<T>));
    2928      this.splitContainer = new System.Windows.Forms.SplitContainer();
    3029      this.showDetailsCheckBox = new System.Windows.Forms.CheckBox();
    … …  
    3332      this.treeView = new System.Windows.Forms.TreeView();
    3433      this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
    35       this.asfasdfToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    36       this.gfgffToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    3734      this.imageList = new System.Windows.Forms.ImageList(this.components);
    3835      this.detailsGroupBox = new System.Windows.Forms.GroupBox();
    … …  
    123120      // contextMenuStrip
    124121      //
    125       this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
    126             this.asfasdfToolStripMenuItem,
    127             this.gfgffToolStripMenuItem});
    128122      this.contextMenuStrip.Name = "contextMenuStrip";
    129123      this.contextMenuStrip.Size = new System.Drawing.Size(153, 70);
    130124      this.contextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip_Opening);
    131       //
    132       // asfasdfToolStripMenuItem
    133       //
    134       this.asfasdfToolStripMenuItem.Name = "asfasdfToolStripMenuItem";
    135       this.asfasdfToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
    136       this.asfasdfToolStripMenuItem.Text = "asfasdf";
    137       //
    138       // gfgffToolStripMenuItem
    139       //
    140       this.gfgffToolStripMenuItem.Name = "gfgffToolStripMenuItem";
    141       this.gfgffToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
    142       this.gfgffToolStripMenuItem.Text = "gfgff";
    143125      //
    144126      // imageList
    … …  
    197179    private System.Windows.Forms.GroupBox detailsGroupBox;
    198180    private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
    199     private System.Windows.Forms.ToolStripMenuItem asfasdfToolStripMenuItem;
    200     private System.Windows.Forms.ToolStripMenuItem gfgffToolStripMenuItem;
    201181    protected System.Windows.Forms.CheckBox showDetailsCheckBox;
    202182    protected System.Windows.Forms.Button removeButton;

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3/TreeView/NewTaskTreeNodeAction.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.
Note: See TracChangeset for help on using the changeset viewer.