Changeset 5908 for trunk

Timestamp:

03/31/11 13:07:29 (14 years ago)

Author:

mkommend

Message:

#1460: Corrected StringConvertibleValueView.

Location:

trunk/sources/HeuristicLab.Data.Views/3.3

Files:

• DoubleRangeView.Designer.cs (modified) (1 diff)
• IntRangeView.Designer.cs (modified) (1 diff)
• StringConvertibleValueTupleView.Designer.cs (modified) (4 diffs)
• StringConvertibleValueView.Designer.cs (modified) (4 diffs)
• StringConvertibleValueView.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Data.Views/3.3/DoubleRangeView.Designer.cs

@@ -46 +46 @@
       this.SuspendLayout();
       // 
-      // Item1View
-      // 
-      this.Item1View.Location = new System.Drawing.Point(41, 3);
-      this.Item1View.Size = new System.Drawing.Size(264, 22);
-      // 
-      // Item2View
-      // 
-      this.Item2View.Location = new System.Drawing.Point(41, 31);
-      this.Item2View.Size = new System.Drawing.Size(264, 22);
-      // 
       // Item1Label
       // 

trunk/sources/HeuristicLab.Data.Views/3.3/IntRangeView.Designer.cs

@@ -46 +46 @@
       this.SuspendLayout();
       // 
-      // Item1View
-      // 
-      this.Item1View.Location = new System.Drawing.Point(41, 3);
-      this.Item1View.Size = new System.Drawing.Size(264, 22);
-      // 
-      // Item2View
-      // 
-      this.Item2View.Location = new System.Drawing.Point(41, 31);
-      this.Item2View.Size = new System.Drawing.Size(264, 22);
-      // 
       // Item1Label
       // 

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueTupleView.Designer.cs

@@ -52 +52 @@
       // Item1View
       // 
-      this.Item1View.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+      this.Item1View.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.Item1View.Caption = "StringConvertibleValue View";
       this.Item1View.Content = null;
       this.Item1View.LabelVisible = false;
-      this.Item1View.Location = new System.Drawing.Point(45, 3);
+      this.Item1View.Location = new System.Drawing.Point(45, 0);
       this.Item1View.Name = "Item1View";
       this.Item1View.ReadOnly = false;
-      this.Item1View.Size = new System.Drawing.Size(260, 22);
+      this.Item1View.Size = new System.Drawing.Size(260, 20);
       this.Item1View.TabIndex = 0;
       // 
       // Item2View
       // 
-      this.Item2View.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+      this.Item2View.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.Item2View.Caption = "StringConvertibleValue View";
       this.Item2View.Content = null;
       this.Item2View.LabelVisible = false;
-      this.Item2View.Location = new System.Drawing.Point(45, 31);
+      this.Item2View.Location = new System.Drawing.Point(45, 26);
       this.Item2View.Name = "Item2View";
       this.Item2View.ReadOnly = false;
-      this.Item2View.Size = new System.Drawing.Size(260, 22);
+      this.Item2View.Size = new System.Drawing.Size(260, 20);
       this.Item2View.TabIndex = 1;
       // 
@@ -79 +79 @@
       // 
       this.Item1Label.AutoSize = true;
-      this.Item1Label.Location = new System.Drawing.Point(3, 6);
+      this.Item1Label.Location = new System.Drawing.Point(3, 3);
       this.Item1Label.Name = "Item1Label";
       this.Item1Label.Size = new System.Drawing.Size(36, 13);
@@ -88 +88 @@
       // 
       this.Item2Label.AutoSize = true;
-      this.Item2Label.Location = new System.Drawing.Point(3, 34);
+      this.Item2Label.Location = new System.Drawing.Point(3, 29);
       this.Item2Label.Name = "Item2Label";
       this.Item2Label.Size = new System.Drawing.Size(36, 13);
@@ -103 +103 @@
       this.Controls.Add(this.Item2View);
       this.Name = "StringConvertibleValueTupleView";
-      this.Size = new System.Drawing.Size(308, 56);
+      this.Size = new System.Drawing.Size(308, 47);
       this.ResumeLayout(false);
       this.PerformLayout();
+
     }
 

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueView.Designer.cs

@@ -49 +49 @@
       this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
       this.valueLabel = new System.Windows.Forms.Label();
+      this.splitContainer = new System.Windows.Forms.SplitContainer();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
+      this.splitContainer.Panel1.SuspendLayout();
+      this.splitContainer.Panel2.SuspendLayout();
+      this.splitContainer.SuspendLayout();
       this.SuspendLayout();
       // 
       // valueTextBox
       // 
-      this.valueTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.valueTextBox.Location = new System.Drawing.Point(56, 0);
+      this.valueTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.valueTextBox.Location = new System.Drawing.Point(17, 0);
       this.valueTextBox.Name = "valueTextBox";
-      this.valueTextBox.Size = new System.Drawing.Size(194, 20);
+      this.valueTextBox.Size = new System.Drawing.Size(135, 20);
       this.valueTextBox.TabIndex = 1;
       this.valueTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.valueTextBox_KeyDown);
@@ -77 +82 @@
       this.valueLabel.TabIndex = 0;
       this.valueLabel.Text = "&Value:";
-      this.valueLabel.VisibleChanged += new System.EventHandler(this.valueLabel_VisibleChanged);
+      // 
+      // splitContainer
+      // 
+      this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+      this.splitContainer.IsSplitterFixed = true;
+      this.splitContainer.Location = new System.Drawing.Point(0, 0);
+      this.splitContainer.Name = "splitContainer";
+      // 
+      // splitContainer.Panel1
+      // 
+      this.splitContainer.Panel1.Controls.Add(this.valueLabel);
+      // 
+      // splitContainer.Panel2
+      // 
+      this.splitContainer.Panel2.Controls.Add(this.valueTextBox);
+      this.splitContainer.Size = new System.Drawing.Size(194, 21);
+      this.splitContainer.SplitterDistance = 41;
+      this.splitContainer.SplitterWidth = 1;
+      this.splitContainer.TabIndex = 2;
       // 
       // StringConvertibleValueView
@@ -83 +107 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.valueLabel);
-      this.Controls.Add(this.valueTextBox);
+      this.Controls.Add(this.splitContainer);
       this.Name = "StringConvertibleValueView";
-      this.Size = new System.Drawing.Size(250, 22);
+      this.Size = new System.Drawing.Size(194, 21);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
+      this.splitContainer.Panel1.ResumeLayout(false);
+      this.splitContainer.Panel1.PerformLayout();
+      this.splitContainer.Panel2.ResumeLayout(false);
+      this.splitContainer.Panel2.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
+      this.splitContainer.ResumeLayout(false);
       this.ResumeLayout(false);
-      this.PerformLayout();
 
     }
@@ -98 +126 @@
     private System.Windows.Forms.ErrorProvider errorProvider;
     private System.Windows.Forms.Label valueLabel;
+    private System.Windows.Forms.SplitContainer splitContainer;
   }
 }

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueView.cs

@@ -22 +22 @@
 using System;
 using System.ComponentModel;
-using System.Drawing;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
@@ -45 +44 @@
 
     public bool LabelVisible {
-      get { return valueLabel.Visible; }
-      set { valueLabel.Visible = value; }
+      get { return !splitContainer.Panel1Collapsed; }
+      set { splitContainer.Panel1Collapsed = !value; }
     }
 
@@ -92 +91 @@
       if (e.KeyCode == Keys.Escape) {
         valueTextBox.Text = Content.GetValue();
-        valueLabel.Select();  // select label to validate data
+        valueLabel.Focus();  // select label to validate data
       }
     }
@@ -108 +107 @@
       valueTextBox.Text = Content.GetValue();
     }
-
-    private void valueLabel_VisibleChanged(object sender, EventArgs e) {
-      if (valueLabel.Visible) {
-        valueTextBox.Location = new Point(56, 0);
-        valueTextBox.Size = new Size(valueTextBox.Size.Width - valueLabel.Size.Width, valueTextBox.Size.Height);
-      } else {
-        valueTextBox.Location = new Point(19, 0);
-        valueTextBox.Size = new Size(valueTextBox.Size.Width + valueLabel.Size.Width, valueTextBox.Size.Height);
-      }
-    }
-
   }
 }