Changeset 9640

Timestamp:

06/17/13 16:50:38 (11 years ago)

Author:

mkommend

Message:

#1734: Updated save file dialog and ColumnGroupView in the data importer.

Location:

branches/HeuristicLab.DataImporter

Files:

• HeuristicLab.DataImporter.Data/View/ColumnGroupView.cs (modified) (3 diffs)
• HeuristicLab.DataImporter.DataProcessor/SaveDialog.Designer.cs (modified) (2 diffs)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/View/ColumnGroupView.cs

@@ -41 +41 @@
       this.splitContainer1.Panel2.Controls.Add(txtColumnName);
       txtColumnName.Visible = false;
-      txtColumnName.Leave += new EventHandler(txtColumnName_Leave);
+      txtColumnName.Validated += new EventHandler(txtColumnName_Validated);
       txtColumnName.KeyDown += new KeyEventHandler(txtColumnName_KeyDown);
 
@@ -589 +589 @@
 
     #region txtColumnName event handler
-    private void txtColumnName_Leave(object source, EventArgs e) {
+    private void txtColumnName_Validated(object source, EventArgs e) {
       if (!this.txtColumnName.Visible) return;
       this.txtColumnName.Visible = false;
@@ -599 +599 @@
 
     private void txtColumnName_KeyDown(object source, KeyEventArgs e) {
-      if (e.KeyCode != Keys.Enter && e.KeyCode != Keys.Escape)
-        return;
-      if (e.KeyCode == Keys.Enter) {
+      if (e.KeyCode == Keys.Escape) {
         DataGridView.HitTestInfo h = this.dataGridView.HitTest(txtColumnName.Location.X, txtColumnName.Location.Y);
-        if (txtColumnName.Text != this.ColumnGroup.GetColumn(h.ColumnIndex).Name)
-          this.commandChain.Add(new RenameColumnCommand(DataSet, this.ColumnGroup.Name, h.ColumnIndex, txtColumnName.Text));
-      }
-      this.txtColumnName.Visible = false;
+        this.txtColumnName.Text = this.ColumnGroup.GetColumn(h.ColumnIndex).Name;
+        dataGridView.Select();
+      } else if (e.KeyCode == Keys.Enter)
+        dataGridView.Select();
     }
     #endregion

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/SaveDialog.Designer.cs

@@ -57 +57 @@
       this.btnCancel.Name = "btnCancel";
       this.btnCancel.Size = new System.Drawing.Size(75, 23);
-      this.btnCancel.TabIndex = 2;
+      this.btnCancel.TabIndex = 3;
       this.btnCancel.Text = "Cancel";
       this.btnCancel.UseVisualStyleBackColor = true;
@@ -68 +68 @@
       this.btnNoSave.Name = "btnNoSave";
       this.btnNoSave.Size = new System.Drawing.Size(75, 23);
-      this.btnNoSave.TabIndex = 3;
+      this.btnNoSave.TabIndex = 2;
       this.btnNoSave.Text = "&Don\'t Save";
       this.btnNoSave.UseVisualStyleBackColor = true;