Changeset 10668

Timestamp:

03/26/14 15:25:37 (11 years ago)

Author:

rstoll

Message:

Change CTRL+F and CTRL+R to be executed when key down (is more usability friendly)

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs (modified) (4 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs

@@ -62 +62 @@
       dataGridView.CellMouseClick += dataGridView_CellMouseClick;
       dataGridView.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(dataGridView_CellPainting);
-      dataGridView.KeyUp += dataGridView_KeyUp;
+      dataGridView.KeyDown += dataGridView_KeyDown;
       contextMenuCell.Items.Add(ShowHideColumns);
       _highlightedCells = new Dictionary<int, IList<int>>();
@@ -138 +138 @@
     }
 
-    private void dataGridView_KeyUp(object sender, KeyEventArgs e) {
-      var selectedRows = dataGridView.SelectedRows;
-      if (e.KeyCode == Keys.Delete && selectedRows.Count > 0) {
-        List<int> rows = new List<int>();
-        for (int i = 0; i < selectedRows.Count; ++i) {
-          rows.Add(selectedRows[i].Index);
-        }
-        triggersOwnEvent(() => {
-          Content.DataGridLogic.DeleteRow(rows);
-          OnContentChanged();
-        });
-      } else if (e.Control && e.KeyCode == Keys.F) {
-        CreateFindAndReplaceDialog();
-        findAndReplaceDialog.ActivateSearch();
-      } else if (e.Control && e.KeyCode == Keys.R) {
-        CreateFindAndReplaceDialog();
-        findAndReplaceDialog.ActivateReplace();
-      }
-    }
+
 
     private void CreateFindAndReplaceDialog() {
@@ -227 +209 @@
         e.Graphics.FillRectangle(backColorBrush, bounds);
       }
-
+      
       using (Brush gridBrush = new SolidBrush(Color.LightGray)) {
         Pen gridLinePen = new Pen(gridBrush);
@@ -242 +224 @@
     }
 
+    void dataGridView_KeyDown(object sender, KeyEventArgs e) {
+      var selectedRows = dataGridView.SelectedRows;
+      if (e.KeyCode == Keys.Delete && selectedRows.Count > 0) {
+        List<int> rows = new List<int>();
+        for (int i = 0; i < selectedRows.Count; ++i) {
+          rows.Add(selectedRows[i].Index);
+        }
+        triggersOwnEvent(() => {
+          Content.DataGridLogic.DeleteRow(rows);
+          OnContentChanged();
+        });
+      } else if (e.Control && e.KeyCode == Keys.F) {
+        CreateFindAndReplaceDialog();
+        findAndReplaceDialog.ActivateSearch();
+      } else if (e.Control && e.KeyCode == Keys.R) {
+        CreateFindAndReplaceDialog();
+        findAndReplaceDialog.ActivateReplace();
+      }
+    }
+
     protected override int[] Sort(IEnumerable<KeyValuePair<int, SortOrder>> sortedColumns) {
       btnApplySort.Enabled = sortedColumns.Any();