Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/09/20 10:36:09 (5 years ago)
Author:
dpiringe
Message:

#3026:

  • deleted INamedMatrixJsonItem and all corresponding classes/views, because of bad design
  • added ILookupJsonItem and IValueLookupJsonItem (incl. all corresponding implementations, VMs, Views)
  • added IResultJsonItem
  • changed type of property Control from JsonItemBaseControl to UserControl in IJsonItemVM (because the details control now builds up with linked user controls -> allows better construction of dynamic controls)
  • added all properties of INamedMatrixJsonItem in IMatrixJsonItem
  • refactored a lot of views for better usage (TableLayoutPanel is used a lot now -> for better item positioning)
  • property ActualName is now located in ILookupJsonItem instead of IJsonItem
Location:
branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/JsonItemBaseControl.Designer.cs

    r17464 r17471  
    2626      this.components = new System.ComponentModel.Container();
    2727      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
     28      this.textBoxName = new System.Windows.Forms.TextBox();
    2829      this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
    29       this.panel4 = new System.Windows.Forms.Panel();
    30       this.textBoxActualName = new System.Windows.Forms.TextBox();
    31       this.labelActualName = new System.Windows.Forms.Label();
    32       this.panel2 = new System.Windows.Forms.Panel();
    3330      this.labelDescription = new System.Windows.Forms.Label();
    3431      this.textBoxDescription = new System.Windows.Forms.TextBox();
    35       this.panel1 = new System.Windows.Forms.Panel();
    36       this.textBoxName = new System.Windows.Forms.TextBox();
    3732      this.label1 = new System.Windows.Forms.Label();
    38       this.panel3 = new System.Windows.Forms.Panel();
    3933      this.labelEnable = new System.Windows.Forms.Label();
    4034      this.checkBoxActive = new System.Windows.Forms.CheckBox();
     35      this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
    4136      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    4237      this.tableLayoutPanel1.SuspendLayout();
    43       this.panel4.SuspendLayout();
    44       this.panel2.SuspendLayout();
    45       this.panel1.SuspendLayout();
    46       this.panel3.SuspendLayout();
     38      this.tableLayoutPanel5.SuspendLayout();
    4739      this.SuspendLayout();
    4840      //
    … …  
    5244      this.errorProvider.ContainerControl = this;
    5345      //
     46      // textBoxName
     47      //
     48      this.textBoxName.Dock = System.Windows.Forms.DockStyle.Fill;
     49      this.errorProvider.SetIconAlignment(this.textBoxName, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     50      this.textBoxName.Location = new System.Drawing.Point(100, 24);
     51      this.textBoxName.Margin = new System.Windows.Forms.Padding(0);
     52      this.textBoxName.Name = "textBoxName";
     53      this.textBoxName.Size = new System.Drawing.Size(394, 20);
     54      this.textBoxName.TabIndex = 10;
     55      this.textBoxName.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxName_Validating);
     56      //
    5457      // tableLayoutPanel1
    5558      //
    5659      this.tableLayoutPanel1.ColumnCount = 1;
    5760      this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
    58       this.tableLayoutPanel1.Controls.Add(this.panel4, 0, 3);
    59       this.tableLayoutPanel1.Controls.Add(this.panel2, 0, 2);
    60       this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 1);
    61       this.tableLayoutPanel1.Controls.Add(this.panel3, 0, 0);
     61      this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel5, 0, 0);
    6262      this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
    6363      this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3);
    6464      this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
    6565      this.tableLayoutPanel1.Name = "tableLayoutPanel1";
    66       this.tableLayoutPanel1.RowCount = 5;
    67       this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
    68       this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
    69       this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
    70       this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
    71       this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
    72       this.tableLayoutPanel1.Size = new System.Drawing.Size(494, 388);
     66      this.tableLayoutPanel1.RowCount = 2;
     67      this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 75F));
     68      this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
     69      this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
     70      this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
     71      this.tableLayoutPanel1.Size = new System.Drawing.Size(494, 594);
    7372      this.tableLayoutPanel1.TabIndex = 16;
    74       //
    75       // panel4
    76       //
    77       this.panel4.Controls.Add(this.textBoxActualName);
    78       this.panel4.Controls.Add(this.labelActualName);
    79       this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
    80       this.panel4.Location = new System.Drawing.Point(0, 75);
    81       this.panel4.Margin = new System.Windows.Forms.Padding(0);
    82       this.panel4.Name = "panel4";
    83       this.panel4.Size = new System.Drawing.Size(494, 25);
    84       this.panel4.TabIndex = 17;
    85       //
    86       // textBoxActualName
    87       //
    88       this.textBoxActualName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    89             | System.Windows.Forms.AnchorStyles.Right)));
    90       this.textBoxActualName.Location = new System.Drawing.Point(92, 3);
    91       this.textBoxActualName.Name = "textBoxActualName";
    92       this.textBoxActualName.Size = new System.Drawing.Size(396, 20);
    93       this.textBoxActualName.TabIndex = 12;
    94       //
    95       // labelActualName
    96       //
    97       this.labelActualName.AutoSize = true;
    98       this.labelActualName.Location = new System.Drawing.Point(6, 6);
    99       this.labelActualName.Name = "labelActualName";
    100       this.labelActualName.Size = new System.Drawing.Size(65, 13);
    101       this.labelActualName.TabIndex = 11;
    102       this.labelActualName.Text = "ActualName";
    103       this.labelActualName.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
    104       //
    105       // panel2
    106       //
    107       this.panel2.Controls.Add(this.labelDescription);
    108       this.panel2.Controls.Add(this.textBoxDescription);
    109       this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
    110       this.panel2.Location = new System.Drawing.Point(0, 50);
    111       this.panel2.Margin = new System.Windows.Forms.Padding(0);
    112       this.panel2.Name = "panel2";
    113       this.panel2.Size = new System.Drawing.Size(494, 25);
    114       this.panel2.TabIndex = 17;
    11573      //
    11674      // labelDescription
    11775      //
    11876      this.labelDescription.AutoSize = true;
    119       this.labelDescription.Location = new System.Drawing.Point(6, 6);
     77      this.labelDescription.Dock = System.Windows.Forms.DockStyle.Fill;
     78      this.labelDescription.Location = new System.Drawing.Point(0, 48);
     79      this.labelDescription.Margin = new System.Windows.Forms.Padding(0);
    12080      this.labelDescription.Name = "labelDescription";
    121       this.labelDescription.Size = new System.Drawing.Size(60, 13);
     81      this.labelDescription.Size = new System.Drawing.Size(100, 27);
    12282      this.labelDescription.TabIndex = 13;
    12383      this.labelDescription.Text = "Description";
     84      this.labelDescription.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
    12485      //
    12586      // textBoxDescription
    12687      //
    127       this.textBoxDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    128             | System.Windows.Forms.AnchorStyles.Right)));
    129       this.textBoxDescription.Location = new System.Drawing.Point(92, 3);
     88      this.textBoxDescription.Dock = System.Windows.Forms.DockStyle.Fill;
     89      this.textBoxDescription.Location = new System.Drawing.Point(100, 50);
     90      this.textBoxDescription.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
    13091      this.textBoxDescription.Name = "textBoxDescription";
    131       this.textBoxDescription.Size = new System.Drawing.Size(396, 20);
     92      this.textBoxDescription.Size = new System.Drawing.Size(394, 20);
    13293      this.textBoxDescription.TabIndex = 14;
    133       //
    134       // panel1
    135       //
    136       this.panel1.Controls.Add(this.textBoxName);
    137       this.panel1.Controls.Add(this.label1);
    138       this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
    139       this.panel1.Location = new System.Drawing.Point(0, 25);
    140       this.panel1.Margin = new System.Windows.Forms.Padding(0);
    141       this.panel1.Name = "panel1";
    142       this.panel1.Size = new System.Drawing.Size(494, 25);
    143       this.panel1.TabIndex = 17;
    144       //
    145       // textBoxName
    146       //
    147       this.textBoxName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    148             | System.Windows.Forms.AnchorStyles.Right)));
    149       this.errorProvider.SetIconAlignment(this.textBoxName, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    150       this.textBoxName.Location = new System.Drawing.Point(92, 3);
    151       this.textBoxName.Name = "textBoxName";
    152       this.textBoxName.Size = new System.Drawing.Size(396, 20);
    153       this.textBoxName.TabIndex = 10;
    154       this.textBoxName.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxName_Validating);
    15594      //
    15695      // label1
    15796      //
    15897      this.label1.AutoSize = true;
    159       this.label1.Location = new System.Drawing.Point(6, 6);
     98      this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
     99      this.label1.Location = new System.Drawing.Point(0, 24);
     100      this.label1.Margin = new System.Windows.Forms.Padding(0);
    160101      this.label1.Name = "label1";
    161       this.label1.Size = new System.Drawing.Size(35, 13);
     102      this.label1.Size = new System.Drawing.Size(100, 24);
    162103      this.label1.TabIndex = 9;
    163104      this.label1.Text = "Name";
    164       this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
    165       //
    166       // panel3
    167       //
    168       this.panel3.Controls.Add(this.labelEnable);
    169       this.panel3.Controls.Add(this.checkBoxActive);
    170       this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
    171       this.panel3.Location = new System.Drawing.Point(0, 0);
    172       this.panel3.Margin = new System.Windows.Forms.Padding(0);
    173       this.panel3.Name = "panel3";
    174       this.panel3.Size = new System.Drawing.Size(494, 25);
    175       this.panel3.TabIndex = 17;
     105      this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
    176106      //
    177107      // labelEnable
    178108      //
    179       this.labelEnable.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    180             | System.Windows.Forms.AnchorStyles.Right)));
    181109      this.labelEnable.AutoSize = true;
    182       this.labelEnable.Location = new System.Drawing.Point(6, 7);
     110      this.labelEnable.Dock = System.Windows.Forms.DockStyle.Fill;
     111      this.labelEnable.Location = new System.Drawing.Point(0, 0);
     112      this.labelEnable.Margin = new System.Windows.Forms.Padding(0);
    183113      this.labelEnable.Name = "labelEnable";
    184       this.labelEnable.Size = new System.Drawing.Size(40, 13);
     114      this.labelEnable.Size = new System.Drawing.Size(100, 24);
    185115      this.labelEnable.TabIndex = 3;
    186116      this.labelEnable.Text = "Enable";
     117      this.labelEnable.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
    187118      //
    188119      // checkBoxActive
    189120      //
    190121      this.checkBoxActive.AutoSize = true;
    191       this.checkBoxActive.Location = new System.Drawing.Point(92, 7);
     122      this.checkBoxActive.Dock = System.Windows.Forms.DockStyle.Fill;
     123      this.checkBoxActive.Location = new System.Drawing.Point(100, 0);
     124      this.checkBoxActive.Margin = new System.Windows.Forms.Padding(0);
    192125      this.checkBoxActive.Name = "checkBoxActive";
    193       this.checkBoxActive.Size = new System.Drawing.Size(15, 14);
     126      this.checkBoxActive.Size = new System.Drawing.Size(394, 24);
    194127      this.checkBoxActive.TabIndex = 2;
    195128      this.checkBoxActive.UseVisualStyleBackColor = true;
     129      //
     130      // tableLayoutPanel5
     131      //
     132      this.tableLayoutPanel5.ColumnCount = 2;
     133      this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 100F));
     134      this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
     135      this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
     136      this.tableLayoutPanel5.Controls.Add(this.textBoxDescription, 1, 2);
     137      this.tableLayoutPanel5.Controls.Add(this.textBoxName, 1, 1);
     138      this.tableLayoutPanel5.Controls.Add(this.checkBoxActive, 1, 0);
     139      this.tableLayoutPanel5.Controls.Add(this.label1, 0, 1);
     140      this.tableLayoutPanel5.Controls.Add(this.labelDescription, 0, 2);
     141      this.tableLayoutPanel5.Controls.Add(this.labelEnable, 0, 0);
     142      this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
     143      this.tableLayoutPanel5.Location = new System.Drawing.Point(0, 0);
     144      this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(0);
     145      this.tableLayoutPanel5.Name = "tableLayoutPanel5";
     146      this.tableLayoutPanel5.RowCount = 3;
     147      this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
     148      this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
     149      this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
     150      this.tableLayoutPanel5.Size = new System.Drawing.Size(494, 75);
     151      this.tableLayoutPanel5.TabIndex = 17;
    196152      //
    197153      // JsonItemBaseControl
    … …  
    203159      this.Name = "JsonItemBaseControl";
    204160      this.Padding = new System.Windows.Forms.Padding(3);
    205       this.Size = new System.Drawing.Size(500, 394);
     161      this.Size = new System.Drawing.Size(500, 600);
    206162      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    207163      this.tableLayoutPanel1.ResumeLayout(false);
    208       this.panel4.ResumeLayout(false);
    209       this.panel4.PerformLayout();
    210       this.panel2.ResumeLayout(false);
    211       this.panel2.PerformLayout();
    212       this.panel1.ResumeLayout(false);
    213       this.panel1.PerformLayout();
    214       this.panel3.ResumeLayout(false);
    215       this.panel3.PerformLayout();
     164      this.tableLayoutPanel5.ResumeLayout(false);
     165      this.tableLayoutPanel5.PerformLayout();
    216166      this.ResumeLayout(false);
    217167
    … …  
    222172    protected System.Windows.Forms.Label labelEnable;
    223173    protected System.Windows.Forms.CheckBox checkBoxActive;
    224     protected System.Windows.Forms.TextBox textBoxActualName;
    225     protected System.Windows.Forms.Label labelActualName;
    226174    protected System.Windows.Forms.TextBox textBoxName;
    227175    protected System.Windows.Forms.Label label1;
    228176    protected System.Windows.Forms.Label labelDescription;
    229177    protected System.Windows.Forms.TextBox textBoxDescription;
    230     private System.Windows.Forms.Panel panel1;
    231     private System.Windows.Forms.Panel panel3;
    232     private System.Windows.Forms.Panel panel2;
    233     private System.Windows.Forms.Panel panel4;
    234178    protected System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
     179    private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;
    235180  }
    236181}

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/JsonItemBaseControl.cs

    r17464 r17471  
    2626      InitializeComponent();
    2727      VM = vm;
    28       tableLayoutPanel1.Controls.Add(control, 0, 4);
     28      control.Margin = new Padding() { All = 0 };
     29      tableLayoutPanel1.Controls.Add(control, 0, 1);
    2930      control.Dock = DockStyle.Fill;
    3031      Init();
    … …  
    3637      textBoxName.DataBindings.Add("Text", VM, nameof(IJsonItemVM.Name));
    3738      textBoxDescription.DataBindings.Add("Text", VM, nameof(IJsonItemVM.Description));
    38       textBoxActualName.DataBindings.Add("Text", VM, nameof(IJsonItemVM.ActualName));
    39 
    40       if (string.IsNullOrWhiteSpace(VM.Item.ActualName)) {
    41         textBoxActualName.Enabled = false;
    42         tableLayoutPanel1.Controls.Remove(panel4);
    43         tableLayoutPanel1.RowStyles[3].Height = 0;
    44         //textBoxActualName.ReadOnly = true;
    45       } else
    46         textBoxActualName.Text = VM.Item.ActualName;
    4739    }
    4840

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/NumericRangeControl.Designer.cs

    r17464 r17471  
    2525    private void InitializeComponent() {
    2626      this.components = new System.ComponentModel.Container();
    27       this.textBoxFrom = new System.Windows.Forms.TextBox();
    2827      this.groupBox2 = new System.Windows.Forms.GroupBox();
    2928      this.checkBoxTo = new System.Windows.Forms.CheckBox();
    3029      this.textBoxTo = new System.Windows.Forms.TextBox();
     30      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
     31      this.textBoxFrom = new System.Windows.Forms.TextBox();
    3132      this.checkBoxFrom = new System.Windows.Forms.CheckBox();
    32       this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
     33      this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
    3334      this.groupBox2.SuspendLayout();
    3435      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
     36      this.tableLayoutPanel2.SuspendLayout();
    3537      this.SuspendLayout();
    36       //
    37       // textBoxFrom
    38       //
    39       this.textBoxFrom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    40             | System.Windows.Forms.AnchorStyles.Right)));
    41       this.errorProvider.SetIconAlignment(this.textBoxFrom, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    42       this.textBoxFrom.Location = new System.Drawing.Point(87, 16);
    43       this.textBoxFrom.Name = "textBoxFrom";
    44       this.textBoxFrom.ReadOnly = true;
    45       this.textBoxFrom.Size = new System.Drawing.Size(407, 20);
    46       this.textBoxFrom.TabIndex = 2;
    47       this.textBoxFrom.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxFrom_Validating);
    4838      //
    4939      // groupBox2
    5040      //
    51       this.groupBox2.Controls.Add(this.checkBoxTo);
    52       this.groupBox2.Controls.Add(this.textBoxTo);
    53       this.groupBox2.Controls.Add(this.checkBoxFrom);
    54       this.groupBox2.Controls.Add(this.textBoxFrom);
     41      this.groupBox2.Controls.Add(this.tableLayoutPanel2);
    5542      this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
    5643      this.groupBox2.Location = new System.Drawing.Point(0, 0);
     44      this.groupBox2.Margin = new System.Windows.Forms.Padding(0);
    5745      this.groupBox2.Name = "groupBox2";
    58       this.groupBox2.Size = new System.Drawing.Size(500, 75);
     46      this.groupBox2.Size = new System.Drawing.Size(526, 63);
    5947      this.groupBox2.TabIndex = 19;
    6048      this.groupBox2.TabStop = false;
    … …  
    6452      //
    6553      this.checkBoxTo.AutoSize = true;
    66       this.checkBoxTo.Location = new System.Drawing.Point(9, 45);
     54      this.checkBoxTo.Dock = System.Windows.Forms.DockStyle.Fill;
     55      this.checkBoxTo.Location = new System.Drawing.Point(0, 22);
     56      this.checkBoxTo.Margin = new System.Windows.Forms.Padding(0);
    6757      this.checkBoxTo.Name = "checkBoxTo";
    68       this.checkBoxTo.Size = new System.Drawing.Size(42, 17);
     58      this.checkBoxTo.Size = new System.Drawing.Size(100, 22);
    6959      this.checkBoxTo.TabIndex = 7;
    7060      this.checkBoxTo.Text = "To:";
    … …  
    7363      // textBoxTo
    7464      //
    75       this.textBoxTo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    76             | System.Windows.Forms.AnchorStyles.Right)));
    77       this.errorProvider.SetIconAlignment(this.textBoxTo, System.Windows.Forms.ErrorIconAlignment.TopLeft);
    78       this.textBoxTo.Location = new System.Drawing.Point(87, 42);
     65      this.textBoxTo.Dock = System.Windows.Forms.DockStyle.Fill;
     66      this.errorProvider.SetIconAlignment(this.textBoxTo, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     67      this.textBoxTo.Location = new System.Drawing.Point(100, 22);
     68      this.textBoxTo.Margin = new System.Windows.Forms.Padding(0);
    7969      this.textBoxTo.Name = "textBoxTo";
    8070      this.textBoxTo.ReadOnly = true;
    81       this.textBoxTo.Size = new System.Drawing.Size(407, 20);
     71      this.textBoxTo.Size = new System.Drawing.Size(420, 20);
    8272      this.textBoxTo.TabIndex = 6;
    8373      this.textBoxTo.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxTo_Validating);
    84       //
    85       // checkBoxFrom
    86       //
    87       this.checkBoxFrom.AutoSize = true;
    88       this.checkBoxFrom.Location = new System.Drawing.Point(9, 19);
    89       this.checkBoxFrom.Name = "checkBoxFrom";
    90       this.checkBoxFrom.Size = new System.Drawing.Size(52, 17);
    91       this.checkBoxFrom.TabIndex = 4;
    92       this.checkBoxFrom.Text = "From:";
    93       this.checkBoxFrom.UseVisualStyleBackColor = true;
    9474      //
    9575      // errorProvider
    … …  
    9777      this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
    9878      this.errorProvider.ContainerControl = this;
     79      //
     80      // textBoxFrom
     81      //
     82      this.textBoxFrom.Dock = System.Windows.Forms.DockStyle.Fill;
     83      this.errorProvider.SetIconAlignment(this.textBoxFrom, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     84      this.textBoxFrom.Location = new System.Drawing.Point(100, 0);
     85      this.textBoxFrom.Margin = new System.Windows.Forms.Padding(0);
     86      this.textBoxFrom.Name = "textBoxFrom";
     87      this.textBoxFrom.ReadOnly = true;
     88      this.textBoxFrom.Size = new System.Drawing.Size(420, 20);
     89      this.textBoxFrom.TabIndex = 2;
     90      this.textBoxFrom.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxFrom_Validating);
     91      //
     92      // checkBoxFrom
     93      //
     94      this.checkBoxFrom.AutoSize = true;
     95      this.checkBoxFrom.Dock = System.Windows.Forms.DockStyle.Fill;
     96      this.checkBoxFrom.Location = new System.Drawing.Point(0, 0);
     97      this.checkBoxFrom.Margin = new System.Windows.Forms.Padding(0);
     98      this.checkBoxFrom.Name = "checkBoxFrom";
     99      this.checkBoxFrom.Size = new System.Drawing.Size(100, 22);
     100      this.checkBoxFrom.TabIndex = 4;
     101      this.checkBoxFrom.Text = "From:";
     102      this.checkBoxFrom.UseVisualStyleBackColor = true;
     103      //
     104      // tableLayoutPanel2
     105      //
     106      this.tableLayoutPanel2.ColumnCount = 2;
     107      this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 100F));
     108      this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
     109      this.tableLayoutPanel2.Controls.Add(this.textBoxTo, 1, 1);
     110      this.tableLayoutPanel2.Controls.Add(this.textBoxFrom, 1, 0);
     111      this.tableLayoutPanel2.Controls.Add(this.checkBoxFrom, 0, 0);
     112      this.tableLayoutPanel2.Controls.Add(this.checkBoxTo, 0, 1);
     113      this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
     114      this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 16);
     115      this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0);
     116      this.tableLayoutPanel2.Name = "tableLayoutPanel2";
     117      this.tableLayoutPanel2.RowCount = 2;
     118      this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
     119      this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
     120      this.tableLayoutPanel2.Size = new System.Drawing.Size(520, 44);
     121      this.tableLayoutPanel2.TabIndex = 22;
    99122      //
    100123      // NumericRangeControl
    … …  
    104127      this.Controls.Add(this.groupBox2);
    105128      this.Name = "NumericRangeControl";
    106       this.Size = new System.Drawing.Size(500, 75);
     129      this.Size = new System.Drawing.Size(526, 63);
    107130      this.groupBox2.ResumeLayout(false);
    108       this.groupBox2.PerformLayout();
    109131      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
     132      this.tableLayoutPanel2.ResumeLayout(false);
     133      this.tableLayoutPanel2.PerformLayout();
    110134      this.ResumeLayout(false);
    111135
    … …  
    113137
    114138    #endregion
    115     private System.Windows.Forms.TextBox textBoxFrom;
    116139    private System.Windows.Forms.GroupBox groupBox2;
    117140    private System.Windows.Forms.CheckBox checkBoxTo;
    118141    private System.Windows.Forms.TextBox textBoxTo;
     142    private System.Windows.Forms.ErrorProvider errorProvider;
    119143    private System.Windows.Forms.CheckBox checkBoxFrom;
    120     private System.Windows.Forms.ErrorProvider errorProvider;
     144    private System.Windows.Forms.TextBox textBoxFrom;
     145    private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
    121146  }
    122147}
Note: See TracChangeset for help on using the changeset viewer.