Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/13/21 10:55:09 (3 years ago)
Author:
gkronber
Message:

#3087: merged r17784:18004 from trunk to branch to prepare for trunk reintegration (fixed a conflict in CrossValidation.cs)

Location:
branches/3087_Ceres_Integration
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3087_Ceres_Integration

  • branches/3087_Ceres_Integration/HeuristicLab.Data.Views

  • branches/3087_Ceres_Integration/HeuristicLab.Data.Views/3.3

  • branches/3087_Ceres_Integration/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.Designer.cs

    r17180 r18006  
    7171      // rowsTextBox
    7272      //
    73       this.rowsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    74                   | System.Windows.Forms.AnchorStyles.Right)));
     73      this.rowsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     74            | System.Windows.Forms.AnchorStyles.Right)));
    7575      this.rowsTextBox.Location = new System.Drawing.Point(69, 0);
    7676      this.rowsTextBox.Name = "rowsTextBox";
     
    8686      this.dataGridView.AllowUserToDeleteRows = false;
    8787      this.dataGridView.AllowUserToOrderColumns = true;
    88       this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    89                   | System.Windows.Forms.AnchorStyles.Left)
    90                   | System.Windows.Forms.AnchorStyles.Right)));
    91       this.dataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable;
     88      this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     89            | System.Windows.Forms.AnchorStyles.Left)
     90            | System.Windows.Forms.AnchorStyles.Right)));
     91      this.dataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText;
    9292      this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
    9393      this.dataGridView.Location = new System.Drawing.Point(0, 52);
     
    115115      // columnsTextBox
    116116      //
    117       this.columnsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    118                   | System.Windows.Forms.AnchorStyles.Right)));
     117      this.columnsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     118            | System.Windows.Forms.AnchorStyles.Right)));
    119119      this.columnsTextBox.Location = new System.Drawing.Point(69, 26);
    120120      this.columnsTextBox.Name = "columnsTextBox";
     
    136136      // contextMenu
    137137      //
     138      this.contextMenu.ImageScalingSize = new System.Drawing.Size(20, 20);
    138139      this.contextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
    139140            this.ShowHideColumns});
     
    150151      // statisticsTextBox
    151152      //
    152       this.statisticsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
    153                   | System.Windows.Forms.AnchorStyles.Right)));
     153      this.statisticsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
     154            | System.Windows.Forms.AnchorStyles.Right)));
    154155      this.statisticsTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
    155156      this.statisticsTextBox.Location = new System.Drawing.Point(3, 388);
     
    161162      // StringConvertibleMatrixView
    162163      //
    163       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    164164      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    165165      this.Controls.Add(this.columnsTextBox);
Note: See TracChangeset for help on using the changeset viewer.