Changeset 11111


Ignore:
Timestamp:
07/07/14 14:42:44 (5 years ago)
Author:
bburlacu
Message:

#1763: Improved alignment of node edit dialogs. Removed GroupSymbols from the list of available symbols when inserting new nodes. Added additional condition disallowing paste operations when it exceeds a symbols max arity. Moved tree status indicator to lower left and changed visibility to appear only when the tree is invalid.

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs

    r11086 r11111  
    4747    private void InitializeComponent() {
    4848      this.components = new System.ComponentModel.Container();
     49      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InteractiveSymbolicDataAnalysisSolutionSimplifierView));
    4950      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    5051      this.splitContainer = new System.Windows.Forms.SplitContainer();
     
    5253      this.treeStatusValue = new System.Windows.Forms.Label();
    5354      this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
     55      this.btnSimplify = new System.Windows.Forms.Button();
    5456      this.btnOptimizeConstants = new System.Windows.Forms.Button();
    55       this.btnSimplify = new System.Windows.Forms.Button();
    56       this.treeStatusLabel = new System.Windows.Forms.Label();
     57      this.grpViewHost = new System.Windows.Forms.GroupBox();
    5758      this.treeChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.InteractiveSymbolicExpressionTreeChart();
    58       this.grpViewHost = new System.Windows.Forms.GroupBox();
    5959      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    6060      this.splitContainer.Panel1.SuspendLayout();
     
    6868      // viewHost
    6969      //
    70       this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    71             | System.Windows.Forms.AnchorStyles.Left)
     70      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     71            | System.Windows.Forms.AnchorStyles.Left) 
    7272            | System.Windows.Forms.AnchorStyles.Right)));
    7373      this.viewHost.Caption = "View";
     
    104104      this.grpSimplify.Controls.Add(this.treeStatusValue);
    105105      this.grpSimplify.Controls.Add(this.flowLayoutPanel);
    106       this.grpSimplify.Controls.Add(this.treeStatusLabel);
    107106      this.grpSimplify.Controls.Add(this.treeChart);
    108107      this.grpSimplify.Dock = System.Windows.Forms.DockStyle.Fill;
     
    116115      // treeStatusValue
    117116      //
     117      this.treeStatusValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    118118      this.treeStatusValue.AutoSize = true;
    119       this.treeStatusValue.BackColor = System.Drawing.Color.Transparent;
    120       this.treeStatusValue.ForeColor = System.Drawing.Color.Green;
    121       this.treeStatusValue.Location = new System.Drawing.Point(72, 16);
     119      this.treeStatusValue.BackColor = System.Drawing.Color.White;
     120      this.treeStatusValue.ForeColor = System.Drawing.Color.Red;
     121      this.treeStatusValue.Location = new System.Drawing.Point(6, 351);
    122122      this.treeStatusValue.Name = "treeStatusValue";
    123       this.treeStatusValue.Size = new System.Drawing.Size(30, 13);
     123      this.treeStatusValue.Size = new System.Drawing.Size(63, 13);
    124124      this.treeStatusValue.TabIndex = 3;
    125       this.treeStatusValue.Text = "Valid";
     125      this.treeStatusValue.Text = "Invalid Tree";
     126      this.treeStatusValue.Visible = false;
    126127      //
    127128      // flowLayoutPanel
    128129      //
    129       this.flowLayoutPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
     130      this.flowLayoutPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
    130131            | System.Windows.Forms.AnchorStyles.Right)));
    131132      this.flowLayoutPanel.Controls.Add(this.btnSimplify);
     
    137138      this.flowLayoutPanel.WrapContents = false;
    138139      //
    139       // btnOptimizeConstants
    140       //       
    141       this.btnOptimizeConstants.AutoSize = true;
    142       this.btnOptimizeConstants.Enabled = false;
    143       this.btnOptimizeConstants.Image = HeuristicLab.Common.Resources.VSImageLibrary.Performance;
    144       this.btnOptimizeConstants.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter;
    145       this.btnOptimizeConstants.Location = new System.Drawing.Point(105, 3);
    146       this.btnOptimizeConstants.Name = "btnOptimizeConstants";
    147       this.btnOptimizeConstants.Size = new System.Drawing.Size(80, 24);
    148       this.btnOptimizeConstants.TabIndex = 2;
    149       this.btnOptimizeConstants.Text = "Optimize";
    150       this.btnOptimizeConstants.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
    151       this.btnOptimizeConstants.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
    152       this.btnOptimizeConstants.UseVisualStyleBackColor = true;
    153       this.btnOptimizeConstants.Click += new System.EventHandler(this.btnOptimizeConstants_Click);
    154       //
    155140      // btnSimplify
    156141      //
    157142      this.btnSimplify.AutoSize = true;
    158       this.btnSimplify.Enabled = true;
    159       this.btnSimplify.Image = HeuristicLab.Common.Resources.VSImageLibrary.FormulaEvaluator;
    160       this.btnSimplify.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter;
     143      this.btnSimplify.Image = ((System.Drawing.Image)(resources.GetObject("btnSimplify.Image")));
    161144      this.btnSimplify.Location = new System.Drawing.Point(3, 3);
    162145      this.btnSimplify.Name = "btnSimplify";
     
    164147      this.btnSimplify.TabIndex = 1;
    165148      this.btnSimplify.Text = "Simplify";
    166       this.btnSimplify.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
    167149      this.btnSimplify.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
    168150      this.btnSimplify.UseVisualStyleBackColor = true;
    169151      this.btnSimplify.Click += new System.EventHandler(this.btnSimplify_Click);
    170152      //
    171       // treeStatusLabel
    172       //
    173       this.treeStatusLabel.AutoSize = true;
    174       this.treeStatusLabel.BackColor = System.Drawing.Color.Transparent;
    175       this.treeStatusLabel.Location = new System.Drawing.Point(6, 16);
    176       this.treeStatusLabel.Name = "treeStatusLabel";
    177       this.treeStatusLabel.Size = new System.Drawing.Size(68, 13);
    178       this.treeStatusLabel.TabIndex = 2;
    179       this.treeStatusLabel.Text = "Tree Status: ";
     153      // btnOptimizeConstants
     154      //
     155      this.btnOptimizeConstants.AutoSize = true;
     156      this.btnOptimizeConstants.Enabled = false;
     157      this.btnOptimizeConstants.Image = ((System.Drawing.Image)(resources.GetObject("btnOptimizeConstants.Image")));
     158      this.btnOptimizeConstants.Location = new System.Drawing.Point(89, 3);
     159      this.btnOptimizeConstants.Name = "btnOptimizeConstants";
     160      this.btnOptimizeConstants.Size = new System.Drawing.Size(80, 24);
     161      this.btnOptimizeConstants.TabIndex = 2;
     162      this.btnOptimizeConstants.Text = "Optimize";
     163      this.btnOptimizeConstants.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
     164      this.btnOptimizeConstants.UseVisualStyleBackColor = true;
     165      this.btnOptimizeConstants.Click += new System.EventHandler(this.btnOptimizeConstants_Click);
     166      //
     167      // grpViewHost
     168      //
     169      this.grpViewHost.Controls.Add(this.viewHost);
     170      this.grpViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
     171      this.grpViewHost.Location = new System.Drawing.Point(0, 0);
     172      this.grpViewHost.Name = "grpViewHost";
     173      this.grpViewHost.Size = new System.Drawing.Size(348, 405);
     174      this.grpViewHost.TabIndex = 1;
     175      this.grpViewHost.TabStop = false;
     176      this.grpViewHost.Text = "Details";
    180177      //
    181178      // treeChart
    182179      //
    183       this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    184             | System.Windows.Forms.AnchorStyles.Left)
     180      this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     181            | System.Windows.Forms.AnchorStyles.Left) 
    185182            | System.Windows.Forms.AnchorStyles.Right)));
    186183      this.treeChart.BackgroundColor = System.Drawing.Color.White;
    187184      this.treeChart.LineColor = System.Drawing.Color.Black;
    188185      this.treeChart.Location = new System.Drawing.Point(6, 32);
     186      this.treeChart.ModifyTree = null;
    189187      this.treeChart.Name = "treeChart";
    190188      this.treeChart.Size = new System.Drawing.Size(201, 332);
     
    195193      this.treeChart.Tree = null;
    196194      this.treeChart.SymbolicExpressionTreeNodeDoubleClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeDoubleClicked);
    197       //
    198       // grpViewHost
    199       //
    200       this.grpViewHost.Controls.Add(this.viewHost);
    201       this.grpViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
    202       this.grpViewHost.Location = new System.Drawing.Point(0, 0);
    203       this.grpViewHost.Name = "grpViewHost";
    204       this.grpViewHost.Size = new System.Drawing.Size(348, 405);
    205       this.grpViewHost.TabIndex = 1;
    206       this.grpViewHost.TabStop = false;
    207       this.grpViewHost.Text = "Details";
    208195      //
    209196      // InteractiveSymbolicDataAnalysisSolutionSimplifierView
     
    223210      this.grpSimplify.PerformLayout();
    224211      this.flowLayoutPanel.ResumeLayout(false);
     212      this.flowLayoutPanel.PerformLayout();
    225213      this.grpViewHost.ResumeLayout(false);
    226214      this.ResumeLayout(false);
     
    239227    protected System.Windows.Forms.Button btnOptimizeConstants;
    240228    private System.Windows.Forms.Label treeStatusValue;
    241     private System.Windows.Forms.Label treeStatusLabel;
    242229  }
    243230}
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

    r11086 r11111  
    116116        btnOptimizeConstants.Enabled = true;
    117117        btnSimplify.Enabled = true;
    118         treeStatusValue.Text = "Valid";
    119         treeStatusValue.ForeColor = Color.Green;
     118        treeStatusValue.Visible = false;
    120119      } else {
    121120        btnOptimizeConstants.Enabled = false;
    122121        btnSimplify.Enabled = false;
    123         treeStatusValue.Text = "Invalid";
    124         treeStatusValue.ForeColor = Color.Red;
     122        treeStatusValue.Visible = true;
    125123      }
    126124      this.Refresh();
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.cs

    r11086 r11111  
    7676        pasteToolStripMenuItem.Visible = true;
    7777        pasteToolStripMenuItem.Enabled = tempNode != null && insertNodeToolStripMenuItem.Enabled
    78                                                           && !(lastOp == EditOp.CutSubtree
    79                                                                && tempNode.IterateNodesBreadth().Contains(currSelected.Content));
     78                                                          && !(lastOp == EditOp.CutSubtree && tempNode.IterateNodesBreadth().Contains(node))
     79                                                          && node.SubtreeCount < node.Symbol.MaximumArity;
    8080      }
    8181    }
     
    9696
    9797      using (var dialog = new InsertNodeDialog()) {
    98         dialog.SetAllowedSymbols(parent.Grammar.Symbols.Where(s => !(s is ProgramRootSymbol || s is StartSymbol || s is Defun))); // allow everything
     98        dialog.SetAllowedSymbols(parent.Grammar.Symbols.Where(s => !(s is ProgramRootSymbol || s is StartSymbol || s is Defun || s is GroupSymbol))); // allow everything
    9999        dialog.ShowDialog(this);
    100100        if (dialog.DialogResult != DialogResult.OK) return;
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeConstantNodeEditDialog.Designer.cs

    r9456 r11111  
    6767      // oldValueTextBox
    6868      //
    69       this.oldValueTextBox.Location = new System.Drawing.Point(123, 6);
     69      this.oldValueTextBox.Location = new System.Drawing.Point(106, 6);
    7070      this.oldValueTextBox.Name = "oldValueTextBox";
    7171      this.oldValueTextBox.ReadOnly = true;
     
    7575      // newValueTextBox
    7676      //
    77       this.newValueTextBox.Location = new System.Drawing.Point(123, 42);
     77      this.newValueTextBox.Location = new System.Drawing.Point(106, 32);
    7878      this.newValueTextBox.Name = "newValueTextBox";
    7979      this.newValueTextBox.Size = new System.Drawing.Size(131, 20);
     
    8686      //
    8787      this.newValueLabel.AutoSize = true;
    88       this.newValueLabel.Location = new System.Drawing.Point(12, 45);
     88      this.newValueLabel.Location = new System.Drawing.Point(12, 35);
    8989      this.newValueLabel.Name = "newValueLabel";
    9090      this.newValueLabel.Size = new System.Drawing.Size(59, 13);
     
    101101      //
    102102      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
    103       this.okButton.Location = new System.Drawing.Point(15, 79);
     103      this.okButton.Location = new System.Drawing.Point(81, 66);
    104104      this.okButton.Name = "okButton";
    105105      this.okButton.Size = new System.Drawing.Size(75, 23);
     
    113113      this.cancelButton.CausesValidation = false;
    114114      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    115       this.cancelButton.Location = new System.Drawing.Point(179, 79);
     115      this.cancelButton.Location = new System.Drawing.Point(162, 66);
    116116      this.cancelButton.Name = "cancelButton";
    117117      this.cancelButton.Size = new System.Drawing.Size(75, 23);
     
    127127      this.AutoSize = true;
    128128      this.CancelButton = this.cancelButton;
    129       this.ClientSize = new System.Drawing.Size(269, 116);
     129      this.ClientSize = new System.Drawing.Size(248, 101);
    130130      this.ControlBox = false;
    131131      this.Controls.Add(this.cancelButton);
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeNodeInsertDialog.Designer.cs

    r9456 r11111  
    6363      //
    6464      this.nodeSymbolLabel.AutoSize = true;
    65       this.nodeSymbolLabel.Location = new System.Drawing.Point(13, 13);
     65      this.nodeSymbolLabel.Location = new System.Drawing.Point(19, 13);
    6666      this.nodeSymbolLabel.Name = "nodeSymbolLabel";
    6767      this.nodeSymbolLabel.Size = new System.Drawing.Size(41, 13);
     
    7373      this.allowedSymbolsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    7474      this.allowedSymbolsCombo.FormattingEnabled = true;
    75       this.allowedSymbolsCombo.Location = new System.Drawing.Point(120, 10);
     75      this.allowedSymbolsCombo.Location = new System.Drawing.Point(101, 10);
    7676      this.allowedSymbolsCombo.Name = "allowedSymbolsCombo";
    77       this.allowedSymbolsCombo.Size = new System.Drawing.Size(108, 21);
     77      this.allowedSymbolsCombo.Size = new System.Drawing.Size(127, 21);
    7878      this.allowedSymbolsCombo.TabIndex = 1;
    7979      this.allowedSymbolsCombo.SelectedIndexChanged += new System.EventHandler(this.allowedSymbolsCombo_SelectedIndexChanged);
     
    8383      //
    8484      this.variableWeightLabel.AutoSize = true;
    85       this.variableWeightLabel.Location = new System.Drawing.Point(13, 44);
     85      this.variableWeightLabel.Location = new System.Drawing.Point(19, 40);
    8686      this.variableWeightLabel.Name = "variableWeightLabel";
    8787      this.variableWeightLabel.Size = new System.Drawing.Size(41, 13);
     
    9393      //
    9494      this.variableNameLabel.AutoSize = true;
    95       this.variableNameLabel.Location = new System.Drawing.Point(13, 74);
     95      this.variableNameLabel.Location = new System.Drawing.Point(19, 66);
    9696      this.variableNameLabel.Name = "variableNameLabel";
    9797      this.variableNameLabel.Size = new System.Drawing.Size(35, 13);
     
    104104      this.variableNamesCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    105105      this.variableNamesCombo.FormattingEnabled = true;
    106       this.variableNamesCombo.Location = new System.Drawing.Point(120, 71);
     106      this.variableNamesCombo.Location = new System.Drawing.Point(101, 63);
    107107      this.variableNamesCombo.Name = "variableNamesCombo";
    108       this.variableNamesCombo.Size = new System.Drawing.Size(108, 21);
     108      this.variableNamesCombo.Size = new System.Drawing.Size(127, 21);
    109109      this.variableNamesCombo.TabIndex = 5;
    110110      this.variableNamesCombo.Visible = false;
     
    112112      // variableWeightTextBox
    113113      //
    114       this.variableWeightTextBox.Location = new System.Drawing.Point(120, 41);
     114      this.variableWeightTextBox.Location = new System.Drawing.Point(120, 37);
    115115      this.variableWeightTextBox.Name = "variableWeightTextBox";
    116116      this.variableWeightTextBox.Size = new System.Drawing.Size(108, 20);
     
    122122      // constantValueTextBox
    123123      //
    124       this.constantValueTextBox.Location = new System.Drawing.Point(120, 41);
     124      this.constantValueTextBox.Location = new System.Drawing.Point(101, 37);
    125125      this.constantValueTextBox.Name = "constantValueTextBox";
    126       this.constantValueTextBox.Size = new System.Drawing.Size(108, 20);
     126      this.constantValueTextBox.Size = new System.Drawing.Size(127, 20);
    127127      this.constantValueTextBox.TabIndex = 7;
    128128      this.constantValueTextBox.Text = "0.0";
     
    133133      //
    134134      this.constantValueLabel.AutoSize = true;
    135       this.constantValueLabel.Location = new System.Drawing.Point(13, 44);
     135      this.constantValueLabel.Location = new System.Drawing.Point(19, 40);
    136136      this.constantValueLabel.Name = "constantValueLabel";
    137137      this.constantValueLabel.Size = new System.Drawing.Size(34, 13);
     
    149149      //
    150150      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
    151       this.okButton.Location = new System.Drawing.Point(12, 112);
     151      this.okButton.Location = new System.Drawing.Point(72, 98);
    152152      this.okButton.Name = "okButton";
    153153      this.okButton.Size = new System.Drawing.Size(75, 23);
     
    160160      //
    161161      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    162       this.cancelButton.Location = new System.Drawing.Point(153, 112);
     162      this.cancelButton.Location = new System.Drawing.Point(153, 98);
    163163      this.cancelButton.Name = "cancelButton";
    164164      this.cancelButton.Size = new System.Drawing.Size(75, 23);
     
    173173      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    174174      this.CancelButton = this.cancelButton;
    175       this.ClientSize = new System.Drawing.Size(240, 147);
     175      this.ClientSize = new System.Drawing.Size(241, 133);
    176176      this.ControlBox = false;
    177177      this.Controls.Add(this.cancelButton);
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeVariableNodeEditDialog.Designer.cs

    r9456 r11111  
    6161      //
    6262      this.originalValueLabel.AutoSize = true;
    63       this.originalValueLabel.Location = new System.Drawing.Point(12, 48);
     63      this.originalValueLabel.Location = new System.Drawing.Point(6, 42);
    6464      this.originalValueLabel.Name = "originalValueLabel";
    6565      this.originalValueLabel.Size = new System.Drawing.Size(72, 13);
     
    6969      // oldValueTextBox
    7070      //
    71       this.oldValueTextBox.Location = new System.Drawing.Point(123, 45);
     71      this.oldValueTextBox.Location = new System.Drawing.Point(101, 39);
    7272      this.oldValueTextBox.Name = "oldValueTextBox";
    7373      this.oldValueTextBox.ReadOnly = true;
     
    7777      // newValueTextBox
    7878      //
    79       this.newValueTextBox.Location = new System.Drawing.Point(123, 82);
     79      this.newValueTextBox.Location = new System.Drawing.Point(101, 65);
    8080      this.newValueTextBox.Name = "newValueTextBox";
    8181      this.newValueTextBox.Size = new System.Drawing.Size(131, 20);
     
    8888      //
    8989      this.newValueLabel.AutoSize = true;
    90       this.newValueLabel.Location = new System.Drawing.Point(12, 85);
     90      this.newValueLabel.Location = new System.Drawing.Point(6, 68);
    9191      this.newValueLabel.Name = "newValueLabel";
    9292      this.newValueLabel.Size = new System.Drawing.Size(59, 13);
     
    103103      //
    104104      this.variableNameLabel.AutoSize = true;
    105       this.variableNameLabel.Location = new System.Drawing.Point(12, 12);
     105      this.variableNameLabel.Location = new System.Drawing.Point(6, 15);
    106106      this.variableNameLabel.Name = "variableNameLabel";
    107107      this.variableNameLabel.Size = new System.Drawing.Size(76, 13);
     
    114114      this.variableNamesCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    115115      this.variableNamesCombo.FormattingEnabled = true;
    116       this.variableNamesCombo.Location = new System.Drawing.Point(123, 9);
     116      this.variableNamesCombo.Location = new System.Drawing.Point(101, 12);
    117117      this.variableNamesCombo.Name = "variableNamesCombo";
    118118      this.variableNamesCombo.Size = new System.Drawing.Size(131, 21);
     
    126126      //
    127127      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
    128       this.okButton.Location = new System.Drawing.Point(15, 119);
     128      this.okButton.Location = new System.Drawing.Point(75, 98);
    129129      this.okButton.Name = "okButton";
    130130      this.okButton.Size = new System.Drawing.Size(75, 23);
     
    138138      this.cancelButton.CausesValidation = false;
    139139      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    140       this.cancelButton.Location = new System.Drawing.Point(179, 119);
     140      this.cancelButton.Location = new System.Drawing.Point(156, 98);
    141141      this.cancelButton.Name = "cancelButton";
    142142      this.cancelButton.Size = new System.Drawing.Size(75, 23);
     
    152152      this.AutoSize = true;
    153153      this.CancelButton = this.cancelButton;
    154       this.ClientSize = new System.Drawing.Size(269, 154);
     154      this.ClientSize = new System.Drawing.Size(244, 134);
    155155      this.ControlBox = false;
    156156      this.Controls.Add(this.cancelButton);
Note: See TracChangeset for help on using the changeset viewer.