Ignore:
Timestamp:
11/19/15 12:02:40 (7 years ago)
Author:
mkommend
Message:

#2486: Merged r12983, r12986, r13252 and r13271 into stable.

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.DataPreprocessing.Views

  • stable/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.Designer.cs

    r12009 r13289  
    6363      this.btnReplace = new System.Windows.Forms.Button();
    6464      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
     65      this.addRowButton = new System.Windows.Forms.Button();
     66      this.addColumnButton = new System.Windows.Forms.Button();
     67      this.renameColumnsButton = new System.Windows.Forms.Button();
    6568      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    6669      this.contextMenuCell.SuspendLayout();
     
    7073      //
    7174      this.rowsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
    72       this.rowsTextBox.Enabled = false;
    7375      this.errorProvider.SetIconAlignment(this.rowsTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    7476      this.errorProvider.SetIconPadding(this.rowsTextBox, 2);
    75       this.rowsTextBox.ReadOnly = true;
    7677      this.rowsTextBox.Size = new System.Drawing.Size(71, 20);
    7778      //
     
    7980      //
    8081      this.columnsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
    81       this.columnsTextBox.Enabled = false;
    82       this.columnsTextBox.ReadOnly = true;
    8382      this.columnsTextBox.Size = new System.Drawing.Size(71, 20);
    8483      //
    8584      // statisticsTextBox
    8685      //
    87       this.statisticsTextBox.Size = new System.Drawing.Size(522, 13);
     86      this.statisticsTextBox.Location = new System.Drawing.Point(3, 387);
     87      this.statisticsTextBox.Size = new System.Drawing.Size(421, 13);
    8888      //
    8989      // btnApplySort
    9090      //
    91       this.btnApplySort.Location = new System.Drawing.Point(349, 19);
     91      this.btnApplySort.Location = new System.Drawing.Point(234, 0);
    9292      this.btnApplySort.Name = "btnApplySort";
    93       this.btnApplySort.Size = new System.Drawing.Size(75, 23);
     93      this.btnApplySort.Size = new System.Drawing.Size(104, 23);
    9494      this.btnApplySort.TabIndex = 7;
    9595      this.btnApplySort.Text = "Apply Sort";
     
    104104            this.replaceValueOverSelectionToolStripMenuItem});
    105105      this.contextMenuCell.Name = "contextMenuCell";
    106       this.contextMenuCell.Size = new System.Drawing.Size(225, 70);
     106      this.contextMenuCell.Size = new System.Drawing.Size(225, 48);
    107107      //
    108108      // replaceValueOverColumnToolStripMenuItem
     
    154154      this.interpolationToolStripMenuItem_Column.Click += new System.EventHandler(this.ReplaceWithInterpolation_Column_Click);
    155155      //
    156       // smoothingToolStripMenuItem
    157       //
    158       this.smoothingToolStripMenuItem_Column.Name = "smoothingToolStripMenuItem";
     156      // smoothingToolStripMenuItem_Column
     157      //
     158      this.smoothingToolStripMenuItem_Column.Name = "smoothingToolStripMenuItem_Column";
    159159      this.smoothingToolStripMenuItem_Column.Size = new System.Drawing.Size(155, 22);
    160160      this.smoothingToolStripMenuItem_Column.Text = "Smoothing";
     
    202202      // btnSearch
    203203      //
    204       this.btnSearch.Location = new System.Drawing.Point(201, 19);
     204      this.btnSearch.Location = new System.Drawing.Point(173, 0);
    205205      this.btnSearch.Name = "btnSearch";
    206       this.btnSearch.Size = new System.Drawing.Size(53, 23);
     206      this.btnSearch.Size = new System.Drawing.Size(55, 23);
    207207      this.btnSearch.TabIndex = 8;
    208208      this.btnSearch.Text = "Search";
     
    213213      // btnReplace
    214214      //
    215       this.btnReplace.Location = new System.Drawing.Point(260, 19);
     215      this.btnReplace.Location = new System.Drawing.Point(173, 26);
    216216      this.btnReplace.Name = "btnReplace";
    217217      this.btnReplace.Size = new System.Drawing.Size(55, 23);
     
    222222      this.btnReplace.Click += new System.EventHandler(this.btnReplace_Click);
    223223      //
     224      // addRowButton
     225      //
     226      this.addRowButton.Location = new System.Drawing.Point(344, 26);
     227      this.addRowButton.Name = "addRowButton";
     228      this.addRowButton.Size = new System.Drawing.Size(76, 23);
     229      this.addRowButton.TabIndex = 10;
     230      this.addRowButton.Text = "Add Row";
     231      this.addRowButton.UseVisualStyleBackColor = true;
     232      this.addRowButton.Click += new System.EventHandler(this.addRowButton_Click);
     233      //
     234      // addColumnButton
     235      //
     236      this.addColumnButton.Location = new System.Drawing.Point(344, 0);
     237      this.addColumnButton.Name = "addColumnButton";
     238      this.addColumnButton.Size = new System.Drawing.Size(76, 23);
     239      this.addColumnButton.TabIndex = 10;
     240      this.addColumnButton.Text = "Add Column";
     241      this.addColumnButton.UseVisualStyleBackColor = true;
     242      this.addColumnButton.Click += new System.EventHandler(this.addColumnButton_Click);
     243      //
     244      // renameColumnsButton
     245      //
     246      this.renameColumnsButton.Location = new System.Drawing.Point(234, 26);
     247      this.renameColumnsButton.Name = "renameColumnsButton";
     248      this.renameColumnsButton.Size = new System.Drawing.Size(104, 23);
     249      this.renameColumnsButton.TabIndex = 11;
     250      this.renameColumnsButton.Text = "Rename Columns";
     251      this.renameColumnsButton.UseVisualStyleBackColor = true;
     252      this.renameColumnsButton.Click += new System.EventHandler(this.renameColumnsButton_Click);
     253      //
    224254      // DataGridContentView
    225255      //
    226256      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    227257      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     258      this.Controls.Add(this.renameColumnsButton);
     259      this.Controls.Add(this.addColumnButton);
     260      this.Controls.Add(this.addRowButton);
    228261      this.Controls.Add(this.btnReplace);
    229262      this.Controls.Add(this.btnSearch);
    230263      this.Controls.Add(this.btnApplySort);
    231264      this.Name = "DataGridContentView";
    232       this.Size = new System.Drawing.Size(528, 404);
     265      this.Size = new System.Drawing.Size(430, 403);
     266      this.Controls.SetChildIndex(this.btnApplySort, 0);
     267      this.Controls.SetChildIndex(this.btnSearch, 0);
     268      this.Controls.SetChildIndex(this.btnReplace, 0);
     269      this.Controls.SetChildIndex(this.addRowButton, 0);
     270      this.Controls.SetChildIndex(this.addColumnButton, 0);
     271      this.Controls.SetChildIndex(this.renameColumnsButton, 0);
    233272      this.Controls.SetChildIndex(this.statisticsTextBox, 0);
    234273      this.Controls.SetChildIndex(this.rowsLabel, 0);
     
    236275      this.Controls.SetChildIndex(this.rowsTextBox, 0);
    237276      this.Controls.SetChildIndex(this.columnsTextBox, 0);
    238       this.Controls.SetChildIndex(this.btnApplySort, 0);
    239       this.Controls.SetChildIndex(this.btnSearch, 0);
    240       this.Controls.SetChildIndex(this.btnReplace, 0);
    241277      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    242278      this.contextMenuCell.ResumeLayout(false);
     
    265301    private System.Windows.Forms.ToolTip toolTip;
    266302    private System.Windows.Forms.ToolStripMenuItem smoothingToolStripMenuItem_Column;
     303    private System.Windows.Forms.Button addRowButton;
     304    private System.Windows.Forms.Button addColumnButton;
     305    private System.Windows.Forms.Button renameColumnsButton;
    267306  }
    268307}
Note: See TracChangeset for help on using the changeset viewer.