Changeset 10739 for branches/DataPreprocessing

Timestamp:

04/09/14 13:16:54 (11 years ago)

Author:

sbreuer

Message:

• close find and replace dialog when switching to other view
• scroll to found cell on find next
• fix search bug (search even if nothing is selected)
• set cursor in search field and set find next button to default
• do not show any icon in find and replace dialog

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• DataGridContentView.cs (modified) (4 diffs)
• FindAndReplaceDialog.Designer.cs (modified) (2 diffs)
• FindAndReplaceDialog.cs (modified) (2 diffs)

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

@@ -86 +86 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      if (Content == null && findAndReplaceDialog != null) {
+        findAndReplaceDialog.Close();
+      }
     }
 
@@ -196 +199 @@
       if (currentCell != null) {
         HightlightedCells = TransformToDictionary(currentCell);
+        dataGridView.FirstDisplayedCell = dataGridView[currentCell.Item1, currentCell.Item2];
       } else {
         ResetHighlightedCells();
@@ -207 +211 @@
     void findAndReplaceDialog_FindAllEvent(object sender, EventArgs e) {
       HightlightedCells = FindAll(findAndReplaceDialog.GetSearchText());
-      searchIterator.Reset();
     }
 
@@ -224 +227 @@
         IList<int> selectedList;
         if (searchInSelection && HightlightedCellsBackground.TryGetValue(i, out selectedList)) {
-          foundCells[i].Intersect(selectedList);
-        } else {
+          foundCells[i] = foundCells[i].Intersect(selectedList).ToList<int>();
+        } else if (searchInSelection) {
           foundCells[i].Clear();
         }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FindAndReplaceDialog.Designer.cs

@@ -60 +60 @@
       this.tabSearch.Name = "tabSearch";
       this.tabSearch.Padding = new System.Windows.Forms.Padding(3);
-      this.tabSearch.Size = new System.Drawing.Size(556, 117);
+      this.tabSearch.Size = new System.Drawing.Size(556, 106);
       this.tabSearch.TabIndex = 0;
       this.tabSearch.Text = "Search";
@@ -178 +178 @@
       this.ClientSize = new System.Drawing.Size(588, 156);
       this.Controls.Add(this.tabSearchReplace);
+      this.MaximizeBox = false;
+      this.MinimizeBox = false;
       this.Name = "FindAndReplaceDialog";
+      this.ShowIcon = false;
+      this.ShowInTaskbar = false;
       this.Text = "Find and Replace";
       this.tabSearchReplace.ResumeLayout(false);

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

@@ -23 +23 @@
 
     public void ActivateSearch() {
-      tabSearch.Focus();
+      tabSearchReplace.SelectTab(tabSearch);
       AddControlsToCurrentTab();
     }
 
     public void ActivateReplace() {
-      tabReplace.Focus();
+      tabSearchReplace.SelectTab(tabReplace);
       AddControlsToCurrentTab();
     }
@@ -45 +45 @@
       tabSearchReplace.SelectedTab.Controls.Add(lblSearch);
       tabSearchReplace.SelectedTab.Controls.Add(txtSearchString);
+      ActiveControl = txtSearchString;
+      AcceptButton = btnFindNext;
     }