Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/26/14 16:38:08 (10 years ago)
Author:
abeham
Message:

#2136: merged r10359, r10391, r10401, r10506 to stable

Location:
stable
Files:
2 edited
2 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.HLScript.Views/3.3

    • Property svn:global-ignores set to
      bin
      obj
      Plugin.cs
  • stable/HeuristicLab.HLScript.Views/3.3/ScriptView.Designer.cs

    r10401 r10891  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 namespace HeuristicLab.HLScript.Views {
     22namespace HeuristicLab.Scripting.Views {
    2323  partial class ScriptView {
    2424    /// <summary>
     
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.components = new System.ComponentModel.Container();
    4748      this.compilationLabel = new System.Windows.Forms.Label();
    4849      this.startStopButton = new System.Windows.Forms.Button();
    4950      this.errorListView = new System.Windows.Forms.ListView();
     51      this.iconColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
    5052      this.categoryColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
    5153      this.errorNumberColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
     
    5355      this.columnColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
    5456      this.descriptionColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
     57      this.imageList = new System.Windows.Forms.ImageList(this.components);
    5558      this.codeEditor = new HeuristicLab.CodeEditor.CodeEditor();
    5659      this.splitContainer1 = new System.Windows.Forms.SplitContainer();
    5760      this.splitContainer2 = new System.Windows.Forms.SplitContainer();
    58       this.tabControl1 = new System.Windows.Forms.TabControl();
    59       this.errorListTabPage = new System.Windows.Forms.TabPage();
     61      this.infoTabControl = new System.Windows.Forms.TabControl();
    6062      this.outputTabPage = new System.Windows.Forms.TabPage();
    6163      this.outputTextBox = new System.Windows.Forms.TextBox();
    62       this.variableStoreView = new HeuristicLab.HLScript.Views.VariableStoreView();
     64      this.errorListTabPage = new System.Windows.Forms.TabPage();
     65      this.variableStoreView = new HeuristicLab.Scripting.Views.VariableStoreView();
    6366      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
     67      this.compileButton = new System.Windows.Forms.Button();
    6468      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    6569      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
     
    7175      this.splitContainer2.Panel2.SuspendLayout();
    7276      this.splitContainer2.SuspendLayout();
    73       this.tabControl1.SuspendLayout();
     77      this.infoTabControl.SuspendLayout();
     78      this.outputTabPage.SuspendLayout();
    7479      this.errorListTabPage.SuspendLayout();
    75       this.outputTabPage.SuspendLayout();
    7680      this.SuspendLayout();
    7781      //
     
    9195      this.compilationLabel.AutoSize = true;
    9296      this.compilationLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
    93       this.compilationLabel.Location = new System.Drawing.Point(33, 32);
     97      this.compilationLabel.Location = new System.Drawing.Point(66, 32);
    9498      this.compilationLabel.Name = "compilationLabel";
    9599      this.compilationLabel.Size = new System.Drawing.Size(69, 13);
     
    100104      //
    101105      this.startStopButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Play;
    102       this.startStopButton.Location = new System.Drawing.Point(3, 26);
     106      this.startStopButton.Location = new System.Drawing.Point(36, 26);
    103107      this.startStopButton.Name = "startStopButton";
    104108      this.startStopButton.Size = new System.Drawing.Size(24, 24);
     
    112116      //
    113117      this.errorListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
     118            this.iconColumnHeader,
    114119            this.categoryColumnHeader,
    115120            this.errorNumberColumnHeader,
     
    124129      this.errorListView.Name = "errorListView";
    125130      this.errorListView.Size = new System.Drawing.Size(623, 79);
     131      this.errorListView.SmallImageList = this.imageList;
    126132      this.errorListView.TabIndex = 0;
    127133      this.errorListView.UseCompatibleStateImageBehavior = false;
    128134      this.errorListView.View = System.Windows.Forms.View.Details;
    129135      //
     136      // iconColumnHeader
     137      //
     138      this.iconColumnHeader.Text = "";
     139      //
    130140      // categoryColumnHeader
    131141      //
     
    135145      //
    136146      this.errorNumberColumnHeader.Text = "Error Number";
    137       this.errorNumberColumnHeader.Width = 78;
    138147      //
    139148      // lineColumnHeader
    140149      //
    141150      this.lineColumnHeader.Text = "Line";
    142       this.lineColumnHeader.Width = 50;
    143151      //
    144152      // columnColumnHeader
    145153      //
    146154      this.columnColumnHeader.Text = "Column";
    147       this.columnColumnHeader.Width = 50;
    148155      //
    149156      // descriptionColumnHeader
    150157      //
    151158      this.descriptionColumnHeader.Text = "Description";
    152       this.descriptionColumnHeader.Width = 600;
     159      //
     160      // imageList
     161      //
     162      this.imageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
     163      this.imageList.ImageSize = new System.Drawing.Size(16, 16);
     164      this.imageList.TransparentColor = System.Drawing.Color.Transparent;
    153165      //
    154166      // codeEditor
     
    197209      // splitContainer2.Panel2
    198210      //
    199       this.splitContainer2.Panel2.Controls.Add(this.tabControl1);
     211      this.splitContainer2.Panel2.Controls.Add(this.infoTabControl);
    200212      this.splitContainer2.Size = new System.Drawing.Size(637, 543);
    201213      this.splitContainer2.SplitterDistance = 428;
    202214      this.splitContainer2.TabIndex = 5;
    203215      //
    204       // tabControl1
    205       //
    206       this.tabControl1.Controls.Add(this.errorListTabPage);
    207       this.tabControl1.Controls.Add(this.outputTabPage);
    208       this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
    209       this.tabControl1.Location = new System.Drawing.Point(0, 0);
    210       this.tabControl1.Name = "tabControl1";
    211       this.tabControl1.SelectedIndex = 0;
    212       this.tabControl1.Size = new System.Drawing.Size(637, 111);
    213       this.tabControl1.TabIndex = 1;
    214       //
    215       // errorListTabPage
    216       //
    217       this.errorListTabPage.Controls.Add(this.errorListView);
    218       this.errorListTabPage.Location = new System.Drawing.Point(4, 22);
    219       this.errorListTabPage.Name = "errorListTabPage";
    220       this.errorListTabPage.Padding = new System.Windows.Forms.Padding(3);
    221       this.errorListTabPage.Size = new System.Drawing.Size(629, 85);
    222       this.errorListTabPage.TabIndex = 0;
    223       this.errorListTabPage.Text = "Error List";
    224       this.errorListTabPage.UseVisualStyleBackColor = true;
     216      // infoTabControl
     217      //
     218      this.infoTabControl.Controls.Add(this.outputTabPage);
     219      this.infoTabControl.Controls.Add(this.errorListTabPage);
     220      this.infoTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
     221      this.infoTabControl.Location = new System.Drawing.Point(0, 0);
     222      this.infoTabControl.Name = "infoTabControl";
     223      this.infoTabControl.SelectedIndex = 0;
     224      this.infoTabControl.Size = new System.Drawing.Size(637, 111);
     225      this.infoTabControl.TabIndex = 1;
    225226      //
    226227      // outputTabPage
     
    247248      this.outputTextBox.TabIndex = 0;
    248249      this.outputTextBox.WordWrap = false;
     250      //
     251      // errorListTabPage
     252      //
     253      this.errorListTabPage.Controls.Add(this.errorListView);
     254      this.errorListTabPage.Location = new System.Drawing.Point(4, 22);
     255      this.errorListTabPage.Name = "errorListTabPage";
     256      this.errorListTabPage.Padding = new System.Windows.Forms.Padding(3);
     257      this.errorListTabPage.Size = new System.Drawing.Size(629, 85);
     258      this.errorListTabPage.TabIndex = 0;
     259      this.errorListTabPage.Text = "Error List";
     260      this.errorListTabPage.UseVisualStyleBackColor = true;
    249261      //
    250262      // variableStoreView
     
    273285      this.viewHost.ViewType = null;
    274286      //
     287      // compileButton
     288      //
     289      this.compileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Script;
     290      this.compileButton.Location = new System.Drawing.Point(6, 26);
     291      this.compileButton.Name = "compileButton";
     292      this.compileButton.Size = new System.Drawing.Size(24, 24);
     293      this.compileButton.TabIndex = 8;
     294      this.compileButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
     295      this.toolTip.SetToolTip(this.compileButton, "Compile (F6)");
     296      this.compileButton.UseVisualStyleBackColor = true;
     297      this.compileButton.Click += new System.EventHandler(this.compileButton_Click);
     298      //
    275299      // ScriptView
    276300      //
    277301      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
     302      this.Controls.Add(this.compileButton);
    278303      this.Controls.Add(this.splitContainer1);
    279304      this.Controls.Add(this.startStopButton);
     
    287312      this.Controls.SetChildIndex(this.nameTextBox, 0);
    288313      this.Controls.SetChildIndex(this.infoLabel, 0);
     314      this.Controls.SetChildIndex(this.compileButton, 0);
    289315      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    290316      this.splitContainer1.Panel1.ResumeLayout(false);
     
    296322      ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
    297323      this.splitContainer2.ResumeLayout(false);
    298       this.tabControl1.ResumeLayout(false);
    299       this.errorListTabPage.ResumeLayout(false);
     324      this.infoTabControl.ResumeLayout(false);
    300325      this.outputTabPage.ResumeLayout(false);
    301326      this.outputTabPage.PerformLayout();
     327      this.errorListTabPage.ResumeLayout(false);
    302328      this.ResumeLayout(false);
    303329      this.PerformLayout();
     
    320346    private System.Windows.Forms.ColumnHeader errorNumberColumnHeader;
    321347    private System.Windows.Forms.ColumnHeader categoryColumnHeader;
    322     private System.Windows.Forms.TabControl tabControl1;
     348    private System.Windows.Forms.TabControl infoTabControl;
    323349    private System.Windows.Forms.TabPage errorListTabPage;
    324350    private System.Windows.Forms.TabPage outputTabPage;
    325351    private System.Windows.Forms.TextBox outputTextBox;
     352    private System.Windows.Forms.Button compileButton;
     353    private System.Windows.Forms.ColumnHeader iconColumnHeader;
     354    private System.Windows.Forms.ImageList imageList;
    326355  }
    327356}
Note: See TracChangeset for help on using the changeset viewer.