Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/03/12 11:22:21 (13 years ago)
Author:
gkronber
Message:

#1081: merged r7214:7266 from trunk into time series branch.

Location:
branches/HeuristicLab.TimeSeries
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ControlExtensions.cs

    r5463 r7268  
    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.TimeSeries/HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.Designer.cs

    r5463 r7268  
    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.TimeSeries/HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.cs

    r5464 r7268  
    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.TimeSeries/HeuristicLab.MainForm.WindowsForms/3.3/Controls/Sidebar.Designer.cs

    r5463 r7268  
    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.TimeSeries/HeuristicLab.MainForm.WindowsForms/3.3/Controls/Sidebar.cs

    r5463 r7268  
    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.TimeSeries/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.Designer.cs

    r5463 r7268  
    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.TimeSeries/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.cs

    r5463 r7268  
    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.TimeSeries/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs

    r6342 r7268  
    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.
    … …  
    4646    private void InitializeComponent() {
    4747      this.components = new System.ComponentModel.Container();
    48       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ViewHost));
    4948      this.messageLabel = new System.Windows.Forms.Label();
    5049      this.viewsLabel = new System.Windows.Forms.Label();
    … …  
    7372      this.viewsLabel.Size = new System.Drawing.Size(16, 16);
    7473      this.viewsLabel.TabIndex = 0;
    75       this.toolTip.SetToolTip(this.viewsLabel, "Double-click to open a new window of the current view.\r\nRight-click to change cur" +
    76               "rent view.\r\nDrag icon to copy or link content to another view.");
     74      this.toolTip.SetToolTip(this.viewsLabel,
     75        "Double-click to open a new window of the current view." + System.Environment.NewLine +
     76        "Right-click to change current view." + System.Environment.NewLine +
     77        "Drag icon to copy or link content to another view.");
    7778      this.viewsLabel.DoubleClick += new System.EventHandler(this.viewsLabel_DoubleClick);
    7879      this.viewsLabel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.viewsLabel_MouseDown);
    … …  
    9596      this.configurationLabel.Name = "configurationLabel";
    9697      this.configurationLabel.Size = new System.Drawing.Size(16, 16);
    97       this.configurationLabel.TabIndex = 0;
     98      this.configurationLabel.TabIndex = 1;
     99      this.toolTip.SetToolTip(this.configurationLabel, "Double-click to open view configuration.");
    98100      this.configurationLabel.Visible = false;
    99       this.configurationLabel.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.configurationLabel_MouseDoubleClick);
     101      this.configurationLabel.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.configurationLabel_DoubleClick);
    100102      //
    101103      // ViewHost
    … …  
    111113
    112114    }
     115    #endregion
    113116
    114     #endregion
    115117    private System.Windows.Forms.Label viewsLabel;
    116118    private System.Windows.Forms.Label messageLabel;

  • branches/HeuristicLab.TimeSeries/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

    r6951 r7268  
    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.
    … …  
    293293    }
    294294
    295     private void configurationLabel_MouseDoubleClick(object sender, MouseEventArgs e) {
     295    private void configurationLabel_DoubleClick(object sender, MouseEventArgs e) {
    296296      ((IConfigureableView)ActiveView).ShowConfiguration();
    297297    }
Note: See TracChangeset for help on using the changeset viewer.