Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/08/14 16:32:40 (11 years ago)
Author:
aesterer
Message:

Corrected merging errors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/DataPreprocessingView.designer.cs

    r10313 r10314  
    2929      this.undoButton = new System.Windows.Forms.Button();
    3030      this.contentListView = new System.Windows.Forms.ListView();
     31      this.tryOutAlgorithmButton = new System.Windows.Forms.Button();
     32      this.saveButton = new System.Windows.Forms.Button();
    3133      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    32       this.saveButton = new System.Windows.Forms.Button();
    33       this.tryOutAlgorithmButton = new System.Windows.Forms.Button();
     34      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    3435      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
    3536      this.splitContainer1.Panel1.SuspendLayout();
     
    4849      //
    4950      this.splitContainer1.Panel1.Controls.Add(this.undoButton);
    50       this.splitContainer1.Panel1.Controls.Add(this.contentListView);
    5151      this.splitContainer1.Panel1.Controls.Add(this.tryOutAlgorithmButton);
    5252      this.splitContainer1.Panel1.Controls.Add(this.saveButton);
     53      this.splitContainer1.Panel1.Controls.Add(this.contentListView);
    5354      //
    5455      // splitContainer1.Panel2
    5556      //
    5657      this.splitContainer1.Panel2.Controls.Add(this.viewHost);
    57       this.splitContainer1.Panel2.Controls.Add(this.saveButton);
    58       this.splitContainer1.Panel2.Controls.Add(this.tryOutAlgorithmButton);
    5958      this.splitContainer1.Size = new System.Drawing.Size(838, 449);
    6059      this.splitContainer1.SplitterDistance = 181;
     
    6463      //
    6564      this.undoButton.Image = ((System.Drawing.Image)(resources.GetObject("undoButton.Image")));
    66       this.undoButton.Location = new System.Drawing.Point(72, 15);
     65      this.undoButton.Location = new System.Drawing.Point(72, 14);
    6766      this.undoButton.Name = "undoButton";
    6867      this.undoButton.Size = new System.Drawing.Size(24, 24);
     
    8988      //
    9089      this.tryOutAlgorithmButton.Image = ((System.Drawing.Image)(resources.GetObject("tryOutAlgorithmButton.Image")));
    91       this.tryOutAlgorithmButton.Location = new System.Drawing.Point(42, 15);
     90      this.tryOutAlgorithmButton.Location = new System.Drawing.Point(42, 14);
    9291      this.tryOutAlgorithmButton.Name = "tryOutAlgorithmButton";
    9392      this.tryOutAlgorithmButton.Size = new System.Drawing.Size(24, 24);
    9493      this.tryOutAlgorithmButton.TabIndex = 2;
    95       this.toolTip.SetToolTip(this.tryOutAlgorithmButton, "Try Out Algorithm");
     94      this.toolTip.SetToolTip(this.tryOutAlgorithmButton, "Apply in new tab");
    9695      this.tryOutAlgorithmButton.UseVisualStyleBackColor = true;
    97       this.tryOutAlgorithmButton.Click += new System.EventHandler(this.tryOutAlgorithmButton_Click);
     96      this.tryOutAlgorithmButton.Click += new System.EventHandler(this.applyInNewTabButton_Click);
    9897      //
    9998      // saveButton
    10099      //
    101100      this.saveButton.Image = ((System.Drawing.Image)(resources.GetObject("saveButton.Image")));
    102       this.saveButton.Location = new System.Drawing.Point(12, 15);
     101      this.saveButton.Location = new System.Drawing.Point(12, 14);
    103102      this.saveButton.Name = "saveButton";
    104103      this.saveButton.Size = new System.Drawing.Size(24, 24);
    105104      this.saveButton.TabIndex = 1;
    106       this.toolTip.SetToolTip(this.saveButton, "Save");
     105      this.toolTip.SetToolTip(this.saveButton, "Export problem");
    107106      this.saveButton.UseVisualStyleBackColor = true;
     107      this.saveButton.Click += new System.EventHandler(this.exportProblemButton_Click);
    108108      //
    109109      // viewHost
     
    122122      this.viewHost.ViewsLabelVisible = true;
    123123      this.viewHost.ViewType = null;
    124       //
    125       // saveButton
    126       //
    127       this.saveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    128       this.saveButton.Location = new System.Drawing.Point(343, 410);
    129       this.saveButton.Name = "saveButton";
    130       this.saveButton.Size = new System.Drawing.Size(75, 23);
    131       this.saveButton.TabIndex = 3;
    132       this.saveButton.Text = "Save";
    133       this.saveButton.UseVisualStyleBackColor = true;
    134       //
    135       // tryOutAlgorithmButton
    136       //
    137       this.tryOutAlgorithmButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    138       this.tryOutAlgorithmButton.Location = new System.Drawing.Point(443, 410);
    139       this.tryOutAlgorithmButton.Name = "tryOutAlgorithmButton";
    140       this.tryOutAlgorithmButton.Size = new System.Drawing.Size(97, 23);
    141       this.tryOutAlgorithmButton.TabIndex = 2;
    142       this.tryOutAlgorithmButton.Text = "Try Out Algorithm";
    143       this.tryOutAlgorithmButton.UseVisualStyleBackColor = true;
    144       this.tryOutAlgorithmButton.Click += new System.EventHandler(this.tryOutAlgorithmButton_Click);
    145124      //
    146125      // DataPreprocessingView
     
    162141
    163142    private System.Windows.Forms.ListView contentListView;
    164     private System.Windows.Forms.Button exportProblemButton;
    165     private System.Windows.Forms.Button applyInNewTabButton;
     143    private System.Windows.Forms.Button saveButton;
     144    private System.Windows.Forms.Button tryOutAlgorithmButton;
     145    private System.Windows.Forms.Button undoButton;
    166146    private MainForm.WindowsForms.ViewHost viewHost;
     147    private System.Windows.Forms.SplitContainer splitContainer1;
     148    private System.Windows.Forms.ToolTip toolTip;
    167149
    168150  }
Note: See TracChangeset for help on using the changeset viewer.